diff options
author | jsing <> | 2022-08-29 06:48:58 +0000 |
---|---|---|
committer | jsing <> | 2022-08-29 06:48:58 +0000 |
commit | c0e544bfa9e294b6b70bc730202bba012157b47f (patch) | |
tree | 1c0707627e2f0a08e74620a03f2480eb84552bc0 | |
parent | a03a478b1e78f960430c820fba5baff78084cd45 (diff) | |
download | openbsd-c0e544bfa9e294b6b70bc730202bba012157b47f.tar.gz openbsd-c0e544bfa9e294b6b70bc730202bba012157b47f.tar.bz2 openbsd-c0e544bfa9e294b6b70bc730202bba012157b47f.zip |
Provide ASN1_R_TYPE_NOT_PRIMITIVE.
Needed for an upcoming change.
ok tb@
-rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/asn1_err.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index f172e027e1..6782549886 100644 --- a/src/lib/libcrypto/asn1/asn1.h +++ b/src/lib/libcrypto/asn1/asn1.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1.h,v 1.68 2022/07/12 14:42:48 kn Exp $ */ | 1 | /* $OpenBSD: asn1.h,v 1.69 2022/08/29 06:48:58 jsing 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 | * |
@@ -1180,6 +1180,7 @@ void ERR_load_ASN1_strings(void); | |||
1180 | #define ASN1_R_TOO_LONG 155 | 1180 | #define ASN1_R_TOO_LONG 155 |
1181 | #define ASN1_R_TOO_SMALL 224 | 1181 | #define ASN1_R_TOO_SMALL 224 |
1182 | #define ASN1_R_TYPE_NOT_CONSTRUCTED 156 | 1182 | #define ASN1_R_TYPE_NOT_CONSTRUCTED 156 |
1183 | #define ASN1_R_TYPE_NOT_PRIMITIVE 231 | ||
1183 | #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 157 | 1184 | #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 157 |
1184 | #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 158 | 1185 | #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 158 |
1185 | #define ASN1_R_UNEXPECTED_EOC 159 | 1186 | #define ASN1_R_UNEXPECTED_EOC 159 |
diff --git a/src/lib/libcrypto/asn1/asn1_err.c b/src/lib/libcrypto/asn1/asn1_err.c index 8a99e78bd8..f67fa71340 100644 --- a/src/lib/libcrypto/asn1/asn1_err.c +++ b/src/lib/libcrypto/asn1/asn1_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1_err.c,v 1.24 2022/07/12 14:42:48 kn Exp $ */ | 1 | /* $OpenBSD: asn1_err.c,v 1.25 2022/08/29 06:48:58 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -176,6 +176,7 @@ static ERR_STRING_DATA ASN1_str_reasons[] = { | |||
176 | {ERR_REASON(ASN1_R_TOO_LONG) , "too long"}, | 176 | {ERR_REASON(ASN1_R_TOO_LONG) , "too long"}, |
177 | {ERR_REASON(ASN1_R_TOO_SMALL) , "too small"}, | 177 | {ERR_REASON(ASN1_R_TOO_SMALL) , "too small"}, |
178 | {ERR_REASON(ASN1_R_TYPE_NOT_CONSTRUCTED) , "type not constructed"}, | 178 | {ERR_REASON(ASN1_R_TYPE_NOT_CONSTRUCTED) , "type not constructed"}, |
179 | {ERR_REASON(ASN1_R_TYPE_NOT_PRIMITIVE) , "type not primitive"}, | ||
179 | {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY), "unable to decode rsa key"}, | 180 | {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY), "unable to decode rsa key"}, |
180 | {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY), "unable to decode rsa private key"}, | 181 | {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY), "unable to decode rsa private key"}, |
181 | {ERR_REASON(ASN1_R_UNEXPECTED_EOC) , "unexpected eoc"}, | 182 | {ERR_REASON(ASN1_R_UNEXPECTED_EOC) , "unexpected eoc"}, |