summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/asn1_err.c
diff options
context:
space:
mode:
authortb <>2020-12-08 15:10:03 +0000
committertb <>2020-12-08 15:10:03 +0000
commit25128aa86b3c1fab0a730b15592a21b839ae5a03 (patch)
treeab578539bc4c69bc884b6e42f1cb7e99e6eb0216 /src/lib/libcrypto/asn1/asn1_err.c
parent3b56f0265346ac27187ab1c0aa41bc27260bea5b (diff)
downloadopenbsd-OPENBSD_6_7.tar.gz
openbsd-OPENBSD_6_7.tar.bz2
openbsd-OPENBSD_6_7.zip
Fix a NULL dereference in GENERAL_NAME_cmp()libressl-v3.1.5OPENBSD_6_7
Comparing two GENERAL_NAME structures containing an EDIPARTYNAME can lead to a crash. This enables a denial of service attack for an attacker who can control both sides of the comparison. Issue reported to OpenSSL on Nov 9 by David Benjamin. OpenSSL shared the information with us on Dec 1st. Fix from Matt Caswell (OpenSSL) with a few small tweaks. ok jsing this is errata/6.7/031_asn1.patch.sig
Diffstat (limited to 'src/lib/libcrypto/asn1/asn1_err.c')
-rw-r--r--src/lib/libcrypto/asn1/asn1_err.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/asn1_err.c b/src/lib/libcrypto/asn1/asn1_err.c
index 5cc355084f..bfa9fbf0b5 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.21 2018/03/29 02:29:24 inoguchi Exp $ */ 1/* $OpenBSD: asn1_err.c,v 1.21.8.1 2020/12/08 15:10:03 tb 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 *
@@ -85,6 +85,7 @@ static ERR_STRING_DATA ASN1_str_reasons[] = {
85 {ERR_REASON(ASN1_R_BAD_OBJECT_HEADER) , "bad object header"}, 85 {ERR_REASON(ASN1_R_BAD_OBJECT_HEADER) , "bad object header"},
86 {ERR_REASON(ASN1_R_BAD_PASSWORD_READ) , "bad password read"}, 86 {ERR_REASON(ASN1_R_BAD_PASSWORD_READ) , "bad password read"},
87 {ERR_REASON(ASN1_R_BAD_TAG) , "bad tag"}, 87 {ERR_REASON(ASN1_R_BAD_TAG) , "bad tag"},
88 {ERR_REASON(ASN1_R_BAD_TEMPLATE) , "bad template"},
88 {ERR_REASON(ASN1_R_BMPSTRING_IS_WRONG_LENGTH), "bmpstring is wrong length"}, 89 {ERR_REASON(ASN1_R_BMPSTRING_IS_WRONG_LENGTH), "bmpstring is wrong length"},
89 {ERR_REASON(ASN1_R_BN_LIB) , "bn lib"}, 90 {ERR_REASON(ASN1_R_BN_LIB) , "bn lib"},
90 {ERR_REASON(ASN1_R_BOOLEAN_IS_WRONG_LENGTH), "boolean is wrong length"}, 91 {ERR_REASON(ASN1_R_BOOLEAN_IS_WRONG_LENGTH), "boolean is wrong length"},