sync with OpenBSD -current
This commit is contained in:
parent
9d8ac7f158
commit
382ecd9441
GPG key ID:
F42C07F07E2E35B7
108 changed files with 9152 additions and 5077 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $OpenBSD: Makefile,v 1.192 2024/03/29 07:36:38 jsing Exp $
|
||||
# $OpenBSD: Makefile,v 1.193 2024/04/15 15:55:01 tb Exp $
|
||||
|
||||
LIB= crypto
|
||||
LIBREBUILD=y
|
||||
|
|
@ -69,7 +69,6 @@ SRCS+= malloc-wrapper.c
|
|||
SRCS+= mem_clr.c
|
||||
SRCS+= mem_dbg.c
|
||||
SRCS+= o_fips.c
|
||||
SRCS+= o_str.c
|
||||
|
||||
# aes/
|
||||
SRCS+= aes.c
|
||||
|
|
|
|||
|
|
@ -197,7 +197,6 @@ ASN1_put_eoc
|
|||
ASN1_put_object
|
||||
ASN1_tag2bit
|
||||
ASN1_tag2str
|
||||
ASN1_time_tm_clamp_notafter
|
||||
ASRange_free
|
||||
ASRange_it
|
||||
ASRange_new
|
||||
|
|
@ -218,8 +217,6 @@ BF_encrypt
|
|||
BF_ofb64_encrypt
|
||||
BF_set_key
|
||||
BIGNUM_it
|
||||
BIO_CONNECT_free
|
||||
BIO_CONNECT_new
|
||||
BIO_accept
|
||||
BIO_callback_ctrl
|
||||
BIO_clear_flags
|
||||
|
|
@ -803,7 +800,6 @@ DH_size
|
|||
DH_test_flags
|
||||
DH_up_ref
|
||||
DHparams_dup
|
||||
DHparams_it
|
||||
DHparams_print
|
||||
DHparams_print_fp
|
||||
DIRECTORYSTRING_free
|
||||
|
|
@ -824,7 +820,6 @@ DSAPublicKey_it
|
|||
DSA_OpenSSL
|
||||
DSA_SIG_free
|
||||
DSA_SIG_get0
|
||||
DSA_SIG_it
|
||||
DSA_SIG_new
|
||||
DSA_SIG_set0
|
||||
DSA_bits
|
||||
|
|
@ -880,7 +875,6 @@ ECDSA_SIG_free
|
|||
ECDSA_SIG_get0
|
||||
ECDSA_SIG_get0_r
|
||||
ECDSA_SIG_get0_s
|
||||
ECDSA_SIG_it
|
||||
ECDSA_SIG_new
|
||||
ECDSA_SIG_set0
|
||||
ECDSA_do_sign
|
||||
|
|
@ -888,12 +882,6 @@ ECDSA_do_verify
|
|||
ECDSA_sign
|
||||
ECDSA_size
|
||||
ECDSA_verify
|
||||
ECPARAMETERS_free
|
||||
ECPARAMETERS_it
|
||||
ECPARAMETERS_new
|
||||
ECPKPARAMETERS_free
|
||||
ECPKPARAMETERS_it
|
||||
ECPKPARAMETERS_new
|
||||
ECPKParameters_print
|
||||
ECPKParameters_print_fp
|
||||
ECParameters_dup
|
||||
|
|
@ -1012,9 +1000,6 @@ EC_POINT_set_compressed_coordinates_GFp
|
|||
EC_POINT_set_to_infinity
|
||||
EC_POINTs_make_affine
|
||||
EC_POINTs_mul
|
||||
EC_PRIVATEKEY_free
|
||||
EC_PRIVATEKEY_it
|
||||
EC_PRIVATEKEY_new
|
||||
EC_curve_nid2nist
|
||||
EC_curve_nist2nid
|
||||
EC_get_builtin_curves
|
||||
|
|
@ -1100,15 +1085,12 @@ ERR_set_mark
|
|||
ERR_unload_strings
|
||||
ESS_CERT_ID_dup
|
||||
ESS_CERT_ID_free
|
||||
ESS_CERT_ID_it
|
||||
ESS_CERT_ID_new
|
||||
ESS_ISSUER_SERIAL_dup
|
||||
ESS_ISSUER_SERIAL_free
|
||||
ESS_ISSUER_SERIAL_it
|
||||
ESS_ISSUER_SERIAL_new
|
||||
ESS_SIGNING_CERT_dup
|
||||
ESS_SIGNING_CERT_free
|
||||
ESS_SIGNING_CERT_it
|
||||
ESS_SIGNING_CERT_new
|
||||
EVP_AEAD_CTX_cleanup
|
||||
EVP_AEAD_CTX_free
|
||||
|
|
@ -1725,8 +1707,6 @@ OPENSSL_init_crypto
|
|||
OPENSSL_load_builtin_modules
|
||||
OPENSSL_no_config
|
||||
OPENSSL_posix_to_tm
|
||||
OPENSSL_strcasecmp
|
||||
OPENSSL_strncasecmp
|
||||
OPENSSL_timegm
|
||||
OPENSSL_tm_to_posix
|
||||
OPENSSL_uni2asc
|
||||
|
|
@ -2197,7 +2177,6 @@ TS_ACCURACY_free
|
|||
TS_ACCURACY_get_micros
|
||||
TS_ACCURACY_get_millis
|
||||
TS_ACCURACY_get_seconds
|
||||
TS_ACCURACY_it
|
||||
TS_ACCURACY_new
|
||||
TS_ACCURACY_set_micros
|
||||
TS_ACCURACY_set_millis
|
||||
|
|
@ -2223,7 +2202,6 @@ TS_MSG_IMPRINT_dup
|
|||
TS_MSG_IMPRINT_free
|
||||
TS_MSG_IMPRINT_get_algo
|
||||
TS_MSG_IMPRINT_get_msg
|
||||
TS_MSG_IMPRINT_it
|
||||
TS_MSG_IMPRINT_new
|
||||
TS_MSG_IMPRINT_print_bio
|
||||
TS_MSG_IMPRINT_set_algo
|
||||
|
|
@ -2246,7 +2224,6 @@ TS_REQ_get_msg_imprint
|
|||
TS_REQ_get_nonce
|
||||
TS_REQ_get_policy_id
|
||||
TS_REQ_get_version
|
||||
TS_REQ_it
|
||||
TS_REQ_new
|
||||
TS_REQ_print_bio
|
||||
TS_REQ_set_cert_req
|
||||
|
|
@ -2280,7 +2257,6 @@ TS_RESP_free
|
|||
TS_RESP_get_status_info
|
||||
TS_RESP_get_token
|
||||
TS_RESP_get_tst_info
|
||||
TS_RESP_it
|
||||
TS_RESP_new
|
||||
TS_RESP_print_bio
|
||||
TS_RESP_set_status_info
|
||||
|
|
@ -2293,7 +2269,6 @@ TS_STATUS_INFO_free
|
|||
TS_STATUS_INFO_get0_failure_info
|
||||
TS_STATUS_INFO_get0_status
|
||||
TS_STATUS_INFO_get0_text
|
||||
TS_STATUS_INFO_it
|
||||
TS_STATUS_INFO_new
|
||||
TS_STATUS_INFO_print_bio
|
||||
TS_STATUS_INFO_set_status
|
||||
|
|
@ -2318,7 +2293,6 @@ TS_TST_INFO_get_serial
|
|||
TS_TST_INFO_get_time
|
||||
TS_TST_INFO_get_tsa
|
||||
TS_TST_INFO_get_version
|
||||
TS_TST_INFO_it
|
||||
TS_TST_INFO_new
|
||||
TS_TST_INFO_print_bio
|
||||
TS_TST_INFO_set_accuracy
|
||||
|
|
@ -2540,7 +2514,6 @@ X509_LOOKUP_file
|
|||
X509_LOOKUP_free
|
||||
X509_LOOKUP_hash_dir
|
||||
X509_LOOKUP_mem
|
||||
X509_NAME_ENTRIES_it
|
||||
X509_NAME_ENTRY_create_by_NID
|
||||
X509_NAME_ENTRY_create_by_OBJ
|
||||
X509_NAME_ENTRY_create_by_txt
|
||||
|
|
@ -2553,7 +2526,6 @@ X509_NAME_ENTRY_new
|
|||
X509_NAME_ENTRY_set
|
||||
X509_NAME_ENTRY_set_data
|
||||
X509_NAME_ENTRY_set_object
|
||||
X509_NAME_INTERNAL_it
|
||||
X509_NAME_add_entry
|
||||
X509_NAME_add_entry_by_NID
|
||||
X509_NAME_add_entry_by_OBJ
|
||||
|
|
@ -2923,14 +2895,6 @@ X509v3_get_ext_by_NID
|
|||
X509v3_get_ext_by_OBJ
|
||||
X509v3_get_ext_by_critical
|
||||
X509v3_get_ext_count
|
||||
X9_62_CHARACTERISTIC_TWO_free
|
||||
X9_62_CHARACTERISTIC_TWO_it
|
||||
X9_62_CHARACTERISTIC_TWO_new
|
||||
X9_62_CURVE_it
|
||||
X9_62_FIELDID_it
|
||||
X9_62_PENTANOMIAL_free
|
||||
X9_62_PENTANOMIAL_it
|
||||
X9_62_PENTANOMIAL_new
|
||||
ZLONG_it
|
||||
_CONF_add_string
|
||||
_CONF_free_data
|
||||
|
|
@ -3007,13 +2971,11 @@ d2i_DSAparams
|
|||
d2i_DSAparams_bio
|
||||
d2i_DSAparams_fp
|
||||
d2i_ECDSA_SIG
|
||||
d2i_ECPKPARAMETERS
|
||||
d2i_ECPKParameters
|
||||
d2i_ECParameters
|
||||
d2i_ECPrivateKey
|
||||
d2i_ECPrivateKey_bio
|
||||
d2i_ECPrivateKey_fp
|
||||
d2i_EC_PRIVATEKEY
|
||||
d2i_EC_PUBKEY
|
||||
d2i_EC_PUBKEY_bio
|
||||
d2i_EC_PUBKEY_fp
|
||||
|
|
@ -3197,13 +3159,11 @@ i2d_DSAparams
|
|||
i2d_DSAparams_bio
|
||||
i2d_DSAparams_fp
|
||||
i2d_ECDSA_SIG
|
||||
i2d_ECPKPARAMETERS
|
||||
i2d_ECPKParameters
|
||||
i2d_ECParameters
|
||||
i2d_ECPrivateKey
|
||||
i2d_ECPrivateKey_bio
|
||||
i2d_ECPrivateKey_fp
|
||||
i2d_EC_PRIVATEKEY
|
||||
i2d_EC_PUBKEY
|
||||
i2d_EC_PUBKEY_bio
|
||||
i2d_EC_PUBKEY_fp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x_name.c,v 1.42 2024/04/09 13:55:02 beck Exp $ */
|
||||
/* $OpenBSD: x_name.c,v 1.43 2024/04/15 15:52:01 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -159,7 +159,7 @@ static const ASN1_TEMPLATE X509_NAME_ENTRIES_item_tt = {
|
|||
.item = &X509_NAME_ENTRY_it,
|
||||
};
|
||||
|
||||
const ASN1_ITEM X509_NAME_ENTRIES_it = {
|
||||
static const ASN1_ITEM X509_NAME_ENTRIES_it = {
|
||||
.itype = ASN1_ITYPE_PRIMITIVE,
|
||||
.utype = -1,
|
||||
.templates = &X509_NAME_ENTRIES_item_tt,
|
||||
|
|
@ -177,7 +177,7 @@ static const ASN1_TEMPLATE X509_NAME_INTERNAL_item_tt = {
|
|||
.item = &X509_NAME_ENTRIES_it,
|
||||
};
|
||||
|
||||
const ASN1_ITEM X509_NAME_INTERNAL_it = {
|
||||
static const ASN1_ITEM X509_NAME_INTERNAL_it = {
|
||||
.itype = ASN1_ITYPE_PRIMITIVE,
|
||||
.utype = -1,
|
||||
.templates = &X509_NAME_INTERNAL_item_tt,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: bss_conn.c,v 1.39 2023/07/07 19:37:53 beck Exp $ */
|
||||
/* $OpenBSD: bss_conn.c,v 1.40 2024/04/15 15:40:08 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -105,8 +105,8 @@ static long conn_callback_ctrl(BIO *h, int cmd, BIO_info_cb *);
|
|||
|
||||
static int conn_state(BIO *b, BIO_CONNECT *c);
|
||||
static void conn_close_socket(BIO *data);
|
||||
BIO_CONNECT *BIO_CONNECT_new(void);
|
||||
void BIO_CONNECT_free(BIO_CONNECT *a);
|
||||
static BIO_CONNECT *BIO_CONNECT_new(void);
|
||||
static void BIO_CONNECT_free(BIO_CONNECT *a);
|
||||
|
||||
static const BIO_METHOD methods_connectp = {
|
||||
.type = BIO_TYPE_CONNECT,
|
||||
|
|
@ -289,7 +289,7 @@ end:
|
|||
return (ret);
|
||||
}
|
||||
|
||||
BIO_CONNECT *
|
||||
static BIO_CONNECT *
|
||||
BIO_CONNECT_new(void)
|
||||
{
|
||||
BIO_CONNECT *ret;
|
||||
|
|
@ -310,7 +310,7 @@ BIO_CONNECT_new(void)
|
|||
return (ret);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
BIO_CONNECT_free(BIO_CONNECT *a)
|
||||
{
|
||||
if (a == NULL)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: bn_lib.c,v 1.90 2023/07/28 10:35:14 tb Exp $ */
|
||||
/* $OpenBSD: bn_lib.c,v 1.91 2024/04/15 14:35:25 jsing Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -438,6 +438,9 @@ BN_clear_bit(BIGNUM *a, int n)
|
|||
|
||||
a->d[i] &= (~(((BN_ULONG)1) << j));
|
||||
bn_correct_top(a);
|
||||
|
||||
BN_set_negative(a, a->neg);
|
||||
|
||||
return (1);
|
||||
}
|
||||
LCRYPTO_ALIAS(BN_clear_bit);
|
||||
|
|
@ -476,6 +479,9 @@ BN_mask_bits(BIGNUM *a, int n)
|
|||
a->d[w] &= ~(BN_MASK2 << b);
|
||||
}
|
||||
bn_correct_top(a);
|
||||
|
||||
BN_set_negative(a, a->neg);
|
||||
|
||||
return (1);
|
||||
}
|
||||
LCRYPTO_ALIAS(BN_mask_bits);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: dh_asn1.c,v 1.12 2023/07/08 15:29:03 beck Exp $ */
|
||||
/* $OpenBSD: dh_asn1.c,v 1.13 2024/04/15 15:47:37 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2000.
|
||||
*/
|
||||
|
|
@ -114,7 +114,7 @@ static const ASN1_TEMPLATE DHparams_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM DHparams_it = {
|
||||
static const ASN1_ITEM DHparams_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = DHparams_seq_tt,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: dsa_asn1.c,v 1.31 2023/07/08 14:28:15 beck Exp $ */
|
||||
/* $OpenBSD: dsa_asn1.c,v 1.32 2024/04/15 15:49:37 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2000.
|
||||
*/
|
||||
|
|
@ -109,7 +109,7 @@ static const ASN1_TEMPLATE DSA_SIG_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM DSA_SIG_it = {
|
||||
static const ASN1_ITEM DSA_SIG_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = DSA_SIG_seq_tt,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ec.h,v 1.47 2024/04/10 15:01:31 beck Exp $ */
|
||||
/* $OpenBSD: ec.h,v 1.48 2024/04/15 15:42:23 tb Exp $ */
|
||||
/*
|
||||
* Originally written by Bodo Moeller for the OpenSSL project.
|
||||
*/
|
||||
|
|
@ -237,8 +237,6 @@ int EC_GROUP_get_basis_type(const EC_GROUP *);
|
|||
#define OPENSSL_EC_EXPLICIT_CURVE 0x000
|
||||
#define OPENSSL_EC_NAMED_CURVE 0x001
|
||||
|
||||
typedef struct ecpk_parameters_st ECPKPARAMETERS;
|
||||
|
||||
EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
|
||||
int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ec_asn1.c,v 1.48 2023/07/07 19:37:53 beck Exp $ */
|
||||
/* $OpenBSD: ec_asn1.c,v 1.52 2024/04/15 15:46:29 tb Exp $ */
|
||||
/*
|
||||
* Written by Nils Larsch for the OpenSSL project.
|
||||
*/
|
||||
|
|
@ -125,14 +125,14 @@ typedef struct ec_parameters_st {
|
|||
ASN1_INTEGER *cofactor;
|
||||
} ECPARAMETERS;
|
||||
|
||||
struct ecpk_parameters_st {
|
||||
typedef struct ecpk_parameters_st {
|
||||
int type;
|
||||
union {
|
||||
ASN1_OBJECT *named_curve;
|
||||
ECPARAMETERS *parameters;
|
||||
ASN1_NULL *implicitlyCA;
|
||||
} value;
|
||||
} /* ECPKPARAMETERS */ ;
|
||||
} ECPKPARAMETERS;
|
||||
|
||||
/* SEC1 ECPrivateKey */
|
||||
typedef struct ec_privatekey_st {
|
||||
|
|
@ -167,7 +167,7 @@ static const ASN1_TEMPLATE X9_62_PENTANOMIAL_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM X9_62_PENTANOMIAL_it = {
|
||||
static const ASN1_ITEM X9_62_PENTANOMIAL_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = X9_62_PENTANOMIAL_seq_tt,
|
||||
|
|
@ -177,21 +177,6 @@ const ASN1_ITEM X9_62_PENTANOMIAL_it = {
|
|||
.sname = "X9_62_PENTANOMIAL",
|
||||
};
|
||||
|
||||
X9_62_PENTANOMIAL *X9_62_PENTANOMIAL_new(void);
|
||||
void X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a);
|
||||
|
||||
X9_62_PENTANOMIAL *
|
||||
X9_62_PENTANOMIAL_new(void)
|
||||
{
|
||||
return (X9_62_PENTANOMIAL*)ASN1_item_new(&X9_62_PENTANOMIAL_it);
|
||||
}
|
||||
|
||||
void
|
||||
X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a)
|
||||
{
|
||||
ASN1_item_free((ASN1_VALUE *)a, &X9_62_PENTANOMIAL_it);
|
||||
}
|
||||
|
||||
static const ASN1_TEMPLATE char_two_def_tt = {
|
||||
.flags = 0,
|
||||
.tag = 0,
|
||||
|
|
@ -267,7 +252,7 @@ static const ASN1_TEMPLATE X9_62_CHARACTERISTIC_TWO_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = {
|
||||
static const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = X9_62_CHARACTERISTIC_TWO_seq_tt,
|
||||
|
|
@ -277,21 +262,6 @@ const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = {
|
|||
.sname = "X9_62_CHARACTERISTIC_TWO",
|
||||
};
|
||||
|
||||
X9_62_CHARACTERISTIC_TWO *X9_62_CHARACTERISTIC_TWO_new(void);
|
||||
void X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a);
|
||||
|
||||
X9_62_CHARACTERISTIC_TWO *
|
||||
X9_62_CHARACTERISTIC_TWO_new(void)
|
||||
{
|
||||
return (X9_62_CHARACTERISTIC_TWO*)ASN1_item_new(&X9_62_CHARACTERISTIC_TWO_it);
|
||||
}
|
||||
|
||||
void
|
||||
X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a)
|
||||
{
|
||||
ASN1_item_free((ASN1_VALUE *)a, &X9_62_CHARACTERISTIC_TWO_it);
|
||||
}
|
||||
|
||||
static const ASN1_TEMPLATE fieldID_def_tt = {
|
||||
.flags = 0,
|
||||
.tag = 0,
|
||||
|
|
@ -349,7 +319,7 @@ static const ASN1_TEMPLATE X9_62_FIELDID_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM X9_62_FIELDID_it = {
|
||||
static const ASN1_ITEM X9_62_FIELDID_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = X9_62_FIELDID_seq_tt,
|
||||
|
|
@ -383,7 +353,7 @@ static const ASN1_TEMPLATE X9_62_CURVE_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM X9_62_CURVE_it = {
|
||||
static const ASN1_ITEM X9_62_CURVE_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = X9_62_CURVE_seq_tt,
|
||||
|
|
@ -448,16 +418,16 @@ const ASN1_ITEM ECPARAMETERS_it = {
|
|||
.sname = "ECPARAMETERS",
|
||||
};
|
||||
|
||||
ECPARAMETERS *ECPARAMETERS_new(void);
|
||||
void ECPARAMETERS_free(ECPARAMETERS *a);
|
||||
static ECPARAMETERS *ECPARAMETERS_new(void);
|
||||
static void ECPARAMETERS_free(ECPARAMETERS *a);
|
||||
|
||||
ECPARAMETERS *
|
||||
static ECPARAMETERS *
|
||||
ECPARAMETERS_new(void)
|
||||
{
|
||||
return (ECPARAMETERS*)ASN1_item_new(&ECPARAMETERS_it);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
ECPARAMETERS_free(ECPARAMETERS *a)
|
||||
{
|
||||
ASN1_item_free((ASN1_VALUE *)a, &ECPARAMETERS_it);
|
||||
|
|
@ -497,31 +467,31 @@ const ASN1_ITEM ECPKPARAMETERS_it = {
|
|||
.sname = "ECPKPARAMETERS",
|
||||
};
|
||||
|
||||
ECPKPARAMETERS *ECPKPARAMETERS_new(void);
|
||||
void ECPKPARAMETERS_free(ECPKPARAMETERS *a);
|
||||
ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len);
|
||||
int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out);
|
||||
static ECPKPARAMETERS *ECPKPARAMETERS_new(void);
|
||||
static void ECPKPARAMETERS_free(ECPKPARAMETERS *a);
|
||||
static ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len);
|
||||
static int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out);
|
||||
|
||||
ECPKPARAMETERS *
|
||||
static ECPKPARAMETERS *
|
||||
d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
|
||||
{
|
||||
return (ECPKPARAMETERS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
|
||||
&ECPKPARAMETERS_it);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out)
|
||||
{
|
||||
return ASN1_item_i2d((ASN1_VALUE *)a, out, &ECPKPARAMETERS_it);
|
||||
}
|
||||
|
||||
ECPKPARAMETERS *
|
||||
static ECPKPARAMETERS *
|
||||
ECPKPARAMETERS_new(void)
|
||||
{
|
||||
return (ECPKPARAMETERS *)ASN1_item_new(&ECPKPARAMETERS_it);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
ECPKPARAMETERS_free(ECPKPARAMETERS *a)
|
||||
{
|
||||
ASN1_item_free((ASN1_VALUE *)a, &ECPKPARAMETERS_it);
|
||||
|
|
@ -558,7 +528,7 @@ static const ASN1_TEMPLATE EC_PRIVATEKEY_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM EC_PRIVATEKEY_it = {
|
||||
static const ASN1_ITEM EC_PRIVATEKEY_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = EC_PRIVATEKEY_seq_tt,
|
||||
|
|
@ -568,31 +538,31 @@ const ASN1_ITEM EC_PRIVATEKEY_it = {
|
|||
.sname = "EC_PRIVATEKEY",
|
||||
};
|
||||
|
||||
EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
|
||||
void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
|
||||
EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
|
||||
int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
|
||||
static EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
|
||||
static void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
|
||||
static EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
|
||||
static int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
|
||||
|
||||
EC_PRIVATEKEY *
|
||||
static EC_PRIVATEKEY *
|
||||
d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)
|
||||
{
|
||||
return (EC_PRIVATEKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
|
||||
&EC_PRIVATEKEY_it);
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out)
|
||||
{
|
||||
return ASN1_item_i2d((ASN1_VALUE *)a, out, &EC_PRIVATEKEY_it);
|
||||
}
|
||||
|
||||
EC_PRIVATEKEY *
|
||||
static EC_PRIVATEKEY *
|
||||
EC_PRIVATEKEY_new(void)
|
||||
{
|
||||
return (EC_PRIVATEKEY *)ASN1_item_new(&EC_PRIVATEKEY_it);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
EC_PRIVATEKEY_free(EC_PRIVATEKEY *a)
|
||||
{
|
||||
ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ecdsa.c,v 1.18 2023/08/08 13:09:28 tb Exp $ */
|
||||
/* $OpenBSD: ecdsa.c,v 1.19 2024/04/15 15:49:37 tb Exp $ */
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
|
|
@ -84,7 +84,7 @@ static const ASN1_TEMPLATE ECDSA_SIG_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM ECDSA_SIG_it = {
|
||||
static const ASN1_ITEM ECDSA_SIG_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = ECDSA_SIG_seq_tt,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: o_fips.c,v 1.7 2024/04/10 14:51:02 beck Exp $ */
|
||||
/* $OpenBSD: o_fips.c,v 1.8 2024/04/15 16:05:49 tb Exp $ */
|
||||
/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2011.
|
||||
*/
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
#include <openssl/err.h>
|
||||
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/crypto.h>
|
||||
|
||||
int
|
||||
FIPS_mode(void)
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
/* $OpenBSD: o_str.c,v 1.9 2014/07/09 20:22:14 tedu Exp $ */
|
||||
/*
|
||||
* Written by Theo de Raadt. Public domain.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
int OPENSSL_strcasecmp(const char *str1, const char *str2);
|
||||
int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n);
|
||||
|
||||
int
|
||||
OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
|
||||
{
|
||||
return strncasecmp(str1, str2, n);
|
||||
}
|
||||
|
||||
int
|
||||
OPENSSL_strcasecmp(const char *str1, const char *str2)
|
||||
{
|
||||
return strcasecmp(str1, str2);
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Don't forget to give libssl and libtls the same type of bump!
|
||||
major=53
|
||||
major=54
|
||||
minor=0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ts_asn1.c,v 1.14 2023/07/07 07:25:21 beck Exp $ */
|
||||
/* $OpenBSD: ts_asn1.c,v 1.15 2024/04/15 15:52:46 tb Exp $ */
|
||||
/* Written by Nils Larsch for the OpenSSL project 2004.
|
||||
*/
|
||||
/* ====================================================================
|
||||
|
|
@ -80,7 +80,7 @@ static const ASN1_TEMPLATE TS_MSG_IMPRINT_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM TS_MSG_IMPRINT_it = {
|
||||
static const ASN1_ITEM TS_MSG_IMPRINT_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = TS_MSG_IMPRINT_seq_tt,
|
||||
|
|
@ -202,7 +202,7 @@ static const ASN1_TEMPLATE TS_REQ_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM TS_REQ_it = {
|
||||
static const ASN1_ITEM TS_REQ_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = TS_REQ_seq_tt,
|
||||
|
|
@ -303,7 +303,7 @@ static const ASN1_TEMPLATE TS_ACCURACY_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM TS_ACCURACY_it = {
|
||||
static const ASN1_ITEM TS_ACCURACY_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = TS_ACCURACY_seq_tt,
|
||||
|
|
@ -423,7 +423,7 @@ static const ASN1_TEMPLATE TS_TST_INFO_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM TS_TST_INFO_it = {
|
||||
static const ASN1_ITEM TS_TST_INFO_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = TS_TST_INFO_seq_tt,
|
||||
|
|
@ -524,7 +524,7 @@ static const ASN1_TEMPLATE TS_STATUS_INFO_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM TS_STATUS_INFO_it = {
|
||||
static const ASN1_ITEM TS_STATUS_INFO_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = TS_STATUS_INFO_seq_tt,
|
||||
|
|
@ -640,7 +640,7 @@ static const ASN1_TEMPLATE TS_RESP_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM TS_RESP_it = {
|
||||
static const ASN1_ITEM TS_RESP_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = TS_RESP_seq_tt,
|
||||
|
|
@ -734,7 +734,7 @@ static const ASN1_TEMPLATE ESS_ISSUER_SERIAL_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM ESS_ISSUER_SERIAL_it = {
|
||||
static const ASN1_ITEM ESS_ISSUER_SERIAL_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = ESS_ISSUER_SERIAL_seq_tt,
|
||||
|
|
@ -798,7 +798,7 @@ static const ASN1_TEMPLATE ESS_CERT_ID_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM ESS_CERT_ID_it = {
|
||||
static const ASN1_ITEM ESS_CERT_ID_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = ESS_CERT_ID_seq_tt,
|
||||
|
|
@ -862,7 +862,7 @@ static const ASN1_TEMPLATE ESS_SIGNING_CERT_seq_tt[] = {
|
|||
},
|
||||
};
|
||||
|
||||
const ASN1_ITEM ESS_SIGNING_CERT_it = {
|
||||
static const ASN1_ITEM ESS_SIGNING_CERT_it = {
|
||||
.itype = ASN1_ITYPE_SEQUENCE,
|
||||
.utype = V_ASN1_SEQUENCE,
|
||||
.templates = ESS_SIGNING_CERT_seq_tt,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue