[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  53c9818e970fc0c22d77e19fda3b3e6f6c9e759d (commit)
      from  f6c024c2e7f33e9d26c62cf19d519e5ef7fa4a09 (commit)


- Log -----------------------------------------------------------------
commit 53c9818e970fc0c22d77e19fda3b3e6f6c9e759d
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 22 14:33:05 2018 +0000

    Don't write out a bad OID
    
    If we don't have OID data for an object then we should fail if we
    are asked to encode the ASN.1 for that OID.
    
    Fixes #5723
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5725)

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

Summary of changes:
 crypto/asn1/tasn_enc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index caa4869..8b562ba 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -528,6 +528,8 @@ static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
         otmp = (ASN1_OBJECT *)*pval;
         cont = otmp->data;
         len = otmp->length;
+        if (cont == NULL || len == 0)
+            return -1;
         break;
 
     case V_ASN1_NULL: