Skip to content

Commit a991d15

Browse files
committed
deps: update archs files for quictls/openssl-3.0.0-beta-1
After an OpenSSL source update, all the config files need to be regenerated and committed by: $ make -C deps/openssl/config $ git add deps/openssl/config/archs $ git add deps/openssl/openssl $ git commit
1 parent c58028d commit a991d15

File tree

2,081 files changed

+61154
-26917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,081 files changed

+61154
-26917
lines changed

deps/openssl/config/archs/BSD-x86/asm/configdata.pm

Lines changed: 639 additions & 204 deletions
Large diffs are not rendered by default.

deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Wed Jun 16 04:34:17 2021 UTC"
14+
#define DATE "built on: Wed Jun 23 07:06:23 2021 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

deps/openssl/config/archs/BSD-x86/asm/include/openssl/asn1.h

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,11 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
438438
# define ASN1_STRFLGS_ESC_CTRL 2
439439
# define ASN1_STRFLGS_ESC_MSB 4
440440

441+
/* Lower 8 bits are reserved as an output type specifier */
442+
# define ASN1_DTFLGS_TYPE_MASK 0x0FUL
443+
# define ASN1_DTFLGS_RFC822 0x00UL
444+
# define ASN1_DTFLGS_ISO8601 0x01UL
445+
441446
/*
442447
* This flag determines how we do escaping: normally RC2253 backslash only,
443448
* set this to use backslash and quote.
@@ -929,6 +934,8 @@ void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x);
929934
in, \
930935
CHECKED_PPTR_OF(type, x)))
931936

937+
void *ASN1_item_d2i_fp_ex(const ASN1_ITEM *it, FILE *in, void *x,
938+
OSSL_LIB_CTX *libctx, const char *propq);
932939
void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
933940
int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x);
934941

@@ -951,6 +958,8 @@ void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x);
951958
in, \
952959
CHECKED_PPTR_OF(type, x)))
953960

961+
void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *pval,
962+
OSSL_LIB_CTX *libctx, const char *propq);
954963
void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *pval);
955964
int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, const void *x);
956965

@@ -963,7 +972,8 @@ int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, const void *x);
963972
BIO *ASN1_item_i2d_mem_bio(const ASN1_ITEM *it, const ASN1_VALUE *val);
964973
int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);
965974
int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
966-
int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
975+
int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm);
976+
int ASN1_TIME_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags);
967977
int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
968978
int ASN1_STRING_print_ex(BIO *out, const ASN1_STRING *str, unsigned long flags);
969979
int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int off);
@@ -1010,7 +1020,12 @@ void ASN1_STRING_TABLE_cleanup(void);
10101020

10111021
/* Old API compatible functions */
10121022
ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);
1023+
ASN1_VALUE *ASN1_item_new_ex(const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
1024+
const char *propq);
10131025
void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);
1026+
ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **val, const unsigned char **in,
1027+
long len, const ASN1_ITEM *it,
1028+
OSSL_LIB_CTX *libctx, const char *propq);
10141029
ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in,
10151030
long len, const ASN1_ITEM *it);
10161031
int ASN1_item_i2d(const ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
@@ -1086,8 +1101,9 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
10861101
STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it,
10871102
OSSL_LIB_CTX *libctx, const char *propq);
10881103
ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
1089-
ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont, const ASN1_ITEM *it,
1090-
ASN1_VALUE **x);
1104+
ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont,
1105+
const ASN1_ITEM *it, ASN1_VALUE **x,
1106+
OSSL_LIB_CTX *libctx, const char *propq);
10911107
int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
10921108
int SMIME_text(BIO *in, BIO *out);
10931109

deps/openssl/config/archs/BSD-x86/asm/include/openssl/asn1t.h

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/asn1t.h.in
44
*
5-
* Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -630,9 +630,15 @@ typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
630630
const ASN1_ITEM *it, int tag, int aclass, char opt,
631631
ASN1_TLC *ctx);
632632

633+
typedef int ASN1_ex_d2i_ex(ASN1_VALUE **pval, const unsigned char **in, long len,
634+
const ASN1_ITEM *it, int tag, int aclass, char opt,
635+
ASN1_TLC *ctx, OSSL_LIB_CTX *libctx,
636+
const char *propq);
633637
typedef int ASN1_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
634638
const ASN1_ITEM *it, int tag, int aclass);
635639
typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
640+
typedef int ASN1_ex_new_ex_func(ASN1_VALUE **pval, const ASN1_ITEM *it,
641+
OSSL_LIB_CTX *libctx, const char *propq);
636642
typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
637643

638644
typedef int ASN1_ex_print_func(BIO *out, const ASN1_VALUE **pval,
@@ -656,6 +662,8 @@ typedef struct ASN1_EXTERN_FUNCS_st {
656662
ASN1_ex_d2i *asn1_ex_d2i;
657663
ASN1_ex_i2d *asn1_ex_i2d;
658664
ASN1_ex_print_func *asn1_ex_print;
665+
ASN1_ex_new_ex_func *asn1_ex_new_ex;
666+
ASN1_ex_d2i_ex *asn1_ex_d2i_ex;
659667
} ASN1_EXTERN_FUNCS;
660668

661669
typedef struct ASN1_PRIMITIVE_FUNCS_st {
@@ -695,7 +703,7 @@ typedef struct ASN1_AUX_st {
695703
void *app_data;
696704
int flags;
697705
int ref_offset; /* Offset of reference value */
698-
int ref_lock; /* Lock type to use */
706+
int ref_lock; /* Offset of lock value */
699707
ASN1_aux_cb *asn1_cb;
700708
int enc_offset; /* Offset of ASN1_ENCODING structure */
701709
ASN1_aux_const_cb *asn1_const_cb; /* for ASN1_OP_I2D_ and ASN1_OP_PRINT_ */
@@ -747,6 +755,8 @@ typedef struct ASN1_STREAM_ARG_st {
747755
# define ASN1_OP_DETACHED_POST 13
748756
# define ASN1_OP_DUP_PRE 14
749757
# define ASN1_OP_DUP_POST 15
758+
# define ASN1_OP_GET0_LIBCTX 16
759+
# define ASN1_OP_GET0_PROPQ 17
750760

751761
/* Macro to implement a primitive type */
752762
# define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)

deps/openssl/config/archs/BSD-x86/asm/include/openssl/bio.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,23 @@ void BIO_clear_flags(BIO *b, int flags);
270270
# define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
271271
# define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
272272

273+
# ifndef OPENSSL_NO_DEPRECATED_3_0
273274
typedef long (*BIO_callback_fn)(BIO *b, int oper, const char *argp, int argi,
274275
long argl, long ret);
276+
OSSL_DEPRECATEDIN_3_0 BIO_callback_fn BIO_get_callback(const BIO *b);
277+
OSSL_DEPRECATEDIN_3_0 void BIO_set_callback(BIO *b, BIO_callback_fn callback);
278+
OSSL_DEPRECATEDIN_3_0 long BIO_debug_callback(BIO *bio, int cmd,
279+
const char *argp, int argi,
280+
long argl, long ret);
281+
# endif
282+
275283
typedef long (*BIO_callback_fn_ex)(BIO *b, int oper, const char *argp,
276284
size_t len, int argi,
277285
long argl, int ret, size_t *processed);
278-
BIO_callback_fn BIO_get_callback(const BIO *b);
279-
void BIO_set_callback(BIO *b, BIO_callback_fn callback);
280-
281286
BIO_callback_fn_ex BIO_get_callback_ex(const BIO *b);
282287
void BIO_set_callback_ex(BIO *b, BIO_callback_fn_ex callback);
288+
long BIO_debug_callback_ex(BIO *bio, int oper, const char *argp, size_t len,
289+
int argi, long argl, int ret, size_t *processed);
283290

284291
char *BIO_get_callback_arg(const BIO *b);
285292
void BIO_set_callback_arg(BIO *b, char *arg);
@@ -657,9 +664,6 @@ int BIO_nread(BIO *bio, char **buf, int num);
657664
int BIO_nwrite0(BIO *bio, char **buf);
658665
int BIO_nwrite(BIO *bio, char **buf, int num);
659666

660-
long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
661-
long argl, long ret);
662-
663667
const BIO_METHOD *BIO_s_mem(void);
664668
const BIO_METHOD *BIO_s_secmem(void);
665669
BIO *BIO_new_mem_buf(const void *buf, int len);

deps/openssl/config/archs/BSD-x86/asm/include/openssl/cmp.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,8 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
499499
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
500500
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
501501
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
502-
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file);
502+
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
503+
const char *propq);
503504
int OSSL_CMP_MSG_write(const char *file, const OSSL_CMP_MSG *msg);
504505
OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg);
505506
int i2d_OSSL_CMP_MSG_bio(BIO *bio, const OSSL_CMP_MSG *msg);

deps/openssl/config/archs/BSD-x86/asm/include/openssl/conf.h

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,11 @@ struct conf_st;
8585
struct conf_method_st;
8686
typedef struct conf_method_st CONF_METHOD;
8787

88-
struct conf_method_st {
89-
const char *name;
90-
CONF *(*create) (CONF_METHOD *meth);
91-
int (*init) (CONF *conf);
92-
int (*destroy) (CONF *conf);
93-
int (*destroy_data) (CONF *conf);
94-
int (*load_bio) (CONF *conf, BIO *bp, long *eline);
95-
int (*dump) (const CONF *conf, BIO *bp);
96-
int (*is_number) (const CONF *conf, char c);
97-
int (*to_int) (const CONF *conf, char c);
98-
int (*load) (CONF *conf, const char *name, long *eline);
99-
};
88+
# ifndef OPENSSL_NO_DEPRECATED_3_0
89+
# include <openssl/conftypes.h>
90+
# endif
10091

10192
/* Module definitions */
102-
10393
typedef struct conf_imodule_st CONF_IMODULE;
10494
typedef struct conf_module_st CONF_MODULE;
10595

@@ -152,17 +142,8 @@ OSSL_DEPRECATEDIN_1_1_0 void OPENSSL_config(const char *config_name);
152142
* that wasn't the case, the above functions would have been replaced
153143
*/
154144

