diff options
| author | lolyonok <archylog@gmail.com> | 2017-07-14 18:22:12 +0300 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-07-24 14:52:43 -0400 |
| commit | c96485f77c2e4cf44aa352890568145e19a056bc (patch) | |
| tree | c71e7493692fc32d76bb6b1d237d7babfd2022a2 /crypto/asn1 | |
| parent | 9433f9f5d945cd413b3f23f05f6681373f601a4a (diff) | |
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)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_strnid.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |