[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  605236f6a8fe0743af2f63d93239a74c69dae137 (commit)
      from  9982cbbbf65473418661f5aa1f05e7ef88ada801 (commit)


- Log -----------------------------------------------------------------
commit 605236f6a8fe0743af2f63d93239a74c69dae137
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Tue Sep 29 19:59:48 2015 +0200

    Fix more d2i cases to properly update the input pointer
    
    Thanks to David Benjamin <davidben at google.com> for pointing them out.
    
    Reviewed-by: Steve Henson <steve at openssl.org>
    MR #1198

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

Summary of changes:
 crypto/asn1/d2i_pr.c | 8 +++++---
 crypto/x509/x_x509.c | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 90ec2f4..1b6f8eb 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -104,7 +104,8 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
             EVP_PKEY_free(ret);
             ret = EVP_PKCS82PKEY(p8);
             PKCS8_PRIV_KEY_INFO_free(p8);
-
+            if (ret == NULL)
+                goto err;
         } else {
             ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);
             goto err;
@@ -160,8 +161,9 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
         }
         ret = EVP_PKCS82PKEY(p8);
         PKCS8_PRIV_KEY_INFO_free(p8);
-        if (ret != NULL)
-            *pp = p;
+        if (ret == NULL)
+            return NULL;
+        *pp = p;
         if (a) {
             *a = ret;
         }
diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c
index 028c75a..92d4fa3 100644
--- a/crypto/x509/x_x509.c
+++ b/crypto/x509/x_x509.c
@@ -184,9 +184,7 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         return NULL;
     /* update length */
     length -= q - *pp;
-    if (!length)
-        return ret;
-    if (!d2i_X509_CERT_AUX(&ret->aux, &q, length))
+    if (length > 0 && !d2i_X509_CERT_AUX(&ret->aux, &q, length))
         goto err;
     *pp = q;
     return ret;