SecBSD
/
src
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with OpenBSD -current

This commit is contained in:
purplerain 2024-04-10 21:48:14 +00:00
parent fe31ca4724
commit 2d743fc5aa
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
189 changed files with 3737 additions and 1337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/armv7/miniroot/Makefile
View File

@ -1,3 +1,3 @@
SUBDIR= am335x cubie cubox nitrogen panda wandboard
SUBDIR= am335x cubox nitrogen panda wandboard
.include <bsd.subdir.mk>

6
distrib/armv7/miniroot/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.32 2023/09/25 16:42:19 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.33 2024/04/09 11:13:51 kettenis Exp $
FS= miniroot-${BOARD}-${OSrev}.img
FSSIZE= 71424 # ffs+msdos, actually
@ -38,10 +38,6 @@ ${FS}: bsd.rd
dd if=${PUBOOT}/${UBOOT}/u-boot.img of=/dev/r`cat vnd`c \
bs=1024 seek=69 conv=sync
.endif
.if ${PLATFORM} == "SUNXI"
dd if=${PUBOOT}/${UBOOT}/u-boot-sunxi-with-spl.bin \
of=/dev/r`cat vnd`c bs=1024 seek=8 conv=sync
.endif
mkdir -p ${MOUNT_POINT}/efi/boot
cp /usr/mdec/BOOTARM.EFI ${MOUNT_POINT}/efi/boot/bootarm.efi

8
distrib/armv7/miniroot/cubie/Makefile
View File

@ -1,8 +0,0 @@
BOARD= cubie
PLATFORM=SUNXI
DTBDIR= allwinner/
UBOOT= Cubieboard2
DTBS=\
sun7i-a20-cubieboard2.dtb
.include "${.CURDIR}/../Makefile.inc"

8
distrib/armv7/ramdisk/install.md
View File

@ -1,4 +1,4 @@
# $OpenBSD: install.md,v 1.56 2023/04/20 19:42:52 kettenis Exp $
# $OpenBSD: install.md,v 1.57 2024/04/09 11:13:51 kettenis Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@ -39,7 +39,6 @@ md_installboot() {
case $(sysctl -n hw.product) in
*AM335x*) _plat=am335x;;
*OMAP4*) _plat=panda;;
*'Cubietech Cubieboard2'*) _plat=cubie;;
*Cubox-i*|*HummingBoard*) _plat=cubox;;
*Wandboard*) _plat=wandboard;;
*Nitrogen6*|*'SABRE Lite'*) _plat=nitrogen;;
@ -79,11 +78,6 @@ md_installboot() {
mkuboot -t script -a arm -o linux /tmp/i/boot.cmd \
/mnt/mnt/6x_bootscript
;;
cubie)
cp $_mdec/*.dtb /mnt/mnt/
dd if=$_mdec/u-boot-sunxi-with-spl.bin of=/dev/${_disk}c \
bs=1024 seek=8 status=none
;;
esac
umount /mnt/mnt

6
distrib/armv7/ramdisk/list
View File

@ -1,4 +1,4 @@
# $OpenBSD: list,v 1.49 2023/09/25 16:42:19 sthen Exp $
# $OpenBSD: list,v 1.50 2024/04/09 11:13:51 kettenis Exp $
SRCDIRS distrib/special
@ -116,10 +116,6 @@ COPY /usr/local/share/dtb/arm/ti/omap/am335x-evm.dtb usr/mdec/am335x/am335x-evm
COPY /usr/local/share/dtb/arm/ti/omap/am335x-evmsk.dtb usr/mdec/am335x/am335x-evmsk.dtb
COPY /usr/local/share/dtb/arm/ti/omap/am335x-icev2.dtb usr/mdec/am335x/am335x-icev2.dtb
MKDIR usr/mdec/cubie
COPY /usr/local/share/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin usr/mdec/cubie/u-boot-sunxi-with-spl.bin
COPY /usr/local/share/dtb/arm/allwinner/sun7i-a20-cubieboard2.dtb usr/mdec/cubie/sun7i-a20-cubieboard2.dtb
MKDIR usr/mdec/panda
COPY /usr/local/share/u-boot/omap4_panda/MLO usr/mdec/panda/MLO
COPY /usr/local/share/u-boot/omap4_panda/u-boot.img usr/mdec/panda/u-boot.img

6
distrib/notes/armv7/contents
View File

@ -1,14 +1,10 @@
dnl $OpenBSD: contents,v 1.16 2023/03/16 18:04:08 miod Exp $
dnl $OpenBSD: contents,v 1.17 2024/04/09 11:13:51 kettenis Exp $
TopPart
miniroot-am335x-{:--:}OSrev.img
A miniroot filesystem to be used for
installation; BeagleBone version.
miniroot-cubie-{:--:}OSrev.img
A miniroot filesystem to be used for
installation; Cubieboard2 version.
miniroot-cubox-{:--:}OSrev.img
A miniroot filesystem to be used for
installation; CuBox-i version.

5
etc/etc.armv7/Makefile.inc
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.17 2020/05/17 17:04:29 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.18 2024/04/09 11:13:51 kettenis Exp $
bootblocks:
cp -p ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
MDEXT= bsd.rd BOOTARM.EFI \
miniroot-am335x-${OSrev}.img \
miniroot-cubie-${OSrev}.img miniroot-cubox-${OSrev}.img \
miniroot-am335x-${OSrev}.img miniroot-cubox-${OSrev}.img \
miniroot-nitrogen-${OSrev}.img miniroot-panda-${OSrev}.img \
miniroot-wandboard-${OSrev}.img

725
lib/libcrypto/Symbols.namespace
View File

@ -149,7 +149,6 @@ _libre_PKCS8_add_keyusage
_libre_PKCS12_get_friendlyname
_libre_PKCS12_verify_mac
_libre_PKCS12_set_mac
_libre_PKCS12_setup_mac
_libre_OPENSSL_asc2uni
_libre_OPENSSL_uni2asc
_libre_PKCS12_new
@ -582,25 +581,6 @@ _libre_X509_VERIFY_PARAM_get_count
_libre_X509_VERIFY_PARAM_add0_table
_libre_X509_VERIFY_PARAM_lookup
_libre_X509_VERIFY_PARAM_table_cleanup
_libre_X509_policy_check
_libre_X509_policy_tree_free
_libre_X509_policy_tree_level_count
_libre_X509_policy_tree_get0_level
_libre_X509_policy_tree_get0_policies
_libre_X509_policy_tree_get0_user_policies
_libre_X509_policy_level_node_count
_libre_X509_policy_level_get0_node
_libre_X509_policy_node_get0_policy
_libre_X509_policy_node_get0_qualifiers
_libre_X509_policy_node_get0_parent
_libre_PROXY_POLICY_new
_libre_PROXY_POLICY_free
_libre_d2i_PROXY_POLICY
_libre_i2d_PROXY_POLICY
_libre_PROXY_CERT_INFO_EXTENSION_new
_libre_PROXY_CERT_INFO_EXTENSION_free
_libre_d2i_PROXY_CERT_INFO_EXTENSION
_libre_i2d_PROXY_CERT_INFO_EXTENSION
_libre_BASIC_CONSTRAINTS_new
_libre_BASIC_CONSTRAINTS_free
_libre_d2i_BASIC_CONSTRAINTS
@ -1856,13 +1836,7 @@ _libre_CRYPTO_cleanup_all_ex_data
_libre_CRYPTO_lock
_libre_CRYPTO_add_lock
_libre_CRYPTO_set_mem_functions
_libre_CRYPTO_set_locked_mem_functions
_libre_CRYPTO_set_mem_ex_functions
_libre_CRYPTO_set_locked_mem_ex_functions
_libre_CRYPTO_set_mem_debug_functions
_libre_CRYPTO_realloc_clean
_libre_CRYPTO_remalloc
_libre_CRYPTO_set_mem_debug_options
_libre_OpenSSLDie
_libre_OPENSSL_cpu_caps
_libre_OPENSSL_init_crypto
@ -2399,48 +2373,6 @@ _libre_DSA_meth_set1_name
_libre_DSA_meth_set_sign
_libre_DSA_meth_set_finish
_libre_ERR_load_DSA_strings
_libre_Gost2814789_set_sbox
_libre_Gost2814789_set_key
_libre_Gost2814789_ecb_encrypt
_libre_Gost2814789_cfb64_encrypt
_libre_Gost2814789_cnt_encrypt
_libre_GOST_CIPHER_PARAMS_new
_libre_GOST_CIPHER_PARAMS_free
_libre_d2i_GOST_CIPHER_PARAMS
_libre_i2d_GOST_CIPHER_PARAMS
_libre_GOST2814789IMIT_Init
_libre_GOST2814789IMIT_Update
_libre_GOST2814789IMIT_Final
_libre_GOST2814789IMIT_Transform
_libre_GOST2814789IMIT
_libre_GOSTR341194_Init
_libre_GOSTR341194_Update
_libre_GOSTR341194_Final
_libre_GOSTR341194_Transform
_libre_GOSTR341194
_libre_STREEBOG256_Init
_libre_STREEBOG256_Update
_libre_STREEBOG256_Final
_libre_STREEBOG256
_libre_STREEBOG512_Init
_libre_STREEBOG512_Update
_libre_STREEBOG512_Final
_libre_STREEBOG512_Transform
_libre_STREEBOG512
_libre_GOST_KEY_new
_libre_GOST_KEY_free
_libre_GOST_KEY_check_key
_libre_GOST_KEY_set_public_key_affine_coordinates
_libre_GOST_KEY_get0_group
_libre_GOST_KEY_set_group
_libre_GOST_KEY_get_digest
_libre_GOST_KEY_set_digest
_libre_GOST_KEY_get0_private_key
_libre_GOST_KEY_set_private_key
_libre_GOST_KEY_get0_public_key
_libre_GOST_KEY_set_public_key
_libre_GOST_KEY_get_size
_libre_ERR_load_GOST_strings
_libre_CRYPTO_cbc128_encrypt
_libre_CRYPTO_cbc128_decrypt
_libre_CRYPTO_ctr128_encrypt
@ -2628,3 +2560,660 @@ _libre_AES_ctr128_encrypt
_libre_AES_ige_encrypt
_libre_AES_wrap_key
_libre_AES_unwrap_key
_libre_EVP_MD_type
_libre_EVP_MD_pkey_type
_libre_EVP_MD_size
_libre_EVP_MD_block_size
_libre_EVP_MD_flags
_libre_EVP_MD_CTX_md
_libre_EVP_MD_CTX_md_data
_libre_EVP_MD_CTX_pkey_ctx
_libre_EVP_MD_CTX_set_pkey_ctx
_libre_EVP_CIPHER_nid
_libre_EVP_CIPHER_block_size
_libre_EVP_CIPHER_key_length
_libre_EVP_CIPHER_iv_length
_libre_EVP_CIPHER_flags
_libre_EVP_CIPHER_CTX_cipher
_libre_EVP_CIPHER_CTX_encrypting
_libre_EVP_CIPHER_CTX_nid
_libre_EVP_CIPHER_CTX_block_size
_libre_EVP_CIPHER_CTX_key_length
_libre_EVP_CIPHER_CTX_iv_length
_libre_EVP_CIPHER_CTX_get_iv
_libre_EVP_CIPHER_CTX_set_iv
_libre_EVP_CIPHER_CTX_copy
_libre_EVP_CIPHER_CTX_get_app_data
_libre_EVP_CIPHER_CTX_set_app_data
_libre_EVP_CIPHER_CTX_get_cipher_data
_libre_EVP_CIPHER_CTX_set_cipher_data
_libre_EVP_CIPHER_CTX_buf_noconst
_libre_EVP_CIPHER_CTX_flags
_libre_EVP_CIPHER_meth_new
_libre_EVP_CIPHER_meth_dup
_libre_EVP_CIPHER_meth_free
_libre_EVP_CIPHER_meth_set_iv_length
_libre_EVP_CIPHER_meth_set_flags
_libre_EVP_CIPHER_meth_set_impl_ctx_size
_libre_EVP_CIPHER_meth_set_init
_libre_EVP_CIPHER_meth_set_do_cipher
_libre_EVP_CIPHER_meth_set_cleanup
_libre_EVP_CIPHER_meth_set_set_asn1_params
_libre_EVP_CIPHER_meth_set_get_asn1_params
_libre_EVP_CIPHER_meth_set_ctrl
_libre_EVP_PKEY_new_raw_private_key
_libre_EVP_PKEY_new_raw_public_key
_libre_EVP_PKEY_get_raw_private_key
_libre_EVP_PKEY_get_raw_public_key
_libre_EVP_Cipher
_libre_EVP_MD_CTX_new
_libre_EVP_MD_CTX_free
_libre_EVP_MD_CTX_reset
_libre_EVP_MD_CTX_create
_libre_EVP_MD_CTX_destroy
_libre_EVP_MD_CTX_cleanup
_libre_EVP_MD_CTX_copy_ex
_libre_EVP_MD_CTX_set_flags
_libre_EVP_MD_CTX_clear_flags
_libre_EVP_MD_CTX_ctrl
_libre_EVP_MD_CTX_test_flags
_libre_EVP_DigestInit_ex
_libre_EVP_DigestUpdate
_libre_EVP_DigestFinal_ex
_libre_EVP_Digest
_libre_EVP_MD_CTX_copy
_libre_EVP_DigestInit
_libre_EVP_DigestFinal
_libre_EVP_read_pw_string
_libre_EVP_read_pw_string_min
_libre_EVP_set_pw_prompt
_libre_EVP_get_pw_prompt
_libre_EVP_BytesToKey
_libre_EVP_CIPHER_CTX_set_flags
_libre_EVP_CIPHER_CTX_clear_flags
_libre_EVP_CIPHER_CTX_test_flags
_libre_EVP_EncryptInit
_libre_EVP_EncryptInit_ex
_libre_EVP_EncryptUpdate
_libre_EVP_EncryptFinal_ex
_libre_EVP_DecryptInit
_libre_EVP_DecryptInit_ex
_libre_EVP_DecryptUpdate
_libre_EVP_DecryptFinal_ex
_libre_EVP_CipherInit
_libre_EVP_CipherInit_ex
_libre_EVP_CipherUpdate
_libre_EVP_CipherFinal_ex
_libre_EVP_SignFinal
_libre_EVP_VerifyFinal
_libre_EVP_DigestSignInit
_libre_EVP_DigestSignFinal
_libre_EVP_DigestSign
_libre_EVP_DigestVerifyInit
_libre_EVP_DigestVerifyFinal
_libre_EVP_DigestVerify
_libre_EVP_OpenInit
_libre_EVP_OpenFinal
_libre_EVP_SealInit
_libre_EVP_SealFinal
_libre_EVP_ENCODE_CTX_new
_libre_EVP_ENCODE_CTX_free
_libre_EVP_EncodeInit
_libre_EVP_EncodeUpdate
_libre_EVP_EncodeFinal
_libre_EVP_EncodeBlock
_libre_EVP_DecodeInit
_libre_EVP_DecodeUpdate
_libre_EVP_DecodeFinal
_libre_EVP_DecodeBlock
_libre_EVP_CIPHER_CTX_cleanup
_libre_EVP_CIPHER_CTX_new
_libre_EVP_CIPHER_CTX_free
_libre_EVP_CIPHER_CTX_reset
_libre_EVP_CIPHER_CTX_set_key_length
_libre_EVP_CIPHER_CTX_set_padding
_libre_EVP_CIPHER_CTX_ctrl
_libre_EVP_CIPHER_CTX_rand_key
_libre_BIO_f_md
_libre_BIO_f_base64
_libre_BIO_f_cipher
_libre_BIO_set_cipher
_libre_EVP_md_null
_libre_EVP_md4
_libre_EVP_md5
_libre_EVP_md5_sha1
_libre_EVP_sha1
_libre_EVP_sha224
_libre_EVP_sha256
_libre_EVP_sha384
_libre_EVP_sha512
_libre_EVP_sha512_224
_libre_EVP_sha512_256
_libre_EVP_sha3_224
_libre_EVP_sha3_256
_libre_EVP_sha3_384
_libre_EVP_sha3_512
_libre_EVP_sm3
_libre_EVP_ripemd160
_libre_EVP_whirlpool
_libre_EVP_enc_null
_libre_EVP_des_ecb
_libre_EVP_des_ede
_libre_EVP_des_ede3
_libre_EVP_des_ede_ecb
_libre_EVP_des_ede3_ecb
_libre_EVP_des_cfb64
_libre_EVP_des_cfb1
_libre_EVP_des_cfb8
_libre_EVP_des_ede_cfb64
_libre_EVP_des_ede3_cfb64
_libre_EVP_des_ede3_cfb1
_libre_EVP_des_ede3_cfb8
_libre_EVP_des_ofb
_libre_EVP_des_ede_ofb
_libre_EVP_des_ede3_ofb
_libre_EVP_des_cbc
_libre_EVP_des_ede_cbc
_libre_EVP_des_ede3_cbc
_libre_EVP_desx_cbc
_libre_EVP_rc4
_libre_EVP_rc4_40
_libre_EVP_idea_ecb
_libre_EVP_idea_cfb64
_libre_EVP_idea_ofb
_libre_EVP_idea_cbc
_libre_EVP_rc2_ecb
_libre_EVP_rc2_cbc
_libre_EVP_rc2_40_cbc
_libre_EVP_rc2_64_cbc
_libre_EVP_rc2_cfb64
_libre_EVP_rc2_ofb
_libre_EVP_bf_ecb
_libre_EVP_bf_cbc
_libre_EVP_bf_cfb64
_libre_EVP_bf_ofb
_libre_EVP_cast5_ecb
_libre_EVP_cast5_cbc
_libre_EVP_cast5_cfb64
_libre_EVP_cast5_ofb
_libre_EVP_aes_128_ecb
_libre_EVP_aes_128_cbc
_libre_EVP_aes_128_cfb1
_libre_EVP_aes_128_cfb8
_libre_EVP_aes_128_cfb128
_libre_EVP_aes_128_ofb
_libre_EVP_aes_128_ctr
_libre_EVP_aes_128_ccm
_libre_EVP_aes_128_gcm
_libre_EVP_aes_128_wrap
_libre_EVP_aes_128_xts
_libre_EVP_aes_192_ecb
_libre_EVP_aes_192_cbc
_libre_EVP_aes_192_cfb1
_libre_EVP_aes_192_cfb8
_libre_EVP_aes_192_cfb128
_libre_EVP_aes_192_ofb
_libre_EVP_aes_192_ctr
_libre_EVP_aes_192_ccm
_libre_EVP_aes_192_gcm
_libre_EVP_aes_192_wrap
_libre_EVP_aes_256_ecb
_libre_EVP_aes_256_cbc
_libre_EVP_aes_256_cfb1
_libre_EVP_aes_256_cfb8
_libre_EVP_aes_256_cfb128
_libre_EVP_aes_256_ofb
_libre_EVP_aes_256_ctr
_libre_EVP_aes_256_ccm
_libre_EVP_aes_256_gcm
_libre_EVP_aes_256_wrap
_libre_EVP_aes_256_xts
_libre_EVP_chacha20_poly1305
_libre_EVP_camellia_128_ecb
_libre_EVP_camellia_128_cbc
_libre_EVP_camellia_128_cfb1
_libre_EVP_camellia_128_cfb8
_libre_EVP_camellia_128_cfb128
_libre_EVP_camellia_128_ofb
_libre_EVP_camellia_192_ecb
_libre_EVP_camellia_192_cbc
_libre_EVP_camellia_192_cfb1
_libre_EVP_camellia_192_cfb8
_libre_EVP_camellia_192_cfb128
_libre_EVP_camellia_192_ofb
_libre_EVP_camellia_256_ecb
_libre_EVP_camellia_256_cbc
_libre_EVP_camellia_256_cfb1
_libre_EVP_camellia_256_cfb8
_libre_EVP_camellia_256_cfb128
_libre_EVP_camellia_256_ofb
_libre_EVP_chacha20
_libre_EVP_sm4_ecb
_libre_EVP_sm4_cbc
_libre_EVP_sm4_cfb128
_libre_EVP_sm4_ofb
_libre_EVP_sm4_ctr
_libre_OPENSSL_add_all_algorithms_noconf
_libre_OPENSSL_add_all_algorithms_conf
_libre_OpenSSL_add_all_ciphers
_libre_OpenSSL_add_all_digests
_libre_EVP_get_cipherbyname
_libre_EVP_get_digestbyname
_libre_EVP_cleanup
_libre_EVP_CIPHER_do_all
_libre_EVP_CIPHER_do_all_sorted
_libre_EVP_MD_do_all
_libre_EVP_MD_do_all_sorted
_libre_EVP_PKEY_decrypt_old
_libre_EVP_PKEY_encrypt_old
_libre_EVP_PKEY_type
_libre_EVP_PKEY_id
_libre_EVP_PKEY_base_id
_libre_EVP_PKEY_bits
_libre_EVP_PKEY_security_bits
_libre_EVP_PKEY_size
_libre_EVP_PKEY_set_type
_libre_EVP_PKEY_set_type_str
_libre_EVP_PKEY_assign
_libre_EVP_PKEY_get0
_libre_EVP_PKEY_get0_hmac
_libre_EVP_PKEY_get0_RSA
_libre_EVP_PKEY_get1_RSA
_libre_EVP_PKEY_set1_RSA
_libre_EVP_PKEY_get0_DSA
_libre_EVP_PKEY_get1_DSA
_libre_EVP_PKEY_set1_DSA
_libre_EVP_PKEY_get0_DH
_libre_EVP_PKEY_get1_DH
_libre_EVP_PKEY_set1_DH
_libre_EVP_PKEY_get0_EC_KEY
_libre_EVP_PKEY_get1_EC_KEY
_libre_EVP_PKEY_set1_EC_KEY
_libre_EVP_PKEY_new
_libre_EVP_PKEY_free
_libre_EVP_PKEY_up_ref
_libre_d2i_PublicKey
_libre_i2d_PublicKey
_libre_d2i_PrivateKey
_libre_d2i_AutoPrivateKey
_libre_i2d_PrivateKey
_libre_EVP_PKEY_copy_parameters
_libre_EVP_PKEY_missing_parameters
_libre_EVP_PKEY_save_parameters
_libre_EVP_PKEY_cmp_parameters
_libre_EVP_PKEY_cmp
_libre_EVP_PKEY_print_public
_libre_EVP_PKEY_print_private
_libre_EVP_PKEY_print_params
_libre_EVP_PKEY_get_default_digest_nid
_libre_EVP_CIPHER_type
_libre_PKCS5_PBKDF2_HMAC_SHA1
_libre_PKCS5_PBKDF2_HMAC
_libre_EVP_PKEY_asn1_get_count
_libre_EVP_PKEY_asn1_get0
_libre_EVP_PKEY_asn1_find
_libre_EVP_PKEY_asn1_find_str
_libre_EVP_PKEY_asn1_get0_info
_libre_EVP_PKEY_get0_asn1
_libre_EVP_PKEY_CTX_new
_libre_EVP_PKEY_CTX_new_id
_libre_EVP_PKEY_CTX_dup
_libre_EVP_PKEY_CTX_free
_libre_EVP_PKEY_CTX_ctrl
_libre_EVP_PKEY_CTX_ctrl_str
_libre_EVP_PKEY_CTX_get_operation
_libre_EVP_PKEY_CTX_set0_keygen_info
_libre_EVP_PKEY_new_mac_key
_libre_EVP_PKEY_new_CMAC_key
_libre_EVP_PKEY_CTX_set_data
_libre_EVP_PKEY_CTX_get_data
_libre_EVP_PKEY_CTX_get0_pkey
_libre_EVP_PKEY_CTX_get0_peerkey
_libre_EVP_PKEY_CTX_set_app_data
_libre_EVP_PKEY_CTX_get_app_data
_libre_EVP_PKEY_sign_init
_libre_EVP_PKEY_sign
_libre_EVP_PKEY_verify_init
_libre_EVP_PKEY_verify
_libre_EVP_PKEY_verify_recover_init
_libre_EVP_PKEY_verify_recover
_libre_EVP_PKEY_encrypt_init
_libre_EVP_PKEY_encrypt
_libre_EVP_PKEY_decrypt_init
_libre_EVP_PKEY_decrypt
_libre_EVP_PKEY_derive_init
_libre_EVP_PKEY_derive_set_peer
_libre_EVP_PKEY_derive
_libre_EVP_PKEY_paramgen_init
_libre_EVP_PKEY_paramgen
_libre_EVP_PKEY_keygen_init
_libre_EVP_PKEY_keygen
_libre_EVP_PKEY_check
_libre_EVP_PKEY_public_check
_libre_EVP_PKEY_param_check
_libre_EVP_PKEY_CTX_set_cb
_libre_EVP_PKEY_CTX_get_cb
_libre_EVP_PKEY_CTX_get_keygen_info
_libre_EVP_aead_aes_128_gcm
_libre_EVP_aead_aes_256_gcm
_libre_EVP_aead_chacha20_poly1305
_libre_EVP_aead_xchacha20_poly1305
_libre_EVP_AEAD_key_length
_libre_EVP_AEAD_nonce_length
_libre_EVP_AEAD_max_overhead
_libre_EVP_AEAD_max_tag_len
_libre_EVP_AEAD_CTX_new
_libre_EVP_AEAD_CTX_free
_libre_EVP_AEAD_CTX_init
_libre_EVP_AEAD_CTX_cleanup
_libre_EVP_AEAD_CTX_seal
_libre_EVP_AEAD_CTX_open
_libre_ERR_load_EVP_strings
_libre_X509_CRL_get_signature_nid
_libre_X509_CRL_get0_extensions
_libre_X509_CRL_get_version
_libre_X509_CRL_get0_lastUpdate
_libre_X509_CRL_get0_nextUpdate
_libre_X509_CRL_get_lastUpdate
_libre_X509_CRL_get_nextUpdate
_libre_X509_CRL_get_issuer
_libre_X509_CRL_get_REVOKED
_libre_X509_CRL_get0_signature
_libre_X509_CRL_get0_tbs_sigalg
_libre_X509_REQ_get_signature_nid
_libre_X509_REQ_get0_signature
_libre_X509_CRL_verify
_libre_NETSCAPE_SPKI_print
_libre_X509_signature_dump
_libre_X509_signature_print
_libre_d2i_RSA_PUBKEY_fp
_libre_i2d_RSA_PUBKEY_fp
_libre_d2i_DSA_PUBKEY_fp
_libre_i2d_DSA_PUBKEY_fp
_libre_d2i_EC_PUBKEY_fp
_libre_i2d_EC_PUBKEY_fp
_libre_i2d_PUBKEY_fp
_libre_d2i_PUBKEY_fp
_libre_d2i_RSA_PUBKEY_bio
_libre_i2d_RSA_PUBKEY_bio
_libre_d2i_DSA_PUBKEY_bio
_libre_i2d_DSA_PUBKEY_bio
_libre_d2i_EC_PUBKEY_bio
_libre_i2d_EC_PUBKEY_bio
_libre_i2d_PUBKEY_bio
_libre_d2i_PUBKEY_bio
_libre_X509_dup
_libre_X509_ATTRIBUTE_dup
_libre_X509_EXTENSION_dup
_libre_X509_CRL_dup
_libre_X509_REQ_dup
_libre_X509_ALGOR_dup
_libre_X509_ALGOR_set0
_libre_X509_ALGOR_get0
_libre_X509_ALGOR_cmp
_libre_X509_NAME_dup
_libre_X509_NAME_get0_der
_libre_X509_NAME_ENTRY_dup
_libre_X509_ALGOR_new
_libre_X509_ALGOR_free
_libre_d2i_X509_ALGOR
_libre_i2d_X509_ALGOR
_libre_d2i_X509_ALGORS
_libre_i2d_X509_ALGORS
_libre_X509_VAL_new
_libre_X509_VAL_free
_libre_d2i_X509_VAL
_libre_i2d_X509_VAL
_libre_X509_PUBKEY_new
_libre_X509_PUBKEY_free
_libre_d2i_X509_PUBKEY
_libre_i2d_X509_PUBKEY
_libre_X509_PUBKEY_set
_libre_X509_PUBKEY_get
_libre_X509_PUBKEY_get0
_libre_i2d_PUBKEY
_libre_d2i_PUBKEY
_libre_i2d_RSA_PUBKEY
_libre_d2i_RSA_PUBKEY
_libre_i2d_DSA_PUBKEY
_libre_d2i_DSA_PUBKEY
_libre_i2d_EC_PUBKEY
_libre_d2i_EC_PUBKEY
_libre_X509_SIG_new
_libre_X509_SIG_free
_libre_d2i_X509_SIG
_libre_i2d_X509_SIG
_libre_X509_SIG_get0
_libre_X509_SIG_getm
_libre_X509_REQ_INFO_new
_libre_X509_REQ_INFO_free
_libre_d2i_X509_REQ_INFO
_libre_i2d_X509_REQ_INFO
_libre_X509_REQ_new
_libre_X509_REQ_free
_libre_d2i_X509_REQ
_libre_i2d_X509_REQ
_libre_X509_ATTRIBUTE_new
_libre_X509_ATTRIBUTE_free
_libre_d2i_X509_ATTRIBUTE
_libre_i2d_X509_ATTRIBUTE
_libre_X509_ATTRIBUTE_create
_libre_X509_EXTENSION_new
_libre_X509_EXTENSION_free
_libre_d2i_X509_EXTENSION
_libre_i2d_X509_EXTENSION
_libre_d2i_X509_EXTENSIONS
_libre_i2d_X509_EXTENSIONS
_libre_X509_NAME_ENTRY_new
_libre_X509_NAME_ENTRY_free
_libre_d2i_X509_NAME_ENTRY
_libre_i2d_X509_NAME_ENTRY
_libre_X509_NAME_new
_libre_X509_NAME_free
_libre_d2i_X509_NAME
_libre_i2d_X509_NAME
_libre_X509_NAME_set
_libre_X509_CINF_new
_libre_X509_CINF_free
_libre_d2i_X509_CINF
_libre_i2d_X509_CINF
_libre_X509_new
_libre_X509_free
_libre_d2i_X509
_libre_i2d_X509
_libre_X509_get_ex_new_index
_libre_X509_set_ex_data
_libre_X509_get_ex_data
_libre_i2d_X509_AUX
_libre_d2i_X509_AUX
_libre_i2d_re_X509_tbs
_libre_X509_get0_signature
_libre_X509_get_signature_nid
_libre_X509_alias_set1
_libre_X509_keyid_set1
_libre_X509_alias_get0
_libre_X509_keyid_get0
_libre_X509_add1_trust_object
_libre_X509_add1_reject_object
_libre_X509_trust_clear
_libre_X509_reject_clear
_libre_X509_REVOKED_new
_libre_X509_REVOKED_free
_libre_X509_REVOKED_dup
_libre_d2i_X509_REVOKED
_libre_i2d_X509_REVOKED
_libre_X509_CRL_INFO_new
_libre_X509_CRL_INFO_free
_libre_d2i_X509_CRL_INFO
_libre_i2d_X509_CRL_INFO
_libre_X509_CRL_new
_libre_X509_CRL_free
_libre_d2i_X509_CRL
_libre_i2d_X509_CRL
_libre_X509_CRL_add0_revoked
_libre_X509_CRL_get0_by_serial
_libre_X509_CRL_get0_by_cert
_libre_X509_PKEY_new
_libre_X509_PKEY_free
_libre_NETSCAPE_SPKI_new
_libre_NETSCAPE_SPKI_free
_libre_d2i_NETSCAPE_SPKI
_libre_i2d_NETSCAPE_SPKI
_libre_NETSCAPE_SPKAC_new
_libre_NETSCAPE_SPKAC_free
_libre_d2i_NETSCAPE_SPKAC
_libre_i2d_NETSCAPE_SPKAC
_libre_X509_INFO_new
_libre_X509_INFO_free
_libre_ASN1_item_digest
_libre_ASN1_item_verify
_libre_ASN1_item_sign
_libre_ASN1_item_sign_ctx
_libre_X509_print_ex_fp
_libre_X509_print_fp
_libre_X509_CRL_print_fp
_libre_X509_REQ_print_fp
_libre_X509_NAME_print_ex_fp
_libre_X509_NAME_print
_libre_X509_NAME_print_ex
_libre_X509_print_ex
_libre_X509_print
_libre_X509_ocspid_print
_libre_X509_CRL_print
_libre_X509_REQ_print_ex
_libre_X509_REQ_print
_libre_EVP_PKEY_get_attr_count
_libre_EVP_PKEY_get_attr_by_NID
_libre_EVP_PKEY_get_attr_by_OBJ
_libre_EVP_PKEY_get_attr
_libre_EVP_PKEY_delete_attr
_libre_EVP_PKEY_add1_attr
_libre_EVP_PKEY_add1_attr_by_OBJ
_libre_EVP_PKEY_add1_attr_by_NID
_libre_EVP_PKEY_add1_attr_by_txt
_libre_PKCS8_PRIV_KEY_INFO_new
_libre_PKCS8_PRIV_KEY_INFO_free
_libre_d2i_PKCS8_PRIV_KEY_INFO
_libre_i2d_PKCS8_PRIV_KEY_INFO
_libre_EVP_PKCS82PKEY
_libre_EVP_PKEY2PKCS8
_libre_PKCS8_pkey_set0
_libre_PKCS8_pkey_get0
_libre_PKCS8_pkey_get0_attrs
_libre_PKCS8_pkey_add1_attr_by_NID
_libre_X509_PUBKEY_set0_param
_libre_X509_PUBKEY_get0_param
_libre_CONF_set_default_method
_libre_CONF_set_nconf
_libre_CONF_load
_libre_CONF_load_fp
_libre_CONF_load_bio
_libre_CONF_get_section
_libre_CONF_get_string
_libre_CONF_get_number
_libre_CONF_free
_libre_CONF_dump_fp
_libre_CONF_dump_bio
_libre_OPENSSL_config
_libre_OPENSSL_no_config
_libre_NCONF_new
_libre_NCONF_default
_libre_NCONF_WIN32
_libre_NCONF_free
_libre_NCONF_free_data
_libre_NCONF_load
_libre_NCONF_load_fp
_libre_NCONF_load_bio
_libre_NCONF_get_section
_libre_NCONF_get_string
_libre_NCONF_get_number_e
_libre_NCONF_dump_fp
_libre_NCONF_dump_bio
_libre_CONF_modules_load
_libre_CONF_modules_load_file
_libre_CONF_modules_unload
_libre_CONF_modules_finish
_libre_CONF_modules_free
_libre_CONF_module_add
_libre_CONF_imodule_get_name
_libre_CONF_imodule_get_value
_libre_CONF_imodule_get_usr_data
_libre_CONF_imodule_set_usr_data
_libre_CONF_imodule_get_module
_libre_CONF_imodule_get_flags
_libre_CONF_imodule_set_flags
_libre_CONF_module_get_usr_data
_libre_CONF_module_set_usr_data
_libre_CONF_get1_default_config_file
_libre_CONF_parse_list
_libre_OPENSSL_load_builtin_modules
_libre_ERR_load_CONF_strings
_libre_CRYPTO_mem_ctrl
_libre_CRYPTO_set_id_callback
_libre_CRYPTO_get_id_callback
_libre_CRYPTO_thread_id
_libre_CRYPTO_get_new_lockid
_libre_CRYPTO_get_lock_name
_libre_CRYPTO_num_locks
_libre_CRYPTO_set_locking_callback
_libre_CRYPTO_get_locking_callback
_libre_CRYPTO_set_add_lock_callback
_libre_CRYPTO_get_add_lock_callback
_libre_CRYPTO_THREADID_set_numeric
_libre_CRYPTO_THREADID_set_pointer
_libre_CRYPTO_THREADID_set_callback
_libre_CRYPTO_THREADID_get_callback
_libre_CRYPTO_get_new_dynlockid
_libre_CRYPTO_destroy_dynlockid
_libre_CRYPTO_get_dynlock_value
_libre_CRYPTO_set_dynlock_create_callback
_libre_CRYPTO_set_dynlock_lock_callback
_libre_CRYPTO_set_dynlock_destroy_callback
_libre_CRYPTO_get_dynlock_lock_callback
_libre_CRYPTO_get_dynlock_destroy_callback
_libre_CRYPTO_malloc
_libre_CRYPTO_strdup
_libre_CRYPTO_free
_libre_OPENSSL_cleanse
_libre_FIPS_mode
_libre_FIPS_mode_set
_libre_OPENSSL_init
_libre_CRYPTO_memcmp
_libre_RAND_cleanup
_libre_RAND_bytes
_libre_RAND_pseudo_bytes
_libre_RAND_seed
_libre_RAND_add
_libre_RAND_load_file
_libre_RAND_write_file
_libre_RAND_file_name
_libre_RAND_status
_libre_RAND_poll
_libre_RC2_set_key
_libre_RC2_ecb_encrypt
_libre_RC2_encrypt
_libre_RC2_decrypt
_libre_RC2_cbc_encrypt
_libre_RC2_cfb64_encrypt
_libre_RC2_ofb64_encrypt
_libre_BN_div
_libre_BN_mod_exp
_libre_BN_mod_exp_mont
_libre_BN_gcd
_libre_BN_mod_inverse
_libre_HMAC_Init
_libre_HMAC_CTX_reset
_libre_EVP_MD_CTX_init
_libre_EVP_EncryptFinal
_libre_EVP_DecryptFinal
_libre_EVP_CipherFinal
_libre_EVP_CIPHER_CTX_init
_libre_EC_GROUP_clear_free
_libre_EC_GROUP_set_curve_GFp
_libre_EC_GROUP_get_curve_GFp
_libre_EC_POINT_clear_free
_libre_EC_POINT_set_Jprojective_coordinates_GFp
_libre_EC_POINT_get_Jprojective_coordinates_GFp
_libre_EC_POINT_set_affine_coordinates_GFp
_libre_EC_POINT_get_affine_coordinates_GFp
_libre_EC_POINT_set_compressed_coordinates_GFp

5
lib/libcrypto/asn1/a_pkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: a_pkey.c,v 1.7 2023/11/19 15:46:09 tb Exp $ */
/* $OpenBSD: a_pkey.c,v 1.8 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -115,6 +115,7 @@ d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
EVP_PKEY_free(ret);
return (NULL);
}
LCRYPTO_ALIAS(d2i_PrivateKey);
int
i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
@ -131,6 +132,7 @@ i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
ASN1error(ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
return (-1);
}
LCRYPTO_ALIAS(i2d_PrivateKey);
/* This works like d2i_PrivateKey() except it automatically works out the type */
@ -176,3 +178,4 @@ d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp, long length)
sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
return d2i_PrivateKey(keytype, a, pp, length);
}
LCRYPTO_ALIAS(d2i_AutoPrivateKey);

4
lib/libcrypto/asn1/a_pubkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: a_pubkey.c,v 1.6 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: a_pubkey.c,v 1.7 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -136,6 +136,7 @@ d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
EVP_PKEY_free(ret);
return (NULL);
}
LCRYPTO_ALIAS(d2i_PublicKey);
int
i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
@ -158,3 +159,4 @@ i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
return (-1);
}
}
LCRYPTO_ALIAS(i2d_PublicKey);

4
lib/libcrypto/asn1/a_strex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: a_strex.c,v 1.34 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: a_strex.c,v 1.35 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2000.
*/
@ -570,6 +570,7 @@ X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
return X509_NAME_print(out, nm, indent);
return do_name_ex(send_bio_chars, out, nm, indent, flags);
}
LCRYPTO_ALIAS(X509_NAME_print_ex);
int
X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent,
@ -587,6 +588,7 @@ X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent,
}
return do_name_ex(send_fp_chars, fp, nm, indent, flags);
}
LCRYPTO_ALIAS(X509_NAME_print_ex_fp);
int
ASN1_STRING_print_ex(BIO *out, const ASN1_STRING *str, unsigned long flags)

24
lib/libcrypto/asn1/a_time_tm.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: a_time_tm.c,v 1.34 2024/04/08 19:57:40 beck Exp $ */
/* $OpenBSD: a_time_tm.c,v 1.36 2024/04/10 14:55:12 beck Exp $ */
/*
* Copyright (c) 2015 Bob Beck <beck@openbsd.org>
*
@ -344,21 +344,32 @@ ASN1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode)
static int
ASN1_TIME_set_string_internal(ASN1_TIME *s, const char *str, int mode)
{
ASN1_TIME *atime = s;
struct tm tm;
int type;
int ret = 0;
if ((type = ASN1_time_parse(str, strlen(str), &tm, mode)) == -1)
return (0);
switch(mode) {
switch (mode) {
case V_ASN1_UTCTIME:
return (type == mode && tm_to_utctime(&tm, s) != NULL);
ret = (type == mode && (atime = tm_to_utctime(&tm, s)) != NULL);
break;
case V_ASN1_GENERALIZEDTIME:
return (type == mode && tm_to_gentime(&tm, s) != NULL);
ret = (type == mode && (atime = tm_to_gentime(&tm, s)) != NULL);
break;
case RFC5280:
return (tm_to_rfc5280_time(&tm, s) != NULL);
ret = ((atime = tm_to_rfc5280_time(&tm, s)) != NULL);
break;
default:
return (0);
ret = 0;
break;
}
if (atime != s)
ASN1_TIME_free(atime);
return ret;
}
static ASN1_TIME *
@ -541,6 +552,7 @@ ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
return ASN1_TIME_cmp_time_t_internal(s, t, V_ASN1_UTCTIME);
return -2;
}
LCRYPTO_ALIAS(ASN1_UTCTIME_cmp_time_t);
/*
* ASN1_GENERALIZEDTIME wrappers

8
lib/libcrypto/asn1/asn1.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: asn1.h,v 1.91 2024/03/02 09:08:41 tb Exp $ */
/* $OpenBSD: asn1.h,v 1.92 2024/04/10 14:55:12 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -573,9 +573,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
int offset_day, long offset_sec);
int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
#ifndef LIBRESSL_INTERNAL
int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
#endif /* !LIBRESSL_INTERNAL */
int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a);
ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
@ -736,12 +734,8 @@ int ASN1_object_size(int constructed, int length, int tag);
void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
#ifndef LIBRESSL_INTERNAL
void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);
#endif /* !LIBRESSL_INTERNAL */
void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \

6
lib/libcrypto/asn1/asn1_item.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: asn1_item.c,v 1.20 2024/01/28 14:43:48 joshua Exp $ */
/* $OpenBSD: asn1_item.c,v 1.21 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -139,6 +139,7 @@ ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *asn,
free(str);
return (1);
}
LCRYPTO_ALIAS(ASN1_item_digest);
/*
* ASN1_ITEM version of ASN1_dup(): follows the same model except there's no
@ -237,6 +238,7 @@ ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
return ret;
}
LCRYPTO_ALIAS(ASN1_item_sign);
static int
asn1_item_set_algorithm_identifiers(EVP_MD_CTX *ctx, X509_ALGOR *algor1,
@ -376,6 +378,7 @@ ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
return ret;
}
LCRYPTO_ALIAS(ASN1_item_sign_ctx);
int
ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
@ -462,6 +465,7 @@ ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
return ret;
}
LCRYPTO_ALIAS(ASN1_item_verify);
#define HEADER_SIZE 8
#define ASN1_CHUNK_INITIAL_SIZE (16 * 1024)

3
lib/libcrypto/asn1/asn1_old.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: asn1_old.c,v 1.5 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: asn1_old.c,v 1.6 2024/04/10 14:55:12 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -91,6 +91,7 @@ ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)
free(b);
return (ret);
}
LCRYPTO_ALIAS(ASN1_dup);
void *
ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)

10
lib/libcrypto/asn1/p8_pkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: p8_pkey.c,v 1.23 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: p8_pkey.c,v 1.24 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@ -121,24 +121,28 @@ d2i_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO **a, const unsigned char **in, long
return (PKCS8_PRIV_KEY_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&PKCS8_PRIV_KEY_INFO_it);
}
LCRYPTO_ALIAS(d2i_PKCS8_PRIV_KEY_INFO);
int
i2d_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS8_PRIV_KEY_INFO_it);
}
LCRYPTO_ALIAS(i2d_PKCS8_PRIV_KEY_INFO);
PKCS8_PRIV_KEY_INFO *
PKCS8_PRIV_KEY_INFO_new(void)
{
return (PKCS8_PRIV_KEY_INFO *)ASN1_item_new(&PKCS8_PRIV_KEY_INFO_it);
}
LCRYPTO_ALIAS(PKCS8_PRIV_KEY_INFO_new);
void
PKCS8_PRIV_KEY_INFO_free(PKCS8_PRIV_KEY_INFO *a)
{
ASN1_item_free((ASN1_VALUE *)a, &PKCS8_PRIV_KEY_INFO_it);
}
LCRYPTO_ALIAS(PKCS8_PRIV_KEY_INFO_free);
int
PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version,
@ -154,6 +158,7 @@ PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version,
ASN1_STRING_set0(priv->pkey, penc, penclen);
return 1;
}
LCRYPTO_ALIAS(PKCS8_pkey_set0);
int
PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk,
@ -169,12 +174,14 @@ PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk,
*pa = p8->pkeyalg;
return 1;
}
LCRYPTO_ALIAS(PKCS8_pkey_get0);
const STACK_OF(X509_ATTRIBUTE) *
PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8)
{
return p8->attributes;
}
LCRYPTO_ALIAS(PKCS8_pkey_get0_attrs);
int
PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type,
@ -185,3 +192,4 @@ PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type,
return 1;
return 0;
}
LCRYPTO_ALIAS(PKCS8_pkey_add1_attr_by_NID);

4
lib/libcrypto/asn1/t_crl.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: t_crl.c,v 1.23 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: t_crl.c,v 1.24 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@ -83,6 +83,7 @@ X509_CRL_print_fp(FILE *fp, X509_CRL *x)
BIO_free(b);
return (ret);
}
LCRYPTO_ALIAS(X509_CRL_print_fp);
int
X509_CRL_print(BIO *out, X509_CRL *x)
@ -143,3 +144,4 @@ X509_CRL_print(BIO *out, X509_CRL *x)
err:
return 0;
}
LCRYPTO_ALIAS(X509_CRL_print);

5
lib/libcrypto/asn1/t_req.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: t_req.c,v 1.26 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: t_req.c,v 1.27 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -91,6 +91,7 @@ X509_REQ_print_fp(FILE *fp, X509_REQ *x)
BIO_free(b);
return (ret);
}
LCRYPTO_ALIAS(X509_REQ_print_fp);
int
X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
@ -254,9 +255,11 @@ X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
X509error(ERR_R_BUF_LIB);
return (0);
}
LCRYPTO_ALIAS(X509_REQ_print_ex);
int
X509_REQ_print(BIO *bp, X509_REQ *x)
{
return X509_REQ_print_ex(bp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
}
LCRYPTO_ALIAS(X509_REQ_print);

3
lib/libcrypto/asn1/t_spki.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: t_spki.c,v 1.16 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: t_spki.c,v 1.17 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@ -113,3 +113,4 @@ NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki)
BIO_write(out, "\n", 1);
return 1;
}
LCRYPTO_ALIAS(NETSCAPE_SPKI_print);

10
lib/libcrypto/asn1/t_x509.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: t_x509.c,v 1.44 2023/12/29 10:59:00 tb Exp $ */
/* $OpenBSD: t_x509.c,v 1.45 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -85,6 +85,7 @@ X509_print_fp(FILE *fp, X509 *x)
{
return X509_print_ex_fp(fp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
}
LCRYPTO_ALIAS(X509_print_fp);
int
X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cflag)
@ -101,12 +102,14 @@ X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cflag)
BIO_free(b);
return (ret);
}
LCRYPTO_ALIAS(X509_print_ex_fp);
int
X509_print(BIO *bp, X509 *x)
{
return X509_print_ex(bp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
}
LCRYPTO_ALIAS(X509_print);
int
X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
@ -250,6 +253,7 @@ X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
free(m);
return (ret);
}
LCRYPTO_ALIAS(X509_print_ex);
int
X509_ocspid_print(BIO *bp, X509 *x)
@ -301,6 +305,7 @@ X509_ocspid_print(BIO *bp, X509 *x)
free(der);
return (0);
}
LCRYPTO_ALIAS(X509_ocspid_print);
int
X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
@ -326,6 +331,7 @@ X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
return 1;
}
LCRYPTO_ALIAS(X509_signature_dump);
int
X509_signature_print(BIO *bp, const X509_ALGOR *sigalg, const ASN1_STRING *sig)
@ -352,6 +358,7 @@ X509_signature_print(BIO *bp, const X509_ALGOR *sigalg, const ASN1_STRING *sig)
return 0;
return 1;
}
LCRYPTO_ALIAS(X509_signature_print);
int
ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm)
@ -513,3 +520,4 @@ X509_NAME_print(BIO *bp, const X509_NAME *name, int obase)
free(b);
return (ret);
}
LCRYPTO_ALIAS(X509_NAME_print);

12
lib/libcrypto/asn1/x_algor.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_algor.c,v 1.39 2024/03/02 10:33:51 tb Exp $ */
/* $OpenBSD: x_algor.c,v 1.40 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2000.
*/
@ -111,24 +111,28 @@ d2i_X509_ALGOR(X509_ALGOR **a, const unsigned char **in, long len)
return (X509_ALGOR *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_ALGOR_it);
}
LCRYPTO_ALIAS(d2i_X509_ALGOR);
int
i2d_X509_ALGOR(X509_ALGOR *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ALGOR_it);
}
LCRYPTO_ALIAS(i2d_X509_ALGOR);
X509_ALGOR *
X509_ALGOR_new(void)
{
return (X509_ALGOR *)ASN1_item_new(&X509_ALGOR_it);
}
LCRYPTO_ALIAS(X509_ALGOR_new);
void
X509_ALGOR_free(X509_ALGOR *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_ALGOR_it);
}
LCRYPTO_ALIAS(X509_ALGOR_free);
X509_ALGORS *
d2i_X509_ALGORS(X509_ALGORS **a, const unsigned char **in, long len)
@ -136,18 +140,21 @@ d2i_X509_ALGORS(X509_ALGORS **a, const unsigned char **in, long len)
return (X509_ALGORS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_ALGORS_it);
}
LCRYPTO_ALIAS(d2i_X509_ALGORS);
int
i2d_X509_ALGORS(X509_ALGORS *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ALGORS_it);
}
LCRYPTO_ALIAS(i2d_X509_ALGORS);
X509_ALGOR *
X509_ALGOR_dup(X509_ALGOR *x)
{
return ASN1_item_dup(&X509_ALGOR_it, x);
}
LCRYPTO_ALIAS(X509_ALGOR_dup);
static int
X509_ALGOR_set0_obj(X509_ALGOR *alg, ASN1_OBJECT *aobj)
@ -225,6 +232,7 @@ X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int parameter_type,
return 1;
}
LCRYPTO_ALIAS(X509_ALGOR_set0);
void
X509_ALGOR_get0(const ASN1_OBJECT **out_aobj, int *out_type,
@ -252,6 +260,7 @@ X509_ALGOR_get0(const ASN1_OBJECT **out_aobj, int *out_type,
if (out_value != NULL)
*out_value = value;
}
LCRYPTO_ALIAS(X509_ALGOR_get0);
int
X509_ALGOR_set_evp_md(X509_ALGOR *alg, const EVP_MD *md)
@ -281,3 +290,4 @@ X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b)
return ASN1_TYPE_cmp(a->parameter, b->parameter);
}
LCRYPTO_ALIAS(X509_ALGOR_cmp);

8
lib/libcrypto/asn1/x_attrib.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_attrib.c,v 1.21 2023/07/28 13:30:07 jsg Exp $ */
/* $OpenBSD: x_attrib.c,v 1.22 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -98,30 +98,35 @@ d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a, const unsigned char **in, long len)
return (X509_ATTRIBUTE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_ATTRIBUTE_it);
}
LCRYPTO_ALIAS(d2i_X509_ATTRIBUTE);
int
i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ATTRIBUTE_it);
}
LCRYPTO_ALIAS(i2d_X509_ATTRIBUTE);
X509_ATTRIBUTE *
X509_ATTRIBUTE_new(void)
{
return (X509_ATTRIBUTE *)ASN1_item_new(&X509_ATTRIBUTE_it);
}
LCRYPTO_ALIAS(X509_ATTRIBUTE_new);
void
X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_ATTRIBUTE_it);
}
LCRYPTO_ALIAS(X509_ATTRIBUTE_free);
X509_ATTRIBUTE *
X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x)
{
return ASN1_item_dup(&X509_ATTRIBUTE_it, x);
}
LCRYPTO_ALIAS(X509_ATTRIBUTE_dup);
X509_ATTRIBUTE *
X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
@ -150,3 +155,4 @@ X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
ASN1_TYPE_free(val);
return (NULL);
}
LCRYPTO_ALIAS(X509_ATTRIBUTE_create);

31
lib/libcrypto/asn1/x_crl.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_crl.c,v 1.43 2024/03/02 10:59:41 tb Exp $ */
/* $OpenBSD: x_crl.c,v 1.44 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -420,30 +420,35 @@ d2i_X509_REVOKED(X509_REVOKED **a, const unsigned char **in, long len)
return (X509_REVOKED *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_REVOKED_it);
}
LCRYPTO_ALIAS(d2i_X509_REVOKED);
int
i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_REVOKED_it);
}
LCRYPTO_ALIAS(i2d_X509_REVOKED);
X509_REVOKED *
X509_REVOKED_new(void)
{
return (X509_REVOKED *)ASN1_item_new(&X509_REVOKED_it);
}
LCRYPTO_ALIAS(X509_REVOKED_new);
void
X509_REVOKED_free(X509_REVOKED *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_REVOKED_it);
}
LCRYPTO_ALIAS(X509_REVOKED_free);
X509_REVOKED *
X509_REVOKED_dup(X509_REVOKED *a)
{
return ASN1_item_dup(&X509_REVOKED_it, a);
}
LCRYPTO_ALIAS(X509_REVOKED_dup);
X509_CRL_INFO *
d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len)
@ -451,24 +456,28 @@ d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len)
return (X509_CRL_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_CRL_INFO_it);
}
LCRYPTO_ALIAS(d2i_X509_CRL_INFO);
int
i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CRL_INFO_it);
}
LCRYPTO_ALIAS(i2d_X509_CRL_INFO);
X509_CRL_INFO *
X509_CRL_INFO_new(void)
{
return (X509_CRL_INFO *)ASN1_item_new(&X509_CRL_INFO_it);
}
LCRYPTO_ALIAS(X509_CRL_INFO_new);
void
X509_CRL_INFO_free(X509_CRL_INFO *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_INFO_it);
}
LCRYPTO_ALIAS(X509_CRL_INFO_free);
X509_CRL *
d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len)
@ -476,30 +485,35 @@ d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len)
return (X509_CRL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_CRL_it);
}
LCRYPTO_ALIAS(d2i_X509_CRL);
int
i2d_X509_CRL(X509_CRL *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CRL_it);
}
LCRYPTO_ALIAS(i2d_X509_CRL);
X509_CRL *
X509_CRL_new(void)
{
return (X509_CRL *)ASN1_item_new(&X509_CRL_it);
}
LCRYPTO_ALIAS(X509_CRL_new);
void
X509_CRL_free(X509_CRL *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_it);
}
LCRYPTO_ALIAS(X509_CRL_free);
X509_CRL *
X509_CRL_dup(X509_CRL *x)
{
return ASN1_item_dup(&X509_CRL_it, x);
}
LCRYPTO_ALIAS(X509_CRL_dup);
static int
X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b)
@ -522,6 +536,7 @@ X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
inf->enc.modified = 1;
return 1;
}
LCRYPTO_ALIAS(X509_CRL_add0_revoked);
int
X509_CRL_verify(X509_CRL *crl, EVP_PKEY *pkey)
@ -529,6 +544,7 @@ X509_CRL_verify(X509_CRL *crl, EVP_PKEY *pkey)
return ASN1_item_verify(&X509_CRL_INFO_it, crl->sig_alg, crl->signature,
crl->crl, pkey);
}
LCRYPTO_ALIAS(X509_CRL_verify);
static int
crl_revoked_issuer_match(X509_CRL *crl, X509_NAME *nm, X509_REVOKED *rev)
@ -595,6 +611,7 @@ X509_CRL_get0_by_serial(X509_CRL *crl, X509_REVOKED **ret,
{
return crl_lookup(crl, ret, serial, NULL);
}
LCRYPTO_ALIAS(X509_CRL_get0_by_serial);
int
X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x)
@ -602,60 +619,70 @@ X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x)
return crl_lookup(crl, ret, X509_get_serialNumber(x),
X509_get_issuer_name(x));
}
LCRYPTO_ALIAS(X509_CRL_get0_by_cert);
int
X509_CRL_get_signature_nid(const X509_CRL *crl)
{
return OBJ_obj2nid(crl->sig_alg->algorithm);
}
LCRYPTO_ALIAS(X509_CRL_get_signature_nid);
const STACK_OF(X509_EXTENSION) *
X509_CRL_get0_extensions(const X509_CRL *crl)
{
return crl->crl->extensions;
}
LCRYPTO_ALIAS(X509_CRL_get0_extensions);
long
X509_CRL_get_version(const X509_CRL *crl)
{
return ASN1_INTEGER_get(crl->crl->version);
}
LCRYPTO_ALIAS(X509_CRL_get_version);
const ASN1_TIME *
X509_CRL_get0_lastUpdate(const X509_CRL *crl)
{
return crl->crl->lastUpdate;
}
LCRYPTO_ALIAS(X509_CRL_get0_lastUpdate);
ASN1_TIME *
X509_CRL_get_lastUpdate(X509_CRL *crl)
{
return crl->crl->lastUpdate;
}
LCRYPTO_ALIAS(X509_CRL_get_lastUpdate);
const ASN1_TIME *
X509_CRL_get0_nextUpdate(const X509_CRL *crl)
{
return crl->crl->nextUpdate;
}
LCRYPTO_ALIAS(X509_CRL_get0_nextUpdate);
ASN1_TIME *
X509_CRL_get_nextUpdate(X509_CRL *crl)
{
return crl->crl->nextUpdate;
}
LCRYPTO_ALIAS(X509_CRL_get_nextUpdate);
X509_NAME *
X509_CRL_get_issuer(const X509_CRL *crl)
{
return crl->crl->issuer;
}
LCRYPTO_ALIAS(X509_CRL_get_issuer);
STACK_OF(X509_REVOKED) *
X509_CRL_get_REVOKED(X509_CRL *crl)
{
return crl->crl->revoked;
}
LCRYPTO_ALIAS(X509_CRL_get_REVOKED);
void
X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
@ -666,9 +693,11 @@ X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
if (palg != NULL)
*palg = crl->sig_alg;
}
LCRYPTO_ALIAS(X509_CRL_get0_signature);
const X509_ALGOR *
X509_CRL_get0_tbs_sigalg(const X509_CRL *crl)
{
return crl->crl->sig_alg;
}
LCRYPTO_ALIAS(X509_CRL_get0_tbs_sigalg);

9
lib/libcrypto/asn1/x_exten.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_exten.c,v 1.20 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: x_exten.c,v 1.21 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2000.
*/
@ -116,24 +116,28 @@ d2i_X509_EXTENSION(X509_EXTENSION **a, const unsigned char **in, long len)
return (X509_EXTENSION *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_EXTENSION_it);
}
LCRYPTO_ALIAS(d2i_X509_EXTENSION);
int
i2d_X509_EXTENSION(X509_EXTENSION *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_EXTENSION_it);
}
LCRYPTO_ALIAS(i2d_X509_EXTENSION);
X509_EXTENSION *
X509_EXTENSION_new(void)
{
return (X509_EXTENSION *)ASN1_item_new(&X509_EXTENSION_it);
}
LCRYPTO_ALIAS(X509_EXTENSION_new);
void
X509_EXTENSION_free(X509_EXTENSION *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_EXTENSION_it);
}
LCRYPTO_ALIAS(X509_EXTENSION_free);
X509_EXTENSIONS *
d2i_X509_EXTENSIONS(X509_EXTENSIONS **a, const unsigned char **in, long len)
@ -141,15 +145,18 @@ d2i_X509_EXTENSIONS(X509_EXTENSIONS **a, const unsigned char **in, long len)
return (X509_EXTENSIONS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_EXTENSIONS_it);
}
LCRYPTO_ALIAS(d2i_X509_EXTENSIONS);
int
i2d_X509_EXTENSIONS(X509_EXTENSIONS *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_EXTENSIONS_it);
}
LCRYPTO_ALIAS(i2d_X509_EXTENSIONS);
X509_EXTENSION *
X509_EXTENSION_dup(X509_EXTENSION *x)
{
return ASN1_item_dup(&X509_EXTENSION_it, x);
}
LCRYPTO_ALIAS(X509_EXTENSION_dup);

