From dcbbedc9acedb9203cec6f635f57b433f541d560 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 10 May 2025 05:54:39 +0000 Subject: Use err_local.h rather than err.h in most places ok jsing --- src/lib/libcrypto/asn1/a_bitstr.c | 4 ++-- src/lib/libcrypto/asn1/a_enum.c | 4 ++-- src/lib/libcrypto/asn1/a_int.c | 4 ++-- src/lib/libcrypto/asn1/a_mbstr.c | 4 ++-- src/lib/libcrypto/asn1/a_object.c | 4 ++-- src/lib/libcrypto/asn1/a_pkey.c | 4 ++-- src/lib/libcrypto/asn1/a_pubkey.c | 4 ++-- src/lib/libcrypto/asn1/a_string.c | 4 ++-- src/lib/libcrypto/asn1/a_strnid.c | 3 +-- src/lib/libcrypto/asn1/a_time.c | 3 +-- src/lib/libcrypto/asn1/a_time_tm.c | 6 +++--- src/lib/libcrypto/asn1/a_type.c | 4 ++-- src/lib/libcrypto/asn1/asn1_gen.c | 4 ++-- src/lib/libcrypto/asn1/asn1_item.c | 4 ++-- src/lib/libcrypto/asn1/asn1_old.c | 4 ++-- src/lib/libcrypto/asn1/asn1_old_lib.c | 4 ++-- src/lib/libcrypto/asn1/asn_mime.c | 4 ++-- src/lib/libcrypto/asn1/asn_moid.c | 4 ++-- src/lib/libcrypto/asn1/bio_ndef.c | 4 ++-- src/lib/libcrypto/asn1/p5_pbe.c | 4 ++-- src/lib/libcrypto/asn1/p5_pbev2.c | 4 ++-- src/lib/libcrypto/asn1/t_crl.c | 4 ++-- src/lib/libcrypto/asn1/t_req.c | 4 ++-- src/lib/libcrypto/asn1/t_x509.c | 4 ++-- src/lib/libcrypto/asn1/tasn_dec.c | 4 ++-- src/lib/libcrypto/asn1/tasn_enc.c | 4 ++-- src/lib/libcrypto/asn1/tasn_new.c | 4 ++-- src/lib/libcrypto/asn1/tasn_prn.c | 3 +-- src/lib/libcrypto/asn1/tasn_utl.c | 4 ++-- src/lib/libcrypto/asn1/x_crl.c | 4 ++-- src/lib/libcrypto/asn1/x_info.c | 5 +++-- src/lib/libcrypto/asn1/x_long.c | 4 ++-- src/lib/libcrypto/asn1/x_name.c | 4 ++-- src/lib/libcrypto/asn1/x_pkey.c | 5 +++-- src/lib/libcrypto/asn1/x_pubkey.c | 4 ++-- src/lib/libcrypto/bio/b_dump.c | 3 +-- src/lib/libcrypto/bio/b_sock.c | 5 +++-- src/lib/libcrypto/bio/bf_buff.c | 4 ++-- src/lib/libcrypto/bio/bio_cb.c | 3 +-- src/lib/libcrypto/bio/bio_lib.c | 4 ++-- src/lib/libcrypto/bio/bss_acpt.c | 4 ++-- src/lib/libcrypto/bio/bss_bio.c | 4 ++-- src/lib/libcrypto/bio/bss_conn.c | 4 ++-- src/lib/libcrypto/bio/bss_file.c | 4 ++-- src/lib/libcrypto/bio/bss_mem.c | 4 ++-- src/lib/libcrypto/bn/bn_add.c | 5 ++--- src/lib/libcrypto/bn/bn_convert.c | 4 ++-- src/lib/libcrypto/bn/bn_ctx.c | 4 ++-- src/lib/libcrypto/bn/bn_div.c | 4 ++-- src/lib/libcrypto/bn/bn_exp.c | 5 ++--- src/lib/libcrypto/bn/bn_gcd.c | 5 ++--- src/lib/libcrypto/bn/bn_isqrt.c | 4 ++-- src/lib/libcrypto/bn/bn_lib.c | 5 ++--- src/lib/libcrypto/bn/bn_mod.c | 5 ++--- src/lib/libcrypto/bn/bn_mod_sqrt.c | 5 ++--- src/lib/libcrypto/bn/bn_prime.c | 5 ++--- src/lib/libcrypto/bn/bn_rand.c | 5 ++--- src/lib/libcrypto/bn/bn_recp.c | 5 ++--- src/lib/libcrypto/bn/bn_shift.c | 4 ++-- src/lib/libcrypto/buffer/buffer.c | 5 +++-- src/lib/libcrypto/cms/cms_dd.c | 4 ++-- src/lib/libcrypto/cms/cms_enc.c | 4 ++-- src/lib/libcrypto/cms/cms_env.c | 4 ++-- src/lib/libcrypto/cms/cms_ess.c | 4 ++-- src/lib/libcrypto/cms/cms_io.c | 4 ++-- src/lib/libcrypto/cms/cms_kari.c | 4 ++-- src/lib/libcrypto/cms/cms_lib.c | 4 ++-- src/lib/libcrypto/cms/cms_pwri.c | 4 ++-- src/lib/libcrypto/cms/cms_sd.c | 4 ++-- src/lib/libcrypto/cms/cms_smime.c | 4 ++-- src/lib/libcrypto/conf/conf_def.c | 4 ++-- src/lib/libcrypto/conf/conf_lib.c | 4 ++-- src/lib/libcrypto/conf/conf_mod.c | 5 +++-- src/lib/libcrypto/crypto_init.c | 4 ++-- src/lib/libcrypto/crypto_legacy.c | 4 ++-- src/lib/libcrypto/ct/ct_b64.c | 4 ++-- src/lib/libcrypto/ct/ct_log.c | 4 ++-- src/lib/libcrypto/ct/ct_oct.c | 4 ++-- src/lib/libcrypto/ct/ct_policy.c | 7 ++++--- src/lib/libcrypto/ct/ct_sct.c | 4 ++-- src/lib/libcrypto/ct/ct_sct_ctx.c | 4 ++-- src/lib/libcrypto/ct/ct_vfy.c | 4 ++-- src/lib/libcrypto/dh/dh_ameth.c | 4 ++-- src/lib/libcrypto/dh/dh_check.c | 3 +-- src/lib/libcrypto/dh/dh_gen.c | 4 ++-- src/lib/libcrypto/dh/dh_key.c | 4 ++-- src/lib/libcrypto/dh/dh_lib.c | 4 ++-- src/lib/libcrypto/dh/dh_pmeth.c | 4 ++-- src/lib/libcrypto/dsa/dsa_ameth.c | 4 ++-- src/lib/libcrypto/dsa/dsa_asn1.c | 4 ++-- src/lib/libcrypto/dsa/dsa_lib.c | 4 ++-- src/lib/libcrypto/dsa/dsa_meth.c | 4 ++-- src/lib/libcrypto/dsa/dsa_ossl.c | 4 ++-- src/lib/libcrypto/dsa/dsa_pmeth.c | 4 ++-- src/lib/libcrypto/dsa/dsa_prn.c | 5 +++-- src/lib/libcrypto/ec/ec_ameth.c | 4 ++-- src/lib/libcrypto/ec/ec_asn1.c | 4 ++-- src/lib/libcrypto/ec/ec_convert.c | 4 ++-- src/lib/libcrypto/ec/ec_curve.c | 4 ++-- src/lib/libcrypto/ec/ec_key.c | 4 ++-- src/lib/libcrypto/ec/ec_lib.c | 4 ++-- src/lib/libcrypto/ec/ec_mult.c | 4 ++-- src/lib/libcrypto/ec/ec_pmeth.c | 4 ++-- src/lib/libcrypto/ec/eck_prn.c | 4 ++-- src/lib/libcrypto/ec/ecp_methods.c | 4 ++-- src/lib/libcrypto/ec/ecx_methods.c | 4 ++-- src/lib/libcrypto/ecdh/ecdh.c | 4 ++-- src/lib/libcrypto/ecdsa/ecdsa.c | 4 ++-- src/lib/libcrypto/evp/e_aes.c | 4 ++-- src/lib/libcrypto/evp/e_camellia.c | 4 ++-- src/lib/libcrypto/evp/e_chacha20poly1305.c | 4 ++-- src/lib/libcrypto/evp/e_rc2.c | 4 ++-- src/lib/libcrypto/evp/evp_aead.c | 4 ++-- src/lib/libcrypto/evp/evp_cipher.c | 4 ++-- src/lib/libcrypto/evp/evp_digest.c | 4 ++-- src/lib/libcrypto/evp/evp_key.c | 4 ++-- src/lib/libcrypto/evp/evp_names.c | 3 +-- src/lib/libcrypto/evp/evp_pbe.c | 4 ++-- src/lib/libcrypto/evp/evp_pkey.c | 4 ++-- src/lib/libcrypto/evp/m_sigver.c | 4 ++-- src/lib/libcrypto/evp/p_legacy.c | 4 ++-- src/lib/libcrypto/evp/p_lib.c | 4 ++-- src/lib/libcrypto/evp/p_sign.c | 3 +-- src/lib/libcrypto/evp/p_verify.c | 3 +-- src/lib/libcrypto/evp/pmeth_fn.c | 4 ++-- src/lib/libcrypto/evp/pmeth_gn.c | 4 ++-- src/lib/libcrypto/evp/pmeth_lib.c | 4 ++-- src/lib/libcrypto/hkdf/hkdf.c | 4 ++-- src/lib/libcrypto/hmac/hmac.c | 4 ++-- src/lib/libcrypto/kdf/hkdf_evp.c | 5 ++--- src/lib/libcrypto/kdf/tls1_prf.c | 4 ++-- src/lib/libcrypto/objects/obj_dat.c | 4 ++-- src/lib/libcrypto/objects/obj_lib.c | 4 ++-- src/lib/libcrypto/ocsp/ocsp_cl.c | 4 ++-- src/lib/libcrypto/ocsp/ocsp_ht.c | 6 ++++-- src/lib/libcrypto/ocsp/ocsp_lib.c | 4 ++-- src/lib/libcrypto/ocsp/ocsp_prn.c | 3 +-- src/lib/libcrypto/ocsp/ocsp_srv.c | 4 ++-- src/lib/libcrypto/ocsp/ocsp_vfy.c | 4 ++-- src/lib/libcrypto/pem/pem_info.c | 4 ++-- src/lib/libcrypto/pem/pem_lib.c | 4 ++-- src/lib/libcrypto/pem/pem_oth.c | 5 +++-- src/lib/libcrypto/pem/pem_pk8.c | 6 +++--- src/lib/libcrypto/pem/pem_pkey.c | 4 ++-- src/lib/libcrypto/pem/pem_sign.c | 5 +++-- src/lib/libcrypto/pem/pvkfmt.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_add.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_crt.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_decr.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_init.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_key.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_kiss.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_mutl.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_npas.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_p8e.c | 4 ++-- src/lib/libcrypto/pkcs12/p12_sbag.c | 4 ++-- src/lib/libcrypto/pkcs7/pk7_attr.c | 5 +++-- src/lib/libcrypto/pkcs7/pk7_doit.c | 4 ++-- src/lib/libcrypto/pkcs7/pk7_lib.c | 4 ++-- src/lib/libcrypto/pkcs7/pk7_smime.c | 4 ++-- src/lib/libcrypto/rsa/rsa_ameth.c | 4 ++-- src/lib/libcrypto/rsa/rsa_blinding.c | 4 ++-- src/lib/libcrypto/rsa/rsa_chk.c | 4 ++-- src/lib/libcrypto/rsa/rsa_eay.c | 4 ++-- src/lib/libcrypto/rsa/rsa_gen.c | 4 ++-- src/lib/libcrypto/rsa/rsa_lib.c | 4 ++-- src/lib/libcrypto/rsa/rsa_meth.c | 3 +-- src/lib/libcrypto/rsa/rsa_none.c | 5 +++-- src/lib/libcrypto/rsa/rsa_oaep.c | 4 ++-- src/lib/libcrypto/rsa/rsa_pk1.c | 4 ++-- src/lib/libcrypto/rsa/rsa_pmeth.c | 4 ++-- src/lib/libcrypto/rsa/rsa_prn.c | 5 +++-- src/lib/libcrypto/rsa/rsa_pss.c | 4 ++-- src/lib/libcrypto/rsa/rsa_saos.c | 5 +++-- src/lib/libcrypto/rsa/rsa_sign.c | 4 ++-- src/lib/libcrypto/rsa/rsa_x931.c | 5 +++-- src/lib/libcrypto/sm2/sm2_crypt.c | 4 ++-- src/lib/libcrypto/sm2/sm2_pmeth.c | 4 ++-- src/lib/libcrypto/sm2/sm2_sign.c | 4 ++-- src/lib/libcrypto/ts/ts_asn1.c | 4 ++-- src/lib/libcrypto/ts/ts_conf.c | 3 +-- src/lib/libcrypto/ts/ts_req_utils.c | 4 ++-- src/lib/libcrypto/ts/ts_rsp_sign.c | 4 ++-- src/lib/libcrypto/ts/ts_rsp_utils.c | 4 ++-- src/lib/libcrypto/ts/ts_rsp_verify.c | 4 ++-- src/lib/libcrypto/ts/ts_verify_ctx.c | 4 ++-- src/lib/libcrypto/ui/ui_lib.c | 4 ++-- src/lib/libcrypto/x509/by_dir.c | 4 ++-- src/lib/libcrypto/x509/by_file.c | 4 ++-- src/lib/libcrypto/x509/by_mem.c | 4 ++-- src/lib/libcrypto/x509/x509_addr.c | 4 ++-- src/lib/libcrypto/x509/x509_akey.c | 4 ++-- src/lib/libcrypto/x509/x509_alt.c | 4 ++-- src/lib/libcrypto/x509/x509_asid.c | 4 ++-- src/lib/libcrypto/x509/x509_att.c | 4 ++-- src/lib/libcrypto/x509/x509_bcons.c | 4 ++-- src/lib/libcrypto/x509/x509_bitst.c | 4 ++-- src/lib/libcrypto/x509/x509_cmp.c | 4 ++-- src/lib/libcrypto/x509/x509_conf.c | 4 ++-- src/lib/libcrypto/x509/x509_cpols.c | 4 ++-- src/lib/libcrypto/x509/x509_crld.c | 4 ++-- src/lib/libcrypto/x509/x509_extku.c | 4 ++-- src/lib/libcrypto/x509/x509_genn.c | 4 +++- src/lib/libcrypto/x509/x509_ia5.c | 5 +++-- src/lib/libcrypto/x509/x509_info.c | 5 +++-- src/lib/libcrypto/x509/x509_lib.c | 4 ++-- src/lib/libcrypto/x509/x509_lu.c | 4 ++-- src/lib/libcrypto/x509/x509_ncons.c | 4 ++-- src/lib/libcrypto/x509/x509_ocsp.c | 4 ++-- src/lib/libcrypto/x509/x509_pcons.c | 4 ++-- src/lib/libcrypto/x509/x509_pmaps.c | 4 ++-- src/lib/libcrypto/x509/x509_policy.c | 4 ++-- src/lib/libcrypto/x509/x509_purp.c | 3 +-- src/lib/libcrypto/x509/x509_r2x.c | 4 ++-- src/lib/libcrypto/x509/x509_req.c | 4 ++-- src/lib/libcrypto/x509/x509_skey.c | 4 ++-- src/lib/libcrypto/x509/x509_utl.c | 4 ++-- src/lib/libcrypto/x509/x509_v3.c | 4 ++-- src/lib/libcrypto/x509/x509_vfy.c | 4 ++-- src/lib/libcrypto/x509/x509_vpm.c | 4 ++-- src/lib/libcrypto/x509/x509name.c | 4 ++-- src/lib/libcrypto/x509/x509spki.c | 5 +++-- 222 files changed, 454 insertions(+), 456 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c index d5d00c4d44..3d1e49c49a 100644 --- a/src/lib/libcrypto/asn1/a_bitstr.c +++ b/src/lib/libcrypto/asn1/a_bitstr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_bitstr.c,v 1.43 2024/07/08 14:52:31 beck Exp $ */ +/* $OpenBSD: a_bitstr.c,v 1.44 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,10 +63,10 @@ #include #include #include -#include #include #include "bytestring.h" +#include "err_local.h" const ASN1_ITEM ASN1_BIT_STRING_it = { .itype = ASN1_ITYPE_PRIMITIVE, diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c index 5d3a3dd0c7..ac5033ea8a 100644 --- a/src/lib/libcrypto/asn1/a_enum.c +++ b/src/lib/libcrypto/asn1/a_enum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_enum.c,v 1.30 2024/07/08 14:52:31 beck Exp $ */ +/* $OpenBSD: a_enum.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,10 +63,10 @@ #include #include #include -#include #include "asn1_local.h" #include "bytestring.h" +#include "err_local.h" /* * Code for ENUMERATED type: identical to INTEGER apart from a different tag. diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c index 0d9b6577d7..f171e330f6 100644 --- a/src/lib/libcrypto/asn1/a_int.c +++ b/src/lib/libcrypto/asn1/a_int.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_int.c,v 1.48 2024/07/08 14:52:31 beck Exp $ */ +/* $OpenBSD: a_int.c,v 1.49 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -64,9 +64,9 @@ #include #include #include -#include #include "bytestring.h" +#include "err_local.h" const ASN1_ITEM ASN1_INTEGER_it = { .itype = ASN1_ITYPE_PRIMITIVE, diff --git a/src/lib/libcrypto/asn1/a_mbstr.c b/src/lib/libcrypto/asn1/a_mbstr.c index f050f97539..38398ad1d1 100644 --- a/src/lib/libcrypto/asn1/a_mbstr.c +++ b/src/lib/libcrypto/asn1/a_mbstr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_mbstr.c,v 1.27 2023/07/05 21:23:36 beck Exp $ */ +/* $OpenBSD: a_mbstr.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -61,9 +61,9 @@ #include #include -#include #include "asn1_local.h" +#include "err_local.h" static int traverse_string(const unsigned char *p, int len, int inform, int (*rfunc)(unsigned long value, void *in), void *arg); diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c index 2f3ca1398f..333ac60348 100644 --- a/src/lib/libcrypto/asn1/a_object.c +++ b/src/lib/libcrypto/asn1/a_object.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_object.c,v 1.55 2024/07/08 14:52:31 beck Exp $ */ +/* $OpenBSD: a_object.c,v 1.56 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,11 +62,11 @@ #include #include -#include #include #include #include "asn1_local.h" +#include "err_local.h" const ASN1_ITEM ASN1_OBJECT_it = { .itype = ASN1_ITYPE_PRIMITIVE, diff --git a/src/lib/libcrypto/asn1/a_pkey.c b/src/lib/libcrypto/asn1/a_pkey.c index a730728076..636b602377 100644 --- a/src/lib/libcrypto/asn1/a_pkey.c +++ b/src/lib/libcrypto/asn1/a_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_pkey.c,v 1.8 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: a_pkey.c,v 1.9 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,12 +62,12 @@ #include #include -#include #include #include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" EVP_PKEY * diff --git a/src/lib/libcrypto/asn1/a_pubkey.c b/src/lib/libcrypto/asn1/a_pubkey.c index 544f3d2cf0..f846b6cda5 100644 --- a/src/lib/libcrypto/asn1/a_pubkey.c +++ b/src/lib/libcrypto/asn1/a_pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_pubkey.c,v 1.7 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: a_pubkey.c,v 1.8 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,7 +62,6 @@ #include #include -#include #include #include @@ -76,6 +75,7 @@ #include #endif +#include "err_local.h" #include "evp_local.h" EVP_PKEY * diff --git a/src/lib/libcrypto/asn1/a_string.c b/src/lib/libcrypto/asn1/a_string.c index ec492e71f0..70e9c95f22 100644 --- a/src/lib/libcrypto/asn1/a_string.c +++ b/src/lib/libcrypto/asn1/a_string.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_string.c,v 1.17 2023/08/15 18:05:15 tb Exp $ */ +/* $OpenBSD: a_string.c,v 1.18 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,9 +61,9 @@ #include #include -#include #include "asn1_local.h" +#include "err_local.h" ASN1_STRING * ASN1_STRING_new(void) diff --git a/src/lib/libcrypto/asn1/a_strnid.c b/src/lib/libcrypto/asn1/a_strnid.c index 5fa60b9ce7..3519d6725d 100644 --- a/src/lib/libcrypto/asn1/a_strnid.c +++ b/src/lib/libcrypto/asn1/a_strnid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_strnid.c,v 1.31 2024/03/02 08:54:02 tb Exp $ */ +/* $OpenBSD: a_strnid.c,v 1.32 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -62,7 +62,6 @@ #include #include -#include #include /* diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c index 15ac1af5c4..3deff56eda 100644 --- a/src/lib/libcrypto/asn1/a_time.c +++ b/src/lib/libcrypto/asn1/a_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_time.c,v 1.38 2024/07/08 14:52:31 beck Exp $ */ +/* $OpenBSD: a_time.c,v 1.39 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -65,7 +65,6 @@ #include #include -#include #include "asn1_local.h" diff --git a/src/lib/libcrypto/asn1/a_time_tm.c b/src/lib/libcrypto/asn1/a_time_tm.c index a1f329be96..dd2893167f 100644 --- a/src/lib/libcrypto/asn1/a_time_tm.c +++ b/src/lib/libcrypto/asn1/a_time_tm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_time_tm.c,v 1.42 2024/05/03 18:33:27 tb Exp $ */ +/* $OpenBSD: a_time_tm.c,v 1.43 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2015 Bob Beck * @@ -22,10 +22,10 @@ #include #include -#include -#include "bytestring.h" #include "asn1_local.h" +#include "bytestring.h" +#include "err_local.h" #define RFC5280 0 #define GENTIME_LENGTH 15 diff --git a/src/lib/libcrypto/asn1/a_type.c b/src/lib/libcrypto/asn1/a_type.c index ef0a76e810..502db42a73 100644 --- a/src/lib/libcrypto/asn1/a_type.c +++ b/src/lib/libcrypto/asn1/a_type.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a_type.c,v 1.27 2023/07/28 10:00:10 tb Exp $ */ +/* $OpenBSD: a_type.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,10 +59,10 @@ #include #include -#include #include #include "asn1_local.h" +#include "err_local.h" typedef struct { ASN1_INTEGER *num; diff --git a/src/lib/libcrypto/asn1/asn1_gen.c b/src/lib/libcrypto/asn1/asn1_gen.c index edd6743993..b409e83c7d 100644 --- a/src/lib/libcrypto/asn1/asn1_gen.c +++ b/src/lib/libcrypto/asn1/asn1_gen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_gen.c,v 1.27 2025/03/06 07:25:01 tb Exp $ */ +/* $OpenBSD: asn1_gen.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2002. */ @@ -59,11 +59,11 @@ #include #include -#include #include #include "asn1_local.h" #include "conf_local.h" +#include "err_local.h" #include "x509_local.h" #define ASN1_GEN_FLAG 0x10000 diff --git a/src/lib/libcrypto/asn1/asn1_item.c b/src/lib/libcrypto/asn1/asn1_item.c index 86c800e3ad..621d65711b 100644 --- a/src/lib/libcrypto/asn1/asn1_item.c +++ b/src/lib/libcrypto/asn1/asn1_item.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_item.c,v 1.21 2024/04/09 13:55:02 beck Exp $ */ +/* $OpenBSD: asn1_item.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -112,11 +112,11 @@ #include #include -#include #include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/asn1/asn1_old.c b/src/lib/libcrypto/asn1/asn1_old.c index 7992fccdef..c47ea8e74a 100644 --- a/src/lib/libcrypto/asn1/asn1_old.c +++ b/src/lib/libcrypto/asn1/asn1_old.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_old.c,v 1.6 2024/04/10 14:55:12 beck Exp $ */ +/* $OpenBSD: asn1_old.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,9 +61,9 @@ #include #include -#include #include "asn1_local.h" +#include "err_local.h" #ifndef NO_OLD_ASN1 diff --git a/src/lib/libcrypto/asn1/asn1_old_lib.c b/src/lib/libcrypto/asn1/asn1_old_lib.c index 80362ae689..541ac7b615 100644 --- a/src/lib/libcrypto/asn1/asn1_old_lib.c +++ b/src/lib/libcrypto/asn1/asn1_old_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_old_lib.c,v 1.6 2023/07/05 21:23:36 beck Exp $ */ +/* $OpenBSD: asn1_old_lib.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,9 +61,9 @@ #include #include -#include #include "asn1_local.h" +#include "err_local.h" static void asn1_put_length(unsigned char **pp, int length); diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c index 3995fc547c..932bfcf0b4 100644 --- a/src/lib/libcrypto/asn1/asn_mime.c +++ b/src/lib/libcrypto/asn1/asn_mime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn_mime.c,v 1.35 2025/01/17 05:02:18 tb Exp $ */ +/* $OpenBSD: asn_mime.c,v 1.36 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -59,10 +59,10 @@ #include #include -#include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" /* Generalised MIME like utilities for streaming ASN1. Although many diff --git a/src/lib/libcrypto/asn1/asn_moid.c b/src/lib/libcrypto/asn1/asn_moid.c index e3c7d09446..e75a63969f 100644 --- a/src/lib/libcrypto/asn1/asn_moid.c +++ b/src/lib/libcrypto/asn1/asn_moid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn_moid.c,v 1.18 2024/08/31 09:26:18 tb Exp $ */ +/* $OpenBSD: asn_moid.c,v 1.19 2025/05/10 05:54:38 tb Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -60,12 +60,12 @@ #include #include -#include #include #include #include #include "asn1_local.h" +#include "err_local.h" #include "conf_local.h" /* Simple ASN1 OID module: add all objects in a given section */ diff --git a/src/lib/libcrypto/asn1/bio_ndef.c b/src/lib/libcrypto/asn1/bio_ndef.c index 98bb1cd197..d001ffb0ae 100644 --- a/src/lib/libcrypto/asn1/bio_ndef.c +++ b/src/lib/libcrypto/asn1/bio_ndef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_ndef.c,v 1.24 2023/07/28 09:58:30 tb Exp $ */ +/* $OpenBSD: bio_ndef.c,v 1.25 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -57,9 +57,9 @@ #include #include #include -#include #include "asn1_local.h" +#include "err_local.h" int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix, asn1_ps_func *prefix_free); int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix, asn1_ps_func *suffix_free); diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c index 582d2d9a9b..815d6b82b6 100644 --- a/src/lib/libcrypto/asn1/p5_pbe.c +++ b/src/lib/libcrypto/asn1/p5_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_pbe.c,v 1.28 2024/07/08 14:48:49 beck Exp $ */ +/* $OpenBSD: p5_pbe.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -61,9 +61,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_local.h" /* PKCS#5 password based encryption structure */ diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 76872a8dec..21b8b6364f 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_pbev2.c,v 1.35 2024/03/26 07:03:10 tb Exp $ */ +/* $OpenBSD: p5_pbev2.c,v 1.36 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999-2004. */ @@ -61,9 +61,9 @@ #include #include -#include #include +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/asn1/t_crl.c b/src/lib/libcrypto/asn1/t_crl.c index 6449e7f199..295ab6c050 100644 --- a/src/lib/libcrypto/asn1/t_crl.c +++ b/src/lib/libcrypto/asn1/t_crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t_crl.c,v 1.26 2024/05/03 02:52:00 tb Exp $ */ +/* $OpenBSD: t_crl.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -61,11 +61,11 @@ #include #include -#include #include #include #include +#include "err_local.h" #include "x509_local.h" int diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c index 1d4be9865d..51e4b4f651 100644 --- a/src/lib/libcrypto/asn1/t_req.c +++ b/src/lib/libcrypto/asn1/t_req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t_req.c,v 1.28 2024/05/03 02:52:00 tb Exp $ */ +/* $OpenBSD: t_req.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,7 +62,6 @@ #include #include -#include #include #include #include @@ -74,6 +73,7 @@ #include #endif +#include "err_local.h" #include "x509_local.h" int diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c index 7cf4557314..417e92bcc5 100644 --- a/src/lib/libcrypto/asn1/t_x509.c +++ b/src/lib/libcrypto/asn1/t_x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t_x509.c,v 1.51 2025/02/08 03:41:36 tb Exp $ */ +/* $OpenBSD: t_x509.c,v 1.52 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,13 +65,13 @@ #include #include -#include #include #include #include #include #include +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c index 31b9efee54..1bffae8a94 100644 --- a/src/lib/libcrypto/asn1/tasn_dec.c +++ b/src/lib/libcrypto/asn1/tasn_dec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tasn_dec.c,v 1.88 2023/07/28 10:00:10 tb Exp $ */ +/* $OpenBSD: tasn_dec.c,v 1.89 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -63,11 +63,11 @@ #include #include #include -#include #include #include "asn1_local.h" #include "bytestring.h" +#include "err_local.h" /* * Constructed types with a recursive definition (such as can be found in PKCS7) diff --git a/src/lib/libcrypto/asn1/tasn_enc.c b/src/lib/libcrypto/asn1/tasn_enc.c index b71993a139..a65fb5b7e7 100644 --- a/src/lib/libcrypto/asn1/tasn_enc.c +++ b/src/lib/libcrypto/asn1/tasn_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tasn_enc.c,v 1.33 2023/07/28 10:00:10 tb Exp $ */ +/* $OpenBSD: tasn_enc.c,v 1.34 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -61,10 +61,10 @@ #include #include -#include #include #include "asn1_local.h" +#include "err_local.h" static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass); diff --git a/src/lib/libcrypto/asn1/tasn_new.c b/src/lib/libcrypto/asn1/tasn_new.c index 10c1137dbf..e17810b832 100644 --- a/src/lib/libcrypto/asn1/tasn_new.c +++ b/src/lib/libcrypto/asn1/tasn_new.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tasn_new.c,v 1.25 2023/07/28 10:00:10 tb Exp $ */ +/* $OpenBSD: tasn_new.c,v 1.26 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -60,11 +60,11 @@ #include #include #include -#include #include #include #include "asn1_local.h" +#include "err_local.h" static int asn1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it); static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it); diff --git a/src/lib/libcrypto/asn1/tasn_prn.c b/src/lib/libcrypto/asn1/tasn_prn.c index 07764fc091..433d939f1f 100644 --- a/src/lib/libcrypto/asn1/tasn_prn.c +++ b/src/lib/libcrypto/asn1/tasn_prn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tasn_prn.c,v 1.27 2024/03/02 09:04:07 tb Exp $ */ +/* $OpenBSD: tasn_prn.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -61,7 +61,6 @@ #include #include #include -#include #include #include diff --git a/src/lib/libcrypto/asn1/tasn_utl.c b/src/lib/libcrypto/asn1/tasn_utl.c index ae546edd4b..178a364c89 100644 --- a/src/lib/libcrypto/asn1/tasn_utl.c +++ b/src/lib/libcrypto/asn1/tasn_utl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tasn_utl.c,v 1.18 2022/12/26 07:18:51 jmc Exp $ */ +/* $OpenBSD: tasn_utl.c,v 1.19 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -63,9 +63,9 @@ #include #include #include -#include #include "bytestring.h" +#include "err_local.h" /* Utility functions for manipulating fields and offsets */ diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c index 7ad8350f3d..f614884eec 100644 --- a/src/lib/libcrypto/asn1/x_crl.c +++ b/src/lib/libcrypto/asn1/x_crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_crl.c,v 1.48 2025/02/27 20:13:41 tb Exp $ */ +/* $OpenBSD: x_crl.c,v 1.49 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,11 +61,11 @@ #include #include -#include #include #include #include "asn1_local.h" +#include "err_local.h" #include "x509_local.h" static void setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp); diff --git a/src/lib/libcrypto/asn1/x_info.c b/src/lib/libcrypto/asn1/x_info.c index d2c4bcfe7a..e8b2c368a6 100644 --- a/src/lib/libcrypto/asn1/x_info.c +++ b/src/lib/libcrypto/asn1/x_info.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_info.c,v 1.22 2024/12/11 10:28:03 tb Exp $ */ +/* $OpenBSD: x_info.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,9 +59,10 @@ #include #include -#include #include +#include "err_local.h" + X509_INFO * X509_INFO_new(void) { diff --git a/src/lib/libcrypto/asn1/x_long.c b/src/lib/libcrypto/asn1/x_long.c index 5e673f4521..a72411f30c 100644 --- a/src/lib/libcrypto/asn1/x_long.c +++ b/src/lib/libcrypto/asn1/x_long.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_long.c,v 1.21 2024/07/08 16:24:22 beck Exp $ */ +/* $OpenBSD: x_long.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -61,9 +61,9 @@ #include #include -#include #include "asn1_local.h" +#include "err_local.h" /* * Custom primitive type for long handling. This converts between an diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c index c60714b74f..09536666fc 100644 --- a/src/lib/libcrypto/asn1/x_name.c +++ b/src/lib/libcrypto/asn1/x_name.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_name.c,v 1.45 2025/03/20 09:41:47 tb Exp $ */ +/* $OpenBSD: x_name.c,v 1.46 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,10 +61,10 @@ #include #include -#include #include #include "asn1_local.h" +#include "err_local.h" #include "x509_local.h" typedef STACK_OF(X509_NAME_ENTRY) STACK_OF_X509_NAME_ENTRY; diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c index 5c96c13ab9..4f72d6092e 100644 --- a/src/lib/libcrypto/asn1/x_pkey.c +++ b/src/lib/libcrypto/asn1/x_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_pkey.c,v 1.24 2024/04/09 13:55:02 beck Exp $ */ +/* $OpenBSD: x_pkey.c,v 1.25 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,11 +59,12 @@ #include #include -#include #include #include #include +#include "err_local.h" + X509_PKEY * X509_PKEY_new(void) { diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c index 1e772a3458..ec847861ea 100644 --- a/src/lib/libcrypto/asn1/x_pubkey.c +++ b/src/lib/libcrypto/asn1/x_pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_pubkey.c,v 1.37 2024/07/08 14:48:49 beck Exp $ */ +/* $OpenBSD: x_pubkey.c,v 1.38 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,7 +61,6 @@ #include #include -#include #include #ifndef OPENSSL_NO_DSA @@ -72,6 +71,7 @@ #endif #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c index 4dcf710bbe..3f673205c1 100644 --- a/src/lib/libcrypto/bio/b_dump.c +++ b/src/lib/libcrypto/bio/b_dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_dump.c,v 1.30 2024/03/02 09:21:24 tb Exp $ */ +/* $OpenBSD: b_dump.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,7 +62,6 @@ #include #include -#include #include "bytestring.h" diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 00bbe9c37e..9ef9953b95 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_sock.c,v 1.71 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: b_sock.c,v 1.72 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2017 Bob Beck * @@ -32,7 +32,8 @@ #include #include -#include + +#include "err_local.h" int BIO_get_host_ip(const char *str, unsigned char *ip) diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c index 226c16835a..36b6fabde3 100644 --- a/src/lib/libcrypto/bio/bf_buff.c +++ b/src/lib/libcrypto/bio/bf_buff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bf_buff.c,v 1.28 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bf_buff.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,9 +61,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" static int buffer_write(BIO *h, const char *buf, int num); static int buffer_read(BIO *h, char *buf, int size); diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c index 18e9be8d68..990cb20708 100644 --- a/src/lib/libcrypto/bio/bio_cb.c +++ b/src/lib/libcrypto/bio/bio_cb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_cb.c,v 1.19 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bio_cb.c,v 1.20 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,7 +60,6 @@ #include #include -#include #include #include "bio_local.h" diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c index 463d2ad23a..04e8f4c295 100644 --- a/src/lib/libcrypto/bio/bio_lib.c +++ b/src/lib/libcrypto/bio/bio_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_lib.c,v 1.54 2024/07/09 06:14:59 beck Exp $ */ +/* $OpenBSD: bio_lib.c,v 1.55 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,10 +62,10 @@ #include #include -#include #include #include "bio_local.h" +#include "err_local.h" /* * Helper function to work out whether to call the new style callback or the old diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index d74c710a7f..73d147f4c1 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_acpt.c,v 1.31 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bss_acpt.c,v 1.32 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,9 +65,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" #define SOCKET_PROTOCOL IPPROTO_TCP diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c index 39d8d1e46c..f1d1bbeecd 100644 --- a/src/lib/libcrypto/bio/bss_bio.c +++ b/src/lib/libcrypto/bio/bss_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_bio.c,v 1.29 2024/07/09 06:14:59 beck Exp $ */ +/* $OpenBSD: bss_bio.c,v 1.30 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. * @@ -81,10 +81,10 @@ #include #include -#include #include #include "bio_local.h" +#include "err_local.h" static int bio_new(BIO *bio); static int bio_free(BIO *bio); diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 3b0e3d3bdd..24dad82f5f 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_conn.c,v 1.41 2024/04/19 09:54:36 tb Exp $ */ +/* $OpenBSD: bss_conn.c,v 1.42 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -68,9 +68,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" #define SOCKET_PROTOCOL IPPROTO_TCP diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c index 9b6ca2bdd8..21f71718bb 100644 --- a/src/lib/libcrypto/bio/bss_file.c +++ b/src/lib/libcrypto/bio/bss_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_file.c,v 1.35 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bss_file.c,v 1.36 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -88,9 +88,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" static int file_write(BIO *h, const char *buf, int num); static int file_read(BIO *h, char *buf, int size); diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c index 6d0d54db84..3e4c1e2e3f 100644 --- a/src/lib/libcrypto/bio/bss_mem.c +++ b/src/lib/libcrypto/bio/bss_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_mem.c,v 1.22 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bss_mem.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,10 +62,10 @@ #include #include -#include #include #include "bio_local.h" +#include "err_local.h" struct bio_mem { BUF_MEM *buf; diff --git a/src/lib/libcrypto/bn/bn_add.c b/src/lib/libcrypto/bn/bn_add.c index 86768a312a..79fc1db41e 100644 --- a/src/lib/libcrypto/bn/bn_add.c +++ b/src/lib/libcrypto/bn/bn_add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_add.c,v 1.26 2023/07/08 12:21:58 beck Exp $ */ +/* $OpenBSD: bn_add.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,11 +60,10 @@ #include #include -#include - #include "bn_arch.h" #include "bn_local.h" #include "bn_internal.h" +#include "err_local.h" /* * bn_add_words() computes (carry:r[i]) = a[i] + b[i] + carry, where a and b diff --git a/src/lib/libcrypto/bn/bn_convert.c b/src/lib/libcrypto/bn/bn_convert.c index 6a6354f44e..ca5c7d7865 100644 --- a/src/lib/libcrypto/bn/bn_convert.c +++ b/src/lib/libcrypto/bn/bn_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_convert.c,v 1.23 2024/11/08 14:18:44 jsing Exp $ */ +/* $OpenBSD: bn_convert.c,v 1.24 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,11 +65,11 @@ #include #include -#include #include "bn_local.h" #include "bytestring.h" #include "crypto_internal.h" +#include "err_local.h" static int bn_dec2bn_cbs(BIGNUM **bnp, CBS *cbs); static int bn_hex2bn_cbs(BIGNUM **bnp, CBS *cbs); diff --git a/src/lib/libcrypto/bn/bn_ctx.c b/src/lib/libcrypto/bn/bn_ctx.c index 129b9c9781..eda93dcaa4 100644 --- a/src/lib/libcrypto/bn/bn_ctx.c +++ b/src/lib/libcrypto/bn/bn_ctx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_ctx.c,v 1.22 2023/07/08 12:21:58 beck Exp $ */ +/* $OpenBSD: bn_ctx.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2023 Joel Sing * @@ -19,9 +19,9 @@ #include #include -#include #include "bn_local.h" +#include "err_local.h" #define BN_CTX_INITIAL_LEN 8 diff --git a/src/lib/libcrypto/bn/bn_div.c b/src/lib/libcrypto/bn/bn_div.c index 09a8a364df..1026b43add 100644 --- a/src/lib/libcrypto/bn/bn_div.c +++ b/src/lib/libcrypto/bn/bn_div.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_div.c,v 1.41 2024/04/10 14:58:06 beck Exp $ */ +/* $OpenBSD: bn_div.c,v 1.42 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,11 +62,11 @@ #include #include -#include #include "bn_arch.h" #include "bn_local.h" #include "bn_internal.h" +#include "err_local.h" BN_ULONG bn_div_3_words(const BN_ULONG *m, BN_ULONG d1, BN_ULONG d0); diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c index e925d325d2..6a5c1c857a 100644 --- a/src/lib/libcrypto/bn/bn_exp.c +++ b/src/lib/libcrypto/bn/bn_exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_exp.c,v 1.58 2025/02/13 11:15:09 tb Exp $ */ +/* $OpenBSD: bn_exp.c,v 1.59 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -112,10 +112,9 @@ #include #include -#include - #include "bn_local.h" #include "constant_time.h" +#include "err_local.h" /* maximum precomputation table size for *variable* sliding windows */ #define TABLE_SIZE 32 diff --git a/src/lib/libcrypto/bn/bn_gcd.c b/src/lib/libcrypto/bn/bn_gcd.c index fa5d71a7f3..aaf1dbe4a9 100644 --- a/src/lib/libcrypto/bn/bn_gcd.c +++ b/src/lib/libcrypto/bn/bn_gcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_gcd.c,v 1.29 2024/04/10 14:58:06 beck Exp $ */ +/* $OpenBSD: bn_gcd.c,v 1.30 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -109,9 +109,8 @@ * */ -#include - #include "bn_local.h" +#include "err_local.h" static BIGNUM * euclid(BIGNUM *a, BIGNUM *b) diff --git a/src/lib/libcrypto/bn/bn_isqrt.c b/src/lib/libcrypto/bn/bn_isqrt.c index 018d5f34bd..b725519e1a 100644 --- a/src/lib/libcrypto/bn/bn_isqrt.c +++ b/src/lib/libcrypto/bn/bn_isqrt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_isqrt.c,v 1.10 2023/06/04 17:28:35 tb Exp $ */ +/* $OpenBSD: bn_isqrt.c,v 1.11 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * @@ -19,10 +19,10 @@ #include #include -#include #include "bn_local.h" #include "crypto_internal.h" +#include "err_local.h" /* * Calculate integer square root of |n| using a variant of Newton's method. diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c index 72b988650c..3e451a6191 100644 --- a/src/lib/libcrypto/bn/bn_lib.c +++ b/src/lib/libcrypto/bn/bn_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_lib.c,v 1.93 2024/04/16 13:07:14 jsing Exp $ */ +/* $OpenBSD: bn_lib.c,v 1.94 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,10 +63,9 @@ #include -#include - #include "bn_local.h" #include "bn_internal.h" +#include "err_local.h" BIGNUM * BN_new(void) diff --git a/src/lib/libcrypto/bn/bn_mod.c b/src/lib/libcrypto/bn/bn_mod.c index 365f6fcf03..7198c02e3b 100644 --- a/src/lib/libcrypto/bn/bn_mod.c +++ b/src/lib/libcrypto/bn/bn_mod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_mod.c,v 1.22 2023/07/08 12:21:58 beck Exp $ */ +/* $OpenBSD: bn_mod.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* Includes code written by Lenka Fibikova * for the OpenSSL project. */ /* ==================================================================== @@ -111,9 +111,8 @@ * [including the GNU Public Licence.] */ -#include - #include "bn_local.h" +#include "err_local.h" int BN_mod_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx) diff --git a/src/lib/libcrypto/bn/bn_mod_sqrt.c b/src/lib/libcrypto/bn/bn_mod_sqrt.c index 280002cc48..fc55f84317 100644 --- a/src/lib/libcrypto/bn/bn_mod_sqrt.c +++ b/src/lib/libcrypto/bn/bn_mod_sqrt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_mod_sqrt.c,v 1.3 2023/08/03 18:53:55 tb Exp $ */ +/* $OpenBSD: bn_mod_sqrt.c,v 1.4 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler @@ -16,9 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - #include "bn_local.h" +#include "err_local.h" /* * Tonelli-Shanks according to H. Cohen "A Course in Computational Algebraic diff --git a/src/lib/libcrypto/bn/bn_prime.c b/src/lib/libcrypto/bn/bn_prime.c index 5a4aa50bf1..d85595e0dd 100644 --- a/src/lib/libcrypto/bn/bn_prime.c +++ b/src/lib/libcrypto/bn/bn_prime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_prime.c,v 1.34 2023/07/20 06:26:27 tb Exp $ */ +/* $OpenBSD: bn_prime.c,v 1.35 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -112,9 +112,8 @@ #include #include -#include - #include "bn_local.h" +#include "err_local.h" /* The quick sieve algorithm approach to weeding out primes is * Philip Zimmermann's, as implemented in PGP. I have had a read of diff --git a/src/lib/libcrypto/bn/bn_rand.c b/src/lib/libcrypto/bn/bn_rand.c index 9cfcd8e2c0..d3b16f70a0 100644 --- a/src/lib/libcrypto/bn/bn_rand.c +++ b/src/lib/libcrypto/bn/bn_rand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_rand.c,v 1.30 2024/03/16 20:42:33 tb Exp $ */ +/* $OpenBSD: bn_rand.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -115,9 +115,8 @@ #include #include -#include - #include "bn_local.h" +#include "err_local.h" static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom) diff --git a/src/lib/libcrypto/bn/bn_recp.c b/src/lib/libcrypto/bn/bn_recp.c index e3f22c52a9..ed5049b772 100644 --- a/src/lib/libcrypto/bn/bn_recp.c +++ b/src/lib/libcrypto/bn/bn_recp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_recp.c,v 1.33 2025/02/04 20:22:20 tb Exp $ */ +/* $OpenBSD: bn_recp.c,v 1.34 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,9 +58,8 @@ #include -#include - #include "bn_local.h" +#include "err_local.h" struct bn_recp_ctx_st { BIGNUM *N; /* the divisor */ diff --git a/src/lib/libcrypto/bn/bn_shift.c b/src/lib/libcrypto/bn/bn_shift.c index 12edc7c0a0..b9f73cc322 100644 --- a/src/lib/libcrypto/bn/bn_shift.c +++ b/src/lib/libcrypto/bn/bn_shift.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_shift.c,v 1.22 2023/07/08 12:21:58 beck Exp $ */ +/* $OpenBSD: bn_shift.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2022, 2023 Joel Sing * @@ -16,9 +16,9 @@ */ #include -#include #include "bn_local.h" +#include "err_local.h" static inline int bn_lshift(BIGNUM *r, const BIGNUM *a, int n) diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c index 51ce90ff80..4a0c17c598 100644 --- a/src/lib/libcrypto/buffer/buffer.c +++ b/src/lib/libcrypto/buffer/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.28 2023/07/08 08:26:26 beck Exp $ */ +/* $OpenBSD: buffer.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,7 +61,8 @@ #include #include -#include + +#include "err_local.h" /* * LIMIT_BEFORE_EXPANSION is the maximum n such that (n + 3) / 3 * 4 < 2**31. diff --git a/src/lib/libcrypto/cms/cms_dd.c b/src/lib/libcrypto/cms/cms_dd.c index 0a357094c5..daccbcd988 100644 --- a/src/lib/libcrypto/cms/cms_dd.c +++ b/src/lib/libcrypto/cms/cms_dd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_dd.c,v 1.17 2023/10/26 09:08:57 tb Exp $ */ +/* $OpenBSD: cms_dd.c,v 1.18 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -56,11 +56,11 @@ #include #include -#include #include #include #include "cms_local.h" +#include "err_local.h" #include "x509_local.h" /* CMS DigestedData Utilities */ diff --git a/src/lib/libcrypto/cms/cms_enc.c b/src/lib/libcrypto/cms/cms_enc.c index ef6925dbd6..928b396815 100644 --- a/src/lib/libcrypto/cms/cms_enc.c +++ b/src/lib/libcrypto/cms/cms_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_enc.c,v 1.25 2024/11/01 18:34:06 tb Exp $ */ +/* $OpenBSD: cms_enc.c,v 1.26 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -58,12 +58,12 @@ #include #include #include -#include #include #include #include #include "cms_local.h" +#include "err_local.h" #include "evp_local.h" /* CMS EncryptedData Utilities */ diff --git a/src/lib/libcrypto/cms/cms_env.c b/src/lib/libcrypto/cms/cms_env.c index 629d23215e..7fa578466d 100644 --- a/src/lib/libcrypto/cms/cms_env.c +++ b/src/lib/libcrypto/cms/cms_env.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_env.c,v 1.28 2024/11/01 18:42:10 tb Exp $ */ +/* $OpenBSD: cms_env.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -59,12 +59,12 @@ #include #include #include -#include #include #include #include #include "cms_local.h" +#include "err_local.h" #include "evp_local.h" /* CMS EnvelopedData Utilities */ diff --git a/src/lib/libcrypto/cms/cms_ess.c b/src/lib/libcrypto/cms/cms_ess.c index f01dcf73ed..5435fa404c 100644 --- a/src/lib/libcrypto/cms/cms_ess.c +++ b/src/lib/libcrypto/cms/cms_ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_ess.c,v 1.26 2024/11/01 18:53:35 tb Exp $ */ +/* $OpenBSD: cms_ess.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -57,13 +57,13 @@ #include #include -#include #include #include #include #include #include "cms_local.h" +#include "err_local.h" CMS_ReceiptRequest * d2i_CMS_ReceiptRequest(CMS_ReceiptRequest **a, const unsigned char **in, long len) diff --git a/src/lib/libcrypto/cms/cms_io.c b/src/lib/libcrypto/cms/cms_io.c index 84ada47c49..a9be5461a3 100644 --- a/src/lib/libcrypto/cms/cms_io.c +++ b/src/lib/libcrypto/cms/cms_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_io.c,v 1.21 2024/03/30 01:53:05 joshua Exp $ */ +/* $OpenBSD: cms_io.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -54,12 +54,12 @@ #include #include -#include #include #include #include "asn1_local.h" #include "cms_local.h" +#include "err_local.h" int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms) diff --git a/src/lib/libcrypto/cms/cms_kari.c b/src/lib/libcrypto/cms/cms_kari.c index 86b1ad9e83..c23da18058 100644 --- a/src/lib/libcrypto/cms/cms_kari.c +++ b/src/lib/libcrypto/cms/cms_kari.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_kari.c,v 1.17 2024/11/01 18:34:06 tb Exp $ */ +/* $OpenBSD: cms_kari.c,v 1.18 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -57,10 +57,10 @@ #include #include -#include #include #include "cms_local.h" +#include "err_local.h" /* Key Agreement Recipient Info (KARI) routines */ diff --git a/src/lib/libcrypto/cms/cms_lib.c b/src/lib/libcrypto/cms/cms_lib.c index 2d7a8d9f21..b9fc5c21c7 100644 --- a/src/lib/libcrypto/cms/cms_lib.c +++ b/src/lib/libcrypto/cms/cms_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_lib.c,v 1.26 2024/11/01 18:53:35 tb Exp $ */ +/* $OpenBSD: cms_lib.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -57,13 +57,13 @@ #include #include #include -#include #include #include #include #include #include "cms_local.h" +#include "err_local.h" #include "x509_local.h" CMS_ContentInfo * diff --git a/src/lib/libcrypto/cms/cms_pwri.c b/src/lib/libcrypto/cms/cms_pwri.c index b6fe5df961..1f64fc71f7 100644 --- a/src/lib/libcrypto/cms/cms_pwri.c +++ b/src/lib/libcrypto/cms/cms_pwri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_pwri.c,v 1.31 2024/01/14 18:40:24 tb Exp $ */ +/* $OpenBSD: cms_pwri.c,v 1.32 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -58,13 +58,13 @@ #include #include -#include #include #include #include #include #include "cms_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c index 9cdd4ce143..f79d740482 100644 --- a/src/lib/libcrypto/cms/cms_sd.c +++ b/src/lib/libcrypto/cms/cms_sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_sd.c,v 1.33 2024/04/20 10:11:55 tb Exp $ */ +/* $OpenBSD: cms_sd.c,v 1.34 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -57,7 +57,6 @@ #include #include -#include #include #include #include @@ -66,6 +65,7 @@ #include "asn1_local.h" #include "cms_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c index 5a194748d9..85a0e6f6e5 100644 --- a/src/lib/libcrypto/cms/cms_smime.c +++ b/src/lib/libcrypto/cms/cms_smime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_smime.c,v 1.28 2023/12/22 10:23:11 tb Exp $ */ +/* $OpenBSD: cms_smime.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -67,6 +66,7 @@ #include #include "cms_local.h" +#include "err_local.h" static BIO * cms_get_text_bio(BIO *out, unsigned int flags) diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c index 0173a7117c..fe9391685d 100644 --- a/src/lib/libcrypto/conf/conf_def.c +++ b/src/lib/libcrypto/conf/conf_def.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_def.c,v 1.44 2024/08/31 09:46:17 tb Exp $ */ +/* $OpenBSD: conf_def.c,v 1.45 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,12 +63,12 @@ #include #include -#include #include #include #include "conf_def.h" #include "conf_local.h" +#include "err_local.h" #define MAX_CONF_VALUE_LENGTH 65536 diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c index 863e1c9475..84b4f8b0a7 100644 --- a/src/lib/libcrypto/conf/conf_lib.c +++ b/src/lib/libcrypto/conf/conf_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_lib.c,v 1.25 2025/03/08 09:35:53 tb Exp $ */ +/* $OpenBSD: conf_lib.c,v 1.26 2025/05/10 05:54:38 tb Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2000. */ @@ -58,11 +58,11 @@ #include #include -#include #include #include #include "conf_local.h" +#include "err_local.h" static const CONF_METHOD *default_CONF_method = NULL; diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c index 0e07bb3ea5..6e697cc478 100644 --- a/src/lib/libcrypto/conf/conf_mod.c +++ b/src/lib/libcrypto/conf/conf_mod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_mod.c,v 1.40 2024/10/10 06:51:22 tb Exp $ */ +/* $OpenBSD: conf_mod.c,v 1.41 2025/05/10 05:54:38 tb Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -63,9 +63,10 @@ #include #include -#include #include +#include "err_local.h" + /* This structure contains data about supported modules. */ struct conf_module_st { /* Name of the module */ diff --git a/src/lib/libcrypto/crypto_init.c b/src/lib/libcrypto/crypto_init.c index 6016d1ae40..931dff73f8 100644 --- a/src/lib/libcrypto/crypto_init.c +++ b/src/lib/libcrypto/crypto_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto_init.c,v 1.22 2024/10/17 14:27:57 jsing Exp $ */ +/* $OpenBSD: crypto_init.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2018 Bob Beck * @@ -22,12 +22,12 @@ #include #include -#include #include #include #include #include "crypto_internal.h" +#include "err_local.h" #include "x509_issuer_cache.h" int OpenSSL_config(const char *); diff --git a/src/lib/libcrypto/crypto_legacy.c b/src/lib/libcrypto/crypto_legacy.c index d864fc4c3f..cfe10467f6 100644 --- a/src/lib/libcrypto/crypto_legacy.c +++ b/src/lib/libcrypto/crypto_legacy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto_legacy.c,v 1.6 2024/11/06 04:18:42 tb Exp $ */ +/* $OpenBSD: crypto_legacy.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -123,10 +123,10 @@ #include #include -#include #include "crypto_internal.h" #include "crypto_local.h" +#include "err_local.h" #include "x86_arch.h" /* Machine independent capabilities. */ diff --git a/src/lib/libcrypto/ct/ct_b64.c b/src/lib/libcrypto/ct/ct_b64.c index 101cd1e2b1..e6e0532add 100644 --- a/src/lib/libcrypto/ct/ct_b64.c +++ b/src/lib/libcrypto/ct/ct_b64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_b64.c,v 1.7 2023/07/08 07:22:58 beck Exp $ */ +/* $OpenBSD: ct_b64.c,v 1.8 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -61,11 +61,11 @@ #include #include -#include #include #include "bytestring.h" #include "ct_local.h" +#include "err_local.h" /* * Decodes the base64 string |in| into |out|. diff --git a/src/lib/libcrypto/ct/ct_log.c b/src/lib/libcrypto/ct/ct_log.c index 72045477ac..48611df979 100644 --- a/src/lib/libcrypto/ct/ct_log.c +++ b/src/lib/libcrypto/ct/ct_log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_log.c,v 1.9 2024/11/05 09:35:40 tb Exp $ */ +/* $OpenBSD: ct_log.c,v 1.10 2025/05/10 05:54:38 tb Exp $ */ /* Author: Adam Eijdenberg . */ /* ==================================================================== * Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved. @@ -65,13 +65,13 @@ #include #include #include -#include #include #include #include #include "conf_local.h" #include "crypto_local.h" +#include "err_local.h" /* diff --git a/src/lib/libcrypto/ct/ct_oct.c b/src/lib/libcrypto/ct/ct_oct.c index 1f5e5c75d0..686d845f11 100644 --- a/src/lib/libcrypto/ct/ct_oct.c +++ b/src/lib/libcrypto/ct/ct_oct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_oct.c,v 1.9 2023/07/08 07:22:58 beck Exp $ */ +/* $OpenBSD: ct_oct.c,v 1.10 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -67,10 +67,10 @@ #include #include #include -#include #include "bytestring.h" #include "ct_local.h" +#include "err_local.h" int o2i_SCT_signature(SCT *sct, CBS *cbs) diff --git a/src/lib/libcrypto/ct/ct_policy.c b/src/lib/libcrypto/ct/ct_policy.c index eb2b312019..a242b0d8f8 100644 --- a/src/lib/libcrypto/ct/ct_policy.c +++ b/src/lib/libcrypto/ct/ct_policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_policy.c,v 1.6 2023/07/08 07:22:58 beck Exp $ */ +/* $OpenBSD: ct_policy.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* * Implementations of Certificate Transparency SCT policies. * Written by Rob Percival (robpercival@google.com) for the OpenSSL project. @@ -56,11 +56,12 @@ # error "CT is disabled" #endif -#include -#include #include +#include + #include "ct_local.h" +#include "err_local.h" /* * Number of seconds in the future that an SCT timestamp can be, by default, diff --git a/src/lib/libcrypto/ct/ct_sct.c b/src/lib/libcrypto/ct/ct_sct.c index 4b2716e734..d647e34d92 100644 --- a/src/lib/libcrypto/ct/ct_sct.c +++ b/src/lib/libcrypto/ct/ct_sct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_sct.c,v 1.10 2023/07/22 17:02:49 tb Exp $ */ +/* $OpenBSD: ct_sct.c,v 1.11 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com), Stephen Henson (steve@openssl.org) * and Adam Eijdenberg (adam.eijdenberg@gmail.com) for the OpenSSL project 2016. @@ -67,11 +67,11 @@ #include #include -#include #include #include #include "ct_local.h" +#include "err_local.h" SCT * SCT_new(void) diff --git a/src/lib/libcrypto/ct/ct_sct_ctx.c b/src/lib/libcrypto/ct/ct_sct_ctx.c index b2b6d4e269..930c7df59b 100644 --- a/src/lib/libcrypto/ct/ct_sct_ctx.c +++ b/src/lib/libcrypto/ct/ct_sct_ctx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_sct_ctx.c,v 1.6 2022/06/30 11:14:47 tb Exp $ */ +/* $OpenBSD: ct_sct_ctx.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -64,11 +64,11 @@ #include #include -#include #include #include #include "ct_local.h" +#include "err_local.h" SCT_CTX * SCT_CTX_new(void) diff --git a/src/lib/libcrypto/ct/ct_vfy.c b/src/lib/libcrypto/ct/ct_vfy.c index 424117263a..5dbb2096e1 100644 --- a/src/lib/libcrypto/ct/ct_vfy.c +++ b/src/lib/libcrypto/ct/ct_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_vfy.c,v 1.6 2022/01/06 14:34:40 jsing Exp $ */ +/* $OpenBSD: ct_vfy.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -60,11 +60,11 @@ #include #include -#include #include #include #include "ct_local.h" +#include "err_local.h" typedef enum sct_signature_type_t { SIGNATURE_TYPE_NOT_SET = -1, diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c index 289307bfd6..ec59245b9c 100644 --- a/src/lib/libcrypto/dh/dh_ameth.c +++ b/src/lib/libcrypto/dh/dh_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_ameth.c,v 1.42 2025/01/17 05:04:25 tb Exp $ */ +/* $OpenBSD: dh_ameth.c,v 1.43 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -61,12 +61,12 @@ #include #include #include -#include #include #include "asn1_local.h" #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" #include "evp_local.h" static void diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c index a880f9fca1..1ba85bc824 100644 --- a/src/lib/libcrypto/dh/dh_check.c +++ b/src/lib/libcrypto/dh/dh_check.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_check.c,v 1.30 2024/11/29 15:59:57 tb Exp $ */ +/* $OpenBSD: dh_check.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,7 +60,6 @@ #include #include -#include #include "bn_local.h" #include "dh_local.h" diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c index 3ffa5d80f1..f28f75909c 100644 --- a/src/lib/libcrypto/dh/dh_gen.c +++ b/src/lib/libcrypto/dh/dh_gen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_gen.c,v 1.21 2023/07/08 15:29:03 beck Exp $ */ +/* $OpenBSD: dh_gen.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,10 +60,10 @@ #include #include -#include #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb); diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c index 93b04f398f..89a02c8309 100644 --- a/src/lib/libcrypto/dh/dh_key.c +++ b/src/lib/libcrypto/dh/dh_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_key.c,v 1.42 2024/05/09 20:43:36 tb Exp $ */ +/* $OpenBSD: dh_key.c,v 1.43 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,10 +60,10 @@ #include #include -#include #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" static int generate_key(DH *dh) diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c index 803aca6421..db76244550 100644 --- a/src/lib/libcrypto/dh/dh_lib.c +++ b/src/lib/libcrypto/dh/dh_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_lib.c,v 1.46 2024/11/29 15:59:57 tb Exp $ */ +/* $OpenBSD: dh_lib.c,v 1.47 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,9 +63,9 @@ #include #include -#include #include "dh_local.h" +#include "err_local.h" static const DH_METHOD *default_DH_method = NULL; diff --git a/src/lib/libcrypto/dh/dh_pmeth.c b/src/lib/libcrypto/dh/dh_pmeth.c index 1e5327b11f..18517b0cde 100644 --- a/src/lib/libcrypto/dh/dh_pmeth.c +++ b/src/lib/libcrypto/dh/dh_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_pmeth.c,v 1.17 2024/08/26 22:00:47 op Exp $ */ +/* $OpenBSD: dh_pmeth.c,v 1.18 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -64,12 +64,12 @@ #include #include #include -#include #include #include #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" #include "evp_local.h" /* DH pkey context structure */ diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c index 866e5ec476..8e65cf68f7 100644 --- a/src/lib/libcrypto/dsa/dsa_ameth.c +++ b/src/lib/libcrypto/dsa/dsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_ameth.c,v 1.59 2024/04/13 14:02:51 tb Exp $ */ +/* $OpenBSD: dsa_ameth.c,v 1.60 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -64,12 +64,12 @@ #include #include #include -#include #include #include "asn1_local.h" #include "bn_local.h" #include "dsa_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/dsa/dsa_asn1.c b/src/lib/libcrypto/dsa/dsa_asn1.c index de6ec46195..e8957a99ff 100644 --- a/src/lib/libcrypto/dsa/dsa_asn1.c +++ b/src/lib/libcrypto/dsa/dsa_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_asn1.c,v 1.33 2024/07/08 17:11:05 beck Exp $ */ +/* $OpenBSD: dsa_asn1.c,v 1.34 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -63,9 +63,9 @@ #include #include #include -#include #include "dsa_local.h" +#include "err_local.h" /* Override the default new methods */ static int diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c index daf2fa135b..ecd517cf8a 100644 --- a/src/lib/libcrypto/dsa/dsa_lib.c +++ b/src/lib/libcrypto/dsa/dsa_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_lib.c,v 1.48 2024/03/27 01:49:31 tb Exp $ */ +/* $OpenBSD: dsa_lib.c,v 1.49 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,7 +65,6 @@ #include #include #include -#include #ifndef OPENSSL_NO_DH #include @@ -73,6 +72,7 @@ #include "dh_local.h" #include "dsa_local.h" +#include "err_local.h" static const DSA_METHOD *default_DSA_method = NULL; diff --git a/src/lib/libcrypto/dsa/dsa_meth.c b/src/lib/libcrypto/dsa/dsa_meth.c index c84b5287e1..c961bb13b4 100644 --- a/src/lib/libcrypto/dsa/dsa_meth.c +++ b/src/lib/libcrypto/dsa/dsa_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_meth.c,v 1.7 2023/07/08 14:28:15 beck Exp $ */ +/* $OpenBSD: dsa_meth.c,v 1.8 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2018 Theo Buehler * @@ -19,9 +19,9 @@ #include #include -#include #include "dsa_local.h" +#include "err_local.h" DSA_METHOD * DSA_meth_new(const char *name, int flags) diff --git a/src/lib/libcrypto/dsa/dsa_ossl.c b/src/lib/libcrypto/dsa/dsa_ossl.c index c53c8b9001..6d1546f4fc 100644 --- a/src/lib/libcrypto/dsa/dsa_ossl.c +++ b/src/lib/libcrypto/dsa/dsa_ossl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_ossl.c,v 1.56 2024/05/11 06:43:50 tb Exp $ */ +/* $OpenBSD: dsa_ossl.c,v 1.57 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,11 +63,11 @@ #include #include #include -#include #include #include "bn_local.h" #include "dsa_local.h" +#include "err_local.h" /* * Since DSA parameters are entirely arbitrary and checking them to be diff --git a/src/lib/libcrypto/dsa/dsa_pmeth.c b/src/lib/libcrypto/dsa/dsa_pmeth.c index adc7319731..73889a8307 100644 --- a/src/lib/libcrypto/dsa/dsa_pmeth.c +++ b/src/lib/libcrypto/dsa/dsa_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_pmeth.c,v 1.21 2024/10/19 14:39:44 tb Exp $ */ +/* $OpenBSD: dsa_pmeth.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -63,12 +63,12 @@ #include #include -#include #include #include #include "bn_local.h" #include "dsa_local.h" +#include "err_local.h" #include "evp_local.h" /* DSA pkey context structure */ diff --git a/src/lib/libcrypto/dsa/dsa_prn.c b/src/lib/libcrypto/dsa/dsa_prn.c index f276d82482..058b7d9ffd 100644 --- a/src/lib/libcrypto/dsa/dsa_prn.c +++ b/src/lib/libcrypto/dsa/dsa_prn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_prn.c,v 1.10 2023/07/08 14:28:15 beck Exp $ */ +/* $OpenBSD: dsa_prn.c,v 1.11 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -59,9 +59,10 @@ #include #include -#include #include +#include "err_local.h" + int DSA_print_fp(FILE *fp, const DSA *x, int off) { diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c index 903b18a8db..ddc8adea1e 100644 --- a/src/lib/libcrypto/ec/ec_ameth.c +++ b/src/lib/libcrypto/ec/ec_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_ameth.c,v 1.73 2024/11/25 06:51:39 tb Exp $ */ +/* $OpenBSD: ec_ameth.c,v 1.74 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -74,6 +73,7 @@ #include "asn1_local.h" #include "bn_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index ef318f8d43..35f4f5b0ba 100644 --- a/src/lib/libcrypto/ec/ec_asn1.c +++ b/src/lib/libcrypto/ec/ec_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_asn1.c,v 1.111 2025/03/13 10:31:12 tb Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.112 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -66,12 +66,12 @@ #include #include #include -#include #include #include #include "asn1_local.h" #include "ec_local.h" +#include "err_local.h" int EC_GROUP_get_basis_type(const EC_GROUP *group) diff --git a/src/lib/libcrypto/ec/ec_convert.c b/src/lib/libcrypto/ec/ec_convert.c index a18bc49132..84641a4e72 100644 --- a/src/lib/libcrypto/ec/ec_convert.c +++ b/src/lib/libcrypto/ec/ec_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_convert.c,v 1.14 2025/01/05 16:07:08 tb Exp $ */ +/* $OpenBSD: ec_convert.c,v 1.15 2025/05/10 05:54:38 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -64,10 +64,10 @@ #include #include -#include #include "asn1_local.h" #include "ec_local.h" +#include "err_local.h" /* * Internal handling of the point conversion octet diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c index 6212247ff2..2cfb219b50 100644 --- a/src/lib/libcrypto/ec/ec_curve.c +++ b/src/lib/libcrypto/ec/ec_curve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_curve.c,v 1.57 2025/05/04 05:10:14 tb Exp $ */ +/* $OpenBSD: ec_curve.c,v 1.58 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -78,10 +78,10 @@ #include #include -#include #include #include "ec_local.h" +#include "err_local.h" static const struct { uint8_t seed[20]; diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index 6257d67cd1..e9777019c8 100644 --- a/src/lib/libcrypto/ec/ec_key.c +++ b/src/lib/libcrypto/ec/ec_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_key.c,v 1.51 2025/01/25 10:34:36 tb Exp $ */ +/* $OpenBSD: ec_key.c,v 1.52 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -66,11 +66,11 @@ #include #include -#include #include "bn_local.h" #include "ec_local.h" #include "ecdsa_local.h" +#include "err_local.h" EC_KEY * EC_KEY_new(void) diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c index 7982d23f06..d760ecfb95 100644 --- a/src/lib/libcrypto/ec/ec_lib.c +++ b/src/lib/libcrypto/ec/ec_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_lib.c,v 1.123 2025/03/24 13:07:04 jsing Exp $ */ +/* $OpenBSD: ec_lib.c,v 1.124 2025/05/10 05:54:38 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -68,12 +68,12 @@ #include #include -#include #include #include #include "bn_local.h" #include "ec_local.h" +#include "err_local.h" EC_GROUP * EC_GROUP_new(const EC_METHOD *meth) diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c index 673696a9fd..d74c89cfe2 100644 --- a/src/lib/libcrypto/ec/ec_mult.c +++ b/src/lib/libcrypto/ec/ec_mult.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_mult.c,v 1.58 2025/03/24 13:07:04 jsing Exp $ */ +/* $OpenBSD: ec_mult.c,v 1.59 2025/05/10 05:54:38 tb Exp $ */ /* * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project. */ @@ -67,9 +67,9 @@ #include #include -#include #include "ec_local.h" +#include "err_local.h" /* Holds the wNAF digits of bn and the corresponding odd multiples of point. */ struct ec_wnaf { diff --git a/src/lib/libcrypto/ec/ec_pmeth.c b/src/lib/libcrypto/ec/ec_pmeth.c index 85ac4822d1..69bf7e741a 100644 --- a/src/lib/libcrypto/ec/ec_pmeth.c +++ b/src/lib/libcrypto/ec/ec_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_pmeth.c,v 1.26 2025/03/13 10:39:51 tb Exp $ */ +/* $OpenBSD: ec_pmeth.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -62,12 +62,12 @@ #include #include -#include #include #include #include "bn_local.h" #include "ec_local.h" +#include "err_local.h" #include "evp_local.h" /* EC pkey context structure */ diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c index c40a64966a..ed5fdce9c1 100644 --- a/src/lib/libcrypto/ec/eck_prn.c +++ b/src/lib/libcrypto/ec/eck_prn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eck_prn.c,v 1.41 2025/01/25 10:30:17 tb Exp $ */ +/* $OpenBSD: eck_prn.c,v 1.42 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -66,12 +66,12 @@ #include #include #include -#include #include #include #include "bn_local.h" #include "ec_local.h" +#include "err_local.h" int EC_KEY_print(BIO *bio, const EC_KEY *ec_key, int off) diff --git a/src/lib/libcrypto/ec/ecp_methods.c b/src/lib/libcrypto/ec/ecp_methods.c index ced85ceb1e..5adc049ab7 100644 --- a/src/lib/libcrypto/ec/ecp_methods.c +++ b/src/lib/libcrypto/ec/ecp_methods.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_methods.c,v 1.45 2025/03/24 13:07:04 jsing Exp $ */ +/* $OpenBSD: ecp_methods.c,v 1.46 2025/05/10 05:54:38 tb Exp $ */ /* Includes code written by Lenka Fibikova * for the OpenSSL project. * Includes code written by Bodo Moeller for the OpenSSL project. @@ -66,11 +66,11 @@ #include #include -#include #include #include "bn_local.h" #include "ec_local.h" +#include "err_local.h" /* * Most method functions in this file are designed to work with non-trivial diff --git a/src/lib/libcrypto/ec/ecx_methods.c b/src/lib/libcrypto/ec/ecx_methods.c index 6b5759d4fa..b08456d03b 100644 --- a/src/lib/libcrypto/ec/ecx_methods.c +++ b/src/lib/libcrypto/ec/ecx_methods.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecx_methods.c,v 1.14 2024/08/28 07:15:04 tb Exp $ */ +/* $OpenBSD: ecx_methods.c,v 1.15 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2022 Joel Sing * @@ -20,13 +20,13 @@ #include #include #include -#include #include #include #include "asn1_local.h" #include "bytestring.h" #include "curve25519_internal.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/ecdh/ecdh.c b/src/lib/libcrypto/ecdh/ecdh.c index dbb91f1991..c3affed682 100644 --- a/src/lib/libcrypto/ecdh/ecdh.c +++ b/src/lib/libcrypto/ecdh/ecdh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecdh.c,v 1.11 2025/02/17 09:25:45 tb Exp $ */ +/* $OpenBSD: ecdh.c,v 1.12 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -73,10 +73,10 @@ #include #include -#include #include #include "ec_local.h" +#include "err_local.h" /* * Key derivation function from X9.63/SECG. diff --git a/src/lib/libcrypto/ecdsa/ecdsa.c b/src/lib/libcrypto/ecdsa/ecdsa.c index 5abc3586e3..4e00eb5ec8 100644 --- a/src/lib/libcrypto/ecdsa/ecdsa.c +++ b/src/lib/libcrypto/ecdsa/ecdsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecdsa.c,v 1.19 2024/04/15 15:49:37 tb Exp $ */ +/* $OpenBSD: ecdsa.c,v 1.20 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. * @@ -61,11 +61,11 @@ #include #include #include -#include #include "bn_local.h" #include "ec_local.h" #include "ecdsa_local.h" +#include "err_local.h" static const ASN1_TEMPLATE ECDSA_SIG_seq_tt[] = { { diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c index 5c52b6b258..f672c998eb 100644 --- a/src/lib/libcrypto/evp/e_aes.c +++ b/src/lib/libcrypto/evp/e_aes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_aes.c,v 1.61 2025/04/18 13:25:03 jsing Exp $ */ +/* $OpenBSD: e_aes.c,v 1.62 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. * @@ -59,9 +59,9 @@ #ifndef OPENSSL_NO_AES #include -#include #include +#include "err_local.h" #include "evp_local.h" #include "modes_local.h" diff --git a/src/lib/libcrypto/evp/e_camellia.c b/src/lib/libcrypto/evp/e_camellia.c index 55dcc79922..5538281e75 100644 --- a/src/lib/libcrypto/evp/e_camellia.c +++ b/src/lib/libcrypto/evp/e_camellia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_camellia.c,v 1.20 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: e_camellia.c,v 1.21 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 2006 The OpenSSL Project. All rights reserved. * @@ -59,9 +59,9 @@ #ifndef OPENSSL_NO_CAMELLIA #include -#include #include +#include "err_local.h" #include "evp_local.h" /* Camellia subkey Structure */ diff --git a/src/lib/libcrypto/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c index d176569f90..d3a1e44875 100644 --- a/src/lib/libcrypto/evp/e_chacha20poly1305.c +++ b/src/lib/libcrypto/evp/e_chacha20poly1305.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_chacha20poly1305.c,v 1.37 2024/12/20 20:05:29 schwarze Exp $ */ +/* $OpenBSD: e_chacha20poly1305.c,v 1.38 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2022 Joel Sing @@ -26,12 +26,12 @@ #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) -#include #include #include #include #include "bytestring.h" +#include "err_local.h" #include "evp_local.h" #define POLY1305_TAG_LEN 16 diff --git a/src/lib/libcrypto/evp/e_rc2.c b/src/lib/libcrypto/evp/e_rc2.c index dc404cff20..b7ba60297a 100644 --- a/src/lib/libcrypto/evp/e_rc2.c +++ b/src/lib/libcrypto/evp/e_rc2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc2.c,v 1.29 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: e_rc2.c,v 1.30 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,11 +63,11 @@ #ifndef OPENSSL_NO_RC2 -#include #include #include #include +#include "err_local.h" #include "evp_local.h" static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/src/lib/libcrypto/evp/evp_aead.c b/src/lib/libcrypto/evp/evp_aead.c index b35f5157ed..fdac082217 100644 --- a/src/lib/libcrypto/evp/evp_aead.c +++ b/src/lib/libcrypto/evp/evp_aead.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_aead.c,v 1.11 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: evp_aead.c,v 1.12 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -19,8 +19,8 @@ #include #include -#include +#include "err_local.h" #include "evp_local.h" size_t diff --git a/src/lib/libcrypto/evp/evp_cipher.c b/src/lib/libcrypto/evp/evp_cipher.c index e9c266d1b9..16606991ae 100644 --- a/src/lib/libcrypto/evp/evp_cipher.c +++ b/src/lib/libcrypto/evp/evp_cipher.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_cipher.c,v 1.23 2024/04/10 15:00:38 beck Exp $ */ +/* $OpenBSD: evp_cipher.c,v 1.24 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -115,10 +115,10 @@ #include #include -#include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" int diff --git a/src/lib/libcrypto/evp/evp_digest.c b/src/lib/libcrypto/evp/evp_digest.c index 0a97d25c7d..8bd6691fbf 100644 --- a/src/lib/libcrypto/evp/evp_digest.c +++ b/src/lib/libcrypto/evp/evp_digest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_digest.c,v 1.14 2024/04/10 15:00:38 beck Exp $ */ +/* $OpenBSD: evp_digest.c,v 1.15 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -114,10 +114,10 @@ #include -#include #include #include +#include "err_local.h" #include "evp_local.h" int diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index e7c7ec3294..128bec0ac3 100644 --- a/src/lib/libcrypto/evp/evp_key.c +++ b/src/lib/libcrypto/evp/evp_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_key.c,v 1.36 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: evp_key.c,v 1.37 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,12 +59,12 @@ #include #include -#include #include #include #include #include +#include "err_local.h" #include "evp_local.h" /* should be init to zeros. */ diff --git a/src/lib/libcrypto/evp/evp_names.c b/src/lib/libcrypto/evp/evp_names.c index 817d33602c..8757d191dd 100644 --- a/src/lib/libcrypto/evp/evp_names.c +++ b/src/lib/libcrypto/evp/evp_names.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_names.c,v 1.18 2024/08/31 10:38:49 tb Exp $ */ +/* $OpenBSD: evp_names.c,v 1.19 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2023 Theo Buehler * @@ -15,7 +15,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index 88ceb14033..cb2ace1fd0 100644 --- a/src/lib/libcrypto/evp/evp_pbe.c +++ b/src/lib/libcrypto/evp/evp_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pbe.c,v 1.50 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.51 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,13 +60,13 @@ #include #include -#include #include #include #include #include #include +#include "err_local.h" #include "evp_local.h" #include "hmac_local.h" #include "pkcs12_local.h" diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c index a1e127352a..1c0b8b41e9 100644 --- a/src/lib/libcrypto/evp/evp_pkey.c +++ b/src/lib/libcrypto/evp/evp_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pkey.c,v 1.33 2025/02/04 04:51:34 tb Exp $ */ +/* $OpenBSD: evp_pkey.c,v 1.34 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,10 +60,10 @@ #include #include -#include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" /* Extract a private key from a PKCS8 structure */ diff --git a/src/lib/libcrypto/evp/m_sigver.c b/src/lib/libcrypto/evp/m_sigver.c index a3353854f1..66e4752242 100644 --- a/src/lib/libcrypto/evp/m_sigver.c +++ b/src/lib/libcrypto/evp/m_sigver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_sigver.c,v 1.27 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: m_sigver.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -58,11 +58,11 @@ #include -#include #include #include #include +#include "err_local.h" #include "evp_local.h" static int diff --git a/src/lib/libcrypto/evp/p_legacy.c b/src/lib/libcrypto/evp/p_legacy.c index 01cfdbcd6a..7c958a16e3 100644 --- a/src/lib/libcrypto/evp/p_legacy.c +++ b/src/lib/libcrypto/evp/p_legacy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_legacy.c,v 1.6 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: p_legacy.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,10 +59,10 @@ #include #include -#include #include +#include "err_local.h" #include "evp_local.h" int diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c index 95c7721303..9623bb59a1 100644 --- a/src/lib/libcrypto/evp/p_lib.c +++ b/src/lib/libcrypto/evp/p_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_lib.c,v 1.61 2024/08/22 12:24:24 tb Exp $ */ +/* $OpenBSD: p_lib.c,v 1.62 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -111,7 +111,6 @@ #include #include #include -#include #include #include #include @@ -129,6 +128,7 @@ #include #endif +#include "err_local.h" #include "evp_local.h" extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth; diff --git a/src/lib/libcrypto/evp/p_sign.c b/src/lib/libcrypto/evp/p_sign.c index 7f472ea716..775cf78d62 100644 --- a/src/lib/libcrypto/evp/p_sign.c +++ b/src/lib/libcrypto/evp/p_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_sign.c,v 1.22 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: p_sign.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,7 +58,6 @@ #include -#include #include #include #include diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c index 02132e2c38..cd7482df55 100644 --- a/src/lib/libcrypto/evp/p_verify.c +++ b/src/lib/libcrypto/evp/p_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_verify.c,v 1.21 2024/04/09 13:52:41 beck Exp $ */ +/* $OpenBSD: p_verify.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,7 +58,6 @@ #include -#include #include #include #include diff --git a/src/lib/libcrypto/evp/pmeth_fn.c b/src/lib/libcrypto/evp/pmeth_fn.c index 308c434f0d..ad6c04dabb 100644 --- a/src/lib/libcrypto/evp/pmeth_fn.c +++ b/src/lib/libcrypto/evp/pmeth_fn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_fn.c,v 1.11 2024/04/12 09:41:39 tb Exp $ */ +/* $OpenBSD: pmeth_fn.c,v 1.12 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -59,10 +59,10 @@ #include #include -#include #include #include +#include "err_local.h" #include "evp_local.h" #define M_check_autoarg(ctx, arg, arglen, err) \ diff --git a/src/lib/libcrypto/evp/pmeth_gn.c b/src/lib/libcrypto/evp/pmeth_gn.c index bc1c5bd7d2..fa5b446124 100644 --- a/src/lib/libcrypto/evp/pmeth_gn.c +++ b/src/lib/libcrypto/evp/pmeth_gn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_gn.c,v 1.21 2024/08/31 09:14:21 tb Exp $ */ +/* $OpenBSD: pmeth_gn.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -60,12 +60,12 @@ #include #include -#include #include #include #include "asn1_local.h" #include "bn_local.h" +#include "err_local.h" #include "evp_local.h" int diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c index fbf4057c38..ce6beecad6 100644 --- a/src/lib/libcrypto/evp/pmeth_lib.c +++ b/src/lib/libcrypto/evp/pmeth_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_lib.c,v 1.42 2025/01/20 12:57:28 tb Exp $ */ +/* $OpenBSD: pmeth_lib.c,v 1.43 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -63,12 +63,12 @@ #include -#include #include #include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" extern const EVP_PKEY_METHOD cmac_pkey_meth; diff --git a/src/lib/libcrypto/hkdf/hkdf.c b/src/lib/libcrypto/hkdf/hkdf.c index 6104ef0cc7..f68df4bea4 100644 --- a/src/lib/libcrypto/hkdf/hkdf.c +++ b/src/lib/libcrypto/hkdf/hkdf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hkdf.c,v 1.11 2024/03/25 13:09:13 jsing Exp $ */ +/* $OpenBSD: hkdf.c,v 1.12 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -19,10 +19,10 @@ #include -#include #include #include "bytestring.h" +#include "err_local.h" #include "evp_local.h" #include "hmac_local.h" diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c index dc1614d3ce..e3d5664143 100644 --- a/src/lib/libcrypto/hmac/hmac.c +++ b/src/lib/libcrypto/hmac/hmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hmac.c,v 1.36 2024/08/31 10:42:21 tb Exp $ */ +/* $OpenBSD: hmac.c,v 1.37 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,9 +60,9 @@ #include #include -#include #include +#include "err_local.h" #include "evp_local.h" #include "hmac_local.h" diff --git a/src/lib/libcrypto/kdf/hkdf_evp.c b/src/lib/libcrypto/kdf/hkdf_evp.c index b33e2e0a26..90686a56f9 100644 --- a/src/lib/libcrypto/kdf/hkdf_evp.c +++ b/src/lib/libcrypto/kdf/hkdf_evp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hkdf_evp.c,v 1.20 2023/06/26 08:57:17 tb Exp $ */ +/* $OpenBSD: hkdf_evp.c,v 1.21 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 2016-2018 The OpenSSL Project. All rights reserved. * @@ -50,12 +50,11 @@ #include #include -#include -#include #include #include #include +#include "err_local.h" #include "evp_local.h" #define HKDF_MAXBUF 1024 diff --git a/src/lib/libcrypto/kdf/tls1_prf.c b/src/lib/libcrypto/kdf/tls1_prf.c index 7d6231e3c7..fb7b718339 100644 --- a/src/lib/libcrypto/kdf/tls1_prf.c +++ b/src/lib/libcrypto/kdf/tls1_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls1_prf.c,v 1.40 2024/07/10 06:53:27 tb Exp $ */ +/* $OpenBSD: tls1_prf.c,v 1.41 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project * 2016. @@ -61,10 +61,10 @@ #include #include -#include #include #include +#include "err_local.h" #include "evp_local.h" #define TLS1_PRF_MAXBUF 1024 diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index 2f4012fe15..d4da6be52c 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obj_dat.c,v 1.94 2025/02/26 10:48:25 tb Exp $ */ +/* $OpenBSD: obj_dat.c,v 1.95 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -66,11 +66,11 @@ #include #include -#include #include #include #include "asn1_local.h" +#include "err_local.h" /* obj_dat.h is generated from objects.h by obj_dat.pl */ #include "obj_dat.h" diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c index 45062dbd4c..56b0b10423 100644 --- a/src/lib/libcrypto/objects/obj_lib.c +++ b/src/lib/libcrypto/objects/obj_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obj_lib.c,v 1.19 2023/08/17 09:13:01 tb Exp $ */ +/* $OpenBSD: obj_lib.c,v 1.20 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,12 +59,12 @@ #include #include -#include #include #include #include #include "asn1_local.h" +#include "err_local.h" ASN1_OBJECT * OBJ_dup(const ASN1_OBJECT *o) diff --git a/src/lib/libcrypto/ocsp/ocsp_cl.c b/src/lib/libcrypto/ocsp/ocsp_cl.c index d8ee33c391..460c1bce5e 100644 --- a/src/lib/libcrypto/ocsp/ocsp_cl.c +++ b/src/lib/libcrypto/ocsp/ocsp_cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_cl.c,v 1.25 2024/03/24 11:30:12 beck Exp $ */ +/* $OpenBSD: ocsp_cl.c,v 1.26 2025/05/10 05:54:38 tb Exp $ */ /* Written by Tom Titchener for the OpenSSL * project. */ @@ -64,7 +64,6 @@ #include #include -#include #include #include #include @@ -73,6 +72,7 @@ #include #include "asn1_local.h" +#include "err_local.h" #include "ocsp_local.h" /* Utility functions related to sending OCSP requests and extracting diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c index 69723c2154..db83b35518 100644 --- a/src/lib/libcrypto/ocsp/ocsp_ht.c +++ b/src/lib/libcrypto/ocsp/ocsp_ht.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_ht.c,v 1.27 2023/11/28 09:29:20 jsg Exp $ */ +/* $OpenBSD: ocsp_ht.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -60,11 +60,13 @@ #include #include #include + #include #include -#include #include +#include "err_local.h" + /* Stateful OCSP request code, supporting non-blocking I/O */ /* Opaque OCSP request status structure */ diff --git a/src/lib/libcrypto/ocsp/ocsp_lib.c b/src/lib/libcrypto/ocsp/ocsp_lib.c index 521fb67aed..dfa002a594 100644 --- a/src/lib/libcrypto/ocsp/ocsp_lib.c +++ b/src/lib/libcrypto/ocsp/ocsp_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_lib.c,v 1.28 2024/08/28 06:27:19 tb Exp $ */ +/* $OpenBSD: ocsp_lib.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Written by Tom Titchener for the OpenSSL * project. */ @@ -67,13 +67,13 @@ #include #include -#include #include #include #include #include #include +#include "err_local.h" #include "ocsp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/ocsp/ocsp_prn.c b/src/lib/libcrypto/ocsp/ocsp_prn.c index fb7b9651d9..537d5e3d20 100644 --- a/src/lib/libcrypto/ocsp/ocsp_prn.c +++ b/src/lib/libcrypto/ocsp/ocsp_prn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_prn.c,v 1.11 2024/08/28 06:18:44 tb Exp $ */ +/* $OpenBSD: ocsp_prn.c,v 1.12 2025/05/10 05:54:38 tb Exp $ */ /* Written by Tom Titchener for the OpenSSL * project. */ @@ -62,7 +62,6 @@ */ #include -#include #include #include #include diff --git a/src/lib/libcrypto/ocsp/ocsp_srv.c b/src/lib/libcrypto/ocsp/ocsp_srv.c index 77c5e2e0fd..4b1d73d7ac 100644 --- a/src/lib/libcrypto/ocsp/ocsp_srv.c +++ b/src/lib/libcrypto/ocsp/ocsp_srv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_srv.c,v 1.13 2023/07/08 10:44:00 beck Exp $ */ +/* $OpenBSD: ocsp_srv.c,v 1.14 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -58,13 +58,13 @@ #include -#include #include #include #include #include #include +#include "err_local.h" #include "ocsp_local.h" /* Utility functions related to sending OCSP responses and extracting diff --git a/src/lib/libcrypto/ocsp/ocsp_vfy.c b/src/lib/libcrypto/ocsp/ocsp_vfy.c index 27d2283ea7..185839f465 100644 --- a/src/lib/libcrypto/ocsp/ocsp_vfy.c +++ b/src/lib/libcrypto/ocsp/ocsp_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_vfy.c,v 1.24 2024/07/12 18:15:10 beck Exp $ */ +/* $OpenBSD: ocsp_vfy.c,v 1.25 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -57,9 +57,9 @@ */ #include -#include #include +#include "err_local.h" #include "ocsp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c index b979c79b33..dfc0a83d3f 100644 --- a/src/lib/libcrypto/pem/pem_info.c +++ b/src/lib/libcrypto/pem/pem_info.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_info.c,v 1.27 2023/07/07 13:40:44 beck Exp $ */ +/* $OpenBSD: pem_info.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,7 +62,6 @@ #include #include -#include #include #include #include @@ -75,6 +74,7 @@ #include #endif +#include "err_local.h" #include "evp_local.h" STACK_OF(X509_INFO) * diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 30db092c3e..7c7f776cae 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_lib.c,v 1.56 2024/02/18 15:44:10 tb Exp $ */ +/* $OpenBSD: pem_lib.c,v 1.57 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -64,7 +64,6 @@ #include #include -#include #include #include #include @@ -76,6 +75,7 @@ #endif #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" #define MIN_LENGTH 4 diff --git a/src/lib/libcrypto/pem/pem_oth.c b/src/lib/libcrypto/pem/pem_oth.c index 2dca978efd..d466179ad7 100644 --- a/src/lib/libcrypto/pem/pem_oth.c +++ b/src/lib/libcrypto/pem/pem_oth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_oth.c,v 1.9 2023/07/07 13:40:44 beck Exp $ */ +/* $OpenBSD: pem_oth.c,v 1.10 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,12 +59,13 @@ #include #include -#include #include #include #include #include +#include "err_local.h" + /* Handle 'other' PEMs: not private keys */ void * diff --git a/src/lib/libcrypto/pem/pem_pk8.c b/src/lib/libcrypto/pem/pem_pk8.c index 6d0c0cbd57..16bde39a7e 100644 --- a/src/lib/libcrypto/pem/pem_pk8.c +++ b/src/lib/libcrypto/pem/pem_pk8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_pk8.c,v 1.14 2023/07/07 13:40:44 beck Exp $ */ +/* $OpenBSD: pem_pk8.c,v 1.15 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,13 +60,13 @@ #include #include -#include -#include #include #include #include #include +#include "err_local.h" + static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u); static int do_pk8pkey_fp(FILE *bp, EVP_PKEY *x, int isder, int nid, diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c index d7001c83cc..df8ebaa036 100644 --- a/src/lib/libcrypto/pem/pem_pkey.c +++ b/src/lib/libcrypto/pem/pem_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_pkey.c,v 1.28 2023/11/19 15:46:10 tb Exp $ */ +/* $OpenBSD: pem_pkey.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,7 +62,6 @@ #include #include -#include #include #include #include @@ -70,6 +69,7 @@ #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" int pem_check_suffix(const char *pem_str, const char *suffix); diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c index 461f957445..878be01b70 100644 --- a/src/lib/libcrypto/pem/pem_sign.c +++ b/src/lib/libcrypto/pem/pem_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_sign.c,v 1.15 2023/07/07 13:40:44 beck Exp $ */ +/* $OpenBSD: pem_sign.c,v 1.16 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,12 +58,13 @@ #include -#include #include #include #include #include +#include "err_local.h" + int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type) { diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c index 40c9feefe5..6967d65eee 100644 --- a/src/lib/libcrypto/pem/pvkfmt.c +++ b/src/lib/libcrypto/pem/pvkfmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pvkfmt.c,v 1.28 2024/02/18 15:45:42 tb Exp $ */ +/* $OpenBSD: pvkfmt.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2005. */ @@ -66,7 +66,6 @@ #include #include -#include #include #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) @@ -75,6 +74,7 @@ #include "bn_local.h" #include "dsa_local.h" +#include "err_local.h" #include "evp_local.h" #include "rsa_local.h" diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c index f6f42c558c..e45218ba96 100644 --- a/src/lib/libcrypto/pkcs12/p12_add.c +++ b/src/lib/libcrypto/pkcs12/p12_add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_add.c,v 1.25 2024/03/02 10:20:27 tb Exp $ */ +/* $OpenBSD: p12_add.c,v 1.26 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -58,9 +58,9 @@ #include -#include #include +#include "err_local.h" #include "pkcs12_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c index 502ccecd25..321115cfcd 100644 --- a/src/lib/libcrypto/pkcs12/p12_crt.c +++ b/src/lib/libcrypto/pkcs12/p12_crt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_crt.c,v 1.26 2024/08/22 12:22:42 tb Exp $ */ +/* $OpenBSD: p12_crt.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -58,10 +58,10 @@ #include -#include #include #include +#include "err_local.h" #include "evp_local.h" #include "pkcs12_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c index 907d4e52a6..8466e92415 100644 --- a/src/lib/libcrypto/pkcs12/p12_decr.c +++ b/src/lib/libcrypto/pkcs12/p12_decr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_decr.c,v 1.26 2024/03/02 10:15:16 tb Exp $ */ +/* $OpenBSD: p12_decr.c,v 1.27 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -59,9 +59,9 @@ #include #include -#include #include +#include "err_local.h" #include "evp_local.h" /* Encrypt/Decrypt a buffer based on password and algor, result in a diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c index cd9422d215..ac0f1eeb57 100644 --- a/src/lib/libcrypto/pkcs12/p12_init.c +++ b/src/lib/libcrypto/pkcs12/p12_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_init.c,v 1.17 2024/03/24 06:48:03 tb Exp $ */ +/* $OpenBSD: p12_init.c,v 1.18 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -58,9 +58,9 @@ #include -#include #include +#include "err_local.h" #include "pkcs12_local.h" /* Initialise a PKCS12 structure to take data */ diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c index 443d632c87..29a99bbca4 100644 --- a/src/lib/libcrypto/pkcs12/p12_key.c +++ b/src/lib/libcrypto/pkcs12/p12_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_key.c,v 1.36 2025/03/09 15:45:52 tb Exp $ */ +/* $OpenBSD: p12_key.c,v 1.37 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,9 +60,9 @@ #include #include -#include #include +#include "err_local.h" #include "evp_local.h" #include "pkcs12_local.h" diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c index e4de2eb61c..f6f09ff2de 100644 --- a/src/lib/libcrypto/pkcs12/p12_kiss.c +++ b/src/lib/libcrypto/pkcs12/p12_kiss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_kiss.c,v 1.28 2025/01/06 23:35:25 tb Exp $ */ +/* $OpenBSD: p12_kiss.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -58,9 +58,9 @@ #include -#include #include +#include "err_local.h" #include "pkcs12_local.h" /* Simplified PKCS#12 routines */ diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c index 2060358188..513aa54ada 100644 --- a/src/lib/libcrypto/pkcs12/p12_mutl.c +++ b/src/lib/libcrypto/pkcs12/p12_mutl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_mutl.c,v 1.38 2024/03/24 06:48:03 tb Exp $ */ +/* $OpenBSD: p12_mutl.c,v 1.39 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -64,10 +64,10 @@ #ifndef OPENSSL_NO_HMAC -#include #include #include +#include "err_local.h" #include "evp_local.h" #include "hmac_local.h" #include "pkcs12_local.h" diff --git a/src/lib/libcrypto/pkcs12/p12_npas.c b/src/lib/libcrypto/pkcs12/p12_npas.c index 6d3b43ce22..c78deb9182 100644 --- a/src/lib/libcrypto/pkcs12/p12_npas.c +++ b/src/lib/libcrypto/pkcs12/p12_npas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_npas.c,v 1.27 2024/01/25 15:33:35 tb Exp $ */ +/* $OpenBSD: p12_npas.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,9 +60,9 @@ #include #include #include -#include #include +#include "err_local.h" #include "pkcs12_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pkcs12/p12_p8e.c b/src/lib/libcrypto/pkcs12/p12_p8e.c index bf61593266..a8a5039dfb 100644 --- a/src/lib/libcrypto/pkcs12/p12_p8e.c +++ b/src/lib/libcrypto/pkcs12/p12_p8e.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_p8e.c,v 1.13 2024/03/02 10:15:16 tb Exp $ */ +/* $OpenBSD: p12_p8e.c,v 1.14 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -58,9 +58,9 @@ #include -#include #include +#include "err_local.h" #include "pkcs12_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pkcs12/p12_sbag.c b/src/lib/libcrypto/pkcs12/p12_sbag.c index 1664e9409d..5fea54073b 100644 --- a/src/lib/libcrypto/pkcs12/p12_sbag.c +++ b/src/lib/libcrypto/pkcs12/p12_sbag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_sbag.c,v 1.9 2024/03/24 06:48:03 tb Exp $ */ +/* $OpenBSD: p12_sbag.c,v 1.10 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project * 1999-2018. @@ -59,9 +59,9 @@ #include -#include #include +#include "err_local.h" #include "pkcs12_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pkcs7/pk7_attr.c b/src/lib/libcrypto/pkcs7/pk7_attr.c index 52463aa3a3..c43b0ae2f1 100644 --- a/src/lib/libcrypto/pkcs7/pk7_attr.c +++ b/src/lib/libcrypto/pkcs7/pk7_attr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_attr.c,v 1.15 2024/02/19 15:37:44 tb Exp $ */ +/* $OpenBSD: pk7_attr.c,v 1.16 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -59,11 +59,12 @@ #include #include -#include #include #include #include +#include "err_local.h" + int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap) { diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index 020de71fef..3a2076a25f 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_doit.c,v 1.59 2025/03/18 12:53:25 tb Exp $ */ +/* $OpenBSD: pk7_doit.c,v 1.60 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,11 +60,11 @@ #include #include -#include #include #include #include +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c index a1c7d61cca..8712a2ecc1 100644 --- a/src/lib/libcrypto/pkcs7/pk7_lib.c +++ b/src/lib/libcrypto/pkcs7/pk7_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_lib.c,v 1.30 2024/12/06 07:10:20 tb Exp $ */ +/* $OpenBSD: pk7_lib.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,11 +58,11 @@ #include -#include #include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/pkcs7/pk7_smime.c b/src/lib/libcrypto/pkcs7/pk7_smime.c index cff89c34e1..32f28f0505 100644 --- a/src/lib/libcrypto/pkcs7/pk7_smime.c +++ b/src/lib/libcrypto/pkcs7/pk7_smime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_smime.c,v 1.27 2024/04/20 10:11:55 tb Exp $ */ +/* $OpenBSD: pk7_smime.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -60,10 +60,10 @@ #include -#include #include #include +#include "err_local.h" #include "x509_local.h" static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si); diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index 5a87522289..00fa6afb3d 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/rsa/rsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_ameth.c,v 1.62 2024/11/02 07:11:14 tb Exp $ */ +/* $OpenBSD: rsa_ameth.c,v 1.63 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -76,6 +75,7 @@ #include "asn1_local.h" #include "bn_local.h" +#include "err_local.h" #include "evp_local.h" #include "rsa_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/rsa/rsa_blinding.c b/src/lib/libcrypto/rsa/rsa_blinding.c index cac5bd91d2..590b45f5a1 100644 --- a/src/lib/libcrypto/rsa/rsa_blinding.c +++ b/src/lib/libcrypto/rsa/rsa_blinding.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_blinding.c,v 1.3 2023/08/09 12:09:06 tb Exp $ */ +/* $OpenBSD: rsa_blinding.c,v 1.4 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -114,10 +114,10 @@ #include -#include #include #include "bn_local.h" +#include "err_local.h" #include "rsa_local.h" #define BN_BLINDING_COUNTER 32 diff --git a/src/lib/libcrypto/rsa/rsa_chk.c b/src/lib/libcrypto/rsa/rsa_chk.c index b7666e0fed..87d261f88e 100644 --- a/src/lib/libcrypto/rsa/rsa_chk.c +++ b/src/lib/libcrypto/rsa/rsa_chk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_chk.c,v 1.18 2023/07/08 12:26:45 beck Exp $ */ +/* $OpenBSD: rsa_chk.c,v 1.19 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -49,10 +49,10 @@ */ #include -#include #include #include "bn_local.h" +#include "err_local.h" #include "rsa_local.h" int diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index c2e1e22f9a..65ccfc35e1 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_eay.c,v 1.65 2023/08/09 12:09:06 tb Exp $ */ +/* $OpenBSD: rsa_eay.c,v 1.66 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -115,10 +115,10 @@ #include #include -#include #include #include "bn_local.h" +#include "err_local.h" #include "rsa_local.h" static int diff --git a/src/lib/libcrypto/rsa/rsa_gen.c b/src/lib/libcrypto/rsa/rsa_gen.c index ff64eb2f0e..ebd0aeffd5 100644 --- a/src/lib/libcrypto/rsa/rsa_gen.c +++ b/src/lib/libcrypto/rsa/rsa_gen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_gen.c,v 1.30 2023/07/08 12:26:45 beck Exp $ */ +/* $OpenBSD: rsa_gen.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,10 +60,10 @@ #include #include -#include #include #include "bn_local.h" +#include "err_local.h" #include "rsa_local.h" static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb); diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c index 91f4938ec9..7b8babdf52 100644 --- a/src/lib/libcrypto/rsa/rsa_lib.c +++ b/src/lib/libcrypto/rsa/rsa_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_lib.c,v 1.50 2024/03/27 01:22:30 tb Exp $ */ +/* $OpenBSD: rsa_lib.c,v 1.51 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,12 +62,12 @@ #include #include -#include #include #include #include #include "bn_local.h" +#include "err_local.h" #include "evp_local.h" #include "rsa_local.h" diff --git a/src/lib/libcrypto/rsa/rsa_meth.c b/src/lib/libcrypto/rsa/rsa_meth.c index 71608caa01..131c4484ab 100644 --- a/src/lib/libcrypto/rsa/rsa_meth.c +++ b/src/lib/libcrypto/rsa/rsa_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_meth.c,v 1.7 2023/07/08 12:26:45 beck Exp $ */ +/* $OpenBSD: rsa_meth.c,v 1.8 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2018 Theo Buehler * @@ -18,7 +18,6 @@ #include #include -#include #include #include "rsa_local.h" diff --git a/src/lib/libcrypto/rsa/rsa_none.c b/src/lib/libcrypto/rsa/rsa_none.c index 9c53dcf595..b8764d54ef 100644 --- a/src/lib/libcrypto/rsa/rsa_none.c +++ b/src/lib/libcrypto/rsa/rsa_none.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_none.c,v 1.12 2023/07/08 12:26:45 beck Exp $ */ +/* $OpenBSD: rsa_none.c,v 1.13 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,9 +60,10 @@ #include #include -#include #include +#include "err_local.h" + int RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *from, int flen) diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c index d1e138c299..9a175f8c55 100644 --- a/src/lib/libcrypto/rsa/rsa_oaep.c +++ b/src/lib/libcrypto/rsa/rsa_oaep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_oaep.c,v 1.39 2024/03/26 05:37:28 joshua Exp $ */ +/* $OpenBSD: rsa_oaep.c,v 1.40 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. * @@ -74,12 +74,12 @@ #include #include -#include #include #include #include #include "constant_time.h" +#include "err_local.h" #include "evp_local.h" #include "rsa_local.h" diff --git a/src/lib/libcrypto/rsa/rsa_pk1.c b/src/lib/libcrypto/rsa/rsa_pk1.c index 8e56a8c4cd..554e00e8f8 100644 --- a/src/lib/libcrypto/rsa/rsa_pk1.c +++ b/src/lib/libcrypto/rsa/rsa_pk1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_pk1.c,v 1.17 2024/03/30 04:34:17 jsing Exp $ */ +/* $OpenBSD: rsa_pk1.c,v 1.18 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,10 +61,10 @@ #include #include -#include #include #include "bytestring.h" +#include "err_local.h" int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen, diff --git a/src/lib/libcrypto/rsa/rsa_pmeth.c b/src/lib/libcrypto/rsa/rsa_pmeth.c index 453570cf74..518b077dbc 100644 --- a/src/lib/libcrypto/rsa/rsa_pmeth.c +++ b/src/lib/libcrypto/rsa/rsa_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_pmeth.c,v 1.43 2025/01/17 15:39:19 tb Exp $ */ +/* $OpenBSD: rsa_pmeth.c,v 1.44 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -65,13 +65,13 @@ #include #include -#include #include #include #include #include #include "bn_local.h" +#include "err_local.h" #include "evp_local.h" #include "rsa_local.h" diff --git a/src/lib/libcrypto/rsa/rsa_prn.c b/src/lib/libcrypto/rsa/rsa_prn.c index 1783563661..ef08f76249 100644 --- a/src/lib/libcrypto/rsa/rsa_prn.c +++ b/src/lib/libcrypto/rsa/rsa_prn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_prn.c,v 1.10 2023/07/08 12:26:45 beck Exp $ */ +/* $OpenBSD: rsa_prn.c,v 1.11 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -58,10 +58,11 @@ #include -#include #include #include +#include "err_local.h" + int RSA_print_fp(FILE *fp, const RSA *x, int off) { diff --git a/src/lib/libcrypto/rsa/rsa_pss.c b/src/lib/libcrypto/rsa/rsa_pss.c index 610ae7c928..72e252ef06 100644 --- a/src/lib/libcrypto/rsa/rsa_pss.c +++ b/src/lib/libcrypto/rsa/rsa_pss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_pss.c,v 1.19 2024/03/26 05:26:27 joshua Exp $ */ +/* $OpenBSD: rsa_pss.c,v 1.20 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2005. */ @@ -61,11 +61,11 @@ #include #include -#include #include #include #include +#include "err_local.h" #include "evp_local.h" #include "rsa_local.h" diff --git a/src/lib/libcrypto/rsa/rsa_saos.c b/src/lib/libcrypto/rsa/rsa_saos.c index 07a4f5d659..3052fa912f 100644 --- a/src/lib/libcrypto/rsa/rsa_saos.c +++ b/src/lib/libcrypto/rsa/rsa_saos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_saos.c,v 1.25 2023/07/08 12:26:45 beck Exp $ */ +/* $OpenBSD: rsa_saos.c,v 1.26 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,11 +60,12 @@ #include #include -#include #include #include #include +#include "err_local.h" + int RSA_sign_ASN1_OCTET_STRING(int type, const unsigned char *m, unsigned int m_len, unsigned char *sigret, unsigned int *siglen, RSA *rsa) diff --git a/src/lib/libcrypto/rsa/rsa_sign.c b/src/lib/libcrypto/rsa/rsa_sign.c index 6edd20626d..09e6972293 100644 --- a/src/lib/libcrypto/rsa/rsa_sign.c +++ b/src/lib/libcrypto/rsa/rsa_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_sign.c,v 1.37 2025/01/05 15:39:12 tb Exp $ */ +/* $OpenBSD: rsa_sign.c,v 1.38 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,12 +60,12 @@ #include #include -#include #include #include #include #include "asn1_local.h" +#include "err_local.h" #include "rsa_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/rsa/rsa_x931.c b/src/lib/libcrypto/rsa/rsa_x931.c index 52f3f803b2..8a0190d7fe 100644 --- a/src/lib/libcrypto/rsa/rsa_x931.c +++ b/src/lib/libcrypto/rsa/rsa_x931.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_x931.c,v 1.12 2023/05/05 12:19:37 tb Exp $ */ +/* $OpenBSD: rsa_x931.c,v 1.13 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2005. */ @@ -60,10 +60,11 @@ #include #include -#include #include #include +#include "err_local.h" + int RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *from, int flen) diff --git a/src/lib/libcrypto/sm2/sm2_crypt.c b/src/lib/libcrypto/sm2/sm2_crypt.c index 63fe1e6ab9..3bc1f21fb6 100644 --- a/src/lib/libcrypto/sm2/sm2_crypt.c +++ b/src/lib/libcrypto/sm2/sm2_crypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sm2_crypt.c,v 1.3 2024/02/09 07:43:52 tb Exp $ */ +/* $OpenBSD: sm2_crypt.c,v 1.4 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2017, 2019 Ribose Inc * @@ -22,10 +22,10 @@ #include #include #include -#include #include #include +#include "err_local.h" #include "sm2_local.h" typedef struct SM2_Ciphertext_st SM2_Ciphertext; diff --git a/src/lib/libcrypto/sm2/sm2_pmeth.c b/src/lib/libcrypto/sm2/sm2_pmeth.c index 441f5475d1..786e48a992 100644 --- a/src/lib/libcrypto/sm2/sm2_pmeth.c +++ b/src/lib/libcrypto/sm2/sm2_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sm2_pmeth.c,v 1.2 2022/11/26 16:08:54 tb Exp $ */ +/* $OpenBSD: sm2_pmeth.c,v 1.3 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2017, 2019 Ribose Inc * @@ -22,9 +22,9 @@ #include #include #include -#include #include +#include "err_local.h" #include "evp_local.h" #include "sm2_local.h" diff --git a/src/lib/libcrypto/sm2/sm2_sign.c b/src/lib/libcrypto/sm2/sm2_sign.c index a5e3a8aee5..1a88d860bc 100644 --- a/src/lib/libcrypto/sm2/sm2_sign.c +++ b/src/lib/libcrypto/sm2/sm2_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sm2_sign.c,v 1.4 2023/07/05 17:36:19 tb Exp $ */ +/* $OpenBSD: sm2_sign.c,v 1.5 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2017, 2019 Ribose Inc * @@ -21,10 +21,10 @@ #include #include -#include #include #include "bn_local.h" +#include "err_local.h" #include "sm2_local.h" static BIGNUM * diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c index feb2da68f9..aa3f4ba867 100644 --- a/src/lib/libcrypto/ts/ts_asn1.c +++ b/src/lib/libcrypto/ts/ts_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_asn1.c,v 1.15 2024/04/15 15:52:46 tb Exp $ */ +/* $OpenBSD: ts_asn1.c,v 1.16 2025/05/10 05:54:39 tb Exp $ */ /* Written by Nils Larsch for the OpenSSL project 2004. */ /* ==================================================================== @@ -58,9 +58,9 @@ #include #include -#include #include +#include "err_local.h" #include "ts_local.h" static const ASN1_TEMPLATE TS_MSG_IMPRINT_seq_tt[] = { diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c index bd499238f5..0acefa902f 100644 --- a/src/lib/libcrypto/ts/ts_conf.c +++ b/src/lib/libcrypto/ts/ts_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_conf.c,v 1.15 2024/08/26 22:01:28 op Exp $ */ +/* $OpenBSD: ts_conf.c,v 1.16 2025/05/10 05:54:39 tb Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2002. */ @@ -63,7 +63,6 @@ #include #include -#include #include #include diff --git a/src/lib/libcrypto/ts/ts_req_utils.c b/src/lib/libcrypto/ts/ts_req_utils.c index d679418060..fa3123863c 100644 --- a/src/lib/libcrypto/ts/ts_req_utils.c +++ b/src/lib/libcrypto/ts/ts_req_utils.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_req_utils.c,v 1.9 2023/07/07 19:37:54 beck Exp $ */ +/* $OpenBSD: ts_req_utils.c,v 1.10 2025/05/10 05:54:39 tb Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2002. */ @@ -58,11 +58,11 @@ #include -#include #include #include #include +#include "err_local.h" #include "ts_local.h" int diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c index e3101340c5..d35f6a7c94 100644 --- a/src/lib/libcrypto/ts/ts_rsp_sign.c +++ b/src/lib/libcrypto/ts/ts_rsp_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_rsp_sign.c,v 1.35 2024/03/26 00:39:22 beck Exp $ */ +/* $OpenBSD: ts_rsp_sign.c,v 1.36 2025/05/10 05:54:39 tb Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2002. */ @@ -60,11 +60,11 @@ #include -#include #include #include #include +#include "err_local.h" #include "evp_local.h" #include "ts_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/ts/ts_rsp_utils.c b/src/lib/libcrypto/ts/ts_rsp_utils.c index 34994adce8..ecdb46773f 100644 --- a/src/lib/libcrypto/ts/ts_rsp_utils.c +++ b/src/lib/libcrypto/ts/ts_rsp_utils.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_rsp_utils.c,v 1.11 2023/07/07 19:37:54 beck Exp $ */ +/* $OpenBSD: ts_rsp_utils.c,v 1.12 2025/05/10 05:54:39 tb Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2002. */ @@ -58,11 +58,11 @@ #include -#include #include #include #include +#include "err_local.h" #include "ts_local.h" /* Function definitions. */ diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c index 69236f68ab..d38bb3b460 100644 --- a/src/lib/libcrypto/ts/ts_rsp_verify.c +++ b/src/lib/libcrypto/ts/ts_rsp_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_rsp_verify.c,v 1.30 2023/07/07 07:25:21 beck Exp $ */ +/* $OpenBSD: ts_rsp_verify.c,v 1.31 2025/05/10 05:54:39 tb Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2002. */ @@ -59,11 +59,11 @@ #include #include -#include #include #include #include +#include "err_local.h" #include "evp_local.h" #include "ts_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/ts/ts_verify_ctx.c b/src/lib/libcrypto/ts/ts_verify_ctx.c index 5a2d95c680..23e2557308 100644 --- a/src/lib/libcrypto/ts/ts_verify_ctx.c +++ b/src/lib/libcrypto/ts/ts_verify_ctx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_verify_ctx.c,v 1.14 2023/07/07 07:25:21 beck Exp $ */ +/* $OpenBSD: ts_verify_ctx.c,v 1.15 2025/05/10 05:54:39 tb Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2003. */ @@ -58,10 +58,10 @@ #include -#include #include #include +#include "err_local.h" #include "ts_local.h" TS_VERIFY_CTX * diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c index 73d899afcc..cc9de59c19 100644 --- a/src/lib/libcrypto/ui/ui_lib.c +++ b/src/lib/libcrypto/ui/ui_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ui_lib.c,v 1.51 2023/02/16 08:38:17 tb Exp $ */ +/* $OpenBSD: ui_lib.c,v 1.52 2025/05/10 05:54:39 tb Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2001. */ @@ -61,9 +61,9 @@ #include #include -#include #include +#include "err_local.h" #include "ui_local.h" static const UI_METHOD *default_UI_meth = NULL; diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c index 2b2733a04b..9b239c1e9d 100644 --- a/src/lib/libcrypto/x509/by_dir.c +++ b/src/lib/libcrypto/x509/by_dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_dir.c,v 1.48 2024/08/31 10:19:17 tb Exp $ */ +/* $OpenBSD: by_dir.c,v 1.49 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -64,9 +64,9 @@ #include -#include #include +#include "err_local.h" #include "x509_local.h" typedef struct lookup_dir_hashes_st { diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c index 9b0fd2542c..86d4cd6b60 100644 --- a/src/lib/libcrypto/x509/by_file.c +++ b/src/lib/libcrypto/x509/by_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_file.c,v 1.31 2024/08/31 10:19:17 tb Exp $ */ +/* $OpenBSD: by_file.c,v 1.32 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,10 +62,10 @@ #include #include -#include #include #include +#include "err_local.h" #include "x509_local.h" static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, diff --git a/src/lib/libcrypto/x509/by_mem.c b/src/lib/libcrypto/x509/by_mem.c index 71afefa8a4..66093dd445 100644 --- a/src/lib/libcrypto/x509/by_mem.c +++ b/src/lib/libcrypto/x509/by_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_mem.c,v 1.10 2024/08/31 10:19:17 tb Exp $ */ +/* $OpenBSD: by_mem.c,v 1.11 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,11 +63,11 @@ #include #include -#include #include #include #include +#include "err_local.h" #include "x509_local.h" static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c index 2208cc434e..b4ee92a14b 100644 --- a/src/lib/libcrypto/x509/x509_addr.c +++ b/src/lib/libcrypto/x509/x509_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_addr.c,v 1.93 2024/07/13 15:08:58 tb Exp $ */ +/* $OpenBSD: x509_addr.c,v 1.94 2025/05/10 05:54:39 tb Exp $ */ /* * Contributed to the OpenSSL Project by the American Registry for * Internet Numbers ("ARIN"). @@ -69,12 +69,12 @@ #include #include #include -#include #include #include #include "asn1_local.h" #include "bytestring.h" +#include "err_local.h" #include "x509_local.h" #ifndef OPENSSL_NO_RFC3779 diff --git a/src/lib/libcrypto/x509/x509_akey.c b/src/lib/libcrypto/x509/x509_akey.c index 926508c4cd..524fea8009 100644 --- a/src/lib/libcrypto/x509/x509_akey.c +++ b/src/lib/libcrypto/x509/x509_akey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_akey.c,v 1.3 2024/08/31 10:03:03 tb Exp $ */ +/* $OpenBSD: x509_akey.c,v 1.4 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -62,9 +62,9 @@ #include #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_alt.c b/src/lib/libcrypto/x509/x509_alt.c index 34734a55bd..ca91493848 100644 --- a/src/lib/libcrypto/x509/x509_alt.c +++ b/src/lib/libcrypto/x509/x509_alt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_alt.c,v 1.19 2025/03/06 07:20:01 tb Exp $ */ +/* $OpenBSD: x509_alt.c,v 1.20 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -60,9 +60,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_internal.h" static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_asid.c b/src/lib/libcrypto/x509/x509_asid.c index 40ee201a9f..45a154e7d9 100644 --- a/src/lib/libcrypto/x509/x509_asid.c +++ b/src/lib/libcrypto/x509/x509_asid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_asid.c,v 1.45 2024/07/13 15:08:58 tb Exp $ */ +/* $OpenBSD: x509_asid.c,v 1.46 2025/05/10 05:54:39 tb Exp $ */ /* * Contributed to the OpenSSL Project by the American Registry for * Internet Numbers ("ARIN"). @@ -68,10 +68,10 @@ #include #include #include -#include #include #include +#include "err_local.h" #include "x509_local.h" #ifndef OPENSSL_NO_RFC3779 diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c index 4931cbbc17..a442a17746 100644 --- a/src/lib/libcrypto/x509/x509_att.c +++ b/src/lib/libcrypto/x509/x509_att.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_att.c,v 1.25 2024/08/31 10:46:40 tb Exp $ */ +/* $OpenBSD: x509_att.c,v 1.26 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,13 +59,13 @@ #include #include -#include #include #include #include #include #include +#include "err_local.h" #include "x509_local.h" int diff --git a/src/lib/libcrypto/x509/x509_bcons.c b/src/lib/libcrypto/x509/x509_bcons.c index 99cb5afe9a..c10f822ccc 100644 --- a/src/lib/libcrypto/x509/x509_bcons.c +++ b/src/lib/libcrypto/x509/x509_bcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_bcons.c,v 1.6 2024/08/31 10:03:03 tb Exp $ */ +/* $OpenBSD: x509_bcons.c,v 1.7 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -62,9 +62,9 @@ #include #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_bitst.c b/src/lib/libcrypto/x509/x509_bitst.c index 2bc4f9911a..89289b7af0 100644 --- a/src/lib/libcrypto/x509/x509_bitst.c +++ b/src/lib/libcrypto/x509/x509_bitst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_bitst.c,v 1.8 2024/08/31 10:23:13 tb Exp $ */ +/* $OpenBSD: x509_bitst.c,v 1.9 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,9 +60,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static const BIT_STRING_BITNAME ns_cert_type_table[] = { diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c index 2c1e427093..2479dcdd0d 100644 --- a/src/lib/libcrypto/x509/x509_cmp.c +++ b/src/lib/libcrypto/x509/x509_cmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_cmp.c,v 1.44 2024/03/25 03:41:16 joshua Exp $ */ +/* $OpenBSD: x509_cmp.c,v 1.45 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,11 +63,11 @@ #include #include -#include #include #include #include +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c index e5b18c2f77..19f771c466 100644 --- a/src/lib/libcrypto/x509/x509_conf.c +++ b/src/lib/libcrypto/x509/x509_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_conf.c,v 1.29 2025/03/06 07:20:01 tb Exp $ */ +/* $OpenBSD: x509_conf.c,v 1.30 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -62,11 +62,11 @@ #include #include -#include #include #include #include "conf_local.h" +#include "err_local.h" #include "x509_local.h" static int v3_check_critical(const char **value); diff --git a/src/lib/libcrypto/x509/x509_cpols.c b/src/lib/libcrypto/x509/x509_cpols.c index 6bae2a0482..b6a456023f 100644 --- a/src/lib/libcrypto/x509/x509_cpols.c +++ b/src/lib/libcrypto/x509/x509_cpols.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_cpols.c,v 1.15 2025/03/06 07:20:01 tb Exp $ */ +/* $OpenBSD: x509_cpols.c,v 1.16 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -62,9 +62,9 @@ #include #include #include -#include #include +#include "err_local.h" #include "x509_local.h" /* Certificate policies extension support: this one is a bit complex... */ diff --git a/src/lib/libcrypto/x509/x509_crld.c b/src/lib/libcrypto/x509/x509_crld.c index 81f2010df5..75afcefca8 100644 --- a/src/lib/libcrypto/x509/x509_crld.c +++ b/src/lib/libcrypto/x509/x509_crld.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_crld.c,v 1.9 2025/03/06 07:20:01 tb Exp $ */ +/* $OpenBSD: x509_crld.c,v 1.10 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -62,9 +62,9 @@ #include #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static void *v2i_crld(const X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_extku.c b/src/lib/libcrypto/x509/x509_extku.c index da5036a09a..35460ca46b 100644 --- a/src/lib/libcrypto/x509/x509_extku.c +++ b/src/lib/libcrypto/x509/x509_extku.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_extku.c,v 1.6 2024/08/31 10:03:03 tb Exp $ */ +/* $OpenBSD: x509_extku.c,v 1.7 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,9 +60,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_genn.c b/src/lib/libcrypto/x509/x509_genn.c index 1ea7155795..5214c394ed 100644 --- a/src/lib/libcrypto/x509/x509_genn.c +++ b/src/lib/libcrypto/x509/x509_genn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_genn.c,v 1.7 2024/07/08 14:47:44 beck Exp $ */ +/* $OpenBSD: x509_genn.c,v 1.8 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -63,6 +63,8 @@ #include #include +#include "err_local.h" + static const ASN1_TEMPLATE OTHERNAME_seq_tt[] = { { .flags = 0, diff --git a/src/lib/libcrypto/x509/x509_ia5.c b/src/lib/libcrypto/x509/x509_ia5.c index 4f62a9134c..b8886c6cb8 100644 --- a/src/lib/libcrypto/x509/x509_ia5.c +++ b/src/lib/libcrypto/x509/x509_ia5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_ia5.c,v 1.2 2024/07/13 15:08:58 tb Exp $ */ +/* $OpenBSD: x509_ia5.c,v 1.3 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -61,9 +61,10 @@ #include #include -#include #include +#include "err_local.h" + static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5); static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); diff --git a/src/lib/libcrypto/x509/x509_info.c b/src/lib/libcrypto/x509/x509_info.c index d1de346ee6..c91642a02e 100644 --- a/src/lib/libcrypto/x509/x509_info.c +++ b/src/lib/libcrypto/x509/x509_info.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_info.c,v 1.5 2024/07/13 15:08:58 tb Exp $ */ +/* $OpenBSD: x509_info.c,v 1.6 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -62,9 +62,10 @@ #include #include #include -#include #include +#include "err_local.h" + static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS( X509V3_EXT_METHOD *method, AUTHORITY_INFO_ACCESS *ainfo, STACK_OF(CONF_VALUE) *ret); diff --git a/src/lib/libcrypto/x509/x509_lib.c b/src/lib/libcrypto/x509/x509_lib.c index 6fa66ab88e..0285ac0d3a 100644 --- a/src/lib/libcrypto/x509/x509_lib.c +++ b/src/lib/libcrypto/x509/x509_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_lib.c,v 1.24 2024/07/13 15:08:58 tb Exp $ */ +/* $OpenBSD: x509_lib.c,v 1.25 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,9 +60,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_local.h" const X509V3_EXT_METHOD * diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c index 0367794fca..1ac3436a6e 100644 --- a/src/lib/libcrypto/x509/x509_lu.c +++ b/src/lib/libcrypto/x509/x509_lu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_lu.c,v 1.67 2025/03/09 15:20:20 tb Exp $ */ +/* $OpenBSD: x509_lu.c,v 1.68 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,11 +59,11 @@ #include #include -#include #include #include #include +#include "err_local.h" #include "x509_local.h" static int X509_OBJECT_up_ref_count(X509_OBJECT *a); diff --git a/src/lib/libcrypto/x509/x509_ncons.c b/src/lib/libcrypto/x509/x509_ncons.c index 148a66e887..f197488d70 100644 --- a/src/lib/libcrypto/x509/x509_ncons.c +++ b/src/lib/libcrypto/x509/x509_ncons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_ncons.c,v 1.11 2024/07/13 15:08:58 tb Exp $ */ +/* $OpenBSD: x509_ncons.c,v 1.12 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -61,9 +61,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_ocsp.c b/src/lib/libcrypto/x509/x509_ocsp.c index 6531b4c420..d0a0d49890 100644 --- a/src/lib/libcrypto/x509/x509_ocsp.c +++ b/src/lib/libcrypto/x509/x509_ocsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_ocsp.c,v 1.4 2024/12/24 09:14:33 schwarze Exp $ */ +/* $OpenBSD: x509_ocsp.c,v 1.5 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -65,10 +65,10 @@ #include #include -#include #include #include +#include "err_local.h" #include "ocsp_local.h" /* OCSP extensions and a couple of CRL entry extensions diff --git a/src/lib/libcrypto/x509/x509_pcons.c b/src/lib/libcrypto/x509/x509_pcons.c index 66dc57abf6..404fa28724 100644 --- a/src/lib/libcrypto/x509/x509_pcons.c +++ b/src/lib/libcrypto/x509/x509_pcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_pcons.c,v 1.6 2024/08/31 10:03:03 tb Exp $ */ +/* $OpenBSD: x509_pcons.c,v 1.7 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -62,9 +62,9 @@ #include #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static STACK_OF(CONF_VALUE) * diff --git a/src/lib/libcrypto/x509/x509_pmaps.c b/src/lib/libcrypto/x509/x509_pmaps.c index 5039f65f2e..141a3a6f90 100644 --- a/src/lib/libcrypto/x509/x509_pmaps.c +++ b/src/lib/libcrypto/x509/x509_pmaps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_pmaps.c,v 1.6 2024/08/31 10:03:03 tb Exp $ */ +/* $OpenBSD: x509_pmaps.c,v 1.7 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -61,9 +61,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_policy.c b/src/lib/libcrypto/x509/x509_policy.c index d93760755d..8267e8dc49 100644 --- a/src/lib/libcrypto/x509/x509_policy.c +++ b/src/lib/libcrypto/x509/x509_policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_policy.c,v 1.31 2025/03/28 13:11:57 tb Exp $ */ +/* $OpenBSD: x509_policy.c,v 1.32 2025/05/10 05:54:39 tb Exp $ */ /* * Copyright (c) 2022, Google Inc. * @@ -17,12 +17,12 @@ #include -#include #include #include #include #include +#include "err_local.h" #include "stack_local.h" #include "x509_internal.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/x509/x509_purp.c b/src/lib/libcrypto/x509/x509_purp.c index 619a4b890a..36dfe6abee 100644 --- a/src/lib/libcrypto/x509/x509_purp.c +++ b/src/lib/libcrypto/x509/x509_purp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_purp.c,v 1.43 2024/07/12 18:15:10 beck Exp $ */ +/* $OpenBSD: x509_purp.c,v 1.44 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -61,7 +61,6 @@ #include -#include #include #include diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c index 39b392259b..4ca8a87935 100644 --- a/src/lib/libcrypto/x509/x509_r2x.c +++ b/src/lib/libcrypto/x509/x509_r2x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_r2x.c,v 1.17 2023/04/25 09:46:36 job Exp $ */ +/* $OpenBSD: x509_r2x.c,v 1.18 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,11 +61,11 @@ #include #include #include -#include #include #include #include +#include "err_local.h" #include "x509_local.h" X509 * diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c index 704acbd897..df1119a55c 100644 --- a/src/lib/libcrypto/x509/x509_req.c +++ b/src/lib/libcrypto/x509/x509_req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_req.c,v 1.43 2024/08/31 10:16:52 tb Exp $ */ +/* $OpenBSD: x509_req.c,v 1.44 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -64,13 +64,13 @@ #include #include #include -#include #include #include #include #include #include "asn1_local.h" +#include "err_local.h" #include "evp_local.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/x509/x509_skey.c b/src/lib/libcrypto/x509/x509_skey.c index d2c90b6f1c..e9e915a0c7 100644 --- a/src/lib/libcrypto/x509/x509_skey.c +++ b/src/lib/libcrypto/x509/x509_skey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_skey.c,v 1.6 2024/07/13 15:08:58 tb Exp $ */ +/* $OpenBSD: x509_skey.c,v 1.7 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -59,9 +59,9 @@ #include #include -#include #include +#include "err_local.h" #include "x509_local.h" static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, diff --git a/src/lib/libcrypto/x509/x509_utl.c b/src/lib/libcrypto/x509/x509_utl.c index 08383849c9..4be8630d89 100644 --- a/src/lib/libcrypto/x509/x509_utl.c +++ b/src/lib/libcrypto/x509/x509_utl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_utl.c,v 1.26 2025/01/26 13:51:41 tb Exp $ */ +/* $OpenBSD: x509_utl.c,v 1.27 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -64,11 +64,11 @@ #include #include #include -#include #include #include "bytestring.h" #include "conf_local.h" +#include "err_local.h" /* * Match reference identifiers starting with "." to any sub-domain. This diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c index 688aed15a2..ee14d2dcef 100644 --- a/src/lib/libcrypto/x509/x509_v3.c +++ b/src/lib/libcrypto/x509/x509_v3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_v3.c,v 1.43 2024/07/12 09:57:04 tb Exp $ */ +/* $OpenBSD: x509_v3.c,v 1.44 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,12 +59,12 @@ #include #include -#include #include #include #include #include +#include "err_local.h" #include "x509_local.h" int diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index c93ae81bd8..3d0abda615 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.c,v 1.147 2025/03/04 08:43:25 tb Exp $ */ +/* $OpenBSD: x509_vfy.c,v 1.148 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -75,6 +74,7 @@ #include #include "asn1_local.h" +#include "err_local.h" #include "x509_internal.h" #include "x509_issuer_cache.h" #include "x509_local.h" diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c index 9efe473fc3..19091b12aa 100644 --- a/src/lib/libcrypto/x509/x509_vpm.c +++ b/src/lib/libcrypto/x509/x509_vpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vpm.c,v 1.55 2025/03/19 17:11:21 tb Exp $ */ +/* $OpenBSD: x509_vpm.c,v 1.56 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2004. */ @@ -61,12 +61,12 @@ #include #include -#include #include #include #include #include +#include "err_local.h" #include "x509_local.h" /* X509_VERIFY_PARAM functions */ diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c index d2df06ccc6..9a582d34e4 100644 --- a/src/lib/libcrypto/x509/x509name.c +++ b/src/lib/libcrypto/x509/x509name.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509name.c,v 1.35 2023/05/29 11:54:50 beck Exp $ */ +/* $OpenBSD: x509name.c,v 1.36 2025/05/10 05:54:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,13 +60,13 @@ #include #include -#include #include #include #include #include #include "bytestring.h" +#include "err_local.h" #include "x509_local.h" int diff --git a/src/lib/libcrypto/x509/x509spki.c b/src/lib/libcrypto/x509/x509spki.c index 04c9a6f01b..ef5f9e34c8 100644 --- a/src/lib/libcrypto/x509/x509spki.c +++ b/src/lib/libcrypto/x509/x509spki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509spki.c,v 1.16 2023/02/16 08:38:17 tb Exp $ */ +/* $OpenBSD: x509spki.c,v 1.17 2025/05/10 05:54:39 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,9 +60,10 @@ #include #include -#include #include +#include "err_local.h" + int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey) { -- cgit v1.2.3-55-g6feb