[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  386e9169c35718436ba038dff93711d2db73fa6a (commit)
      from  cf9f101995adf9e751ff91f0e60a2e8c3a938f71 (commit)


- Log -----------------------------------------------------------------
commit 386e9169c35718436ba038dff93711d2db73fa6a
Author: lolyonok <archylog at gmail.com>
Date:   Fri Jul 14 18:22:12 2017 +0300

    Fix nid assignment in ASN1_STRING_TABLE_add
    
    CLA: trivial
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3934)

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

Summary of changes:
 crypto/asn1/a_strnid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index ce8a646..df4ea2a 100644
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -167,6 +167,7 @@ static ASN1_STRING_TABLE *stable_get(int nid)
         rv->mask = tmp->mask;
         rv->flags = tmp->flags | STABLE_FLAGS_MALLOC;
     } else {
+        rv->nid = nid;
         rv->minsize = -1;
         rv->maxsize = -1;
         rv->flags = STABLE_FLAGS_MALLOC;