[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  e4cf866322a4549c55153f9f135f9dadf4d3fc31 (commit)
      from  91b0d2c114d843ca775fafa12a74a33e974f4a4f (commit)


- Log -----------------------------------------------------------------
commit e4cf866322a4549c55153f9f135f9dadf4d3fc31
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Dec 16 14:45:40 2015 +0000

    fix for no-ec
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/s3_lib.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 465ed1e..a61ca62 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -4997,15 +4997,21 @@ EVP_PKEY *ssl_generate_pkey(EVP_PKEY *pm, int nid)
     if (pm != NULL) {
         pctx = EVP_PKEY_CTX_new(pm, NULL);
     } else {
-        /* Generate a new key for this curve */
+        /*
+         * Generate a new key for this curve.
+         * Should not be called if EC is disabled: if it is it will
+         * fail with an unknown algorithm error.
+         */
         pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL);
     }
     if (pctx == NULL)
         goto err;
     if (EVP_PKEY_keygen_init(pctx) <= 0)
         goto err;
+#ifndef OPENSSL_NO_EC
     if (pm == NULL && EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx, nid) <= 0)
         goto err;
+#endif
 
     if (EVP_PKEY_keygen(pctx, &pkey) <= 0) {
         EVP_PKEY_free(pkey);