4
lib/libcrypto/asn1/x_info.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_info.c,v 1.20 2023/07/07 19:37:52 beck Exp $ */
/* $OpenBSD: x_info.c,v 1.21 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -75,6 +75,7 @@ X509_INFO_new(void)
return ret;
}
LCRYPTO_ALIAS(X509_INFO_new);
void
X509_INFO_free(X509_INFO *x)
@ -92,3 +93,4 @@ X509_INFO_free(X509_INFO *x)
free(x);
}
LCRYPTO_ALIAS(X509_INFO_free);

14
lib/libcrypto/asn1/x_name.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_name.c,v 1.41 2023/07/24 06:56:54 tb Exp $ */
/* $OpenBSD: x_name.c,v 1.42 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -117,30 +117,35 @@ d2i_X509_NAME_ENTRY(X509_NAME_ENTRY **a, const unsigned char **in, long len)
return (X509_NAME_ENTRY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_NAME_ENTRY_it);
}
LCRYPTO_ALIAS(d2i_X509_NAME_ENTRY);
int
i2d_X509_NAME_ENTRY(X509_NAME_ENTRY *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_NAME_ENTRY_it);
}
LCRYPTO_ALIAS(i2d_X509_NAME_ENTRY);
X509_NAME_ENTRY *
X509_NAME_ENTRY_new(void)
{
return (X509_NAME_ENTRY *)ASN1_item_new(&X509_NAME_ENTRY_it);
}
LCRYPTO_ALIAS(X509_NAME_ENTRY_new);
void
X509_NAME_ENTRY_free(X509_NAME_ENTRY *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_ENTRY_it);
}
LCRYPTO_ALIAS(X509_NAME_ENTRY_free);
X509_NAME_ENTRY *
X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x)
{
return ASN1_item_dup(&X509_NAME_ENTRY_it, x);
}
LCRYPTO_ALIAS(X509_NAME_ENTRY_dup);
/* For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY }
* so declare two template wrappers for this
@ -214,30 +219,35 @@ d2i_X509_NAME(X509_NAME **a, const unsigned char **in, long len)
return (X509_NAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_NAME_it);
}
LCRYPTO_ALIAS(d2i_X509_NAME);
int
i2d_X509_NAME(X509_NAME *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_NAME_it);
}
LCRYPTO_ALIAS(i2d_X509_NAME);
X509_NAME *
X509_NAME_new(void)
{
return (X509_NAME *)ASN1_item_new(&X509_NAME_it);
}
LCRYPTO_ALIAS(X509_NAME_new);
void
X509_NAME_free(X509_NAME *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_it);
}
LCRYPTO_ALIAS(X509_NAME_free);
X509_NAME *
X509_NAME_dup(X509_NAME *x)
{
return ASN1_item_dup(&X509_NAME_it, x);
}
LCRYPTO_ALIAS(X509_NAME_dup);
static int
x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it)
@ -635,6 +645,7 @@ X509_NAME_set(X509_NAME **xn, X509_NAME *name)
*xn = name;
return 1;
}
LCRYPTO_ALIAS(X509_NAME_set);
int
X509_NAME_get0_der(X509_NAME *nm, const unsigned char **pder, size_t *pderlen)
@ -648,3 +659,4 @@ X509_NAME_get0_der(X509_NAME *nm, const unsigned char **pder, size_t *pderlen)
*pderlen = nm->bytes->length;
return 1;
}
LCRYPTO_ALIAS(X509_NAME_get0_der);

4
lib/libcrypto/asn1/x_pkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_pkey.c,v 1.23 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_pkey.c,v 1.24 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -98,6 +98,7 @@ X509_PKEY_new(void)
}
return NULL;
}
LCRYPTO_ALIAS(X509_PKEY_new);
void
X509_PKEY_free(X509_PKEY *x)
@ -119,3 +120,4 @@ X509_PKEY_free(X509_PKEY *x)
free(x->key_data);
free(x);
}
LCRYPTO_ALIAS(X509_PKEY_free);

35
lib/libcrypto/asn1/x_pubkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_pubkey.c,v 1.35 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_pubkey.c,v 1.36 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -118,24 +118,28 @@ d2i_X509_PUBKEY(X509_PUBKEY **a, const unsigned char **in, long len)
return (X509_PUBKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_PUBKEY_it);
}
LCRYPTO_ALIAS(d2i_X509_PUBKEY);
int
i2d_X509_PUBKEY(X509_PUBKEY *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_PUBKEY_it);
}
LCRYPTO_ALIAS(i2d_X509_PUBKEY);
X509_PUBKEY *
X509_PUBKEY_new(void)
{
return (X509_PUBKEY *)ASN1_item_new(&X509_PUBKEY_it);
}
LCRYPTO_ALIAS(X509_PUBKEY_new);
void
X509_PUBKEY_free(X509_PUBKEY *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_PUBKEY_it);
}
LCRYPTO_ALIAS(X509_PUBKEY_free);
int
X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
@ -174,6 +178,7 @@ X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
X509_PUBKEY_free(pk);
return 0;
}
LCRYPTO_ALIAS(X509_PUBKEY_set);
EVP_PKEY *
X509_PUBKEY_get0(X509_PUBKEY *key)
@ -226,6 +231,7 @@ X509_PUBKEY_get0(X509_PUBKEY *key)
EVP_PKEY_free(ret);
return (NULL);
}
LCRYPTO_ALIAS(X509_PUBKEY_get0);
EVP_PKEY *
X509_PUBKEY_get(X509_PUBKEY *key)
@ -239,6 +245,7 @@ X509_PUBKEY_get(X509_PUBKEY *key)
return pkey;
}
LCRYPTO_ALIAS(X509_PUBKEY_get);
/*
* Decode an X509_PUBKEY into the specified key type.
@ -403,12 +410,14 @@ d2i_PUBKEY(EVP_PKEY **pkey, const unsigned char **in, long len)
return (EVP_PKEY *)ASN1_item_d2i((ASN1_VALUE **)pkey, in, len,
&EVP_PKEY_PUBKEY_it);
}
LCRYPTO_ALIAS(d2i_PUBKEY);
int
i2d_PUBKEY(EVP_PKEY *pkey, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)pkey, out, &EVP_PKEY_PUBKEY_it);
}
LCRYPTO_ALIAS(i2d_PUBKEY);
EVP_PKEY *
d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **pkey)
@ -416,12 +425,14 @@ d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **pkey)
return (EVP_PKEY *)ASN1_item_d2i_bio(&EVP_PKEY_PUBKEY_it, bp,
(ASN1_VALUE **)pkey);
}
LCRYPTO_ALIAS(d2i_PUBKEY_bio);
int
i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey)
{
return ASN1_item_i2d_bio(&EVP_PKEY_PUBKEY_it, bp, (ASN1_VALUE *)pkey);
}
LCRYPTO_ALIAS(i2d_PUBKEY_bio);
EVP_PKEY *
d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **pkey)
@ -429,12 +440,14 @@ d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **pkey)
return (EVP_PKEY *)ASN1_item_d2i_fp(&EVP_PKEY_PUBKEY_it, fp,
(ASN1_VALUE **)pkey);
}
LCRYPTO_ALIAS(d2i_PUBKEY_fp);
int
i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey)
{
return ASN1_item_i2d_fp(&EVP_PKEY_PUBKEY_it, fp, (ASN1_VALUE *)pkey);
}
LCRYPTO_ALIAS(i2d_PUBKEY_fp);
/*
* The following are equivalents but which return RSA and DSA keys.
@ -497,36 +510,42 @@ d2i_RSA_PUBKEY(RSA **rsa, const unsigned char **in, long len)
return (RSA *)ASN1_item_d2i((ASN1_VALUE **)rsa, in, len,
&RSA_PUBKEY_it);
}
LCRYPTO_ALIAS(d2i_RSA_PUBKEY);
int
i2d_RSA_PUBKEY(RSA *rsa, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)rsa, out, &RSA_PUBKEY_it);
}
LCRYPTO_ALIAS(i2d_RSA_PUBKEY);
RSA *
d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa)
{
return (RSA *)ASN1_item_d2i_bio(&RSA_PUBKEY_it, bp, (ASN1_VALUE **)rsa);
}
LCRYPTO_ALIAS(d2i_RSA_PUBKEY_bio);
int
i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa)
{
return ASN1_item_i2d_bio(&RSA_PUBKEY_it, bp, (ASN1_VALUE *)rsa);
}
LCRYPTO_ALIAS(i2d_RSA_PUBKEY_bio);
RSA *
d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa)
{
return (RSA *)ASN1_item_d2i_fp(&RSA_PUBKEY_it, fp, (ASN1_VALUE **)rsa);
}
LCRYPTO_ALIAS(d2i_RSA_PUBKEY_fp);
int
i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa)
{
return ASN1_item_i2d_fp(&RSA_PUBKEY_it, fp, (ASN1_VALUE *)rsa);
}
LCRYPTO_ALIAS(i2d_RSA_PUBKEY_fp);
#endif
#ifndef OPENSSL_NO_DSA
@ -587,36 +606,42 @@ d2i_DSA_PUBKEY(DSA **dsa, const unsigned char **in, long len)
return (DSA *)ASN1_item_d2i((ASN1_VALUE **)dsa, in, len,
&DSA_PUBKEY_it);
}
LCRYPTO_ALIAS(d2i_DSA_PUBKEY);
int
i2d_DSA_PUBKEY(DSA *dsa, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)dsa, out, &DSA_PUBKEY_it);
}
LCRYPTO_ALIAS(i2d_DSA_PUBKEY);
DSA *
d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa)
{
return (DSA *)ASN1_item_d2i_bio(&DSA_PUBKEY_it, bp, (ASN1_VALUE **)dsa);
}
LCRYPTO_ALIAS(d2i_DSA_PUBKEY_bio);
int
i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa)
{
return ASN1_item_i2d_bio(&DSA_PUBKEY_it, bp, (ASN1_VALUE *)dsa);
}
LCRYPTO_ALIAS(i2d_DSA_PUBKEY_bio);
DSA *
d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa)
{
return (DSA *)ASN1_item_d2i_fp(&DSA_PUBKEY_it, fp, (ASN1_VALUE **)dsa);
}
LCRYPTO_ALIAS(d2i_DSA_PUBKEY_fp);
int
i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa)
{
return ASN1_item_i2d_fp(&DSA_PUBKEY_it, fp, (ASN1_VALUE *)dsa);
}
LCRYPTO_ALIAS(i2d_DSA_PUBKEY_fp);
#endif
@ -678,36 +703,42 @@ d2i_EC_PUBKEY(EC_KEY **ec, const unsigned char **in, long len)
return (EC_KEY *)ASN1_item_d2i((ASN1_VALUE **)ec, in, len,
&EC_PUBKEY_it);
}
LCRYPTO_ALIAS(d2i_EC_PUBKEY);
int
i2d_EC_PUBKEY(EC_KEY *ec, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)ec, out, &EC_PUBKEY_it);
}
LCRYPTO_ALIAS(i2d_EC_PUBKEY);
EC_KEY *
d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **ec)
{
return (EC_KEY *)ASN1_item_d2i_bio(&EC_PUBKEY_it, bp, (ASN1_VALUE **)ec);
}
LCRYPTO_ALIAS(d2i_EC_PUBKEY_bio);
int
i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *ec)
{
return ASN1_item_i2d_bio(&EC_PUBKEY_it, bp, (ASN1_VALUE *)ec);
}
LCRYPTO_ALIAS(i2d_EC_PUBKEY_bio);
EC_KEY *
d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **ec)
{
return (EC_KEY *)ASN1_item_d2i_fp(&EC_PUBKEY_it, fp, (ASN1_VALUE **)ec);
}
LCRYPTO_ALIAS(d2i_EC_PUBKEY_fp);
int
i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *ec)
{
return ASN1_item_i2d_fp(&EC_PUBKEY_it, fp, (ASN1_VALUE *)ec);
}
LCRYPTO_ALIAS(i2d_EC_PUBKEY_fp);
#endif
int
@ -724,6 +755,7 @@ X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj, int ptype,
return asn1_abs_set_unused_bits(pub->public_key, 0);
}
LCRYPTO_ALIAS(X509_PUBKEY_set0_param);
int
X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg, const unsigned char **pk,
@ -739,3 +771,4 @@ X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg, const unsigned char **pk,
*pa = pub->algor;
return 1;
}
LCRYPTO_ALIAS(X509_PUBKEY_get0_param);

13
lib/libcrypto/asn1/x_req.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_req.c,v 1.21 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_req.c,v 1.22 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -143,24 +143,28 @@ d2i_X509_REQ_INFO(X509_REQ_INFO **a, const unsigned char **in, long len)
return (X509_REQ_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_REQ_INFO_it);
}
LCRYPTO_ALIAS(d2i_X509_REQ_INFO);
int
i2d_X509_REQ_INFO(X509_REQ_INFO *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_REQ_INFO_it);
}
LCRYPTO_ALIAS(i2d_X509_REQ_INFO);
X509_REQ_INFO *
X509_REQ_INFO_new(void)
{
return (X509_REQ_INFO *)ASN1_item_new(&X509_REQ_INFO_it);
}
LCRYPTO_ALIAS(X509_REQ_INFO_new);
void
X509_REQ_INFO_free(X509_REQ_INFO *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_REQ_INFO_it);
}
LCRYPTO_ALIAS(X509_REQ_INFO_free);
static const ASN1_AUX X509_REQ_aux = {
.app_data = NULL,
@ -203,36 +207,42 @@ d2i_X509_REQ(X509_REQ **a, const unsigned char **in, long len)
return (X509_REQ *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_REQ_it);
}
LCRYPTO_ALIAS(d2i_X509_REQ);
int
i2d_X509_REQ(X509_REQ *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_REQ_it);
}
LCRYPTO_ALIAS(i2d_X509_REQ);
X509_REQ *
X509_REQ_new(void)
{
return (X509_REQ *)ASN1_item_new(&X509_REQ_it);
}
LCRYPTO_ALIAS(X509_REQ_new);
void
X509_REQ_free(X509_REQ *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_REQ_it);
}
LCRYPTO_ALIAS(X509_REQ_free);
X509_REQ *
X509_REQ_dup(X509_REQ *x)
{
return ASN1_item_dup(&X509_REQ_it, x);
}
LCRYPTO_ALIAS(X509_REQ_dup);
int
X509_REQ_get_signature_nid(const X509_REQ *req)
{
return OBJ_obj2nid(req->sig_alg->algorithm);
}
LCRYPTO_ALIAS(X509_REQ_get_signature_nid);
void
X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
@ -243,3 +253,4 @@ X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
if (palg != NULL)
*palg = req->sig_alg;
}
LCRYPTO_ALIAS(X509_REQ_get0_signature);

8
lib/libcrypto/asn1/x_sig.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_sig.c,v 1.16 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_sig.c,v 1.17 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -92,24 +92,28 @@ d2i_X509_SIG(X509_SIG **a, const unsigned char **in, long len)
return (X509_SIG *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_SIG_it);
}
LCRYPTO_ALIAS(d2i_X509_SIG);
int
i2d_X509_SIG(X509_SIG *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_SIG_it);
}
LCRYPTO_ALIAS(i2d_X509_SIG);
X509_SIG *
X509_SIG_new(void)
{
return (X509_SIG *)ASN1_item_new(&X509_SIG_it);
}
LCRYPTO_ALIAS(X509_SIG_new);
void
X509_SIG_free(X509_SIG *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_SIG_it);
}
LCRYPTO_ALIAS(X509_SIG_free);
void
X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
@ -120,6 +124,7 @@ X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
if (pdigest != NULL)
*pdigest = sig->digest;
}
LCRYPTO_ALIAS(X509_SIG_get0);
void
X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg, ASN1_OCTET_STRING **pdigest)
@ -129,3 +134,4 @@ X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg, ASN1_OCTET_STRING **pdigest)
if (pdigest != NULL)
*pdigest = sig->digest;
}
LCRYPTO_ALIAS(X509_SIG_getm);

10
lib/libcrypto/asn1/x_spki.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_spki.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_spki.c,v 1.14 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -94,24 +94,28 @@ d2i_NETSCAPE_SPKAC(NETSCAPE_SPKAC **a, const unsigned char **in, long len)
return (NETSCAPE_SPKAC *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&NETSCAPE_SPKAC_it);
}
LCRYPTO_ALIAS(d2i_NETSCAPE_SPKAC);
int
i2d_NETSCAPE_SPKAC(NETSCAPE_SPKAC *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &NETSCAPE_SPKAC_it);
}
LCRYPTO_ALIAS(i2d_NETSCAPE_SPKAC);
NETSCAPE_SPKAC *
NETSCAPE_SPKAC_new(void)
{
return (NETSCAPE_SPKAC *)ASN1_item_new(&NETSCAPE_SPKAC_it);
}
LCRYPTO_ALIAS(NETSCAPE_SPKAC_new);
void
NETSCAPE_SPKAC_free(NETSCAPE_SPKAC *a)
{
ASN1_item_free((ASN1_VALUE *)a, &NETSCAPE_SPKAC_it);
}
LCRYPTO_ALIAS(NETSCAPE_SPKAC_free);
static const ASN1_TEMPLATE NETSCAPE_SPKI_seq_tt[] = {
{
@ -154,21 +158,25 @@ d2i_NETSCAPE_SPKI(NETSCAPE_SPKI **a, const unsigned char **in, long len)
return (NETSCAPE_SPKI *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&NETSCAPE_SPKI_it);
}
LCRYPTO_ALIAS(d2i_NETSCAPE_SPKI);
int
i2d_NETSCAPE_SPKI(NETSCAPE_SPKI *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &NETSCAPE_SPKI_it);
}
LCRYPTO_ALIAS(i2d_NETSCAPE_SPKI);
NETSCAPE_SPKI *
NETSCAPE_SPKI_new(void)
{
return (NETSCAPE_SPKI *)ASN1_item_new(&NETSCAPE_SPKI_it);
}
LCRYPTO_ALIAS(NETSCAPE_SPKI_new);
void
NETSCAPE_SPKI_free(NETSCAPE_SPKI *a)
{
ASN1_item_free((ASN1_VALUE *)a, &NETSCAPE_SPKI_it);
}
LCRYPTO_ALIAS(NETSCAPE_SPKI_free);

6
lib/libcrypto/asn1/x_val.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_val.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_val.c,v 1.14 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -90,21 +90,25 @@ d2i_X509_VAL(X509_VAL **a, const unsigned char **in, long len)
return (X509_VAL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_VAL_it);
}
LCRYPTO_ALIAS(d2i_X509_VAL);
int
i2d_X509_VAL(X509_VAL *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_VAL_it);
}
LCRYPTO_ALIAS(i2d_X509_VAL);
X509_VAL *
X509_VAL_new(void)
{
return (X509_VAL *)ASN1_item_new(&X509_VAL_it);
}
LCRYPTO_ALIAS(X509_VAL_new);
void
X509_VAL_free(X509_VAL *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_VAL_it);
}
LCRYPTO_ALIAS(X509_VAL_free);

20
lib/libcrypto/asn1/x_x509.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_x509.c,v 1.37 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_x509.c,v 1.38 2024/04/09 13:55:02 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -149,24 +149,28 @@ d2i_X509_CINF(X509_CINF **a, const unsigned char **in, long len)
return (X509_CINF *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_CINF_it);
}
LCRYPTO_ALIAS(d2i_X509_CINF);
int
i2d_X509_CINF(X509_CINF *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CINF_it);
}
LCRYPTO_ALIAS(i2d_X509_CINF);
X509_CINF *
X509_CINF_new(void)
{
return (X509_CINF *)ASN1_item_new(&X509_CINF_it);
}
LCRYPTO_ALIAS(X509_CINF_new);
void
X509_CINF_free(X509_CINF *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_CINF_it);
}
LCRYPTO_ALIAS(X509_CINF_free);
/* X509 top level structure needs a bit of customisation */
static int
@ -216,6 +220,7 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
return 1;
}
LCRYPTO_ALIAS(d2i_X509_CINF);
static const ASN1_AUX X509_aux = {
.app_data = NULL,
@ -259,30 +264,35 @@ d2i_X509(X509 **a, const unsigned char **in, long len)
return (X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
&X509_it);
}
LCRYPTO_ALIAS(d2i_X509);
int
i2d_X509(X509 *a, unsigned char **out)
{
return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_it);
}
LCRYPTO_ALIAS(i2d_X509);
X509 *
X509_new(void)
{
return (X509 *)ASN1_item_new(&X509_it);
}
LCRYPTO_ALIAS(X509_new);
void
X509_free(X509 *a)
{
ASN1_item_free((ASN1_VALUE *)a, &X509_it);
}
LCRYPTO_ALIAS(X509_free);
X509 *
X509_dup(X509 *x)
{
return ASN1_item_dup(&X509_it, x);
}
LCRYPTO_ALIAS(X509_dup);
int
X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
@ -291,18 +301,21 @@ X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp,
new_func, dup_func, free_func);
}
LCRYPTO_ALIAS(X509_get_ex_new_index);
int
X509_set_ex_data(X509 *r, int idx, void *arg)
{
return (CRYPTO_set_ex_data(&r->ex_data, idx, arg));
}
LCRYPTO_ALIAS(X509_set_ex_data);
void *
X509_get_ex_data(X509 *r, int idx)
{
return (CRYPTO_get_ex_data(&r->ex_data, idx));
}
LCRYPTO_ALIAS(X509_get_ex_data);
/* X509_AUX ASN1 routines. X509_AUX is the name given to
* a certificate with extra info tagged on the end. Since these
@ -340,6 +353,7 @@ d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
X509_free(ret);
return NULL;
}
LCRYPTO_ALIAS(d2i_X509_AUX);
int
i2d_X509_AUX(X509 *a, unsigned char **pp)
@ -351,6 +365,7 @@ i2d_X509_AUX(X509 *a, unsigned char **pp)
length += i2d_X509_CERT_AUX(a->aux, pp);
return length;
}
LCRYPTO_ALIAS(i2d_X509_AUX);
int
i2d_re_X509_tbs(X509 *x, unsigned char **pp)
@ -358,6 +373,7 @@ i2d_re_X509_tbs(X509 *x, unsigned char **pp)
x->cert_info->enc.modified = 1;
return i2d_X509_CINF(x->cert_info, pp);
}
LCRYPTO_ALIAS(i2d_re_X509_tbs);
void
X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg,
@ -368,9 +384,11 @@ X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg,
if (palg != NULL)
*palg = x->sig_alg;
}
LCRYPTO_ALIAS(X509_get0_signature);
int
X509_get_signature_nid(const X509 *x)
{
return OBJ_obj2nid(x->sig_alg->algorithm);
}
LCRYPTO_ALIAS(X509_get_signature_nid);

10
lib/libcrypto/asn1/x_x509a.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: x_x509a.c,v 1.21 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: x_x509a.c,v 1.22 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@ -172,6 +172,7 @@ X509_alias_set1(X509 *x, const unsigned char *name, int len)
return 0;
return ASN1_STRING_set(aux->alias, name, len);
}
LCRYPTO_ALIAS(X509_alias_set1);
int
X509_keyid_set1(X509 *x, const unsigned char *id, int len)
@ -190,6 +191,7 @@ X509_keyid_set1(X509 *x, const unsigned char *id, int len)
return 0;
return ASN1_STRING_set(aux->keyid, id, len);
}
LCRYPTO_ALIAS(X509_keyid_set1);
unsigned char *
X509_alias_get0(X509 *x, int *len)
@ -200,6 +202,7 @@ X509_alias_get0(X509 *x, int *len)
*len = x->aux->alias->length;
return x->aux->alias->data;
}
LCRYPTO_ALIAS(X509_alias_get0);
unsigned char *
X509_keyid_get0(X509 *x, int *len)
@ -210,6 +213,7 @@ X509_keyid_get0(X509 *x, int *len)
*len = x->aux->keyid->length;
return x->aux->keyid->data;
}
LCRYPTO_ALIAS(X509_keyid_get0);
int
X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj)
@ -232,6 +236,7 @@ X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj)
ASN1_OBJECT_free(objtmp);
return 0;
}
LCRYPTO_ALIAS(X509_add1_trust_object);
int
X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj)
@ -254,6 +259,7 @@ X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj)
ASN1_OBJECT_free(objtmp);
return 0;
}
LCRYPTO_ALIAS(X509_add1_reject_object);
void
X509_trust_clear(X509 *x)
@ -263,6 +269,7 @@ X509_trust_clear(X509 *x)
x->aux->trust = NULL;
}
}
LCRYPTO_ALIAS(X509_trust_clear);
void
X509_reject_clear(X509 *x)
@ -272,3 +279,4 @@ X509_reject_clear(X509 *x)
x->aux->reject = NULL;
}
}
LCRYPTO_ALIAS(X509_reject_clear);

11
lib/libcrypto/bn/bn.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bn.h,v 1.77 2024/03/02 09:27:31 tb Exp $ */
/* $OpenBSD: bn.h,v 1.78 2024/04/10 14:58:06 beck Exp $ */
/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -350,11 +350,10 @@ void BN_set_negative(BIGNUM *b, int n);
int BN_is_negative(const BIGNUM *b);
#ifndef LIBRESSL_INTERNAL
int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
BN_CTX *ctx);
#define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx))
#endif
int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m);
@ -383,12 +382,10 @@ int BN_lshift(BIGNUM *r, const BIGNUM *a, int n);
int BN_lshift1(BIGNUM *r, const BIGNUM *a);
int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
#ifndef LIBRESSL_INTERNAL
int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx);
int BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
#endif
int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
@ -407,14 +404,10 @@ char * BN_bn2dec(const BIGNUM *a);
int BN_hex2bn(BIGNUM **a, const char *str);
int BN_dec2bn(BIGNUM **a, const char *str);
int BN_asc2bn(BIGNUM **a, const char *str);
#ifndef LIBRESSL_INTERNAL
int BN_gcd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
#endif
int BN_kronecker(const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx); /* returns -2 for error */
#ifndef LIBRESSL_INTERNAL
BIGNUM *BN_mod_inverse(BIGNUM *ret,
const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
#endif
BIGNUM *BN_mod_sqrt(BIGNUM *ret,
const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);

3
lib/libcrypto/bn/bn_div.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bn_div.c,v 1.40 2023/03/27 10:21:23 tb Exp $ */
/* $OpenBSD: bn_div.c,v 1.41 2024/04/10 14:58:06 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -441,6 +441,7 @@ BN_div(BIGNUM *quotient, BIGNUM *remainder, const BIGNUM *numerator,
return BN_div_internal(quotient, remainder, numerator, divisor, ctx, ct);
}
LCRYPTO_ALIAS(BN_div);
int
BN_div_nonct(BIGNUM *quotient, BIGNUM *remainder, const BIGNUM *numerator,

4
lib/libcrypto/bn/bn_exp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bn_exp.c,v 1.52 2024/03/02 09:27:31 tb Exp $ */
/* $OpenBSD: bn_exp.c,v 1.53 2024/04/10 14:58:06 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -799,6 +799,7 @@ BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
return BN_mod_exp_mont_internal(rr, a, p, m, ctx, in_mont,
(BN_get_flags(p, BN_FLG_CONSTTIME) != 0));
}
LCRYPTO_ALIAS(BN_mod_exp_mont);
int
BN_mod_exp_mont_ct(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
@ -1160,6 +1161,7 @@ BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
return BN_mod_exp_internal(r, a, p, m, ctx,
(BN_get_flags(p, BN_FLG_CONSTTIME) != 0));
}
LCRYPTO_ALIAS(BN_mod_exp);
int
BN_mod_exp_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,

10
lib/libcrypto/bn/bn_gcd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bn_gcd.c,v 1.28 2023/06/02 17:15:30 tb Exp $ */
/* $OpenBSD: bn_gcd.c,v 1.29 2024/04/10 14:58:06 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -195,12 +195,7 @@ BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
BN_CTX_end(ctx);
return (ret);
}
int
BN_gcd_nonct(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
{
return BN_gcd(r, in_a, in_b, ctx);
}
LCRYPTO_ALIAS(BN_gcd);
/*
* BN_gcd_no_branch is a special version of BN_mod_inverse_no_branch.
@ -808,6 +803,7 @@ BN_mod_inverse(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
(BN_get_flags(n, BN_FLG_CONSTTIME) != 0));
return BN_mod_inverse_internal(in, a, n, ctx, ct);
}
LCRYPTO_ALIAS(BN_mod_inverse);
BIGNUM *
BN_mod_inverse_nonct(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)

3
lib/libcrypto/bn/bn_local.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bn_local.h,v 1.40 2024/03/02 09:27:31 tb Exp $ */
/* $OpenBSD: bn_local.h,v 1.41 2024/04/10 15:09:03 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -322,7 +322,6 @@ BIGNUM *BN_mod_inverse_ct(BIGNUM *ret, const BIGNUM *a, const BIGNUM *n,
BIGNUM *BN_mod_inverse_nonct(BIGNUM *ret, const BIGNUM *a, const BIGNUM *n,
BN_CTX *ctx);
int BN_gcd_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
int BN_gcd_nonct(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
int BN_swap_ct(BN_ULONG swap, BIGNUM *a, BIGNUM *b, size_t nwords);

4
lib/libcrypto/conf/conf_def.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: conf_def.c,v 1.33 2020/02/17 12:51:48 inoguchi Exp $ */
/* $OpenBSD: conf_def.c,v 1.34 2024/04/09 13:56:30 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -122,12 +122,14 @@ NCONF_default(void)
{
return &default_method;
}
LCRYPTO_ALIAS(NCONF_default);
CONF_METHOD *
NCONF_WIN32(void)
{
return &WIN32_method;
}
LCRYPTO_ALIAS(NCONF_WIN32);
static CONF *
def_create(CONF_METHOD *meth)

3
lib/libcrypto/conf/conf_err.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: conf_err.c,v 1.15 2022/07/12 14:42:48 kn Exp $ */
/* $OpenBSD: conf_err.c,v 1.16 2024/04/09 13:56:30 beck Exp $ */
/* ====================================================================
* Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.
*
@ -103,3 +103,4 @@ ERR_load_CONF_strings(void)
}
#endif
}
LCRYPTO_ALIAS(ERR_load_CONF_strings);

24
lib/libcrypto/conf/conf_lib.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: conf_lib.c,v 1.16 2024/01/28 21:00:54 tb Exp $ */
/* $OpenBSD: conf_lib.c,v 1.17 2024/04/09 13:56:30 beck Exp $ */
/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
* project 2000.
*/
@ -75,6 +75,7 @@ CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash)
default_CONF_method->init(conf);
conf->data = hash;
}
LCRYPTO_ALIAS(CONF_set_nconf);
/* The following section contains the "CONF classic" functions,
rewritten in terms of the new CONF interface. */
@ -85,6 +86,7 @@ CONF_set_default_method(CONF_METHOD *meth)
default_CONF_method = meth;
return 1;
}
LCRYPTO_ALIAS(CONF_set_default_method);
LHASH_OF(CONF_VALUE) *
CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, long *eline)
@ -103,6 +105,7 @@ CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, long *eline)
return ltmp;
}
LCRYPTO_ALIAS(CONF_load);
LHASH_OF(CONF_VALUE) *
CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, long *eline)
@ -118,6 +121,7 @@ CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, long *eline)
BIO_free(btmp);
return ltmp;
}
LCRYPTO_ALIAS(CONF_load_fp);
LHASH_OF(CONF_VALUE) *
CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline)
@ -132,6 +136,7 @@ CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline)
return ctmp.data;
return NULL;
}
LCRYPTO_ALIAS(CONF_load_bio);
STACK_OF(CONF_VALUE) *
CONF_get_section(LHASH_OF(CONF_VALUE) *conf, const char *section)
@ -144,6 +149,7 @@ CONF_get_section(LHASH_OF(CONF_VALUE) *conf, const char *section)
return NCONF_get_section(&ctmp, section);
}
}
LCRYPTO_ALIAS(CONF_get_section);
char *
CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
@ -157,6 +163,7 @@ CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
return NCONF_get_string(&ctmp, group, name);
}
}
LCRYPTO_ALIAS(CONF_get_string);
long
CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
@ -179,6 +186,7 @@ CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
}
return result;
}
LCRYPTO_ALIAS(CONF_get_number);
void
CONF_free(LHASH_OF(CONF_VALUE) *conf)
@ -188,6 +196,7 @@ CONF_free(LHASH_OF(CONF_VALUE) *conf)
CONF_set_nconf(&ctmp, conf);
NCONF_free_data(&ctmp);
}
LCRYPTO_ALIAS(CONF_free);
int
CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out)
@ -203,6 +212,7 @@ CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out)
BIO_free(btmp);
return ret;
}
LCRYPTO_ALIAS(CONF_dump_fp);
int
CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out)
@ -212,6 +222,7 @@ CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out)
CONF_set_nconf(&ctmp, conf);
return NCONF_dump_bio(&ctmp, out);
}
LCRYPTO_ALIAS(CONF_dump_bio);
/* The following section contains the "New CONF" functions. They are
completely centralised around a new CONF structure that may contain
@ -235,6 +246,7 @@ NCONF_new(CONF_METHOD *meth)
return ret;
}
LCRYPTO_ALIAS(NCONF_new);
void
NCONF_free(CONF *conf)
@ -243,6 +255,7 @@ NCONF_free(CONF *conf)
return;
conf->meth->destroy(conf);
}
LCRYPTO_ALIAS(NCONF_free);
void
NCONF_free_data(CONF *conf)
@ -251,6 +264,7 @@ NCONF_free_data(CONF *conf)
return;
conf->meth->destroy_data(conf);
}
LCRYPTO_ALIAS(NCONF_free_data);
int
NCONF_load(CONF *conf, const char *file, long *eline)
@ -262,6 +276,7 @@ NCONF_load(CONF *conf, const char *file, long *eline)
return conf->meth->load(conf, file, eline);
}
LCRYPTO_ALIAS(NCONF_load);
int
NCONF_load_fp(CONF *conf, FILE *fp, long *eline)
@ -277,6 +292,7 @@ NCONF_load_fp(CONF *conf, FILE *fp, long *eline)
BIO_free(btmp);
return ret;
}
LCRYPTO_ALIAS(NCONF_load_fp);
int
NCONF_load_bio(CONF *conf, BIO *bp, long *eline)
@ -288,6 +304,7 @@ NCONF_load_bio(CONF *conf, BIO *bp, long *eline)
return conf->meth->load_bio(conf, bp, eline);
}
LCRYPTO_ALIAS(NCONF_load_bio);
STACK_OF(CONF_VALUE) *
NCONF_get_section(const CONF *conf, const char *section)
@ -304,6 +321,7 @@ NCONF_get_section(const CONF *conf, const char *section)
return _CONF_get_section_values(conf, section);
}
LCRYPTO_ALIAS(NCONF_get_section);
char *
NCONF_get_string(const CONF *conf, const char *group, const char *name)
@ -324,6 +342,7 @@ NCONF_get_string(const CONF *conf, const char *group, const char *name)
group ? group : "", name);
return NULL;
}
LCRYPTO_ALIAS(NCONF_get_string);
int
NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
@ -348,6 +367,7 @@ NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
return 1;
}
LCRYPTO_ALIAS(NCONF_get_number_e);
int
NCONF_dump_fp(const CONF *conf, FILE *out)
@ -362,6 +382,7 @@ NCONF_dump_fp(const CONF *conf, FILE *out)
BIO_free(btmp);
return ret;
}
LCRYPTO_ALIAS(NCONF_dump_fp);
int
NCONF_dump_bio(const CONF *conf, BIO *out)
@ -373,3 +394,4 @@ NCONF_dump_bio(const CONF *conf, BIO *out)
return conf->meth->dump(conf, out);
}
LCRYPTO_ALIAS(NCONF_dump_bio);

3
lib/libcrypto/conf/conf_mall.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: conf_mall.c,v 1.11 2024/03/02 09:02:04 tb Exp $ */
/* $OpenBSD: conf_mall.c,v 1.12 2024/04/09 13:56:30 beck Exp $ */
/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@ -67,3 +67,4 @@ OPENSSL_load_builtin_modules(void)
/* Add builtin modules here */
ASN1_add_oid_module();
}
LCRYPTO_ALIAS(OPENSSL_load_builtin_modules);

19
lib/libcrypto/conf/conf_mod.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: conf_mod.c,v 1.37 2024/03/26 00:24:11 tb Exp $ */
/* $OpenBSD: conf_mod.c,v 1.38 2024/04/09 13:56:30 beck Exp $ */
/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@ -147,6 +147,7 @@ CONF_modules_load(const CONF *cnf, const char *appname, unsigned long flags)
return 1;
}
LCRYPTO_ALIAS(CONF_modules_load);
int
CONF_modules_load_file(const char *filename, const char *appname,
@ -185,6 +186,7 @@ err:
return ret;
}
LCRYPTO_ALIAS(CONF_modules_load_file);
static int
module_run(const CONF *cnf, char *name, char *value, unsigned long flags)
@ -352,6 +354,7 @@ CONF_modules_unload(int all)
supported_modules = NULL;
}
}
LCRYPTO_ALIAS(CONF_modules_unload);
/* unload a single module */
static void
@ -389,6 +392,7 @@ CONF_modules_finish(void)
sk_CONF_IMODULE_free(initialized_modules);
initialized_modules = NULL;
}
LCRYPTO_ALIAS(CONF_modules_finish);
/* finish a module instance */
@ -409,6 +413,7 @@ CONF_module_add(const char *name, conf_init_func *ifunc, conf_finish_func *ffunc
{
return module_add(name, ifunc, ffunc);
}
LCRYPTO_ALIAS(CONF_module_add);
void
CONF_modules_free(void)
@ -416,6 +421,7 @@ CONF_modules_free(void)
CONF_modules_finish();
CONF_modules_unload(1);
}
LCRYPTO_ALIAS(CONF_modules_free);
/* Utility functions */
@ -424,54 +430,63 @@ CONF_imodule_get_name(const CONF_IMODULE *imod)
{
return imod->name;
}
LCRYPTO_ALIAS(CONF_imodule_get_name);
const char *
CONF_imodule_get_value(const CONF_IMODULE *imod)
{
return imod->value;
}
LCRYPTO_ALIAS(CONF_imodule_get_value);
void *
CONF_imodule_get_usr_data(const CONF_IMODULE *imod)
{
return imod->usr_data;
}
LCRYPTO_ALIAS(CONF_imodule_get_usr_data);
void
CONF_imodule_set_usr_data(CONF_IMODULE *imod, void *usr_data)
{
imod->usr_data = usr_data;
}
LCRYPTO_ALIAS(CONF_imodule_set_usr_data);
CONF_MODULE *
CONF_imodule_get_module(const CONF_IMODULE *imod)
{
return imod->mod;
}
LCRYPTO_ALIAS(CONF_imodule_get_module);
unsigned long
CONF_imodule_get_flags(const CONF_IMODULE *imod)
{
return imod->flags;
}
LCRYPTO_ALIAS(CONF_imodule_get_flags);
void
CONF_imodule_set_flags(CONF_IMODULE *imod, unsigned long flags)
{
imod->flags = flags;
}
LCRYPTO_ALIAS(CONF_imodule_set_flags);
void *
CONF_module_get_usr_data(CONF_MODULE *mod)
{
return mod->usr_data;
}
LCRYPTO_ALIAS(CONF_module_get_usr_data);
void
CONF_module_set_usr_data(CONF_MODULE *mod, void *usr_data)
{
mod->usr_data = usr_data;
}
LCRYPTO_ALIAS(CONF_module_set_usr_data);
/* Return default config file name */
@ -485,6 +500,7 @@ CONF_get1_default_config_file(void)
return (NULL);
return file;
}
LCRYPTO_ALIAS(CONF_get1_default_config_file);
/* This function takes a list separated by 'sep' and calls the
* callback function giving the start and length of each member
@ -531,3 +547,4 @@ CONF_parse_list(const char *list_, int sep, int nospc,
lstart = p + 1;
}
}
LCRYPTO_ALIAS(CONF_parse_list);

4
lib/libcrypto/conf/conf_sap.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: conf_sap.c,v 1.15 2023/11/19 15:46:09 tb Exp $ */
/* $OpenBSD: conf_sap.c,v 1.16 2024/04/09 13:56:30 beck Exp $ */
/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
* project 2001.
*/
@ -124,6 +124,7 @@ OPENSSL_config(const char *config_name)
{
(void) OpenSSL_config(config_name);
}
LCRYPTO_ALIAS(OPENSSL_config);
static void
OPENSSL_no_config_internal(void)
@ -144,3 +145,4 @@ OPENSSL_no_config(void)
{
(void) OpenSSL_no_config();
}
LCRYPTO_ALIAS(OPENSSL_no_config);

25
lib/libcrypto/cryptlib.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cryptlib.c,v 1.49 2024/03/24 06:48:03 tb Exp $ */
/* $OpenBSD: cryptlib.c,v 1.50 2024/04/10 14:51:02 beck Exp $ */
/* ====================================================================
* Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
*
@ -136,24 +136,28 @@ CRYPTO_num_locks(void)
{
return 1;
}
LCRYPTO_ALIAS(CRYPTO_num_locks);
unsigned long
(*CRYPTO_get_id_callback(void))(void)
{
return NULL;
}
LCRYPTO_ALIAS(CRYPTO_get_id_callback);
void
CRYPTO_set_id_callback(unsigned long (*func)(void))
{
return;
}
LCRYPTO_ALIAS(CRYPTO_set_id_callback);
unsigned long
CRYPTO_thread_id(void)
{
return (unsigned long)pthread_self();
}
LCRYPTO_ALIAS(CRYPTO_thread_id);
void
CRYPTO_set_locking_callback(void (*func)(int mode, int lock_num,
@ -161,6 +165,7 @@ CRYPTO_set_locking_callback(void (*func)(int mode, int lock_num,
{
locking_callback = func;
}
LCRYPTO_ALIAS(CRYPTO_set_locking_callback);
void
(*CRYPTO_get_locking_callback(void))(int mode, int lock_num,
@ -168,6 +173,7 @@ void
{
return locking_callback;
}
LCRYPTO_ALIAS(CRYPTO_get_locking_callback);
void
CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num,
@ -175,6 +181,7 @@ CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num,
{
add_lock_callback = func;
}
LCRYPTO_ALIAS(CRYPTO_set_add_lock_callback);
int
(*CRYPTO_get_add_lock_callback(void))(int *num, int mount, int type,
@ -182,58 +189,68 @@ int
{
return add_lock_callback;
}
LCRYPTO_ALIAS(CRYPTO_get_add_lock_callback);
const char *
CRYPTO_get_lock_name(int lock_num)
{
return "";
}
LCRYPTO_ALIAS(CRYPTO_get_lock_name);
struct CRYPTO_dynlock_value *
CRYPTO_get_dynlock_value(int i)
{
return NULL;
}
LCRYPTO_ALIAS(CRYPTO_get_dynlock_value);
int CRYPTO_get_new_dynlockid(void)
{
return 0;
}
LCRYPTO_ALIAS(CRYPTO_get_new_dynlockid);
void
CRYPTO_destroy_dynlockid(int i)
{
return;
}
LCRYPTO_ALIAS(CRYPTO_destroy_dynlockid);
int CRYPTO_get_new_lockid(char *name)
{
return 0;
}
LCRYPTO_ALIAS(CRYPTO_get_new_lockid);
int
CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *))
{
return 1;
}
LCRYPTO_ALIAS(CRYPTO_THREADID_set_callback);
void
(*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *)
{
return NULL;
}
LCRYPTO_ALIAS(CRYPTO_THREADID_get_callback);
void
CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val)
{
return;
}
LCRYPTO_ALIAS(CRYPTO_THREADID_set_numeric);
void
CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
{
return;
}
LCRYPTO_ALIAS(CRYPTO_THREADID_set_pointer);
void
CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(
@ -241,6 +258,7 @@ CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(
{
return;
}
LCRYPTO_ALIAS(CRYPTO_set_dynlock_create_callback);
void
CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)(
@ -248,6 +266,7 @@ CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)(
{
return;
}
LCRYPTO_ALIAS(CRYPTO_set_dynlock_lock_callback);
void
CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)(
@ -255,6 +274,7 @@ CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)(
{
return;
}
LCRYPTO_ALIAS(CRYPTO_set_dynlock_destroy_callback);
struct CRYPTO_dynlock_value *
(*CRYPTO_get_dynlock_create_callback(void))(
@ -269,6 +289,7 @@ void
{
return NULL;
}
LCRYPTO_ALIAS(CRYPTO_get_dynlock_lock_callback);
void
(*CRYPTO_get_dynlock_destroy_callback(void))(
@ -276,6 +297,7 @@ void
{
return NULL;
}
LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback);
void
CRYPTO_THREADID_current(CRYPTO_THREADID *id)
@ -380,3 +402,4 @@ CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
return x;
}
LCRYPTO_ALIAS(CRYPTO_memcmp);

12
lib/libcrypto/crypto.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: crypto.h,v 1.72 2024/03/02 15:40:05 tb Exp $ */
/* $OpenBSD: crypto.h,v 1.74 2024/04/10 15:13:23 beck Exp $ */
/* ====================================================================
* Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
*
@ -265,6 +265,7 @@ DECLARE_STACK_OF(void)
#ifndef LIBRESSL_INTERNAL
#define CRYPTO_malloc_init() (0)
#define CRYPTO_malloc_debug_init() (0)
#endif /* LIBRESSL_INTERNAL */
#if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
# ifndef CRYPTO_MDEBUG /* avoid duplicate #define */
@ -277,7 +278,6 @@ int CRYPTO_mem_ctrl(int mode);
#define OPENSSL_malloc(num) CRYPTO_malloc((num),NULL,0)
#define OPENSSL_strdup(str) CRYPTO_strdup((str),NULL,0)
#define OPENSSL_free(addr) CRYPTO_free((addr),NULL,0)
#endif
const char *OpenSSL_version(int type);
#define OPENSSL_VERSION 0
@ -316,7 +316,6 @@ int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
/* Don't use this structure directly. */
typedef struct crypto_threadid_st CRYPTO_THREADID;
#ifndef LIBRESSL_INTERNAL
/* These functions are deprecated no-op stubs */
void CRYPTO_set_id_callback(unsigned long (*func)(void));
unsigned long (*CRYPTO_get_id_callback(void))(void);
@ -349,7 +348,6 @@ void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)(struct CRY
struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))(const char *file, int line);
void (*CRYPTO_get_dynlock_lock_callback(void))(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line);
void (*CRYPTO_get_dynlock_destroy_callback(void))(struct CRYPTO_dynlock_value *l, const char *file, int line);
#endif
/* CRYPTO_set_mem_functions includes CRYPTO_set_locked_mem_functions --
* call the latter last if you need different functions */
@ -357,15 +355,11 @@ int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t), voi
int CRYPTO_set_mem_ex_functions(void *(*m)(size_t, const char *, int),
void *(*r)(void *, size_t, const char *, int), void (*f)(void *));
#ifndef LIBRESSL_INTERNAL
void *CRYPTO_malloc(size_t num, const char *file, int line);
char *CRYPTO_strdup(const char *str, const char *file, int line);
void CRYPTO_free(void *ptr, const char *file, int line);
#endif
#ifndef LIBRESSL_INTERNAL
void OPENSSL_cleanse(void *ptr, size_t len);
#endif
/*
* Because this is a public header, use a portable method of indicating the
@ -381,7 +375,6 @@ void OpenSSLDie(const char *file, int line, const char *assertion);
uint64_t OPENSSL_cpu_caps(void);
#ifndef LIBRESSL_INTERNAL
int FIPS_mode(void);
int FIPS_mode_set(int r);
@ -393,7 +386,6 @@ void OPENSSL_init(void);
* defined order as the return value when a != b is undefined, other than to be
* non-zero. */
int CRYPTO_memcmp(const void *a, const void *b, size_t len);
#endif
/*
* OpenSSL compatible OPENSSL_INIT options.

7
lib/libcrypto/crypto_init.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: crypto_init.c,v 1.19 2024/03/19 19:27:33 tb Exp $ */
/* $OpenBSD: crypto_init.c,v 1.21 2024/04/10 14:51:02 beck Exp $ */
/*
* Copyright (c) 2018 Bob Beck <beck@openbsd.org>
*
@ -41,6 +41,7 @@ void
OPENSSL_init(void)
{
}
LCRYPTO_ALIAS(OPENSSL_init);
static void
OPENSSL_init_crypto_internal(void)
@ -98,19 +99,23 @@ void
OpenSSL_add_all_ciphers(void)
{
}
LCRYPTO_ALIAS(OpenSSL_add_all_ciphers);
void
OpenSSL_add_all_digests(void)
{
}
LCRYPTO_ALIAS(OpenSSL_add_all_digests);
void
OPENSSL_add_all_algorithms_noconf(void)
{
}
LCRYPTO_ALIAS(OPENSSL_add_all_algorithms_noconf);
void
OPENSSL_add_all_algorithms_conf(void)
{
OPENSSL_config(NULL);
}
LCRYPTO_ALIAS(OPENSSL_add_all_algorithms_conf);

10
lib/libcrypto/ec/ec.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ec.h,v 1.46 2023/08/11 04:45:27 tb Exp $ */
/* $OpenBSD: ec.h,v 1.47 2024/04/10 15:01:31 beck Exp $ */
/*
* Originally written by Bodo Moeller for the OpenSSL project.
*/
@ -108,9 +108,7 @@ const EC_METHOD *EC_GFp_mont_method(void);
EC_GROUP *EC_GROUP_new(const EC_METHOD *meth);
void EC_GROUP_free(EC_GROUP *group);
#ifndef LIBRESSL_INTERNAL
void EC_GROUP_clear_free(EC_GROUP *group);
#endif
int EC_GROUP_copy(EC_GROUP *dst, const EC_GROUP *src);
EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
@ -145,12 +143,10 @@ int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
BN_CTX *ctx);
#if !defined(LIBRESSL_INTERNAL)
int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
const BIGNUM *b, BN_CTX *ctx);
int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
BIGNUM *b, BN_CTX *ctx);
#endif
int EC_GROUP_get_degree(const EC_GROUP *group);
@ -176,9 +172,7 @@ int EC_curve_nist2nid(const char *name);
EC_POINT *EC_POINT_new(const EC_GROUP *group);
void EC_POINT_free(EC_POINT *point);
#ifndef LIBRESSL_INTERNAL
void EC_POINT_clear_free(EC_POINT *point);
#endif
int EC_POINT_copy(EC_POINT *dst, const EC_POINT *src);
EC_POINT *EC_POINT_dup(const EC_POINT *src, const EC_GROUP *group);
@ -193,7 +187,6 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p,
int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p,
const BIGNUM *x, int y_bit, BN_CTX *ctx);
#ifndef LIBRESSL_INTERNAL
int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx);
int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
@ -204,7 +197,6 @@ int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
const EC_POINT *p, BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
const BIGNUM *x, int y_bit, BN_CTX *ctx);
#endif /* !LIBRESSL_INTERNAL */
size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *p,
point_conversion_form_t form, unsigned char *buf, size_t len, BN_CTX *ctx);
int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,

10
lib/libcrypto/ec/ec_lib.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ec_lib.c,v 1.65 2023/07/25 06:57:26 tb Exp $ */
/* $OpenBSD: ec_lib.c,v 1.66 2024/04/10 15:01:31 beck Exp $ */
/*
* Originally written by Bodo Moeller for the OpenSSL project.
*/
@ -136,6 +136,7 @@ EC_GROUP_clear_free(EC_GROUP *group)
{
EC_GROUP_free(group);
}
LCRYPTO_ALIAS(EC_GROUP_clear_free);
int
EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
@ -542,6 +543,7 @@ EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
{
return EC_GROUP_set_curve(group, p, a, b, ctx);
}
LCRYPTO_ALIAS(EC_GROUP_set_curve_GFp);
int
EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
@ -549,6 +551,7 @@ EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
{
return EC_GROUP_get_curve(group, p, a, b, ctx);
}
LCRYPTO_ALIAS(EC_GROUP_get_curve_GFp);
int
EC_GROUP_get_degree(const EC_GROUP *group)
@ -727,6 +730,7 @@ EC_POINT_clear_free(EC_POINT *point)
{
EC_POINT_free(point);
}
LCRYPTO_ALIAS(EC_POINT_clear_free);
int
EC_POINT_copy(EC_POINT *dest, const EC_POINT *src)
@ -862,6 +866,7 @@ EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
{
return EC_POINT_set_Jprojective_coordinates(group, point, x, y, z, ctx);
}
LCRYPTO_ALIAS(EC_POINT_set_Jprojective_coordinates_GFp);
int
EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
@ -869,6 +874,7 @@ EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
{
return EC_POINT_get_Jprojective_coordinates(group, point, x, y, z, ctx);
}
LCRYPTO_ALIAS(EC_POINT_get_Jprojective_coordinates_GFp);
int
EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
@ -914,6 +920,7 @@ EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
{
return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);
}
LCRYPTO_ALIAS(EC_POINT_set_affine_coordinates_GFp);
int
EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,
@ -951,6 +958,7 @@ EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point
{
return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);
}
LCRYPTO_ALIAS(EC_POINT_get_affine_coordinates_GFp);
int
EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,

3
lib/libcrypto/ec/ec_oct.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ec_oct.c,v 1.16 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: ec_oct.c,v 1.17 2024/04/10 15:01:31 beck Exp $ */
/*
* Originally written by Bodo Moeller for the OpenSSL project.
*/
@ -107,6 +107,7 @@ EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
{
return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);
}
LCRYPTO_ALIAS(EC_POINT_set_compressed_coordinates_GFp);
size_t
EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,

3
lib/libcrypto/evp/bio_b64.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bio_b64.c,v 1.28 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: bio_b64.c,v 1.29 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -111,6 +111,7 @@ BIO_f_base64(void)
{
return (&methods_b64);
}
LCRYPTO_ALIAS(BIO_f_base64);
static int
b64_new(BIO *bi)

4
lib/libcrypto/evp/bio_enc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bio_enc.c,v 1.31 2024/03/25 04:05:22 joshua Exp $ */
/* $OpenBSD: bio_enc.c,v 1.32 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -107,6 +107,7 @@ BIO_f_cipher(void)
{
return (&methods_enc);
}
LCRYPTO_ALIAS(BIO_f_cipher);
static void
bio_enc_ctx_free(BIO_ENC_CTX *ctx)
@ -426,3 +427,4 @@ BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
return 1;
}
LCRYPTO_ALIAS(BIO_set_cipher);

3
lib/libcrypto/evp/bio_md.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bio_md.c,v 1.21 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: bio_md.c,v 1.22 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -94,6 +94,7 @@ BIO_f_md(void)
{
return (&methods_md);
}
LCRYPTO_ALIAS(BIO_f_md);
static int
md_new(BIO *bi)

42
lib/libcrypto/evp/e_aes.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_aes.c,v 1.56 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_aes.c,v 1.58 2024/04/09 13:52:41 beck Exp $ */
/* ====================================================================
* Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved.
*
@ -572,6 +572,7 @@ EVP_aes_128_cbc(void)
return &aes_128_cbc;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_cbc);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_128_ecb = {
@ -606,6 +607,7 @@ EVP_aes_128_ecb(void)
return &aes_128_ecb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_ecb);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_128_ofb = {
@ -640,6 +642,7 @@ EVP_aes_128_ofb(void)
return &aes_128_ofb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_ofb);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_128_cfb = {
@ -666,7 +669,7 @@ static const EVP_CIPHER aes_128_cfb = {
};
const EVP_CIPHER *
EVP_aes_128_cfb(void)
EVP_aes_128_cfb128(void)
{
#ifdef AESNI_CAPABLE
return AESNI_CAPABLE ? &aesni_128_cfb : &aes_128_cfb;
@ -674,6 +677,7 @@ EVP_aes_128_cfb(void)
return &aes_128_cfb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_cfb128);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_128_cfb1 = {
@ -708,6 +712,7 @@ EVP_aes_128_cfb1(void)
return &aes_128_cfb1;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_cfb1);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_128_cfb8 = {
@ -742,6 +747,7 @@ EVP_aes_128_cfb8(void)
return &aes_128_cfb8;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_cfb8);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_128_ctr = {
@ -776,6 +782,7 @@ EVP_aes_128_ctr(void)
return &aes_128_ctr;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_ctr);
#ifdef AESNI_CAPABLE
@ -811,6 +818,7 @@ EVP_aes_192_cbc(void)
return &aes_192_cbc;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_cbc);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_ecb = {
@ -845,6 +853,7 @@ EVP_aes_192_ecb(void)
return &aes_192_ecb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_ecb);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_ofb = {
@ -879,6 +888,7 @@ EVP_aes_192_ofb(void)
return &aes_192_ofb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_ofb);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_cfb = {
@ -905,7 +915,7 @@ static const EVP_CIPHER aes_192_cfb = {
};
const EVP_CIPHER *
EVP_aes_192_cfb(void)
EVP_aes_192_cfb128(void)
{
#ifdef AESNI_CAPABLE
return AESNI_CAPABLE ? &aesni_192_cfb : &aes_192_cfb;
@ -913,6 +923,7 @@ EVP_aes_192_cfb(void)
return &aes_192_cfb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_cfb128);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_cfb1 = {
@ -947,6 +958,7 @@ EVP_aes_192_cfb1(void)
return &aes_192_cfb1;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_cfb1);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_cfb8 = {
@ -981,6 +993,7 @@ EVP_aes_192_cfb8(void)
return &aes_192_cfb8;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_cfb8);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_ctr = {
@ -1015,6 +1028,7 @@ EVP_aes_192_ctr(void)
return &aes_192_ctr;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_ctr);
#ifdef AESNI_CAPABLE
@ -1050,6 +1064,7 @@ EVP_aes_256_cbc(void)
return &aes_256_cbc;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_cbc);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_ecb = {
@ -1084,6 +1099,7 @@ EVP_aes_256_ecb(void)
return &aes_256_ecb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_ecb);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_ofb = {
@ -1118,6 +1134,7 @@ EVP_aes_256_ofb(void)
return &aes_256_ofb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_ofb);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_cfb = {
@ -1144,7 +1161,7 @@ static const EVP_CIPHER aes_256_cfb = {
};
const EVP_CIPHER *
EVP_aes_256_cfb(void)
EVP_aes_256_cfb128(void)
{
#ifdef AESNI_CAPABLE
return AESNI_CAPABLE ? &aesni_256_cfb : &aes_256_cfb;
@ -1152,6 +1169,7 @@ EVP_aes_256_cfb(void)
return &aes_256_cfb;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_cfb128);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_cfb1 = {
@ -1186,6 +1204,7 @@ EVP_aes_256_cfb1(void)
return &aes_256_cfb1;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_cfb1);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_cfb8 = {
@ -1220,6 +1239,7 @@ EVP_aes_256_cfb8(void)
return &aes_256_cfb8;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_cfb8);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_ctr = {
@ -1254,6 +1274,7 @@ EVP_aes_256_ctr(void)
return &aes_256_ctr;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_ctr);
static int
aes_gcm_cleanup(EVP_CIPHER_CTX *c)
@ -1677,6 +1698,7 @@ EVP_aes_128_gcm(void)
return &aes_128_gcm;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_gcm);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_gcm = {
@ -1715,6 +1737,7 @@ EVP_aes_192_gcm(void)
return &aes_192_gcm;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_gcm);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_gcm = {
@ -1753,6 +1776,7 @@ EVP_aes_256_gcm(void)
return &aes_256_gcm;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_gcm);
static int
aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
@ -1919,6 +1943,7 @@ EVP_aes_128_xts(void)
return &aes_128_xts;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_xts);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_xts = {
@ -1957,6 +1982,7 @@ EVP_aes_256_xts(void)
return &aes_256_xts;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_xts);
static int
aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
@ -2157,6 +2183,7 @@ EVP_aes_128_ccm(void)
return &aes_128_ccm;
#endif
}
LCRYPTO_ALIAS(EVP_aes_128_ccm);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_192_ccm = {
@ -2195,6 +2222,7 @@ EVP_aes_192_ccm(void)
return &aes_192_ccm;
#endif
}
LCRYPTO_ALIAS(EVP_aes_192_ccm);
#ifdef AESNI_CAPABLE
static const EVP_CIPHER aesni_256_ccm = {
@ -2233,6 +2261,7 @@ EVP_aes_256_ccm(void)
return &aes_256_ccm;
#endif
}
LCRYPTO_ALIAS(EVP_aes_256_ccm);
#define EVP_AEAD_AES_GCM_TAG_LEN 16
@ -2423,12 +2452,14 @@ EVP_aead_aes_128_gcm(void)
{
return &aead_aes_128_gcm;
}
LCRYPTO_ALIAS(EVP_aead_aes_128_gcm);
const EVP_AEAD *
EVP_aead_aes_256_gcm(void)
{
return &aead_aes_256_gcm;
}
LCRYPTO_ALIAS(EVP_aead_aes_256_gcm);
typedef struct {
union {
@ -2557,6 +2588,7 @@ EVP_aes_128_wrap(void)
{
return &aes_128_wrap;
}
LCRYPTO_ALIAS(EVP_aes_128_wrap);
static const EVP_CIPHER aes_192_wrap = {
.nid = NID_id_aes192_wrap,
@ -2578,6 +2610,7 @@ EVP_aes_192_wrap(void)
{
return &aes_192_wrap;
}
LCRYPTO_ALIAS(EVP_aes_192_wrap);
static const EVP_CIPHER aes_256_wrap = {
.nid = NID_id_aes256_wrap,
@ -2599,5 +2632,6 @@ EVP_aes_256_wrap(void)
{
return &aes_256_wrap;
}
LCRYPTO_ALIAS(EVP_aes_256_wrap);
#endif

6
lib/libcrypto/evp/e_bf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_bf.c,v 1.18 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_bf.c,v 1.19 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -177,6 +177,7 @@ EVP_bf_cbc(void)
{
return &bf_cbc;
}
LCRYPTO_ALIAS(EVP_bf_cbc);
static const EVP_CIPHER bf_cfb64 = {
.nid = NID_bf_cfb64,
@ -198,6 +199,7 @@ EVP_bf_cfb64(void)
{
return &bf_cfb64;
}
LCRYPTO_ALIAS(EVP_bf_cfb64);
static const EVP_CIPHER bf_ofb = {
.nid = NID_bf_ofb64,
@ -219,6 +221,7 @@ EVP_bf_ofb(void)
{
return &bf_ofb;
}
LCRYPTO_ALIAS(EVP_bf_ofb);
static const EVP_CIPHER bf_ecb = {
.nid = NID_bf_ecb,
@ -240,4 +243,5 @@ EVP_bf_ecb(void)
{
return &bf_ecb;
}
LCRYPTO_ALIAS(EVP_bf_ecb);
#endif

20
lib/libcrypto/evp/e_camellia.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_camellia.c,v 1.19 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_camellia.c,v 1.20 2024/04/09 13:52:41 beck Exp $ */
/* ====================================================================
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
*
@ -178,6 +178,7 @@ EVP_camellia_128_cbc(void)
{
return &camellia_128_cbc;
}
LCRYPTO_ALIAS(EVP_camellia_128_cbc);
static const EVP_CIPHER camellia_128_cfb128 = {
.nid = NID_camellia_128_cfb128,
@ -199,6 +200,7 @@ EVP_camellia_128_cfb128(void)
{
return &camellia_128_cfb128;
}
LCRYPTO_ALIAS(EVP_camellia_128_cfb128);
static const EVP_CIPHER camellia_128_ofb = {
.nid = NID_camellia_128_ofb128,
@ -220,6 +222,7 @@ EVP_camellia_128_ofb(void)
{
return &camellia_128_ofb;
}
LCRYPTO_ALIAS(EVP_camellia_128_ofb);
static const EVP_CIPHER camellia_128_ecb = {
.nid = NID_camellia_128_ecb,
@ -241,6 +244,7 @@ EVP_camellia_128_ecb(void)
{
return &camellia_128_ecb;
}
LCRYPTO_ALIAS(EVP_camellia_128_ecb);
static int
camellia_192_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@ -332,6 +336,7 @@ EVP_camellia_192_cbc(void)
{
return &camellia_192_cbc;
}
LCRYPTO_ALIAS(EVP_camellia_192_cbc);
static const EVP_CIPHER camellia_192_cfb128 = {
.nid = NID_camellia_192_cfb128,
@ -353,6 +358,7 @@ EVP_camellia_192_cfb128(void)
{
return &camellia_192_cfb128;
}
LCRYPTO_ALIAS(EVP_camellia_192_cfb128);
static const EVP_CIPHER camellia_192_ofb = {
.nid = NID_camellia_192_ofb128,
@ -374,6 +380,7 @@ EVP_camellia_192_ofb(void)
{
return &camellia_192_ofb;
}
LCRYPTO_ALIAS(EVP_camellia_192_ofb);
static const EVP_CIPHER camellia_192_ecb = {
.nid = NID_camellia_192_ecb,
@ -395,6 +402,7 @@ EVP_camellia_192_ecb(void)
{
return &camellia_192_ecb;
}
LCRYPTO_ALIAS(EVP_camellia_192_ecb);
static int
camellia_256_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@ -486,6 +494,7 @@ EVP_camellia_256_cbc(void)
{
return &camellia_256_cbc;
}
LCRYPTO_ALIAS(EVP_camellia_256_cbc);
static const EVP_CIPHER camellia_256_cfb128 = {
.nid = NID_camellia_256_cfb128,
@ -507,6 +516,7 @@ EVP_camellia_256_cfb128(void)
{
return &camellia_256_cfb128;
}
LCRYPTO_ALIAS(EVP_camellia_256_cfb128);
static const EVP_CIPHER camellia_256_ofb = {
.nid = NID_camellia_256_ofb128,
@ -528,6 +538,7 @@ EVP_camellia_256_ofb(void)
{
return &camellia_256_ofb;
}
LCRYPTO_ALIAS(EVP_camellia_256_ofb);
static const EVP_CIPHER camellia_256_ecb = {
.nid = NID_camellia_256_ecb,
@ -549,6 +560,7 @@ EVP_camellia_256_ecb(void)
{
return &camellia_256_ecb;
}
LCRYPTO_ALIAS(EVP_camellia_256_ecb);
static int
camellia_128_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@ -592,6 +604,7 @@ EVP_camellia_128_cfb1(void)
{
return &camellia_128_cfb1;
}
LCRYPTO_ALIAS(EVP_camellia_128_cfb1);
static int
camellia_192_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@ -635,6 +648,7 @@ EVP_camellia_192_cfb1(void)
{
return &camellia_192_cfb1;
}
LCRYPTO_ALIAS(EVP_camellia_192_cfb1);
static int
camellia_256_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@ -678,6 +692,7 @@ EVP_camellia_256_cfb1(void)
{
return &camellia_256_cfb1;
}
LCRYPTO_ALIAS(EVP_camellia_256_cfb1);
static int
@ -720,6 +735,7 @@ EVP_camellia_128_cfb8(void)
{
return &camellia_128_cfb8;
}
LCRYPTO_ALIAS(EVP_camellia_128_cfb8);
static int
camellia_192_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@ -761,6 +777,7 @@ EVP_camellia_192_cfb8(void)
{
return &camellia_192_cfb8;
}
LCRYPTO_ALIAS(EVP_camellia_192_cfb8);
static int
camellia_256_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
@ -802,4 +819,5 @@ EVP_camellia_256_cfb8(void)
{
return &camellia_256_cfb8;
}
LCRYPTO_ALIAS(EVP_camellia_256_cfb8);
#endif

6
lib/libcrypto/evp/e_cast.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_cast.c,v 1.17 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_cast.c,v 1.18 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -177,6 +177,7 @@ EVP_cast5_cbc(void)
{
return &cast5_cbc;
}
LCRYPTO_ALIAS(EVP_cast5_cbc);
static const EVP_CIPHER cast5_cfb64 = {
.nid = NID_cast5_cfb64,
@ -198,6 +199,7 @@ EVP_cast5_cfb64(void)
{
return &cast5_cfb64;
}
LCRYPTO_ALIAS(EVP_cast5_cfb64);
static const EVP_CIPHER cast5_ofb = {
.nid = NID_cast5_ofb64,
@ -219,6 +221,7 @@ EVP_cast5_ofb(void)
{
return &cast5_ofb;
}
LCRYPTO_ALIAS(EVP_cast5_ofb);
static const EVP_CIPHER cast5_ecb = {
.nid = NID_cast5_ecb,
@ -240,4 +243,5 @@ EVP_cast5_ecb(void)
{
return &cast5_ecb;
}
LCRYPTO_ALIAS(EVP_cast5_ecb);
#endif

3
lib/libcrypto/evp/e_chacha.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_chacha.c,v 1.13 2023/08/24 04:20:57 tb Exp $ */
/* $OpenBSD: e_chacha.c,v 1.14 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@ -72,5 +72,6 @@ EVP_chacha20(void)
{
return (&chacha20_cipher);
}
LCRYPTO_ALIAS(EVP_chacha20);
#endif

5
lib/libcrypto/evp/e_chacha20poly1305.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_chacha20poly1305.c,v 1.34 2023/12/30 18:24:09 tb Exp $ */
/* $OpenBSD: e_chacha20poly1305.c,v 1.35 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
@ -349,6 +349,7 @@ EVP_aead_chacha20_poly1305(void)
{
return &aead_chacha20_poly1305;
}
LCRYPTO_ALIAS(EVP_aead_chacha20_poly1305);
static const EVP_AEAD aead_xchacha20_poly1305 = {
.key_len = 32,
@ -367,6 +368,7 @@ EVP_aead_xchacha20_poly1305(void)
{
return &aead_xchacha20_poly1305;
}
LCRYPTO_ALIAS(EVP_aead_xchacha20_poly1305);
struct chacha20_poly1305_ctx {
ChaCha_ctx chacha;
@ -614,5 +616,6 @@ EVP_chacha20_poly1305(void)
{
return &cipher_chacha20_poly1305;
}
LCRYPTO_ALIAS(EVP_chacha20_poly1305);
#endif /* !OPENSSL_NO_CHACHA && !OPENSSL_NO_POLY1305 */