155-
struct conf_st {
156-
CONF_METHOD *meth;
157-
void *meth_data;
158-
LHASH_OF(CONF_VALUE) *data;
159-
int flag_dollarid;
160-
int flag_abspath;
161-
char *includedir;
162-
OSSL_LIB_CTX *libctx;
163-
};
164-
165145
CONF *NCONF_new_ex(OSSL_LIB_CTX *libctx, CONF_METHOD *meth);
146+
OSSL_LIB_CTX *NCONF_get0_libctx(const CONF *conf);
166147
CONF *NCONF_new(CONF_METHOD *meth);
167148
CONF_METHOD *NCONF_default(void);
168149
#ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -176,6 +157,7 @@ int NCONF_load(CONF *conf, const char *file, long *eline);
176157
int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);
177158
# endif
178159
int NCONF_load_bio(CONF *conf, BIO *bp, long *eline);
160+
STACK_OF(OPENSSL_CSTRING) *NCONF_get_section_names(const CONF *conf);
179161
STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,
180162
const char *section);
181163
char *NCONF_get_string(const CONF *conf, const char *group, const char *name);

deps/openssl/config/archs/BSD-x86/asm/include/openssl/err.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ static ossl_unused ossl_inline int ERR_COMMON_ERROR(unsigned long errcode)
355355
# define ERR_R_MISSING_ASN1_EOS (267|ERR_RFLAG_COMMON)
356356
# define ERR_R_UNSUPPORTED (268|ERR_RFLAG_COMMON)
357357
# define ERR_R_FETCH_FAILED (269|ERR_RFLAG_COMMON)
358+
# define ERR_R_INVALID_PROPERTY_DEFINITION (270|ERR_RFLAG_COMMON)
358359

359360
typedef struct ERR_string_data_st {
360361
unsigned long error;

deps/openssl/config/archs/BSD-x86/asm/include/openssl/ocsp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ typedef OSSL_HTTP_REQ_CTX OCSP_REQ_CTX;
285285
OCSP_REQ_CTX_i2d(r, ASN1_ITEM_rptr(OCSP_REQUEST), (ASN1_VALUE *)(req))
286286
# define OCSP_REQ_CTX_nbio OSSL_HTTP_REQ_CTX_nbio
287287
# define OCSP_REQ_CTX_nbio_d2i OSSL_HTTP_REQ_CTX_nbio_d2i
288-
# define OCSP_sendreq_nbio(r, p) \
288+
# define OCSP_sendreq_nbio(p, r) \
289289
OSSL_HTTP_REQ_CTX_nbio_d2i(r, (ASN1_VALUE **)(p), \
290290
ASN1_ITEM_rptr(OCSP_RESPONSE))
291291
# define OCSP_REQ_CTX_get0_mem_bio OSSL_HTTP_REQ_CTX_get0_mem_bio

deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern "C" {
3939
*/
4040

4141
/* Could be: #define OPENSSL_VERSION_PRE_RELEASE "-alpha.1" */
42-
# define OPENSSL_VERSION_PRE_RELEASE "-alpha17"
42+
# define OPENSSL_VERSION_PRE_RELEASE "-beta1"
4343
/* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */
4444
/* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */
4545
# define OPENSSL_VERSION_BUILD_METADATA "+quic"
@@ -75,20 +75,20 @@ extern "C" {
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
7777
# define OPENSSL_VERSION_STR "3.0.0"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.0-alpha17+quic"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.0-beta1+quic"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "20 May 2021"
85+
# define OPENSSL_RELEASE_DATE "17 Jun 2021"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.0-alpha17+quic 20 May 2021"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.0-beta1+quic 17 Jun 2021"
9292

9393
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
9494
# ifdef OPENSSL_VERSION_PRE_RELEASE

deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
# include <openssl/symhacks.h>
4242
# include <openssl/ct.h>
4343
# include <openssl/sslerr.h>
44+
# include <openssl/prov_ssl.h>
4445

4546
#ifdef __cplusplus
4647
extern "C" {
@@ -58,7 +59,7 @@ extern "C" {
5859

5960
# define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES (512/8)
6061
# define SSL_MAX_KEY_ARG_LENGTH 8
61-
# define SSL_MAX_MASTER_KEY_LENGTH 48
62+
/* SSL_MAX_MASTER_KEY_LENGTH is defined in prov_ssl.h */
6263

6364
/* The maximum number of encrypt/decrypt pipelines we can support */
6465
# define SSL_MAX_PIPELINES 32
@@ -692,6 +693,7 @@ typedef int (*GEN_SESSION_CB) (SSL *ssl, unsigned char *id,
692693
# define SSL_SESS_CACHE_NO_INTERNAL_STORE 0x0200
693694
# define SSL_SESS_CACHE_NO_INTERNAL \
694695
(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP|SSL_SESS_CACHE_NO_INTERNAL_STORE)
696+
# define SSL_SESS_CACHE_UPDATE_TIME 0x0400
695697

696698
LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx);
697699
# define SSL_CTX_sess_number(ctx) \

0 commit comments

Comments
 (0)