[openssl-commits] [openssl] master update

[Tim Hudson]

The branch master has been updated
       via  82f52631b21b021787f344733e08bb53f1e7f0ec (commit)
      from  141d7325e7e513102fb8c123dab62dbbd61e846d (commit)


- Log -----------------------------------------------------------------
commit 82f52631b21b021787f344733e08bb53f1e7f0ec
Author: Tim Hudson <tjh at openssl.org>
Date:   Sat Sep 10 06:53:33 2016 +1000

    Fix EC_KEY_print so it prints out private key information
    even when the public key is not present in an EC_KEY
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 crypto/ec/ec_ameth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 9792007..66437e0 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -345,7 +345,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
         return 0;
     }
 
-    if (ktype != EC_KEY_PRINT_PARAM) {
+    if (ktype != EC_KEY_PRINT_PARAM && EC_KEY_get0_public_key(x) != NULL) {
         publen = EC_KEY_key2buf(x, EC_KEY_get_conv_form(x), &pub, NULL);
         if (publen == 0)
             goto err;