8
lib/libcrypto/evp/e_des.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_des.c,v 1.23 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_des.c,v 1.24 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -241,6 +241,7 @@ EVP_des_cbc(void)
{
return &des_cbc;
}
LCRYPTO_ALIAS(EVP_des_cbc);
static const EVP_CIPHER des_cfb64 = {
.nid = NID_des_cfb64,
@ -262,6 +263,7 @@ EVP_des_cfb64(void)
{
return &des_cfb64;
}
LCRYPTO_ALIAS(EVP_des_cfb64);
static const EVP_CIPHER des_ofb = {
.nid = NID_des_ofb64,
@ -283,6 +285,7 @@ EVP_des_ofb(void)
{
return &des_ofb;
}
LCRYPTO_ALIAS(EVP_des_ofb);
static const EVP_CIPHER des_ecb = {
.nid = NID_des_ecb,
@ -304,6 +307,7 @@ EVP_des_ecb(void)
{
return &des_ecb;
}
LCRYPTO_ALIAS(EVP_des_ecb);
static const EVP_CIPHER des_cfb1 = {
.nid = NID_des_cfb1,
@ -325,6 +329,7 @@ EVP_des_cfb1(void)
{
return &des_cfb1;
}
LCRYPTO_ALIAS(EVP_des_cfb1);
static const EVP_CIPHER des_cfb8 = {
.nid = NID_des_cfb8,
@ -346,4 +351,5 @@ EVP_des_cfb8(void)
{
return &des_cfb8;
}
LCRYPTO_ALIAS(EVP_des_cfb8);
#endif

14
lib/libcrypto/evp/e_des3.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_des3.c,v 1.29 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_des3.c,v 1.30 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -273,6 +273,7 @@ EVP_des_ede_cbc(void)
{
return &des_ede_cbc;
}
LCRYPTO_ALIAS(EVP_des_ede_cbc);
static const EVP_CIPHER des_ede_cfb64 = {
.nid = NID_des_ede_cfb64,
@ -294,6 +295,7 @@ EVP_des_ede_cfb64(void)
{
return &des_ede_cfb64;
}
LCRYPTO_ALIAS(EVP_des_ede_cfb64);
static const EVP_CIPHER des_ede_ofb = {
.nid = NID_des_ede_ofb64,
@ -315,6 +317,7 @@ EVP_des_ede_ofb(void)
{
return &des_ede_ofb;
}
LCRYPTO_ALIAS(EVP_des_ede_ofb);
static const EVP_CIPHER des_ede_ecb = {
.nid = NID_des_ede_ecb,
@ -336,6 +339,7 @@ EVP_des_ede_ecb(void)
{
return &des_ede_ecb;
}
LCRYPTO_ALIAS(EVP_des_ede_ecb);
#define des_ede3_cfb64_cipher des_ede_cfb64_cipher
@ -363,6 +367,7 @@ EVP_des_ede3_cbc(void)
{
return &des_ede3_cbc;
}
LCRYPTO_ALIAS(EVP_des_ede3_cbc);
static const EVP_CIPHER des_ede3_cfb64 = {
.nid = NID_des_ede3_cfb64,
@ -384,6 +389,7 @@ EVP_des_ede3_cfb64(void)
{
return &des_ede3_cfb64;
}
LCRYPTO_ALIAS(EVP_des_ede3_cfb64);
static const EVP_CIPHER des_ede3_ofb = {
.nid = NID_des_ede3_ofb64,
@ -405,6 +411,7 @@ EVP_des_ede3_ofb(void)
{
return &des_ede3_ofb;
}
LCRYPTO_ALIAS(EVP_des_ede3_ofb);
static const EVP_CIPHER des_ede3_ecb = {
.nid = NID_des_ede3_ecb,
@ -426,6 +433,7 @@ EVP_des_ede3_ecb(void)
{
return &des_ede3_ecb;
}
LCRYPTO_ALIAS(EVP_des_ede3_ecb);
static const EVP_CIPHER des_ede3_cfb1 = {
@ -448,6 +456,7 @@ EVP_des_ede3_cfb1(void)
{
return &des_ede3_cfb1;
}
LCRYPTO_ALIAS(EVP_des_ede3_cfb1);
static const EVP_CIPHER des_ede3_cfb8 = {
@ -470,16 +479,19 @@ EVP_des_ede3_cfb8(void)
{
return &des_ede3_cfb8;
}
LCRYPTO_ALIAS(EVP_des_ede3_cfb8);
const EVP_CIPHER *
EVP_des_ede(void)
{
return &des_ede_ecb;
}
LCRYPTO_ALIAS(EVP_des_ede);
const EVP_CIPHER *
EVP_des_ede3(void)
{
return &des_ede3_ecb;
}
LCRYPTO_ALIAS(EVP_des_ede3);
#endif

6
lib/libcrypto/evp/e_idea.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_idea.c,v 1.21 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_idea.c,v 1.22 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -196,6 +196,7 @@ EVP_idea_cbc(void)
{
return &idea_cbc;
}
LCRYPTO_ALIAS(EVP_idea_cbc);
static const EVP_CIPHER idea_cfb64 = {
.nid = NID_idea_cfb64,
@ -217,6 +218,7 @@ EVP_idea_cfb64(void)
{
return &idea_cfb64;
}
LCRYPTO_ALIAS(EVP_idea_cfb64);
static const EVP_CIPHER idea_ofb = {
.nid = NID_idea_ofb64,
@ -238,6 +240,7 @@ EVP_idea_ofb(void)
{
return &idea_ofb;
}
LCRYPTO_ALIAS(EVP_idea_ofb);
static const EVP_CIPHER idea_ecb = {
.nid = NID_idea_ecb,
@ -259,4 +262,5 @@ EVP_idea_ecb(void)
{
return &idea_ecb;
}
LCRYPTO_ALIAS(EVP_idea_ecb);
#endif

3
lib/libcrypto/evp/e_null.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_null.c,v 1.20 2024/01/07 15:42:57 tb Exp $ */
/* $OpenBSD: e_null.c,v 1.21 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -89,6 +89,7 @@ EVP_enc_null(void)
{
return (&n_cipher);
}
LCRYPTO_ALIAS(EVP_enc_null);
static int
null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

8
lib/libcrypto/evp/e_rc2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_rc2.c,v 1.28 2024/03/26 06:58:21 tb Exp $ */
/* $OpenBSD: e_rc2.c,v 1.29 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -179,6 +179,7 @@ EVP_rc2_cbc(void)
{
return &rc2_cbc;
}
LCRYPTO_ALIAS(EVP_rc2_cbc);
static const EVP_CIPHER rc2_cfb64 = {
.nid = NID_rc2_cfb64,
@ -200,6 +201,7 @@ EVP_rc2_cfb64(void)
{
return &rc2_cfb64;
}
LCRYPTO_ALIAS(EVP_rc2_cfb64);
static const EVP_CIPHER rc2_ofb = {
.nid = NID_rc2_ofb64,
@ -221,6 +223,7 @@ EVP_rc2_ofb(void)
{
return &rc2_ofb;
}
LCRYPTO_ALIAS(EVP_rc2_ofb);
static const EVP_CIPHER rc2_ecb = {
.nid = NID_rc2_ecb,
@ -242,6 +245,7 @@ EVP_rc2_ecb(void)
{
return &rc2_ecb;
}
LCRYPTO_ALIAS(EVP_rc2_ecb);
#define RC2_40_MAGIC 0xa0
#define RC2_64_MAGIC 0x78
@ -282,12 +286,14 @@ EVP_rc2_64_cbc(void)
{
return (&r2_64_cbc_cipher);
}
LCRYPTO_ALIAS(EVP_rc2_64_cbc);
const EVP_CIPHER *
EVP_rc2_40_cbc(void)
{
return (&r2_40_cbc_cipher);
}
LCRYPTO_ALIAS(EVP_rc2_40_cbc);
static int
rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

4
lib/libcrypto/evp/e_rc4.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_rc4.c,v 1.19 2024/01/07 15:42:57 tb Exp $ */
/* $OpenBSD: e_rc4.c,v 1.20 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -117,12 +117,14 @@ EVP_rc4(void)
{
return (&r4_cipher);
}
LCRYPTO_ALIAS(EVP_rc4);
const EVP_CIPHER *
EVP_rc4_40(void)
{
return (&r4_40_cipher);
}
LCRYPTO_ALIAS(EVP_rc4_40);
static int
rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

7
lib/libcrypto/evp/e_sm4.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_sm4.c,v 1.12 2024/01/04 17:38:36 tb Exp $ */
/* $OpenBSD: e_sm4.c,v 1.13 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2017, 2019 Ribose Inc
*
@ -164,6 +164,7 @@ EVP_sm4_cbc(void)
{
return &sm4_cbc;
}
LCRYPTO_ALIAS(EVP_sm4_cbc);
static const EVP_CIPHER sm4_cfb128 = {
.nid = NID_sm4_cfb128,
@ -185,6 +186,7 @@ EVP_sm4_cfb128(void)
{
return &sm4_cfb128;
}
LCRYPTO_ALIAS(EVP_sm4_cfb128);
static const EVP_CIPHER sm4_ofb = {
.nid = NID_sm4_ofb128,
@ -206,6 +208,7 @@ EVP_sm4_ofb(void)
{
return &sm4_ofb;
}
LCRYPTO_ALIAS(EVP_sm4_ofb);
static const EVP_CIPHER sm4_ecb = {
.nid = NID_sm4_ecb,
@ -227,6 +230,7 @@ EVP_sm4_ecb(void)
{
return &sm4_ecb;
}
LCRYPTO_ALIAS(EVP_sm4_ecb);
static int
sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
@ -259,4 +263,5 @@ EVP_sm4_ctr(void)
{
return &sm4_ctr_mode;
}
LCRYPTO_ALIAS(EVP_sm4_ctr);
#endif

3
lib/libcrypto/evp/e_xcbc_d.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: e_xcbc_d.c,v 1.17 2024/01/07 15:42:57 tb Exp $ */
/* $OpenBSD: e_xcbc_d.c,v 1.18 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -103,6 +103,7 @@ EVP_desx_cbc(void)
{
return (&d_xcbc_cipher);
}
LCRYPTO_ALIAS(EVP_desx_cbc);
static int
desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

12
lib/libcrypto/evp/evp.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp.h,v 1.132 2024/03/02 10:21:12 tb Exp $ */
/* $OpenBSD: evp.h,v 1.133 2024/04/10 15:00:38 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -442,9 +442,7 @@ int EVP_Cipher(EVP_CIPHER_CTX *c, unsigned char *out, const unsigned char *in,
EVP_MD_CTX *EVP_MD_CTX_new(void);
void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
#ifndef LIBRESSL_INTERNAL
int EVP_MD_CTX_init(EVP_MD_CTX *ctx);
#endif
int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);
EVP_MD_CTX *EVP_MD_CTX_create(void);
void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
@ -486,9 +484,7 @@ int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
const unsigned char *in, int inl);
int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
#ifndef LIBRESSL_INTERNAL
int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
#endif
int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
const unsigned char *key, const unsigned char *iv);
@ -497,9 +493,7 @@ int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
const unsigned char *in, int inl);
int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
#ifndef LIBRESSL_INTERNAL
int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
#endif
int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
const unsigned char *key, const unsigned char *iv, int enc);
@ -508,9 +502,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
const unsigned char *in, int inl);
int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
#ifndef LIBRESSL_INTERNAL
int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
#endif
int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s,
EVP_PKEY *pkey);
@ -556,9 +548,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl);
int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
#ifndef LIBRESSL_INTERNAL
int EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
#endif
int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a);

12
lib/libcrypto/evp/evp_aead.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_aead.c,v 1.10 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: evp_aead.c,v 1.11 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2014, Google Inc.
*
@ -28,24 +28,28 @@ EVP_AEAD_key_length(const EVP_AEAD *aead)
{
return aead->key_len;
}
LCRYPTO_ALIAS(EVP_AEAD_key_length);
size_t
EVP_AEAD_nonce_length(const EVP_AEAD *aead)
{
return aead->nonce_len;
}
LCRYPTO_ALIAS(EVP_AEAD_nonce_length);
size_t
EVP_AEAD_max_overhead(const EVP_AEAD *aead)
{
return aead->overhead;
}
LCRYPTO_ALIAS(EVP_AEAD_max_overhead);
size_t
EVP_AEAD_max_tag_len(const EVP_AEAD *aead)
{
return aead->max_tag_len;
}
LCRYPTO_ALIAS(EVP_AEAD_max_tag_len);
int
EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead,
@ -58,6 +62,7 @@ EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead,
}
return aead->init(ctx, key, key_len, tag_len);
}
LCRYPTO_ALIAS(EVP_AEAD_CTX_init);
void
EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx)
@ -67,12 +72,14 @@ EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx)
ctx->aead->cleanup(ctx);
ctx->aead = NULL;
}
LCRYPTO_ALIAS(EVP_AEAD_CTX_cleanup);
EVP_AEAD_CTX *
EVP_AEAD_CTX_new(void)
{
return calloc(1, sizeof(EVP_AEAD_CTX));
}
LCRYPTO_ALIAS(EVP_AEAD_CTX_new);
void
EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx)
@ -83,6 +90,7 @@ EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx)
EVP_AEAD_CTX_cleanup(ctx);
free(ctx);
}
LCRYPTO_ALIAS(EVP_AEAD_CTX_free);
/* check_alias returns 0 if out points within the buffer determined by in
* and in_len and 1 otherwise.
@ -133,6 +141,7 @@ error:
*out_len = 0;
return 0;
}
LCRYPTO_ALIAS(EVP_AEAD_CTX_seal);
int
EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out, size_t *out_len,
@ -158,3 +167,4 @@ error:
*out_len = 0;
return 0;
}
LCRYPTO_ALIAS(EVP_AEAD_CTX_open);

63
lib/libcrypto/evp/evp_cipher.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_cipher.c,v 1.21 2024/03/02 09:55:30 tb Exp $ */
/* $OpenBSD: evp_cipher.c,v 1.23 2024/04/10 15:00:38 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -127,6 +127,7 @@ EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
{
return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc);
}
LCRYPTO_ALIAS(EVP_CipherInit);
int
EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *engine,
@ -242,6 +243,7 @@ EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *engine,
return 1;
}
LCRYPTO_ALIAS(EVP_CipherInit_ex);
int
EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len,
@ -252,6 +254,7 @@ EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len,
return EVP_DecryptUpdate(ctx, out, out_len, in, in_len);
}
LCRYPTO_ALIAS(EVP_CipherUpdate);
int
EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
@ -261,6 +264,7 @@ EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
return EVP_DecryptFinal_ex(ctx, out, out_len);
}
LCRYPTO_ALIAS(EVP_CipherFinal);
int
EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
@ -270,6 +274,7 @@ EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
return EVP_DecryptFinal_ex(ctx, out, out_len);
}
LCRYPTO_ALIAS(EVP_CipherFinal_ex);
int
EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
@ -277,6 +282,7 @@ EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
{
return EVP_CipherInit(ctx, cipher, key, iv, 1);
}
LCRYPTO_ALIAS(EVP_EncryptInit);
int
EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *engine,
@ -284,6 +290,7 @@ EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *engine
{
return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 1);
}
LCRYPTO_ALIAS(EVP_EncryptInit_ex);
/*
* EVP_Cipher() is an implementation detail of EVP_Cipher{Update,Final}().
@ -303,6 +310,7 @@ EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
{
return ctx->cipher->do_cipher(ctx, out, in, in_len);
}
LCRYPTO_ALIAS(EVP_Cipher);
static int
evp_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len,
@ -413,12 +421,14 @@ EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len,
return 1;
}
LCRYPTO_ALIAS(EVP_EncryptUpdate);
int
EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
{
return EVP_EncryptFinal_ex(ctx, out, out_len);
}
LCRYPTO_ALIAS(EVP_EncryptFinal);
int
EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
@ -453,6 +463,7 @@ EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
return evp_cipher(ctx, out, out_len, ctx->buf, block_size);
}
LCRYPTO_ALIAS(EVP_EncryptFinal_ex);
int
EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
@ -460,6 +471,7 @@ EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
{
return EVP_CipherInit(ctx, cipher, key, iv, 0);
}
LCRYPTO_ALIAS(EVP_DecryptInit);
int
EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *engine,
@ -467,6 +479,7 @@ EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *engine
{
return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 0);
}
LCRYPTO_ALIAS(EVP_DecryptInit_ex);
int
EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len,
@ -536,12 +549,14 @@ EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len,
return 1;
}
LCRYPTO_ALIAS(EVP_DecryptUpdate);
int
EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
{
return EVP_DecryptFinal_ex(ctx, out, out_len);
}
LCRYPTO_ALIAS(EVP_DecryptFinal);
int
EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
@ -594,12 +609,14 @@ EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len)
return 1;
}
LCRYPTO_ALIAS(EVP_DecryptFinal_ex);
EVP_CIPHER_CTX *
EVP_CIPHER_CTX_new(void)
{
return calloc(1, sizeof(EVP_CIPHER_CTX));
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_new);
void
EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
@ -611,6 +628,7 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
free(ctx);
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_free);
void
EVP_CIPHER_CTX_legacy_clear(EVP_CIPHER_CTX *ctx)
@ -623,12 +641,14 @@ EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
{
return EVP_CIPHER_CTX_cleanup(ctx);
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_init);
int
EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx)
{
return EVP_CIPHER_CTX_cleanup(ctx);
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_reset);
int
EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *ctx)
@ -651,6 +671,7 @@ EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *ctx)
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_cleanup);
int
EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
@ -674,6 +695,7 @@ EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
}
return ret;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_ctrl);
int
EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key)
@ -683,6 +705,7 @@ EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key)
arc4random_buf(key, ctx->key_len);
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_rand_key);
int
EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
@ -722,6 +745,7 @@ EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_copy);
/*
* EVP_CIPHER_CTX accessors.
@ -732,12 +756,14 @@ EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx)
{
return ctx->cipher;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_cipher);
int
EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx)
{
return ctx->encrypt;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_encrypting);
int
EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len)
@ -757,6 +783,7 @@ EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len)
}
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_iv);
int
EVP_CIPHER_CTX_set_iv(EVP_CIPHER_CTX *ctx, const unsigned char *iv, size_t len)
@ -776,30 +803,35 @@ EVP_CIPHER_CTX_set_iv(EVP_CIPHER_CTX *ctx, const unsigned char *iv, size_t len)
}
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_iv);
unsigned char *
EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx)
{
return ctx->buf;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_buf_noconst);
void *
EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx)
{
return ctx->app_data;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_app_data);
void
EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data)
{
ctx->app_data = data;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_app_data);
int
EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
{
return ctx->key_len;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_key_length);
int
EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *ctx, int key_len)
@ -813,6 +845,7 @@ EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *ctx, int key_len)
EVPerror(EVP_R_INVALID_KEY_LENGTH);
return 0;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_key_length);
int
EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad)
@ -823,30 +856,35 @@ EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad)
ctx->flags |= EVP_CIPH_NO_PADDING;
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_padding);
void
EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags)
{
ctx->flags |= flags;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_flags);
void
EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags)
{
ctx->flags &= ~flags;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_clear_flags);
int
EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags)
{
return (ctx->flags & flags);
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_test_flags);
void *
EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx)
{
return ctx->cipher_data;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_get_cipher_data);
void *
EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data)
@ -858,6 +896,7 @@ EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data)
return old_cipher_data;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_set_cipher_data);
/*
* EVP_CIPHER_CTX getters that reach into the cipher attached to the context.
@ -868,12 +907,14 @@ EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx)
{
return ctx->cipher->nid;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_nid);
int
EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx)
{
return ctx->cipher->block_size;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_block_size);
int
EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
@ -893,12 +934,14 @@ EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
return iv_length;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_iv_length);
unsigned long
EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx)
{
return ctx->cipher->flags;
}
LCRYPTO_ALIAS(EVP_CIPHER_CTX_flags);
/*
* Used by CMS and its predecessors. Only GOST and RC2 have a custom method.
@ -1020,6 +1063,7 @@ EVP_CIPHER_type(const EVP_CIPHER *cipher)
return nid;
}
}
LCRYPTO_ALIAS(EVP_CIPHER_type);
/*
* Accessors. First the trivial getters, then the setters for the method API.
@ -1030,30 +1074,35 @@ EVP_CIPHER_nid(const EVP_CIPHER *cipher)
{
return cipher->nid;
}
LCRYPTO_ALIAS(EVP_CIPHER_nid);
int
EVP_CIPHER_block_size(const EVP_CIPHER *cipher)
{
return cipher->block_size;
}
LCRYPTO_ALIAS(EVP_CIPHER_block_size);
int
EVP_CIPHER_key_length(const EVP_CIPHER *cipher)
{
return cipher->key_len;
}
LCRYPTO_ALIAS(EVP_CIPHER_key_length);
int
EVP_CIPHER_iv_length(const EVP_CIPHER *cipher)
{
return cipher->iv_len;
}
LCRYPTO_ALIAS(EVP_CIPHER_iv_length);
unsigned long
EVP_CIPHER_flags(const EVP_CIPHER *cipher)
{
return cipher->flags;
}
LCRYPTO_ALIAS(EVP_CIPHER_flags);
EVP_CIPHER *
EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)
@ -1076,6 +1125,7 @@ EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)
return cipher;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_new);
EVP_CIPHER *
EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
@ -1089,12 +1139,14 @@ EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
return copy;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_dup);
void
EVP_CIPHER_meth_free(EVP_CIPHER *cipher)
{
free(cipher);
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_free);
int
EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len)
@ -1103,6 +1155,7 @@ EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len)
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_iv_length);
int
EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags)
@ -1111,6 +1164,7 @@ EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags)
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_flags);
int
EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
@ -1119,6 +1173,7 @@ EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_impl_ctx_size);
int
EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
@ -1129,6 +1184,7 @@ EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_init);
int
EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
@ -1139,6 +1195,7 @@ EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_do_cipher);
int
EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
@ -1148,6 +1205,7 @@ EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_cleanup);
int
EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
@ -1157,6 +1215,7 @@ EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_set_asn1_params);
int
EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
@ -1166,6 +1225,7 @@ EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_get_asn1_params);
int
EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
@ -1175,3 +1235,4 @@ EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
return 1;
}
LCRYPTO_ALIAS(EVP_CIPHER_meth_set_ctrl);

30
lib/libcrypto/evp/evp_digest.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_digest.c,v 1.12 2024/03/02 09:59:56 tb Exp $ */
/* $OpenBSD: evp_digest.c,v 1.14 2024/04/10 15:00:38 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -126,6 +126,7 @@ EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type)
EVP_MD_CTX_legacy_clear(ctx);
return EVP_DigestInit_ex(ctx, type, NULL);
}
LCRYPTO_ALIAS(EVP_DigestInit);
int
EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
@ -161,12 +162,14 @@ EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
return 1;
return ctx->digest->init(ctx);
}
LCRYPTO_ALIAS(EVP_DigestInit_ex);
int
EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
{
return ctx->update(ctx, data, count);
}
LCRYPTO_ALIAS(EVP_DigestUpdate);
/* The caller can assume that this removes any secret data from the context */
int
@ -178,6 +181,7 @@ EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
EVP_MD_CTX_cleanup(ctx);
return ret;
}
LCRYPTO_ALIAS(EVP_DigestFinal);
/* The caller can assume that this removes any secret data from the context */
int
@ -199,6 +203,7 @@ EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
memset(ctx->md_data, 0, ctx->digest->ctx_size);
return ret;
}
LCRYPTO_ALIAS(EVP_DigestFinal_ex);
int
EVP_Digest(const void *data, size_t count,
@ -216,12 +221,14 @@ EVP_Digest(const void *data, size_t count,
return ret;
}
LCRYPTO_ALIAS(EVP_Digest);
EVP_MD_CTX *
EVP_MD_CTX_new(void)
{
return calloc(1, sizeof(EVP_MD_CTX));
}
LCRYPTO_ALIAS(EVP_MD_CTX_new);
void
EVP_MD_CTX_free(EVP_MD_CTX *ctx)
@ -233,18 +240,21 @@ EVP_MD_CTX_free(EVP_MD_CTX *ctx)
free(ctx);
}
LCRYPTO_ALIAS(EVP_MD_CTX_free);
EVP_MD_CTX *
EVP_MD_CTX_create(void)
{
return EVP_MD_CTX_new();
}
LCRYPTO_ALIAS(EVP_MD_CTX_create);
void
EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
{
EVP_MD_CTX_free(ctx);
}
LCRYPTO_ALIAS(EVP_MD_CTX_destroy);
void
EVP_MD_CTX_legacy_clear(EVP_MD_CTX *ctx)
@ -257,12 +267,14 @@ EVP_MD_CTX_init(EVP_MD_CTX *ctx)
{
return EVP_MD_CTX_cleanup(ctx);
}
LCRYPTO_ALIAS(EVP_MD_CTX_init);
int
EVP_MD_CTX_reset(EVP_MD_CTX *ctx)
{
return EVP_MD_CTX_cleanup(ctx);
}
LCRYPTO_ALIAS(EVP_MD_CTX_reset);
int
EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
@ -290,6 +302,7 @@ EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
return 1;
}
LCRYPTO_ALIAS(EVP_MD_CTX_cleanup);
int
EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in)
@ -297,6 +310,7 @@ EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in)
EVP_MD_CTX_legacy_clear(out);
return EVP_MD_CTX_copy_ex(out, in);
}
LCRYPTO_ALIAS(EVP_MD_CTX_copy);
int
EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
@ -352,6 +366,7 @@ EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
return 1;
}
LCRYPTO_ALIAS(EVP_MD_CTX_copy_ex);
int
EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
@ -375,6 +390,7 @@ EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
}
return ret;
}
LCRYPTO_ALIAS(EVP_MD_CTX_ctrl);
const EVP_MD *
EVP_MD_CTX_md(const EVP_MD_CTX *ctx)
@ -383,36 +399,42 @@ EVP_MD_CTX_md(const EVP_MD_CTX *ctx)
return NULL;
return ctx->digest;
}
LCRYPTO_ALIAS(EVP_MD_CTX_md);
void
EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags)
{
ctx->flags &= ~flags;
}
LCRYPTO_ALIAS(EVP_MD_CTX_clear_flags);
void
EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags)
{
ctx->flags |= flags;
}
LCRYPTO_ALIAS(EVP_MD_CTX_set_flags);
int
EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags)
{
return (ctx->flags & flags);
}
LCRYPTO_ALIAS(EVP_MD_CTX_test_flags);
void *
EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx)
{
return ctx->md_data;
}
LCRYPTO_ALIAS(EVP_MD_CTX_md_data);
EVP_PKEY_CTX *
EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx)
{
return ctx->pctx;
}
LCRYPTO_ALIAS(EVP_MD_CTX_pkey_ctx);
void
EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx)
@ -436,18 +458,21 @@ EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx)
EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
}
}
LCRYPTO_ALIAS(EVP_MD_CTX_set_pkey_ctx);
int
EVP_MD_type(const EVP_MD *md)
{
return md->type;
}
LCRYPTO_ALIAS(EVP_MD_type);
int
EVP_MD_pkey_type(const EVP_MD *md)
{
return md->pkey_type;
}
LCRYPTO_ALIAS(EVP_MD_pkey_type);
int
EVP_MD_size(const EVP_MD *md)
@ -458,15 +483,18 @@ EVP_MD_size(const EVP_MD *md)
}
return md->md_size;
}
LCRYPTO_ALIAS(EVP_MD_size);
unsigned long
EVP_MD_flags(const EVP_MD *md)
{
return md->flags;
}
LCRYPTO_ALIAS(EVP_MD_flags);
int
EVP_MD_block_size(const EVP_MD *md)
{
return md->block_size;
}
LCRYPTO_ALIAS(EVP_MD_block_size);

12
lib/libcrypto/evp/evp_encode.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_encode.c,v 1.2 2023/12/29 10:31:50 tb Exp $ */
/* $OpenBSD: evp_encode.c,v 1.3 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -128,12 +128,14 @@ EVP_ENCODE_CTX_new(void)
{
return calloc(1, sizeof(EVP_ENCODE_CTX));
}
LCRYPTO_ALIAS(EVP_ENCODE_CTX_new);
void
EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx)
{
free(ctx);
}
LCRYPTO_ALIAS(EVP_ENCODE_CTX_free);
void
EVP_EncodeInit(EVP_ENCODE_CTX *ctx)
@ -142,6 +144,7 @@ EVP_EncodeInit(EVP_ENCODE_CTX *ctx)
ctx->num = 0;
ctx->line_num = 0;
}
LCRYPTO_ALIAS(EVP_EncodeInit);
int
EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
@ -192,6 +195,7 @@ EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
return 1;
}
LCRYPTO_ALIAS(EVP_EncodeUpdate);
void
EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
@ -206,6 +210,7 @@ EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
}
*outl = ret;
}
LCRYPTO_ALIAS(EVP_EncodeFinal);
int
EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen)
@ -238,6 +243,7 @@ EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen)
*t = '\0';
return (ret);
}
LCRYPTO_ALIAS(EVP_EncodeBlock);
void
EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
@ -247,6 +253,7 @@ EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
ctx->line_num = 0;
ctx->expect_nl = 0;
}
LCRYPTO_ALIAS(EVP_DecodeInit);
int
EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
@ -355,6 +362,7 @@ EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
ctx->num = n;
return (rv);
}
LCRYPTO_ALIAS(EVP_DecodeUpdate);
int
EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n)
@ -395,6 +403,7 @@ EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n)
}
return (ret);
}
LCRYPTO_ALIAS(EVP_DecodeBlock);
int
EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
@ -412,3 +421,4 @@ EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
} else
return (1);
}
LCRYPTO_ALIAS(EVP_DecodeFinal);

3
lib/libcrypto/evp/evp_err.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_err.c,v 1.32 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: evp_err.c,v 1.33 2024/04/09 13:52:41 beck Exp $ */
/* ====================================================================
* Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved.
*
@ -164,3 +164,4 @@ ERR_load_EVP_strings(void)
}
#endif
}
LCRYPTO_ALIAS(ERR_load_EVP_strings);

7
lib/libcrypto/evp/evp_key.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_key.c,v 1.35 2024/03/25 10:58:06 joshua Exp $ */
/* $OpenBSD: evp_key.c,v 1.36 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -78,6 +78,7 @@ EVP_set_pw_prompt(const char *prompt)
else
strlcpy(prompt_string, prompt, sizeof(prompt_string));
}
LCRYPTO_ALIAS(EVP_set_pw_prompt);
char *
EVP_get_pw_prompt(void)
@ -87,12 +88,14 @@ EVP_get_pw_prompt(void)
return prompt_string;
}
LCRYPTO_ALIAS(EVP_get_pw_prompt);
int
EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
{
return EVP_read_pw_string_min(buf, 0, len, prompt, verify);
}
LCRYPTO_ALIAS(EVP_read_pw_string);
int
EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
@ -129,6 +132,7 @@ EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
return ret;
}
LCRYPTO_ALIAS(EVP_read_pw_string_min);
int
EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
@ -216,3 +220,4 @@ err:
explicit_bzero(md_buf, sizeof md_buf);
return rv;
}
LCRYPTO_ALIAS(EVP_BytesToKey);

9
lib/libcrypto/evp/evp_names.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_names.c,v 1.15 2024/03/24 13:56:35 jca Exp $ */
/* $OpenBSD: evp_names.c,v 1.16 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
*
@ -1495,6 +1495,7 @@ EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *, const char *,
fn(evp_cipher, cipher->name, NULL, arg);
}
}
LCRYPTO_ALIAS(EVP_CIPHER_do_all_sorted);
void
EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *, const char *, const char *,
@ -1502,6 +1503,7 @@ EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *, const char *, const char *,
{
EVP_CIPHER_do_all_sorted(fn, arg);
}
LCRYPTO_ALIAS(EVP_CIPHER_do_all);
void
EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *, const char *, const char *,
@ -1525,6 +1527,7 @@ EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *, const char *, const char *,
fn(evp_md, digest->name, NULL, arg);
}
}
LCRYPTO_ALIAS(EVP_MD_do_all_sorted);
void
EVP_MD_do_all(void (*fn)(const EVP_MD *, const char *, const char *, void *),
@ -1532,6 +1535,7 @@ EVP_MD_do_all(void (*fn)(const EVP_MD *, const char *, const char *, void *),
{
EVP_MD_do_all_sorted(fn, arg);
}
LCRYPTO_ALIAS(EVP_MD_do_all);
/*
* The OBJ_NAME API is completely misnamed. It has little to do with objects
@ -1652,6 +1656,7 @@ EVP_get_cipherbyname(const char *name)
return cipher->cipher();
}
LCRYPTO_ALIAS(EVP_get_cipherbyname);
static int
digest_cmp(const void *a, const void *b)
@ -1676,6 +1681,7 @@ EVP_get_digestbyname(const char *name)
return digest->digest();
}
LCRYPTO_ALIAS(EVP_get_digestbyname);
/*
* XXX - this is here because most of its job was to clean up the dynamic
@ -1687,3 +1693,4 @@ void
EVP_cleanup(void)
{
}
LCRYPTO_ALIAS(EVP_cleanup);

4
lib/libcrypto/evp/evp_pbe.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_pbe.c,v 1.49 2024/03/25 11:38:47 joshua Exp $ */
/* $OpenBSD: evp_pbe.c,v 1.50 2024/04/09 13:52:41 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@ -398,6 +398,7 @@ PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt,
HMAC_CTX_cleanup(&hctx_tpl);
return 1;
}
LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC);
int
PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt,
@ -406,6 +407,7 @@ PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt,
return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter,
EVP_sha1(), keylen, out);
}
LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC_SHA1);
/*
* Now the key derivation function itself. This is a bit evil because

13
lib/libcrypto/evp/evp_pkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: evp_pkey.c,v 1.27 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: evp_pkey.c,v 1.28 2024/04/09 13:55:02 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
@ -105,6 +105,7 @@ error:
EVP_PKEY_free(pkey);
return NULL;
}
LCRYPTO_ALIAS(EVP_PKCS82PKEY);
/* Turn a private key into a PKCS8 structure */
@ -138,6 +139,7 @@ error:
PKCS8_PRIV_KEY_INFO_free(p8);
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY2PKCS8);
/* EVP_PKEY attribute functions */
@ -146,12 +148,14 @@ EVP_PKEY_get_attr_count(const EVP_PKEY *key)
{
return X509at_get_attr_count(key->attributes);
}
LCRYPTO_ALIAS(EVP_PKEY_get_attr_count);
int
EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos)
{
return X509at_get_attr_by_NID(key->attributes, nid, lastpos);
}
LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_NID);
int
EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
@ -159,18 +163,21 @@ EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
{
return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);
}
LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_OBJ);
X509_ATTRIBUTE *
EVP_PKEY_get_attr(const EVP_PKEY *key, int loc)
{
return X509at_get_attr(key->attributes, loc);
}
LCRYPTO_ALIAS(EVP_PKEY_get_attr);
X509_ATTRIBUTE *
EVP_PKEY_delete_attr(EVP_PKEY *key, int loc)
{
return X509at_delete_attr(key->attributes, loc);
}
LCRYPTO_ALIAS(EVP_PKEY_delete_attr);
int
EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)
@ -179,6 +186,7 @@ EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)
return 1;
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_add1_attr);
int
EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type,
@ -188,6 +196,7 @@ EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type,
return 1;
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_OBJ);
int
EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type,
@ -197,6 +206,7 @@ EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type,
return 1;
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID);
int
EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type,
@ -207,3 +217,4 @@ EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type,
return 1;
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_txt);

3
lib/libcrypto/evp/m_md4.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_md4.c,v 1.21 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: m_md4.c,v 1.22 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -110,4 +110,5 @@ EVP_md4(void)
{
return (&md4_md);
}
LCRYPTO_ALIAS(EVP_md4);
#endif

3
lib/libcrypto/evp/m_md5.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_md5.c,v 1.20 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: m_md5.c,v 1.21 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -110,4 +110,5 @@ EVP_md5(void)
{
return (&md5_md);
}
LCRYPTO_ALIAS(EVP_md5);
#endif

3
lib/libcrypto/evp/m_md5_sha1.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_md5_sha1.c,v 1.8 2023/09/02 04:55:18 tb Exp $ */
/* $OpenBSD: m_md5_sha1.c,v 1.9 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
*
@ -87,3 +87,4 @@ EVP_md5_sha1(void)
{
return &md5_sha1_md;
}
LCRYPTO_ALIAS(EVP_md5_sha1);

3
lib/libcrypto/evp/m_null.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_null.c,v 1.14 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: m_null.c,v 1.15 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -101,3 +101,4 @@ EVP_md_null(void)
{
return (&null_md);
}
LCRYPTO_ALIAS(EVP_md_null);

3
lib/libcrypto/evp/m_ripemd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_ripemd.c,v 1.17 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: m_ripemd.c,v 1.18 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -110,4 +110,5 @@ EVP_ripemd160(void)
{
return (&ripemd160_md);
}
LCRYPTO_ALIAS(EVP_ripemd160);
#endif

9
lib/libcrypto/evp/m_sha1.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_sha1.c,v 1.25 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: m_sha1.c,v 1.26 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -110,6 +110,7 @@ EVP_sha1(void)
{
return &sha1_md;
}
LCRYPTO_ALIAS(EVP_sha1);
#endif
#ifndef OPENSSL_NO_SHA256
@ -155,6 +156,7 @@ EVP_sha224(void)
{
return &sha224_md;
}
LCRYPTO_ALIAS(EVP_sha224);
static int
sha256_init(EVP_MD_CTX *ctx)
@ -193,6 +195,7 @@ EVP_sha256(void)
{
return &sha256_md;
}
LCRYPTO_ALIAS(EVP_sha256);
#endif /* ifndef OPENSSL_NO_SHA256 */
#ifndef OPENSSL_NO_SHA512
@ -234,6 +237,7 @@ EVP_sha384(void)
{
return &sha384_md;
}
LCRYPTO_ALIAS(EVP_sha384);
static int
sha512_init(EVP_MD_CTX *ctx)
@ -272,6 +276,7 @@ EVP_sha512(void)
{
return &sha512_md;
}
LCRYPTO_ALIAS(EVP_sha512);
static int
sha512_224_init(EVP_MD_CTX *ctx)
@ -310,6 +315,7 @@ EVP_sha512_224(void)
{
return &sha512_224_md;
}
LCRYPTO_ALIAS(EVP_sha512_224);
static int
sha512_256_init(EVP_MD_CTX *ctx)
@ -348,4 +354,5 @@ EVP_sha512_256(void)
{
return &sha512_256_md;
}
LCRYPTO_ALIAS(EVP_sha512_256);
#endif /* ifndef OPENSSL_NO_SHA512 */

6
lib/libcrypto/evp/m_sha3.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_sha3.c,v 1.3 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: m_sha3.c,v 1.4 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2023 Joel Sing <jsing@openbsd.org>
*
@ -57,6 +57,7 @@ EVP_sha3_224(void)
{
return &sha3_224_md;
}
LCRYPTO_ALIAS(EVP_sha3_224);
static int
sha3_256_init(EVP_MD_CTX *ctx)
@ -95,6 +96,7 @@ EVP_sha3_256(void)
{
return &sha3_256_md;
}
LCRYPTO_ALIAS(EVP_sha3_256);
static int
sha3_384_init(EVP_MD_CTX *ctx)
@ -133,6 +135,7 @@ EVP_sha3_384(void)
{
return &sha3_384_md;
}
LCRYPTO_ALIAS(EVP_sha3_384);
static int
sha3_512_init(EVP_MD_CTX *ctx)
@ -171,3 +174,4 @@ EVP_sha3_512(void)
{
return &sha3_512_md;
}
LCRYPTO_ALIAS(EVP_sha3_512);

8
lib/libcrypto/evp/m_sigver.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_sigver.c,v 1.26 2024/03/27 07:36:59 tb Exp $ */
/* $OpenBSD: m_sigver.c,v 1.27 2024/04/09 13:52:41 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@ -128,6 +128,7 @@ EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
{
return do_sigver_init(ctx, pctx, type, pkey, 0);
}
LCRYPTO_ALIAS(EVP_DigestSignInit);
int
EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
@ -135,6 +136,7 @@ EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
{
return do_sigver_init(ctx, pctx, type, pkey, 1);
}
LCRYPTO_ALIAS(EVP_DigestVerifyInit);
static int
evp_digestsignfinal_sigctx_custom(EVP_MD_CTX *ctx, unsigned char *sigret,
@ -215,6 +217,7 @@ EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
return ret;
}
LCRYPTO_ALIAS(EVP_DigestSignFinal);
int
EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
@ -231,6 +234,7 @@ EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
return EVP_DigestSignFinal(ctx, sigret, siglen);
}
LCRYPTO_ALIAS(EVP_DigestSign);
int
EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig, size_t siglen)
@ -249,6 +253,7 @@ EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig, size_t siglen)
return r;
return EVP_PKEY_verify(ctx->pctx, sig, siglen, md, mdlen);
}
LCRYPTO_ALIAS(EVP_DigestVerifyFinal);
int
EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, size_t siglen,
@ -263,3 +268,4 @@ EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, size_t siglen,
return EVP_DigestVerifyFinal(ctx, sigret, siglen);
}
LCRYPTO_ALIAS(EVP_DigestVerify);

3
lib/libcrypto/evp/m_sm3.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_sm3.c,v 1.6 2023/07/07 19:37:53 beck Exp $ */
/* $OpenBSD: m_sm3.c,v 1.7 2024/04/09 13:52:41 beck Exp $ */
/*
* Copyright (c) 2018, Ribose Inc
*
@ -64,5 +64,6 @@ EVP_sm3(void)
{
return &sm3_md;
}
LCRYPTO_ALIAS(EVP_sm3);
#endif /* OPENSSL_NO_SM3 */

3
lib/libcrypto/evp/m_wp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: m_wp.c,v 1.13 2023/07/07 19:37:54 beck Exp $ */
/* $OpenBSD: m_wp.c,v 1.14 2024/04/09 13:52:41 beck Exp $ */
#include <stdio.h>
@ -50,4 +50,5 @@ EVP_whirlpool(void)
{
return (&whirlpool_md);
}
LCRYPTO_ALIAS(EVP_whirlpool);
#endif

