Additional "chain_cert" functions.

[openssl.git] / ssl / ssl_cert.c

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index f86511d81c39347b45aa8b9a84882eb9b8370cd9..9d77ef79a2fea19ae2a5bf0ce3dcfeea0705c9c0 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -330,35 +330,18 @@ CERT *ssl_cert_dup(CERT *cert)
                        }
                rpk->valid_flags = 0;
 #ifndef OPENSSL_NO_TLSEXT
-     if (cert->pkeys[i].authz != NULL)
-                       {
-                       /* Just copy everything. */
-                       ret->pkeys[i].authz_length =
-                               cert->pkeys[i].authz_length;
-                       ret->pkeys[i].authz =
-                               OPENSSL_malloc(ret->pkeys[i].authz_length);
-                       if (ret->pkeys[i].authz == NULL)
-                               {
-                               SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE);
-                               return NULL;
-                               }
-                       memcpy(ret->pkeys[i].authz,
-                              cert->pkeys[i].authz,
-                              cert->pkeys[i].authz_length);
-                       }
-
                if (cert->pkeys[i].serverinfo != NULL)
                        {
                        /* Just copy everything. */
-                       ret->pkeys[i].serverinfo_length =
-                               cert->pkeys[i].serverinfo_length;
                        ret->pkeys[i].serverinfo =
-                               OPENSSL_malloc(ret->pkeys[i].serverinfo_length);
+                               OPENSSL_malloc(cert->pkeys[i].serverinfo_length);
                        if (ret->pkeys[i].serverinfo == NULL)
                                {
                                SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE);
                                return NULL;
                                }
+                       ret->pkeys[i].serverinfo_length =
+                               cert->pkeys[i].serverinfo_length;
                        memcpy(ret->pkeys[i].serverinfo,
                               cert->pkeys[i].serverinfo,
                               cert->pkeys[i].serverinfo_length);
@@ -479,15 +462,11 @@ void ssl_cert_clear_certs(CERT *c)
                        cpk->chain = NULL;
                        }
 #ifndef OPENSSL_NO_TLSEXT
-               if (cpk->authz)
-                       {
-                       OPENSSL_free(cpk->authz);
-                       cpk->authz = NULL;
-                       }
                if (cpk->serverinfo)
                        {
                        OPENSSL_free(cpk->serverinfo);
                        cpk->serverinfo = NULL;
+                       cpk->serverinfo_length = 0;
                        }
 #endif
                /* Clear all flags apart from explicit sign */
@@ -620,6 +599,20 @@ int ssl_cert_add1_chain_cert(CERT *c, X509 *x)
        return 1;
        }
 
+int ssl_cert_select_current(CERT *c, X509 *x)
+       {
+       int i;
+       for (i = 0; i < SSL_PKEY_NUM; i++)
+               {
+               if (c->pkeys[i].x509 == x)
+                       {
+                       c->key = &c->pkeys[i];
+                       return 1;
+                       }
+               }
+       return 0;
+       }
+
 void ssl_cert_set_cert_cb(CERT *c, int (*cb)(SSL *ssl, void *arg), void *arg)
        {
        c->cert_cb = cb;