From 2f0ab90bd4cdd94e926cd49b748577f1caf4ccf7 Mon Sep 17 00:00:00 2001 From: jsing Date: Mon, 29 Aug 2022 06:48:58 +0000 Subject: [PATCH] Provide ASN1_R_TYPE_NOT_PRIMITIVE. Needed for an upcoming change. ok tb@ --- lib/libcrypto/asn1/asn1.h | 3 ++- lib/libcrypto/asn1/asn1_err.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h index f172e027e1e..67825498868 100644 --- a/lib/libcrypto/asn1/asn1.h +++ b/lib/libcrypto/asn1/asn1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1.h,v 1.68 2022/07/12 14:42:48 kn Exp $ */ +/* $OpenBSD: asn1.h,v 1.69 2022/08/29 06:48:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1180,6 +1180,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_R_TOO_LONG 155 #define ASN1_R_TOO_SMALL 224 #define ASN1_R_TYPE_NOT_CONSTRUCTED 156 +#define ASN1_R_TYPE_NOT_PRIMITIVE 231 #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 157 #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 158 #define ASN1_R_UNEXPECTED_EOC 159 diff --git a/lib/libcrypto/asn1/asn1_err.c b/lib/libcrypto/asn1/asn1_err.c index 8a99e78bd82..f67fa71340f 100644 --- a/lib/libcrypto/asn1/asn1_err.c +++ b/lib/libcrypto/asn1/asn1_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_err.c,v 1.24 2022/07/12 14:42:48 kn Exp $ */ +/* $OpenBSD: asn1_err.c,v 1.25 2022/08/29 06:48:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -176,6 +176,7 @@ static ERR_STRING_DATA ASN1_str_reasons[] = { {ERR_REASON(ASN1_R_TOO_LONG) , "too long"}, {ERR_REASON(ASN1_R_TOO_SMALL) , "too small"}, {ERR_REASON(ASN1_R_TYPE_NOT_CONSTRUCTED) , "type not constructed"}, + {ERR_REASON(ASN1_R_TYPE_NOT_PRIMITIVE) , "type not primitive"}, {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY), "unable to decode rsa key"}, {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY), "unable to decode rsa private key"}, {ERR_REASON(ASN1_R_UNEXPECTED_EOC) , "unexpected eoc"}, -- 2.20.1