8
lib/libcrypto/evp/p_legacy.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: p_legacy.c,v 1.5 2024/03/28 01:42:02 tb Exp $ */
/* $OpenBSD: p_legacy.c,v 1.6 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -77,6 +77,7 @@ EVP_PKEY_decrypt_old(unsigned char *to, const unsigned char *from, int from_len,
return RSA_private_decrypt(from_len, from, to, pkey->pkey.rsa,
RSA_PKCS1_PADDING);
}
LCRYPTO_ALIAS(EVP_PKEY_decrypt_old);
int
EVP_PKEY_encrypt_old(unsigned char *to, const unsigned char *from, int from_len,
@ -90,6 +91,7 @@ EVP_PKEY_encrypt_old(unsigned char *to, const unsigned char *from, int from_len,
return RSA_public_encrypt(from_len, from, to, pkey->pkey.rsa,
RSA_PKCS1_PADDING);
}
LCRYPTO_ALIAS(EVP_PKEY_encrypt_old);
int
EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
@ -135,6 +137,7 @@ err:
freezero(key, size);
return (ret);
}
LCRYPTO_ALIAS(EVP_OpenInit);
int
EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@ -146,6 +149,7 @@ EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL);
return (i);
}
LCRYPTO_ALIAS(EVP_OpenFinal);
int
EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek,
@ -181,6 +185,7 @@ EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek,
}
return (npubk);
}
LCRYPTO_ALIAS(EVP_SealInit);
int
EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@ -192,3 +197,4 @@ EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
i = EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL);
return i;
}
LCRYPTO_ALIAS(EVP_SealFinal);

48
lib/libcrypto/evp/p_lib.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: p_lib.c,v 1.59 2024/03/02 11:17:27 tb Exp $ */
/* $OpenBSD: p_lib.c,v 1.60 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -170,6 +170,7 @@ EVP_PKEY_asn1_get_count(void)
{
return N_ASN1_METHODS;
}
LCRYPTO_ALIAS(EVP_PKEY_asn1_get_count);
const EVP_PKEY_ASN1_METHOD *
EVP_PKEY_asn1_get0(int idx)
@ -179,6 +180,7 @@ EVP_PKEY_asn1_get0(int idx)
return asn1_methods[idx];
}
LCRYPTO_ALIAS(EVP_PKEY_asn1_get0);
const EVP_PKEY_ASN1_METHOD *
EVP_PKEY_asn1_find(ENGINE **engine, int pkey_id)
@ -195,6 +197,7 @@ EVP_PKEY_asn1_find(ENGINE **engine, int pkey_id)
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_asn1_find);
const EVP_PKEY_ASN1_METHOD *
EVP_PKEY_asn1_find_str(ENGINE **engine, const char *str, int len)
@ -224,6 +227,7 @@ EVP_PKEY_asn1_find_str(ENGINE **engine, const char *str, int len)
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_asn1_find_str);
int
EVP_PKEY_asn1_get0_info(int *pkey_id, int *pkey_base_id, int *pkey_flags,
@ -246,12 +250,14 @@ EVP_PKEY_asn1_get0_info(int *pkey_id, int *pkey_base_id, int *pkey_flags,
return 1;
}
LCRYPTO_ALIAS(EVP_PKEY_asn1_get0_info);
const EVP_PKEY_ASN1_METHOD*
EVP_PKEY_get0_asn1(const EVP_PKEY *pkey)
{
return pkey->ameth;
}
LCRYPTO_ALIAS(EVP_PKEY_get0_asn1);
int
EVP_PKEY_bits(const EVP_PKEY *pkey)
@ -260,6 +266,7 @@ EVP_PKEY_bits(const EVP_PKEY *pkey)
return pkey->ameth->pkey_bits(pkey);
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_bits);
int
EVP_PKEY_security_bits(const EVP_PKEY *pkey)
@ -271,6 +278,7 @@ EVP_PKEY_security_bits(const EVP_PKEY *pkey)
return pkey->ameth->pkey_security_bits(pkey);
}
LCRYPTO_ALIAS(EVP_PKEY_security_bits);
int
EVP_PKEY_size(const EVP_PKEY *pkey)
@ -279,6 +287,7 @@ EVP_PKEY_size(const EVP_PKEY *pkey)
return pkey->ameth->pkey_size(pkey);
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_size);
int
EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
@ -303,6 +312,7 @@ EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
#endif
return (0);
}
LCRYPTO_ALIAS(EVP_PKEY_save_parameters);
int
EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
@ -322,6 +332,7 @@ EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
err:
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_copy_parameters);
int
EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
@ -330,6 +341,7 @@ EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
return pkey->ameth->param_missing(pkey);
return 0;
}
LCRYPTO_ALIAS(EVP_PKEY_missing_parameters);
int
EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
@ -340,6 +352,7 @@ EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
return a->ameth->param_cmp(a, b);
return -2;
}
LCRYPTO_ALIAS(EVP_PKEY_cmp_parameters);
int
EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
@ -362,6 +375,7 @@ EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
return -2;
}
LCRYPTO_ALIAS(EVP_PKEY_cmp);
EVP_PKEY *
EVP_PKEY_new(void)
@ -379,12 +393,14 @@ EVP_PKEY_new(void)
return pkey;
}
LCRYPTO_ALIAS(EVP_PKEY_new);
int
EVP_PKEY_up_ref(EVP_PKEY *pkey)
{
return CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY) > 1;
}
LCRYPTO_ALIAS(EVP_PKEY_up_ref);
static void
evp_pkey_free_pkey_ptr(EVP_PKEY *pkey)
@ -409,6 +425,7 @@ EVP_PKEY_free(EVP_PKEY *pkey)
sk_X509_ATTRIBUTE_pop_free(pkey->attributes, X509_ATTRIBUTE_free);
freezero(pkey, sizeof(*pkey));
}
LCRYPTO_ALIAS(EVP_PKEY_free);
int
EVP_PKEY_set_type(EVP_PKEY *pkey, int type)
@ -428,6 +445,7 @@ EVP_PKEY_set_type(EVP_PKEY *pkey, int type)
return 1;
}
LCRYPTO_ALIAS(EVP_PKEY_set_type);
int
EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
@ -447,6 +465,7 @@ EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
return 1;
}
LCRYPTO_ALIAS(EVP_PKEY_set_type_str);
int
EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
@ -456,6 +475,7 @@ EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
return (pkey->pkey.ptr = key) != NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_assign);
EVP_PKEY *
EVP_PKEY_new_raw_private_key(int type, ENGINE *engine,
@ -485,6 +505,7 @@ EVP_PKEY_new_raw_private_key(int type, ENGINE *engine,
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_new_raw_private_key);
EVP_PKEY *
EVP_PKEY_new_raw_public_key(int type, ENGINE *engine,
@ -514,6 +535,7 @@ EVP_PKEY_new_raw_public_key(int type, ENGINE *engine,
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_new_raw_public_key);
int
EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey,
@ -530,6 +552,7 @@ EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey,
return 1;
}
LCRYPTO_ALIAS(EVP_PKEY_get_raw_private_key);
int
EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey,
@ -546,6 +569,7 @@ EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey,
return 1;
}
LCRYPTO_ALIAS(EVP_PKEY_get_raw_public_key);
EVP_PKEY *
EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len,
@ -577,12 +601,14 @@ EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len,
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_new_CMAC_key);
void *
EVP_PKEY_get0(const EVP_PKEY *pkey)
{
return pkey->pkey.ptr;
}
LCRYPTO_ALIAS(EVP_PKEY_get0);
const unsigned char *
EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len)
@ -599,6 +625,7 @@ EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len)
return os->data;
}
LCRYPTO_ALIAS(EVP_PKEY_get0_hmac);
#ifndef OPENSSL_NO_RSA
RSA *
@ -610,6 +637,7 @@ EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
EVPerror(EVP_R_EXPECTING_AN_RSA_KEY);
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_get0_RSA);
RSA *
EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
@ -623,6 +651,7 @@ EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
return rsa;
}
LCRYPTO_ALIAS(EVP_PKEY_get1_RSA);
int
EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
@ -632,6 +661,7 @@ EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
RSA_up_ref(key);
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_set1_RSA);
#endif
#ifndef OPENSSL_NO_DSA
@ -644,6 +674,7 @@ EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
}
return pkey->pkey.dsa;
}
LCRYPTO_ALIAS(EVP_PKEY_get0_DSA);
DSA *
EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
@ -657,6 +688,7 @@ EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
return dsa;
}
LCRYPTO_ALIAS(EVP_PKEY_get1_DSA);
int
EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
@ -666,6 +698,7 @@ EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
DSA_up_ref(key);
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_set1_DSA);
#endif
#ifndef OPENSSL_NO_EC
@ -678,6 +711,7 @@ EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey)
}
return pkey->pkey.ec;
}
LCRYPTO_ALIAS(EVP_PKEY_get0_EC_KEY);
EC_KEY *
EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
@ -691,6 +725,7 @@ EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
return key;
}
LCRYPTO_ALIAS(EVP_PKEY_get1_EC_KEY);
int
EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key)
@ -700,6 +735,7 @@ EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key)
EC_KEY_up_ref(key);
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_set1_EC_KEY);
#endif
@ -713,6 +749,7 @@ EVP_PKEY_get0_DH(EVP_PKEY *pkey)
}
return pkey->pkey.dh;
}
LCRYPTO_ALIAS(EVP_PKEY_get0_DH);
DH *
EVP_PKEY_get1_DH(EVP_PKEY *pkey)
@ -726,6 +763,7 @@ EVP_PKEY_get1_DH(EVP_PKEY *pkey)
return dh;
}
LCRYPTO_ALIAS(EVP_PKEY_get1_DH);
int
EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
@ -735,6 +773,7 @@ EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
DH_up_ref(key);
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_set1_DH);
#endif
int
@ -747,18 +786,21 @@ EVP_PKEY_type(int type)
return NID_undef;
}
LCRYPTO_ALIAS(EVP_PKEY_type);
int
EVP_PKEY_id(const EVP_PKEY *pkey)
{
return pkey->type;
}
LCRYPTO_ALIAS(EVP_PKEY_id);
int
EVP_PKEY_base_id(const EVP_PKEY *pkey)
{
return EVP_PKEY_type(pkey->type);
}
LCRYPTO_ALIAS(EVP_PKEY_base_id);
static int
unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent, const char *kstr)
@ -779,6 +821,7 @@ EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey, int indent,
return unsup_alg(out, pkey, indent, "Public Key");
}
LCRYPTO_ALIAS(EVP_PKEY_print_public);
int
EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent,
@ -789,6 +832,7 @@ EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent,
return unsup_alg(out, pkey, indent, "Private Key");
}
LCRYPTO_ALIAS(EVP_PKEY_print_private);
int
EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent,
@ -798,6 +842,7 @@ EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey, int indent,
return pkey->ameth->param_print(out, pkey, indent, pctx);
return unsup_alg(out, pkey, indent, "Parameters");
}
LCRYPTO_ALIAS(EVP_PKEY_print_params);
int
EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid)
@ -807,3 +852,4 @@ EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid)
return pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_DEFAULT_MD_NID,
0, pnid);
}
LCRYPTO_ALIAS(EVP_PKEY_get_default_digest_nid);

3
lib/libcrypto/evp/p_sign.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: p_sign.c,v 1.21 2024/03/26 06:08:51 joshua Exp $ */
/* $OpenBSD: p_sign.c,v 1.22 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -104,3 +104,4 @@ EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
EVP_PKEY_CTX_free(pkctx);
return ret;
}
LCRYPTO_ALIAS(EVP_SignFinal);

3
lib/libcrypto/evp/p_verify.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: p_verify.c,v 1.20 2024/03/26 05:50:49 joshua Exp $ */
/* $OpenBSD: p_verify.c,v 1.21 2024/04/09 13:52:41 beck Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -96,3 +96,4 @@ EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
EVP_PKEY_CTX_free(pkctx);
return ret;
}
LCRYPTO_ALIAS(EVP_VerifyFinal);

15
lib/libcrypto/evp/pmeth_fn.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pmeth_fn.c,v 1.9 2023/07/07 19:37:54 beck Exp $ */
/* $OpenBSD: pmeth_fn.c,v 1.10 2024/04/09 13:52:41 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@ -98,6 +98,7 @@ EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_sign_init);
int
EVP_PKEY_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
@ -114,6 +115,7 @@ EVP_PKEY_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN)
return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
}
LCRYPTO_ALIAS(EVP_PKEY_sign);
int
EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
@ -132,6 +134,7 @@ EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_verify_init);
int
EVP_PKEY_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
@ -147,6 +150,7 @@ EVP_PKEY_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
}
return ctx->pmeth->verify(ctx, sig, siglen, tbs, tbslen);
}
LCRYPTO_ALIAS(EVP_PKEY_verify);
int
EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
@ -165,6 +169,7 @@ EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_verify_recover_init);
int
EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx, unsigned char *rout, size_t *routlen,
@ -181,6 +186,7 @@ EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx, unsigned char *rout, size_t *routlen,
M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER)
return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
}
LCRYPTO_ALIAS(EVP_PKEY_verify_recover);
int
EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx)
@ -199,6 +205,7 @@ EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_encrypt_init);
int
EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
@ -215,6 +222,7 @@ EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT)
return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
}
LCRYPTO_ALIAS(EVP_PKEY_encrypt);
int
EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
@ -233,6 +241,7 @@ EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_decrypt_init);
int
EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
@ -249,6 +258,7 @@ EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT)
return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
}
LCRYPTO_ALIAS(EVP_PKEY_decrypt);
int
EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
@ -267,6 +277,7 @@ EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_derive_init);
int
EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
@ -328,6 +339,7 @@ EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
CRYPTO_add(&peer->references, 1, CRYPTO_LOCK_EVP_PKEY);
return 1;
}
LCRYPTO_ALIAS(EVP_PKEY_derive_set_peer);
int
EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen)
@ -343,3 +355,4 @@ EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen)
M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE)
return ctx->pmeth->derive(ctx, key, pkeylen);
}
LCRYPTO_ALIAS(EVP_PKEY_derive);

13
lib/libcrypto/evp/pmeth_gn.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pmeth_gn.c,v 1.15 2024/01/01 18:33:04 tb Exp $ */
/* $OpenBSD: pmeth_gn.c,v 1.16 2024/04/09 13:52:41 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@ -85,6 +85,7 @@ EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_paramgen_init);
int
EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
@ -114,6 +115,7 @@ EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
}
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_paramgen);
int
EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx)
@ -132,6 +134,7 @@ EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx)
ctx->operation = EVP_PKEY_OP_UNDEFINED;
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_keygen_init);
int
EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
@ -160,18 +163,21 @@ EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
}
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_keygen);
void
EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb)
{
ctx->pkey_gencb = cb;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_set_cb);
EVP_PKEY_gen_cb *
EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx)
{
return ctx->pkey_gencb;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_get_cb);
/* "translation callback" to call EVP_PKEY_CTX callbacks using BN_GENCB
* style callbacks.
@ -201,6 +207,7 @@ EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
return 0;
return ctx->keygen_info[idx];
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_get_keygen_info);
EVP_PKEY *
EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key, int keylen)
@ -223,6 +230,7 @@ merr:
EVP_PKEY_CTX_free(mac_ctx);
return mac_key;
}
LCRYPTO_ALIAS(EVP_PKEY_new_mac_key);
int
EVP_PKEY_check(EVP_PKEY_CTX *ctx)
@ -244,6 +252,7 @@ EVP_PKEY_check(EVP_PKEY_CTX *ctx)
return pkey->ameth->pkey_check(pkey);
}
LCRYPTO_ALIAS(EVP_PKEY_check);
int
EVP_PKEY_public_check(EVP_PKEY_CTX *ctx)
@ -265,6 +274,7 @@ EVP_PKEY_public_check(EVP_PKEY_CTX *ctx)
return pkey->ameth->pkey_public_check(pkey);
}
LCRYPTO_ALIAS(EVP_PKEY_public_check);
int
EVP_PKEY_param_check(EVP_PKEY_CTX *ctx)
@ -286,3 +296,4 @@ EVP_PKEY_param_check(EVP_PKEY_CTX *ctx)
return pkey->ameth->pkey_param_check(pkey);
}
LCRYPTO_ALIAS(EVP_PKEY_param_check);

16
lib/libcrypto/evp/pmeth_lib.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pmeth_lib.c,v 1.39 2024/03/02 11:17:27 tb Exp $ */
/* $OpenBSD: pmeth_lib.c,v 1.40 2024/04/09 13:52:41 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@ -155,12 +155,14 @@ EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *engine)
{
return evp_pkey_ctx_new(pkey, -1);
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_new);
EVP_PKEY_CTX *
EVP_PKEY_CTX_new_id(int nid, ENGINE *engine)
{
return evp_pkey_ctx_new(NULL, nid);
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_new_id);
EVP_PKEY_CTX *
EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx)
@ -192,6 +194,7 @@ EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx)
EVP_PKEY_CTX_free(rctx);
return NULL;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_dup);
void
EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
@ -204,6 +207,7 @@ EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
EVP_PKEY_free(ctx->peerkey);
free(ctx);
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_free);
int
EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, int cmd,
@ -236,6 +240,7 @@ EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, int cmd,
return ret;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_ctrl);
int
EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *name, const char *value)
@ -250,6 +255,7 @@ EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *name, const char *value)
}
return ctx->pmeth->ctrl_str(ctx, name, value);
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_ctrl_str);
int
EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str)
@ -300,6 +306,7 @@ EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx)
{
return ctx->operation;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_get_operation);
void
EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen)
@ -307,39 +314,46 @@ EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen)
ctx->keygen_info = dat;
ctx->keygen_info_count = datlen;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_set0_keygen_info);
void
EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data)
{
ctx->data = data;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_set_data);
void *
EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx)
{
return ctx->data;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_get_data);
EVP_PKEY *
EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx)
{
return ctx->pkey;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_get0_pkey);
EVP_PKEY *
EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx)
{
return ctx->peerkey;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_get0_peerkey);
void
EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data)
{
ctx->app_data = data;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_set_app_data);
void *
EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx)
{
return ctx->app_data;
}
LCRYPTO_ALIAS(EVP_PKEY_CTX_get_app_data);

4
lib/libcrypto/hidden/openssl/asn1.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: asn1.h,v 1.12 2024/03/02 09:08:41 tb Exp $ */
/* $OpenBSD: asn1.h,v 1.13 2024/04/10 14:55:12 beck Exp $ */
/*
* Copyright (c) 2023 Bob Beck <beck@openbsd.org>
*
@ -231,5 +231,7 @@ LCRYPTO_USED(ASN1_item_print);
LCRYPTO_USED(SMIME_crlf_copy);
LCRYPTO_USED(SMIME_text);
LCRYPTO_USED(ERR_load_ASN1_strings);
LCRYPTO_UNUSED(ASN1_UTCTIME_cmp_time_t);
LCRYPTO_UNUSED(ASN1_dup);
#endif /* _LIBCRYPTO_ASN1_H */

7
lib/libcrypto/hidden/openssl/bn.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bn.h,v 1.6 2024/03/02 09:27:31 tb Exp $ */
/* $OpenBSD: bn.h,v 1.7 2024/04/10 14:58:06 beck Exp $ */
/*
* Copyright (c) 2023 Bob Beck <beck@openbsd.org>
*
@ -136,5 +136,10 @@ LCRYPTO_USED(BN_get_rfc3526_prime_4096);
LCRYPTO_USED(BN_get_rfc3526_prime_6144);
LCRYPTO_USED(BN_get_rfc3526_prime_8192);
LCRYPTO_USED(ERR_load_BN_strings);
LCRYPTO_UNUSED(BN_div);
LCRYPTO_UNUSED(BN_mod_exp);
LCRYPTO_UNUSED(BN_mod_exp_mont);
LCRYPTO_UNUSED(BN_gcd);
LCRYPTO_UNUSED(BN_mod_inverse);
#endif /* _LIBCRYPTO_BN_H */

74
lib/libcrypto/hidden/openssl/conf.h Normal file
View File

@ -0,0 +1,74 @@
/* $OpenBSD: conf.h,v 1.1 2024/04/09 14:57:28 tb Exp $ */
/*
* Copyright (c) 2024 Bob Beck <beck@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _LIBCRYPTO_CONF_H
#define _LIBCRYPTO_CONF_H
#ifndef _MSC_VER
#include_next <openssl/conf.h>
#else
#include "../include/openssl/conf.h"
#endif
#include "crypto_namespace.h"
LCRYPTO_USED(CONF_set_default_method);
LCRYPTO_USED(CONF_set_nconf);
LCRYPTO_USED(CONF_load);
LCRYPTO_USED(CONF_load_fp);
LCRYPTO_USED(CONF_load_bio);
LCRYPTO_USED(CONF_get_section);
LCRYPTO_USED(CONF_get_string);
LCRYPTO_USED(CONF_get_number);
LCRYPTO_USED(CONF_free);
LCRYPTO_USED(CONF_dump_fp);
LCRYPTO_USED(CONF_dump_bio);
LCRYPTO_USED(OPENSSL_config);
LCRYPTO_USED(OPENSSL_no_config);
LCRYPTO_USED(NCONF_new);
LCRYPTO_USED(NCONF_default);
LCRYPTO_USED(NCONF_WIN32);
LCRYPTO_USED(NCONF_free);
LCRYPTO_USED(NCONF_free_data);
LCRYPTO_USED(NCONF_load);
LCRYPTO_USED(NCONF_load_fp);
LCRYPTO_USED(NCONF_load_bio);
LCRYPTO_USED(NCONF_get_section);
LCRYPTO_USED(NCONF_get_string);
LCRYPTO_USED(NCONF_get_number_e);
LCRYPTO_USED(NCONF_dump_fp);
LCRYPTO_USED(NCONF_dump_bio);
LCRYPTO_USED(CONF_modules_load);
LCRYPTO_USED(CONF_modules_load_file);
LCRYPTO_USED(CONF_modules_unload);
LCRYPTO_USED(CONF_modules_finish);
LCRYPTO_USED(CONF_modules_free);
LCRYPTO_USED(CONF_module_add);
LCRYPTO_USED(CONF_imodule_get_name);
LCRYPTO_USED(CONF_imodule_get_value);
LCRYPTO_USED(CONF_imodule_get_usr_data);
LCRYPTO_USED(CONF_imodule_set_usr_data);
LCRYPTO_USED(CONF_imodule_get_module);
LCRYPTO_USED(CONF_imodule_get_flags);
LCRYPTO_USED(CONF_imodule_set_flags);
LCRYPTO_USED(CONF_module_get_usr_data);
LCRYPTO_USED(CONF_module_set_usr_data);
LCRYPTO_USED(CONF_get1_default_config_file);
LCRYPTO_USED(CONF_parse_list);
LCRYPTO_USED(OPENSSL_load_builtin_modules);
LCRYPTO_USED(ERR_load_CONF_strings);
#endif /* _LIBCRYPTO_CONF_H */

33
lib/libcrypto/hidden/openssl/crypto.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: crypto.h,v 1.6 2024/03/02 11:37:13 tb Exp $ */
/* $OpenBSD: crypto.h,v 1.7 2024/04/10 14:51:02 beck Exp $ */
/*
* Copyright (c) 2023 Bob Beck <beck@openbsd.org>
*
@ -46,5 +46,36 @@ LCRYPTO_USED(OPENSSL_init_crypto);
LCRYPTO_USED(OPENSSL_cleanup);
LCRYPTO_USED(OPENSSL_gmtime);
LCRYPTO_USED(ERR_load_CRYPTO_strings);
LCRYPTO_UNUSED(CRYPTO_mem_ctrl);
LCRYPTO_UNUSED(CRYPTO_set_id_callback);
LCRYPTO_UNUSED(CRYPTO_get_id_callback);
LCRYPTO_UNUSED(CRYPTO_thread_id);
LCRYPTO_UNUSED(CRYPTO_get_new_lockid);
LCRYPTO_UNUSED(CRYPTO_get_lock_name);
LCRYPTO_UNUSED(CRYPTO_num_locks);
LCRYPTO_UNUSED(CRYPTO_set_locking_callback);
LCRYPTO_UNUSED(CRYPTO_get_locking_callback);
LCRYPTO_UNUSED(CRYPTO_set_add_lock_callback);
LCRYPTO_UNUSED(CRYPTO_get_add_lock_callback);
LCRYPTO_UNUSED(CRYPTO_THREADID_set_numeric);
LCRYPTO_UNUSED(CRYPTO_THREADID_set_pointer);
LCRYPTO_UNUSED(CRYPTO_THREADID_set_callback);
LCRYPTO_UNUSED(CRYPTO_THREADID_get_callback);
LCRYPTO_UNUSED(CRYPTO_get_new_dynlockid);
LCRYPTO_UNUSED(CRYPTO_destroy_dynlockid);
LCRYPTO_UNUSED(CRYPTO_get_dynlock_value);
LCRYPTO_UNUSED(CRYPTO_set_dynlock_create_callback);
LCRYPTO_UNUSED(CRYPTO_set_dynlock_lock_callback);
LCRYPTO_UNUSED(CRYPTO_set_dynlock_destroy_callback);
LCRYPTO_UNUSED(CRYPTO_get_dynlock_lock_callback);
LCRYPTO_UNUSED(CRYPTO_get_dynlock_destroy_callback);
LCRYPTO_UNUSED(CRYPTO_malloc);
LCRYPTO_UNUSED(CRYPTO_strdup);
LCRYPTO_UNUSED(CRYPTO_free);
LCRYPTO_UNUSED(OPENSSL_cleanse);
LCRYPTO_UNUSED(FIPS_mode);
LCRYPTO_UNUSED(FIPS_mode_set);
LCRYPTO_UNUSED(OPENSSL_init);
LCRYPTO_UNUSED(CRYPTO_memcmp);
#endif /* _LIBCRYPTO_CRYPTO_H */

11
lib/libcrypto/hidden/openssl/ec.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ec.h,v 1.4 2023/07/28 09:25:12 tb Exp $ */
/* $OpenBSD: ec.h,v 1.5 2024/04/10 15:01:31 beck Exp $ */
/*
* Copyright (c) 2023 Bob Beck <beck@openbsd.org>
*
@ -161,5 +161,14 @@ LCRYPTO_USED(EC_KEY_METHOD_get_sign);
LCRYPTO_USED(EC_KEY_METHOD_get_verify);
LCRYPTO_USED(ECParameters_dup);
LCRYPTO_USED(ERR_load_EC_strings);
LCRYPTO_UNUSED(EC_GROUP_clear_free);
LCRYPTO_UNUSED(EC_GROUP_set_curve_GFp);
LCRYPTO_UNUSED(EC_GROUP_get_curve_GFp);
LCRYPTO_UNUSED(EC_POINT_clear_free);
LCRYPTO_UNUSED(EC_POINT_set_Jprojective_coordinates_GFp);
LCRYPTO_UNUSED(EC_POINT_get_Jprojective_coordinates_GFp);
LCRYPTO_UNUSED(EC_POINT_set_affine_coordinates_GFp);
LCRYPTO_UNUSED(EC_POINT_get_affine_coordinates_GFp);
LCRYPTO_UNUSED(EC_POINT_set_compressed_coordinates_GFp);
#endif /* _LIBCRYPTO_EC_H */

Some files were not shown because too many files have changed in this diff Show More