From: lolyonok <archylog@gmail.com>
Date: Fri, 14 Jul 2017 15:22:12 +0000 (+0300)
Subject: Fix nid assignment in ASN1_STRING_TABLE_add
X-Git-Tag: OpenSSL_1_1_0g~130
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c96485f77c2e4cf44aa352890568145e19a056bc;p=oweals%2Fopenssl.git

Fix nid assignment in ASN1_STRING_TABLE_add

CLA: trivial

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3934)

(cherry picked from commit 386e9169c35718436ba038dff93711d2db73fa6a)
---

diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index aadc26ced0..ecf178e28b 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
@@ -214,6 +214,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;