aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/include
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2020-12-08 19:10:40 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2020-12-08 19:10:40 +0000
commit2120d07af09cb830873554ba5405c5d3e51b41cc (patch)
tree791263db978a9838d40416cd443c5bc408bd03eb /crypto/openssl/include
parentfc825298b84729facaced36d32c3fc8d111648c1 (diff)
downloadsrc-releng/12.2.tar.gz
src-releng/12.2.zip
Fix OpenSSL NULL pointer de-reference.releng/12.2
Approved by: so Security: FreeBSD-SA-20:33.openssl Security: CVE-2020-1971
Notes
Notes: svn path=/releng/12.2/; revision=368463
Diffstat (limited to 'crypto/openssl/include')
-rw-r--r--crypto/openssl/include/openssl/asn1err.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssl/include/openssl/asn1err.h b/crypto/openssl/include/openssl/asn1err.h
index faed5a55180d..e1ad1fefeca7 100644
--- a/crypto/openssl/include/openssl/asn1err.h
+++ b/crypto/openssl/include/openssl/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -11,9 +11,7 @@
#ifndef HEADER_ASN1ERR_H
# define HEADER_ASN1ERR_H
-# ifndef HEADER_SYMHACKS_H
-# include <openssl/symhacks.h>
-# endif
+# include <openssl/symhacks.h>
# ifdef __cplusplus
extern "C"
@@ -53,6 +51,7 @@ int ERR_load_ASN1_strings(void);
# define ASN1_F_ASN1_ITEM_DUP 191
# define ASN1_F_ASN1_ITEM_EMBED_D2I 120
# define ASN1_F_ASN1_ITEM_EMBED_NEW 121
+# define ASN1_F_ASN1_ITEM_EX_I2D 144
# define ASN1_F_ASN1_ITEM_FLAGS_I2D 118
# define ASN1_F_ASN1_ITEM_I2D_BIO 192
# define ASN1_F_ASN1_ITEM_I2D_FP 193
@@ -145,6 +144,7 @@ int ERR_load_ASN1_strings(void);
# define ASN1_R_ASN1_SIG_PARSE_ERROR 204
# define ASN1_R_AUX_ERROR 100
# define ASN1_R_BAD_OBJECT_HEADER 102
+# define ASN1_R_BAD_TEMPLATE 230
# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 214
# define ASN1_R_BN_LIB 105
# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106