summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/util')
-rw-r--r--src/lib/libcrypto/util/libeay.num58
-rw-r--r--src/lib/libcrypto/util/mk1mf.pl4
-rw-r--r--src/lib/libcrypto/util/mkdef.pl6
-rw-r--r--src/lib/libcrypto/util/pl/VC-32.pl8
-rw-r--r--src/lib/libcrypto/util/ssleay.num1
5 files changed, 68 insertions, 9 deletions
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index 2989500c4b..62664f3c37 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -725,7 +725,7 @@ d2i_DSAPublicKey 731 EXIST::FUNCTION:DSA
725d2i_DSAparams 732 EXIST::FUNCTION:DSA 725d2i_DSAparams 732 EXIST::FUNCTION:DSA
726d2i_NETSCAPE_SPKAC 733 EXIST::FUNCTION: 726d2i_NETSCAPE_SPKAC 733 EXIST::FUNCTION:
727d2i_NETSCAPE_SPKI 734 EXIST::FUNCTION: 727d2i_NETSCAPE_SPKI 734 EXIST::FUNCTION:
728d2i_Netscape_RSA 735 EXIST::FUNCTION:RSA 728d2i_Netscape_RSA 735 EXIST::FUNCTION:RC4,RSA
729d2i_PKCS7 736 EXIST::FUNCTION: 729d2i_PKCS7 736 EXIST::FUNCTION:
730d2i_PKCS7_DIGEST 737 EXIST::FUNCTION: 730d2i_PKCS7_DIGEST 737 EXIST::FUNCTION:
731d2i_PKCS7_ENCRYPT 738 EXIST::FUNCTION: 731d2i_PKCS7_ENCRYPT 738 EXIST::FUNCTION:
@@ -827,7 +827,7 @@ i2d_DSAPublicKey 834 EXIST::FUNCTION:DSA
827i2d_DSAparams 835 EXIST::FUNCTION:DSA 827i2d_DSAparams 835 EXIST::FUNCTION:DSA
828i2d_NETSCAPE_SPKAC 836 EXIST::FUNCTION: 828i2d_NETSCAPE_SPKAC 836 EXIST::FUNCTION:
829i2d_NETSCAPE_SPKI 837 EXIST::FUNCTION: 829i2d_NETSCAPE_SPKI 837 EXIST::FUNCTION:
830i2d_Netscape_RSA 838 EXIST::FUNCTION:RSA 830i2d_Netscape_RSA 838 EXIST::FUNCTION:RC4,RSA
831i2d_PKCS7 839 EXIST::FUNCTION: 831i2d_PKCS7 839 EXIST::FUNCTION:
832i2d_PKCS7_DIGEST 840 EXIST::FUNCTION: 832i2d_PKCS7_DIGEST 840 EXIST::FUNCTION:
833i2d_PKCS7_ENCRYPT 841 EXIST::FUNCTION: 833i2d_PKCS7_ENCRYPT 841 EXIST::FUNCTION:
@@ -1814,9 +1814,9 @@ RAND_egd_bytes 2402 EXIST::FUNCTION:
1814X509_REQ_get1_email 2403 EXIST::FUNCTION: 1814X509_REQ_get1_email 2403 EXIST::FUNCTION:
1815X509_get1_email 2404 EXIST::FUNCTION: 1815X509_get1_email 2404 EXIST::FUNCTION:
1816X509_email_free 2405 EXIST::FUNCTION: 1816X509_email_free 2405 EXIST::FUNCTION:
1817i2d_RSA_NET 2406 EXIST::FUNCTION:RSA 1817i2d_RSA_NET 2406 EXIST::FUNCTION:RC4,RSA
1818d2i_RSA_NET_2 2407 NOEXIST::FUNCTION: 1818d2i_RSA_NET_2 2407 NOEXIST::FUNCTION:
1819d2i_RSA_NET 2408 EXIST::FUNCTION:RSA 1819d2i_RSA_NET 2408 EXIST::FUNCTION:RC4,RSA
1820DSO_bind_func 2409 EXIST::FUNCTION: 1820DSO_bind_func 2409 EXIST::FUNCTION:
1821CRYPTO_get_new_dynlockid 2410 EXIST::FUNCTION: 1821CRYPTO_get_new_dynlockid 2410 EXIST::FUNCTION:
1822sk_new_null 2411 EXIST::FUNCTION: 1822sk_new_null 2411 EXIST::FUNCTION:
@@ -2843,7 +2843,7 @@ FIPS_selftest_failed 3284 NOEXIST::FUNCTION:
2843sk_is_sorted 3285 EXIST::FUNCTION: 2843sk_is_sorted 3285 EXIST::FUNCTION:
2844X509_check_ca 3286 EXIST::FUNCTION: 2844X509_check_ca 3286 EXIST::FUNCTION:
2845private_idea_set_encrypt_key 3287 NOEXIST::FUNCTION: 2845private_idea_set_encrypt_key 3287 NOEXIST::FUNCTION:
2846HMAC_CTX_set_flags 3288 NOEXIST::FUNCTION: 2846HMAC_CTX_set_flags 3288 EXIST::FUNCTION:HMAC
2847private_SHA_Init 3289 NOEXIST::FUNCTION: 2847private_SHA_Init 3289 NOEXIST::FUNCTION:
2848private_CAST_set_key 3290 NOEXIST::FUNCTION: 2848private_CAST_set_key 3290 NOEXIST::FUNCTION:
2849private_RIPEMD160_Init 3291 NOEXIST::FUNCTION: 2849private_RIPEMD160_Init 3291 NOEXIST::FUNCTION:
@@ -3652,3 +3652,51 @@ CMS_set1_eContentType 4040 EXIST::FUNCTION:CMS
3652CMS_ReceiptRequest_create0 4041 EXIST::FUNCTION:CMS 3652CMS_ReceiptRequest_create0 4041 EXIST::FUNCTION:CMS
3653CMS_add1_signer 4042 EXIST::FUNCTION:CMS 3653CMS_add1_signer 4042 EXIST::FUNCTION:CMS
3654CMS_RecipientInfo_set0_pkey 4043 EXIST::FUNCTION:CMS 3654CMS_RecipientInfo_set0_pkey 4043 EXIST::FUNCTION:CMS
3655ENGINE_set_load_ssl_client_cert_function 4044 EXIST::FUNCTION:ENGINE
3656ENGINE_get_ssl_client_cert_function 4045 EXIST::FUNCTION:ENGINE
3657ENGINE_load_ssl_client_cert 4046 EXIST::FUNCTION:ENGINE
3658ENGINE_load_capi 4047 EXIST::FUNCTION:CAPIENG,ENGINE
3659OPENSSL_isservice 4048 EXIST::FUNCTION:
3660FIPS_dsa_sig_decode 4049 NOEXIST::FUNCTION:
3661EVP_CIPHER_CTX_clear_flags 4050 NOEXIST::FUNCTION:
3662FIPS_rand_status 4051 NOEXIST::FUNCTION:
3663FIPS_rand_set_key 4052 NOEXIST::FUNCTION:
3664CRYPTO_set_mem_info_functions 4053 NOEXIST::FUNCTION:
3665RSA_X931_generate_key_ex 4054 NOEXIST::FUNCTION:
3666int_ERR_set_state_func 4055 NOEXIST::FUNCTION:
3667int_EVP_MD_set_engine_callbacks 4056 NOEXIST::FUNCTION:
3668int_CRYPTO_set_do_dynlock_callback 4057 NOEXIST::FUNCTION:
3669FIPS_rng_stick 4058 NOEXIST::FUNCTION:
3670EVP_CIPHER_CTX_set_flags 4059 NOEXIST::FUNCTION:
3671BN_X931_generate_prime_ex 4060 NOEXIST::FUNCTION:
3672FIPS_selftest_check 4061 NOEXIST::FUNCTION:
3673FIPS_rand_set_dt 4062 NOEXIST::FUNCTION:
3674CRYPTO_dbg_pop_info 4063 NOEXIST::FUNCTION:
3675FIPS_dsa_free 4064 NOEXIST::FUNCTION:
3676RSA_X931_derive_ex 4065 NOEXIST::FUNCTION:
3677FIPS_rsa_new 4066 NOEXIST::FUNCTION:
3678FIPS_rand_bytes 4067 NOEXIST::FUNCTION:
3679fips_cipher_test 4068 NOEXIST::FUNCTION:
3680EVP_CIPHER_CTX_test_flags 4069 NOEXIST::FUNCTION:
3681CRYPTO_malloc_debug_init 4070 NOEXIST::FUNCTION:
3682CRYPTO_dbg_push_info 4071 NOEXIST::FUNCTION:
3683FIPS_corrupt_rsa_keygen 4072 NOEXIST::FUNCTION:
3684FIPS_dh_new 4073 NOEXIST::FUNCTION:
3685FIPS_corrupt_dsa_keygen 4074 NOEXIST::FUNCTION:
3686FIPS_dh_free 4075 NOEXIST::FUNCTION:
3687fips_pkey_signature_test 4076 NOEXIST::FUNCTION:
3688EVP_add_alg_module 4077 NOEXIST::FUNCTION:
3689int_RAND_init_engine_callbacks 4078 NOEXIST::FUNCTION:
3690int_EVP_CIPHER_set_engine_callbacks 4079 NOEXIST::FUNCTION:
3691int_EVP_MD_init_engine_callbacks 4080 NOEXIST::FUNCTION:
3692FIPS_rand_test_mode 4081 NOEXIST::FUNCTION:
3693FIPS_rand_reset 4082 NOEXIST::FUNCTION:
3694FIPS_dsa_new 4083 NOEXIST::FUNCTION:
3695int_RAND_set_callbacks 4084 NOEXIST::FUNCTION:
3696BN_X931_derive_prime_ex 4085 NOEXIST::FUNCTION:
3697int_ERR_lib_init 4086 NOEXIST::FUNCTION:
3698int_EVP_CIPHER_init_engine_callbacks 4087 NOEXIST::FUNCTION:
3699FIPS_rsa_free 4088 NOEXIST::FUNCTION:
3700FIPS_dsa_sig_encode 4089 NOEXIST::FUNCTION:
3701CRYPTO_dbg_remove_all_info 4090 NOEXIST::FUNCTION:
3702OPENSSL_init 4091 NOEXIST::FUNCTION:
diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl
index 1ac5fd3a50..7ba804ce33 100644
--- a/src/lib/libcrypto/util/mk1mf.pl
+++ b/src/lib/libcrypto/util/mk1mf.pl
@@ -221,6 +221,7 @@ $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
221$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3; 221$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
222$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext; 222$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
223$cflags.=" -DOPENSSL_NO_CMS" if $no_cms; 223$cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
224$cflags.=" -DOPENSSL_NO_CAPIENG" if $no_capieng;
224$cflags.=" -DOPENSSL_NO_ERR" if $no_err; 225$cflags.=" -DOPENSSL_NO_ERR" if $no_err;
225$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; 226$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
226$cflags.=" -DOPENSSL_NO_EC" if $no_ec; 227$cflags.=" -DOPENSSL_NO_EC" if $no_ec;
@@ -1017,6 +1018,7 @@ sub read_options
1017 "no-ssl3" => \$no_ssl3, 1018 "no-ssl3" => \$no_ssl3,
1018 "no-tlsext" => \$no_tlsext, 1019 "no-tlsext" => \$no_tlsext,
1019 "no-cms" => \$no_cms, 1020 "no-cms" => \$no_cms,
1021 "no-capieng" => \$no_capieng,
1020 "no-err" => \$no_err, 1022 "no-err" => \$no_err,
1021 "no-sock" => \$no_sock, 1023 "no-sock" => \$no_sock,
1022 "no-krb5" => \$no_krb5, 1024 "no-krb5" => \$no_krb5,
@@ -1100,7 +1102,7 @@ sub read_options
1100 } 1102 }
1101 } 1103 }
1102 } 1104 }
1103 elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; } 1105 elsif (/^([^=]*)=(.*)$/ && !/^-D/){ $VARS{$1}=$2; }
1104 elsif (/^-[lL].*$/) { $l_flags.="$_ "; } 1106 elsif (/^-[lL].*$/) { $l_flags.="$_ "; }
1105 elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/) 1107 elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)
1106 { $c_flags.="$_ "; } 1108 { $c_flags.="$_ "; }
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl
index ef1cc6e513..8ecfde1848 100644
--- a/src/lib/libcrypto/util/mkdef.pl
+++ b/src/lib/libcrypto/util/mkdef.pl
@@ -100,6 +100,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
100 "TLSEXT", 100 "TLSEXT",
101 # CMS 101 # CMS
102 "CMS", 102 "CMS",
103 # CryptoAPI Engine
104 "CAPIENG",
103 # Deprecated functions 105 # Deprecated functions
104 "DEPRECATED" ); 106 "DEPRECATED" );
105 107
@@ -120,7 +122,7 @@ my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
120my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia; 122my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia;
121my $no_seed; 123my $no_seed;
122my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated; 124my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated;
123my $no_rfc3779; my $no_tlsext; my $no_cms; 125my $no_rfc3779; my $no_tlsext; my $no_cms; my $no_capieng;
124 126
125 127
126foreach (@ARGV, split(/ /, $options)) 128foreach (@ARGV, split(/ /, $options))
@@ -206,6 +208,7 @@ foreach (@ARGV, split(/ /, $options))
206 elsif (/^no-rfc3779$/) { $no_rfc3779=1; } 208 elsif (/^no-rfc3779$/) { $no_rfc3779=1; }
207 elsif (/^no-tlsext$/) { $no_tlsext=1; } 209 elsif (/^no-tlsext$/) { $no_tlsext=1; }
208 elsif (/^no-cms$/) { $no_cms=1; } 210 elsif (/^no-cms$/) { $no_cms=1; }
211 elsif (/^no-capieng$/) { $no_capieng=1; }
209 } 212 }
210 213
211 214
@@ -1131,6 +1134,7 @@ sub is_valid
1131 if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; } 1134 if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; }
1132 if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; } 1135 if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
1133 if ($keyword eq "CMS" && $no_cms) { return 0; } 1136 if ($keyword eq "CMS" && $no_cms) { return 0; }
1137 if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
1134 if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } 1138 if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
1135 1139
1136 # Nothing recognise as true 1140 # Nothing recognise as true
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl
index 9cb2ab7e99..1e254119e6 100644
--- a/src/lib/libcrypto/util/pl/VC-32.pl
+++ b/src/lib/libcrypto/util/pl/VC-32.pl
@@ -138,7 +138,7 @@ if ($FLAVOR =~ /CE/)
138 } 138 }
139else 139else
140 { 140 {
141 $ex_libs.=' gdi32.lib advapi32.lib user32.lib'; 141 $ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
142 $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); 142 $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
143 } 143 }
144 144
@@ -259,7 +259,6 @@ sub do_lib_rule
259 $name =~ tr/a-z/A-Z/; 259 $name =~ tr/a-z/A-Z/;
260 $name = "/def:ms/${name}.def"; 260 $name = "/def:ms/${name}.def";
261 } 261 }
262
263# $target="\$(LIB_D)$o$target"; 262# $target="\$(LIB_D)$o$target";
264 $ret.="$target: $objs\n"; 263 $ret.="$target: $objs\n";
265 if (!$shlib) 264 if (!$shlib)
@@ -274,6 +273,10 @@ sub do_lib_rule
274 if ($name eq "") 273 if ($name eq "")
275 { 274 {
276 $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); 275 $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
276 if ($target =~ /capi/)
277 {
278 $ex.=' crypt32.lib advapi32.lib';
279 }
277 } 280 }
278 elsif ($FLAVOR =~ /CE/) 281 elsif ($FLAVOR =~ /CE/)
279 { 282 {
@@ -283,6 +286,7 @@ sub do_lib_rule
283 { 286 {
284 $ex.=' unicows.lib' if ($FLAVOR =~ /NT/); 287 $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
285 $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; 288 $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
289 $ex.=' crypt32.lib';
286 $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); 290 $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
287 } 291 }
288 $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; 292 $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
diff --git a/src/lib/libcrypto/util/ssleay.num b/src/lib/libcrypto/util/ssleay.num
index b3ac136a56..2055cc1597 100644
--- a/src/lib/libcrypto/util/ssleay.num
+++ b/src/lib/libcrypto/util/ssleay.num
@@ -241,3 +241,4 @@ SSL_CTX_sess_get_remove_cb 289 EXIST::FUNCTION:
241SSL_set_SSL_CTX 290 EXIST::FUNCTION: 241SSL_set_SSL_CTX 290 EXIST::FUNCTION:
242SSL_get_servername 291 EXIST::FUNCTION:TLSEXT 242SSL_get_servername 291 EXIST::FUNCTION:TLSEXT
243SSL_get_servername_type 292 EXIST::FUNCTION:TLSEXT 243SSL_get_servername_type 292 EXIST::FUNCTION:TLSEXT
244SSL_CTX_set_client_cert_engine 293 EXIST::FUNCTION:ENGINE
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-27 00:44:47 +0000