[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  afcee950b4559a3975bde06c484e98eddef5837e (commit)
      from  875856efd6a6f5d3e6f32661e0e50afcea5bcb62 (commit)


- Log -----------------------------------------------------------------
commit afcee950b4559a3975bde06c484e98eddef5837e
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Feb 26 14:11:46 2016 -0500

    Revert "EC_KEY_priv2buf (): check parameter sanity"
    
    This reverts commit acae59bb29ddc769743ab4a8ae373b5ff2f42b57.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

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

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 439cfa2..c382e7e 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -583,8 +583,8 @@ size_t EC_KEY_priv2buf(const EC_KEY *eckey, unsigned char **pbuf)
     size_t len;
     unsigned char *buf;
     len = EC_KEY_priv2oct(eckey, NULL, 0);
-    if (len == 0 || pbuf == NULL)
-        return len;
+    if (len == 0)
+        return 0;
     buf = OPENSSL_malloc(len);
     if (buf == NULL)
         return 0;