aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2020-12-08 18:10:16 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2020-12-08 18:10:16 +0000
commit970a464089066970886f0bce6d1c9dcfbcb2e8ea (patch)
tree655c2eb8197c7c07b52e3246e4f63157f928f13d /include
parent92f02b3b0f21350e7c92a16ca9b594ad7682c717 (diff)
downloadsrc-970a464089066970886f0bce6d1c9dcfbcb2e8ea.tar.gz
src-970a464089066970886f0bce6d1c9dcfbcb2e8ea.zip
Import OpenSSL 1.1.1i.vendor/openssl/1.1.1i
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=368456 svn path=/vendor-crypto/openssl/1.1.1i/; revision=368457; tag=vendor/openssl/1.1.1i
Diffstat (limited to 'include')
-rw-r--r--include/openssl/asn1err.h8
-rw-r--r--include/openssl/opensslv.h4
-rw-r--r--include/openssl/x509.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index faed5a55180d..e1ad1fefeca7 100644
--- a/include/openssl/asn1err.h
+++ b/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
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 7cf31d3625cc..f5d660a467bc 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ extern "C" {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-# define OPENSSL_VERSION_NUMBER 0x1010108fL
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1h 22 Sep 2020"
+# define OPENSSL_VERSION_NUMBER 0x1010109fL
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1i 8 Dec 2020"
/*-
* The macros below are to be used for shared library (.so, .dll, ...)
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index b97ec342e2c9..3ff86ec7b54d 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -933,7 +933,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
int type,
const unsigned char *bytes,
int len);
-void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,
+void *X509at_get0_data_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *x,
const ASN1_OBJECT *obj, int lastpos, int type);
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
int atrtype, const void *data,