summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/asn1.h
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.h
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.h')
-rw-r--r--src/lib/libcrypto/asn1/asn1.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 0a8da415fb..9cbc21238b 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.53 2018/11/30 04:51:19 jeremy Exp $ */ 1/* $OpenBSD: asn1.h,v 1.53.6.1 2020/12/08 15:10:03 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 *
@@ -1137,6 +1137,7 @@ void ERR_load_ASN1_strings(void);
1137#define ASN1_R_BAD_OBJECT_HEADER 102 1137#define ASN1_R_BAD_OBJECT_HEADER 102
1138#define ASN1_R_BAD_PASSWORD_READ 103 1138#define ASN1_R_BAD_PASSWORD_READ 103
1139#define ASN1_R_BAD_TAG 104 1139#define ASN1_R_BAD_TAG 104
1140#define ASN1_R_BAD_TEMPLATE 230
1140#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 214 1141#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 214
1141#define ASN1_R_BN_LIB 105 1142#define ASN1_R_BN_LIB 105
1142#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106 1143#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106