The branch OpenSSL_1_1_0-stable has been updated
via c96485f77c2e4cf44aa352890568145e19a056bc (commit)
from 9433f9f5d945cd413b3f23f05f6681373f601a4a (commit)
- Log -----------------------------------------------------------------
commit c96485f77c2e4cf44aa352890568145e19a056bc
Author: lolyonok <[email protected]>
Date: Fri Jul 14 18:22:12 2017 +0300
Fix nid assignment in ASN1_STRING_TABLE_add
CLA: trivial
Reviewed-by: Kurt Roeckx <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/3934)
(cherry picked from commit 386e9169c35718436ba038dff93711d2db73fa6a)
-----------------------------------------------------------------------
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 aadc26c..ecf178e 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
