diff options
| author | tb <> | 2022-07-09 14:46:43 +0000 |
|---|---|---|
| committer | tb <> | 2022-07-09 14:46:43 +0000 |
| commit | 40868ef62b1c990379f28b723127ae704c232772 (patch) | |
| tree | 5c650ce686e63356a0cab13dba431952564ce406 /src/lib/libcrypto/asn1/a_enum.c | |
| parent | 5cf8b7bf8d40a8ed9ec1e6e728eba63e0d7243b9 (diff) | |
| download | openbsd-40868ef62b1c990379f28b723127ae704c232772.tar.gz openbsd-40868ef62b1c990379f28b723127ae704c232772.tar.bz2 openbsd-40868ef62b1c990379f28b723127ae704c232772.zip | |
Make ASN1_{INTEGER,ENUMERATED}_get() return 0 on NULL again
This is the documented behavior which got lost in the recent rewrite.
Mismatch of documentation and reality pointed out by schwarze
ok jsing
Diffstat (limited to 'src/lib/libcrypto/asn1/a_enum.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_enum.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c index 11868cef37..3b6cd9f954 100644 --- a/src/lib/libcrypto/asn1/a_enum.c +++ b/src/lib/libcrypto/asn1/a_enum.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_enum.c,v 1.24 2022/06/25 16:15:18 jsing Exp $ */ | 1 | /* $OpenBSD: a_enum.c,v 1.25 2022/07/09 14:46:43 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -141,6 +141,8 @@ ASN1_ENUMERATED_get(const ASN1_ENUMERATED *aenum) | |||
| 141 | { | 141 | { |
| 142 | int64_t val; | 142 | int64_t val; |
| 143 | 143 | ||
| 144 | if (aenum == NULL) | ||
| 145 | return 0; | ||
| 144 | if (!ASN1_ENUMERATED_get_int64(&val, aenum)) | 146 | if (!ASN1_ENUMERATED_get_int64(&val, aenum)) |
| 145 | return -1; | 147 | return -1; |
| 146 | if (val < LONG_MIN || val > LONG_MAX) { | 148 | if (val < LONG_MIN || val > LONG_MAX) { |
