Move connection info into it's own private structure allocated and filled in

at handshake time. change accessors to return const char * to remove need
for caller to free memory.
ok jsing@

1 files changed, 18 insertions, 90 deletions

diff --git a/src/lib/libtls/tls_peer.c b/src/lib/libtls/tls_peer.c
index cd1984f215..3145e500c4 100644
--- a/src/lib/libtls/tls_peer.c
+++ b/src/lib/libtls/tls_peer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_peer.c,v 1.3 2015/09/11 13:22:39 beck Exp $ */
+/* $OpenBSD: tls_peer.c,v 1.4 2015/09/12 21:00:38 beck Exp $ */
 /*
  * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
@@ -23,68 +23,27 @@
 #include <tls.h>
 #include "tls_internal.h"
 
-static int
-tls_hex_string(const unsigned char *in, size_t inlen, char **out,
-    size_t *outlen)
+const char *
+tls_peer_cert_hash(struct tls *ctx)
 {
-        static const char hex[] = "0123456789abcdef";
-        size_t i, len;
-        char *p;
-
-        if (outlen != NULL)
-                *outlen = 0;
-
-        if (inlen >= SIZE_MAX)
-                return (-1);
-        if ((*out = reallocarray(NULL, inlen + 1, 2)) == NULL)
-                return (-1);
-
-        p = *out;
-        len = 0;
-        for (i = 0; i < inlen; i++) {
-                p[len++] = hex[(in[i] >> 4) & 0x0f];
-                p[len++] = hex[in[i] & 0x0f];
-        }
-        p[len++] = 0;
-
-        if (outlen != NULL)
-                *outlen = len;
-
-        return (0);
+        if (ctx->conninfo)
+                return (ctx->conninfo->hash);
+        return NULL;
 }
-
-int
-tls_peer_cert_hash(struct tls *ctx, char **hash)
+const char *
+tls_peer_cert_issuer(struct tls *ctx)
 {
-        char d[EVP_MAX_MD_SIZE], *dhex = NULL;
-        int dlen, rv = -1;
-
-        *hash = NULL;
-        if (ctx->ssl_peer_cert == NULL)
-                return (0);
-
-        if (X509_digest(ctx->ssl_peer_cert, EVP_sha256(), d, &dlen) != 1) {
-                tls_set_errorx(ctx, "digest failed");
-                goto err;
-        }
-
-        if (tls_hex_string(d, dlen, &dhex, NULL) != 0) {
-                tls_set_errorx(ctx, "digest hex string failed");
-                goto err;
-        }
-
-        if (asprintf(hash, "SHA256:%s", dhex) == -1) {
-                tls_set_errorx(ctx, "out of memory");
-                *hash = NULL;
-                goto err;
-        }
-
-        rv = 0;
-
-err:
-        free(dhex);
+        if (ctx->conninfo)
+                return (ctx->conninfo->issuer);
+        return NULL;
+}
 
-        return (rv);
+const char *
+tls_peer_cert_subject(struct tls *ctx)
+{
+        if (ctx->conninfo)
+                return (ctx->conninfo->subject);
+        return NULL;
 }
 
 int
@@ -102,34 +61,3 @@ tls_peer_cert_contains_name(struct tls *ctx, const char *name)
         return (tls_check_name(ctx, ctx->ssl_peer_cert, name) == 0);
 }
 
-int
-tls_peer_cert_issuer(struct tls *ctx,  char **issuer)
-{
-        X509_NAME *name = NULL;
-
-        *issuer = NULL;
-        if (ctx->ssl_peer_cert == NULL)
-                return (-1);
-        if ((name = X509_get_issuer_name(ctx->ssl_peer_cert)) == NULL)
-                return (-1);
-        *issuer = X509_NAME_oneline(name, 0, 0);
-        if (*issuer == NULL)
-                return (-1);
-        return (0);
-}
-
-int
-tls_peer_cert_subject(struct tls *ctx, char **subject)
-{
-        X509_NAME *name = NULL;
-
-        *subject = NULL;
-        if (ctx->ssl_peer_cert == NULL)
-                return (-1);
-        if ((name = X509_get_subject_name(ctx->ssl_peer_cert)) == NULL)
-                return (-1);
-        *subject = X509_NAME_oneline(name, 0, 0);
-        if (*subject == NULL)
-                return (-1);
-        return (0);
-}