[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  4445704f912495227e9e99835e94219d7e79684c (commit)
       via  4fdf17a0ec8abe758723b9ff4dac85b8134e9ebf (commit)
      from  3d9ebc373f6c95df1d4b079d73f3ab0194c57621 (commit)


- Log -----------------------------------------------------------------
commit 4445704f912495227e9e99835e94219d7e79684c
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Jul 21 14:27:10 2015 +0100

    free names before context
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

commit 4fdf17a0ec8abe758723b9ff4dac85b8134e9ebf
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Jul 21 14:16:09 2015 +0100

    typo
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 4160566..5c320cb 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -153,7 +153,7 @@ struct ssl_conf_ctx_st {
 static void ssl_set_option(SSL_CONF_CTX *cctx, unsigned int name_flags,
                            unsigned long option_value, int onoff)
 {
-    unint32_t *pflags;
+    uint32_t *pflags;
     if (cctx->poptions == NULL)
         return;
     if (name_flags & SSL_TFLAG_INV)
@@ -832,8 +832,8 @@ void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx)
         for (i = 0; i < SSL_PKEY_NUM; i++)
             OPENSSL_free(cctx->cert_filename[i]);
         OPENSSL_free(cctx->prefix);
-        OPENSSL_free(cctx);
         sk_X509_NAME_pop_free(cctx->canames, X509_NAME_free);
+        OPENSSL_free(cctx);
     }
 }