summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/libeay.num203
-rwxr-xr-xutil/mk1mf.pl24
-rwxr-xr-xutil/mkdef.pl20
-rwxr-xr-xutil/mkfiles.pl2
-rw-r--r--util/pl/VC-32.pl1
-rwxr-xr-xutil/ssleay.num2
6 files changed, 12 insertions, 240 deletions
diff --git a/util/libeay.num b/util/libeay.num
index dc2cedc1e2..81f5d31df9 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2071,7 +2071,7 @@ PKCS7_ATTR_SIGN_it 2632 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
UI_add_error_string 2633 EXIST::FUNCTION:
KRB5_CHECKSUM_free 2634 EXIST::FUNCTION:
OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION:
-ENGINE_load_ubsec 2636 EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_ubsec 2636 EXIST::FUNCTION:
ENGINE_register_all_digests 2637 EXIST::FUNCTION:
PKEY_USAGE_PERIOD_it 2638 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
PKEY_USAGE_PERIOD_it 2638 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2545,7 +2545,7 @@ OCSP_RESPONSE_new 3023 EXIST::FUNCTION:
AES_set_encrypt_key 3024 EXIST::FUNCTION:AES
OCSP_resp_count 3025 EXIST::FUNCTION:
KRB5_CHECKSUM_new 3026 EXIST::FUNCTION:
-ENGINE_load_cswift 3027 EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_cswift 3027 EXIST::FUNCTION:
OCSP_onereq_get0_id 3028 EXIST::FUNCTION:
ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:
NOTICEREF_it 3030 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2576,7 +2576,7 @@ ASN1_primitive_free 3051 EXIST::FUNCTION:
i2d_EXTENDED_KEY_USAGE 3052 EXIST::FUNCTION:
i2d_OCSP_SIGNATURE 3053 EXIST::FUNCTION:
asn1_enc_save 3054 EXIST::FUNCTION:
-ENGINE_load_nuron 3055 EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_nuron 3055 EXIST::FUNCTION:
_ossl_old_des_pcbc_encrypt 3056 EXIST::FUNCTION:DES
PKCS12_MAC_DATA_it 3057 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
PKCS12_MAC_DATA_it 3057 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2600,7 +2600,7 @@ asn1_get_choice_selector 3071 EXIST::FUNCTION:
i2d_KRB5_CHECKSUM 3072 EXIST::FUNCTION:
ENGINE_set_table_flags 3073 EXIST::FUNCTION:
AES_options 3074 EXIST::FUNCTION:AES
-ENGINE_load_chil 3075 EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_chil 3075 EXIST::FUNCTION:
OCSP_id_cmp 3076 EXIST::FUNCTION:
OCSP_BASICRESP_new 3077 EXIST::FUNCTION:
OCSP_REQUEST_get_ext_by_NID 3078 EXIST::FUNCTION:
@@ -2667,7 +2667,7 @@ OCSP_CRLID_it 3127 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
OCSP_CRLID_it 3127 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION:
OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION:
-ENGINE_load_atalla 3130 EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_atalla 3130 EXIST::FUNCTION:
X509_NAME_it 3131 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
X509_NAME_it 3131 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
USERNOTICE_it 3132 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2762,8 +2762,8 @@ DES_read_2passwords 3206 EXIST::FUNCTION:DES
DES_read_password 3207 EXIST::FUNCTION:DES
UI_UTIL_read_pw 3208 EXIST::FUNCTION:
UI_UTIL_read_pw_string 3209 EXIST::FUNCTION:
-ENGINE_load_aep 3210 EXIST::FUNCTION:STATIC_ENGINE
-ENGINE_load_sureware 3211 EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_aep 3210 EXIST::FUNCTION:
+ENGINE_load_sureware 3211 EXIST::FUNCTION:
OPENSSL_add_all_algorithms_noconf 3212 EXIST:!VMS:FUNCTION:
OPENSSL_add_all_algo_noconf 3212 EXIST:VMS:FUNCTION:
OPENSSL_add_all_algorithms_conf 3213 EXIST:!VMS:FUNCTION:
@@ -2772,7 +2772,7 @@ OPENSSL_load_builtin_modules 3214 EXIST::FUNCTION:
AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES
AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES
AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES
-ENGINE_load_4758cca 3218 EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_4758cca 3218 EXIST::FUNCTION:
_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES
EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES
EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES
@@ -2801,190 +2801,3 @@ BIO_indent 3242 EXIST::FUNCTION:
BUF_strlcpy 3243 EXIST::FUNCTION:
OpenSSLDie 3244 EXIST::FUNCTION:
OPENSSL_cleanse 3245 EXIST::FUNCTION:
-BN_get0_nist_prime_384 3246 EXIST::FUNCTION:
-ENGINE_register_ECDSA 3247 EXIST::FUNCTION:
-BN_nist_mod_192 3248 EXIST::FUNCTION:
-EC_GROUP_get_trinomial_basis 3249 EXIST::FUNCTION:EC
-ECDH_get_default_method 3250 EXIST::FUNCTION:ECDH
-PKCS12_add_safe 3251 EXIST::FUNCTION:
-ENGINE_register_ECDH 3252 EXIST::FUNCTION:
-i2d_ECPrivateKey 3253 EXIST::FUNCTION:EC
-BN_get0_nist_prime_192 3254 EXIST::FUNCTION:
-EC_POINT_set_affine_coordinates_GF2m 3255 EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_affine_coords_GF2m 3255 EXIST:VMS:FUNCTION:EC
-BN_GF2m_mod_exp_arr 3256 EXIST::FUNCTION:
-X509_keyid_get0 3257 EXIST::FUNCTION:
-EC_GROUP_new_by_nid 3258 EXIST::FUNCTION:EC
-BN_GF2m_mod_mul_arr 3259 EXIST::FUNCTION:
-EC_KEY_copy 3260 EXIST::FUNCTION:EC
-EC_GROUP_check_discriminant 3261 EXIST::FUNCTION:EC
-EC_POINT_point2bn 3262 EXIST::FUNCTION:EC
-EC_GROUP_new_curve_GF2m 3263 EXIST::FUNCTION:EC
-EVP_PKEY_get1_EC_KEY 3264 EXIST::FUNCTION:EC
-ENGINE_get_default_ECDH 3265 EXIST::FUNCTION:
-ASN1_OCTET_STRING_NDEF_it 3266 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_OCTET_STRING_NDEF_it 3266 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_static_state 3267 EXIST::FUNCTION:
-ECDSA_SIG_new 3268 EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_sqr 3269 EXIST::FUNCTION:
-EC_POINT_bn2point 3270 EXIST::FUNCTION:EC
-EC_GROUP_get_point_conversion_form 3271 EXIST:!VMS:FUNCTION:EC
-EC_GROUP_get_point_conv_form 3271 EXIST:VMS:FUNCTION:EC
-PEM_read_bio_ECPKParameters 3272 EXIST::FUNCTION:EC
-EC_GROUP_get_pentanomial_basis 3273 EXIST::FUNCTION:EC
-EC_GROUP_get_nid 3274 EXIST::FUNCTION:EC
-ECDSA_sign_setup 3275 EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_solve_quad_arr 3276 EXIST::FUNCTION:
-EC_KEY_up_ref 3277 EXIST::FUNCTION:EC
-BN_GF2m_mod_div 3278 EXIST::FUNCTION:
-EC_KEY_free 3279 EXIST::FUNCTION:EC
-PEM_write_bio_ECPrivateKey 3280 EXIST::FUNCTION:EC
-d2i_EC_PUBKEY 3281 EXIST::FUNCTION:EC
-EC_KEY_print_fp 3282 EXIST::FUNCTION:EC,FP_API
-BN_GF2m_mod_arr 3283 EXIST::FUNCTION:
-PEM_write_bio_X509_CERT_PAIR 3284 EXIST::FUNCTION:
-ECDH_get_ex_data 3285 EXIST::FUNCTION:ECDH
-ECDSA_do_sign 3286 EXIST::FUNCTION:ECDSA
-ENGINE_unregister_ECDH 3287 EXIST::FUNCTION:
-ECDH_OpenSSL 3288 EXIST::FUNCTION:ECDH
-EC_POINT_dup 3289 EXIST::FUNCTION:EC
-EC_get_builtin_curves 3290 EXIST::FUNCTION:EC
-EVP_PKEY_set1_EC_KEY 3291 EXIST::FUNCTION:EC
-BN_GF2m_mod_sqrt_arr 3292 EXIST::FUNCTION:
-i2d_ECPrivateKey_bio 3293 EXIST::FUNCTION:BIO,EC
-ECPKParameters_print_fp 3294 EXIST::FUNCTION:EC,FP_API
-ECDSA_SIG_free 3295 EXIST::FUNCTION:ECDSA
-PEM_write_bio_ECPKParameters 3296 EXIST::FUNCTION:EC
-EC_GROUP_set_nid 3297 EXIST::FUNCTION:EC
-PKCS12_add_safes 3298 EXIST::FUNCTION:
-BN_GF2m_poly2arr 3299 EXIST::FUNCTION:
-BN_get0_nist_prime_224 3300 EXIST::FUNCTION:
-i2d_ECParameters 3301 EXIST::FUNCTION:EC
-i2d_ECPKParameters 3302 EXIST::FUNCTION:EC
-BN_ncopy 3303 EXIST::FUNCTION:
-d2i_ECPKParameters 3304 EXIST::FUNCTION:EC
-ENGINE_set_ECDH 3305 EXIST::FUNCTION:
-PEM_write_bio_EC_PUBKEY 3306 EXIST::FUNCTION:EC
-ECParameters_print 3307 EXIST::FUNCTION:BIO,EC
-ASN1_generate_nconf 3308 EXIST::FUNCTION:
-BN_GF2m_mod_mul 3309 EXIST::FUNCTION:
-EC_GROUP_set_seed 3310 EXIST::FUNCTION:EC
-EC_GROUP_get_curve_GF2m 3311 EXIST::FUNCTION:EC
-PEM_read_X509_CERT_PAIR 3312 EXIST:!WIN16:FUNCTION:
-ECPublicKey_set_octet_string 3313 EXIST::FUNCTION:EC
-ECDSA_get_ex_data 3314 EXIST::FUNCTION:ECDSA
-BN_GF2m_mod 3315 EXIST::FUNCTION:
-EC_GROUP_get_seed_len 3316 EXIST::FUNCTION:EC
-PEM_read_bio_EC_PUBKEY 3317 EXIST::FUNCTION:EC
-i2d_EC_PUBKEY 3318 EXIST::FUNCTION:EC
-ECDSA_get_default_method 3319 EXIST::FUNCTION:ECDSA
-ASN1_put_eoc 3320 EXIST::FUNCTION:
-ECDSA_DATA_free 3321 EXIST::FUNCTION:ECDSA
-EC_METHOD_get_field_type 3322 EXIST::FUNCTION:EC
-EC_GFp_nist_method 3323 EXIST::FUNCTION:EC
-X509_CERT_PAIR_it 3324 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CERT_PAIR_it 3324 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-BN_GF2m_mod_sqr_arr 3325 EXIST::FUNCTION:
-EC_GROUP_set_curve_GF2m 3326 EXIST::FUNCTION:EC
-ENGINE_set_default_ECDSA 3327 EXIST::FUNCTION:
-BN_GF2m_mod_sqrt 3328 EXIST::FUNCTION:
-ECDH_set_default_method 3329 EXIST::FUNCTION:ECDH
-EC_KEY_generate_key 3330 EXIST::FUNCTION:EC
-BN_GF2m_arr2poly 3331 EXIST::FUNCTION:
-ECPublicKey_get_octet_string 3332 EXIST::FUNCTION:EC
-EC_GROUP_check 3333 EXIST::FUNCTION:EC
-d2i_ECPrivateKey_bio 3334 EXIST::FUNCTION:BIO,EC
-d2i_ECPrivateKey 3335 EXIST::FUNCTION:EC
-ASN1_item_ndef_i2d 3336 EXIST::FUNCTION:
-i2d_PKCS7_NDEF 3337 EXIST::FUNCTION:
-EC_GROUP_get_degree 3338 EXIST::FUNCTION:EC
-ASN1_generate_v3 3339 EXIST::FUNCTION:
-BN_GF2m_add 3340 EXIST::FUNCTION:
-X509_CERT_PAIR_free 3341 EXIST::FUNCTION:
-BN_nist_mod_224 3342 EXIST::FUNCTION:
-i2d_EC_PUBKEY_bio 3343 EXIST::FUNCTION:BIO,EC
-EC_GROUP_get_asn1_flag 3344 EXIST::FUNCTION:EC
-ECDH_get_ex_new_index 3345 EXIST::FUNCTION:ECDH
-ECDH_size 3346 EXIST::FUNCTION:ECDH
-BN_GF2m_mod_inv 3347 EXIST::FUNCTION:
-BN_GF2m_mod_exp 3348 EXIST::FUNCTION:
-EC_GROUP_get0_seed 3349 EXIST::FUNCTION:EC
-ecdsa_check 3350 EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_div_arr 3351 EXIST::FUNCTION:
-ENGINE_set_ECDSA 3352 EXIST::FUNCTION:
-ECPKParameters_print 3353 EXIST::FUNCTION:BIO,EC
-PEM_write_EC_PUBKEY 3354 EXIST:!WIN16:FUNCTION:EC
-ECDH_set_method 3355 EXIST::FUNCTION:ECDH
-ECDH_set_ex_data 3356 EXIST::FUNCTION:ECDH
-BN_nist_mod_521 3357 EXIST::FUNCTION:
-EC_GROUP_set_point_conversion_form 3358 EXIST:!VMS:FUNCTION:EC
-EC_GROUP_set_point_conv_form 3358 EXIST:VMS:FUNCTION:EC
-PEM_read_EC_PUBKEY 3359 EXIST:!WIN16:FUNCTION:EC
-i2d_ECDSA_SIG 3360 EXIST::FUNCTION:ECDSA
-ECDSA_OpenSSL 3361 EXIST::FUNCTION:ECDSA
-ECDSA_set_default_method 3362 EXIST::FUNCTION:ECDSA
-EC_POINT_set_compressed_coordinates_GF2m 3363 EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_compr_coords_GF2m 3363 EXIST:VMS:FUNCTION:EC
-ECDH_DATA_new_method 3364 EXIST::FUNCTION:ECDH
-BN_get0_nist_prime_256 3365 EXIST::FUNCTION:
-PEM_read_ECPrivateKey 3366 EXIST:!WIN16:FUNCTION:EC
-ERR_load_ECDSA_strings 3367 EXIST::FUNCTION:ECDSA
-EC_GROUP_get_basis_type 3368 EXIST::FUNCTION:EC
-ECDH_DATA_new 3369 EXIST::FUNCTION:ECDH
-BN_nist_mod_384 3370 EXIST::FUNCTION:
-i2d_X509_CERT_PAIR 3371 EXIST::FUNCTION:
-PEM_write_ECPKParameters 3372 EXIST:!WIN16:FUNCTION:EC
-ECDH_compute_key 3373 EXIST::FUNCTION:ECDH
-ENGINE_register_all_ECDH 3374 EXIST::FUNCTION:
-BN_GF2m_mod_solve_quad 3375 EXIST::FUNCTION:
-i2d_ECPrivateKey_fp 3376 EXIST::FUNCTION:EC,FP_API
-ENGINE_register_all_ECDSA 3377 EXIST::FUNCTION:
-EC_POINT_get_affine_coordinates_GF2m 3378 EXIST:!VMS:FUNCTION:EC
-EC_POINT_get_affine_coords_GF2m 3378 EXIST:VMS:FUNCTION:EC
-EC_GROUP_dup 3379 EXIST::FUNCTION:EC
-ENGINE_get_default_ECDSA 3380 EXIST::FUNCTION:
-EC_KEY_new 3381 EXIST::FUNCTION:EC
-ECDSA_verify 3382 EXIST::FUNCTION:ECDSA
-EC_POINT_point2hex 3383 EXIST::FUNCTION:EC
-ECDSA_do_verify 3384 EXIST::FUNCTION:ECDSA
-d2i_ECPrivateKey_fp 3385 EXIST::FUNCTION:EC,FP_API
-PEM_write_ECPrivateKey 3386 EXIST:!WIN16:FUNCTION:EC
-PEM_read_ECPKParameters 3387 EXIST:!WIN16:FUNCTION:EC
-X509_CERT_PAIR_new 3388 EXIST::FUNCTION:
-ECParameters_print_fp 3389 EXIST::FUNCTION:EC,FP_API
-ECDH_DATA_free 3390 EXIST::FUNCTION:ECDH
-PEM_write_X509_CERT_PAIR 3391 EXIST:!WIN16:FUNCTION:
-d2i_X509_CERT_PAIR 3392 EXIST::FUNCTION:
-i2d_EC_PUBKEY_fp 3393 EXIST::FUNCTION:EC,FP_API
-BN_nist_mod_256 3394 EXIST::FUNCTION:
-ECDSA_DATA_new 3395 EXIST::FUNCTION:ECDSA
-ECDSA_size 3396 EXIST::FUNCTION:ECDSA
-d2i_EC_PUBKEY_bio 3397 EXIST::FUNCTION:BIO,EC
-BN_get0_nist_prime_521 3398 EXIST::FUNCTION:
-PEM_read_bio_ECPrivateKey 3399 EXIST::FUNCTION:EC
-ENGINE_get_ECDH 3400 EXIST::FUNCTION:
-d2i_ECDSA_SIG 3401 EXIST::FUNCTION:ECDSA
-ECDSA_sign 3402 EXIST::FUNCTION:ECDSA
-ENGINE_get_ECDSA 3403 EXIST::FUNCTION:
-EVP_ecdsa 3404 EXIST::FUNCTION:SHA
-PKCS12_add_cert 3405 EXIST::FUNCTION:
-ERR_load_ECDH_strings 3406 EXIST::FUNCTION:ECDH
-EC_KEY_dup 3407 EXIST::FUNCTION:EC
-ECDSA_set_method 3408 EXIST::FUNCTION:ECDSA
-d2i_ECParameters 3409 EXIST::FUNCTION:EC
-EC_GF2m_simple_method 3410 EXIST::FUNCTION:EC
-ECDSA_set_ex_data 3411 EXIST::FUNCTION:ECDSA
-EC_KEY_print 3412 EXIST::FUNCTION:BIO,EC
-ECDSA_get_ex_new_index 3413 EXIST::FUNCTION:ECDSA
-EC_GROUP_set_asn1_flag 3414 EXIST::FUNCTION:EC
-EC_KEY_check_key 3415 EXIST::FUNCTION:EC
-d2i_EC_PUBKEY_fp 3416 EXIST::FUNCTION:EC,FP_API
-ecdh_check 3417 EXIST::FUNCTION:ECDH
-ECDSA_DATA_new_method 3418 EXIST::FUNCTION:ECDSA
-PEM_read_bio_X509_CERT_PAIR 3419 EXIST::FUNCTION:
-ENGINE_set_default_ECDH 3420 EXIST::FUNCTION:
-PKCS12_add_key 3421 EXIST::FUNCTION:
-DSO_merge 3422 EXIST::FUNCTION:
-EC_POINT_hex2point 3423 EXIST::FUNCTION:EC
-BN_GF2m_mod_inv_arr 3424 EXIST::FUNCTION:
-ENGINE_unregister_ECDSA 3425 EXIST::FUNCTION:
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 18ef2f5708..cc65f25d4f 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -64,7 +64,6 @@ and [options] can be one of
no-asm - No x86 asm
no-krb5 - No KRB5
no-ec - No EC
- no-ecdsa - No ECDSA
nasm - Use NASM for x86 asm
gaswin - Use GNU as with Mingw32
no-socks - No socket code
@@ -233,7 +232,6 @@ $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
$cflags.=" -DOPENSSL_NO_ERR" if $no_err;
$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
$cflags.=" -DOPENSSL_NO_EC" if $no_ec;
-$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
#$cflags.=" -DRSAref" if $rsaref ne "";
## if ($unix)
@@ -293,7 +291,6 @@ SRC_D=$src_dir
LINK=$link
LFLAGS=$lflags
-RSC=$rsc
BN_ASM_OBJ=$bn_asm_obj
BN_ASM_SRC=$bn_asm_src
@@ -606,18 +603,6 @@ foreach (values %lib_nam)
$rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);
}
-# hack to add version info on MSVC
-if (($platform eq "VC-WIN32") || ($platform eq "VC-NT")) {
- $rules.= <<"EOF";
-\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc
- \$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc
-
-\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc
- \$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc
-
-EOF
-}
-
$defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep);
foreach (split(/\s+/,$test))
{
@@ -773,14 +758,6 @@ sub do_defs
$Vars{$var}.="$t ";
$ret.=$t;
}
- # hack to add version info on MSVC
- if ($shlib && ($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
- {
- if ($var eq "CRYPTOOBJ")
- { $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; }
- elsif ($var eq "SSLOBJ")
- { $ret.="\$(OBJ_D)\\\$(SSL).res "; }
- }
chop($ret);
$ret.="\n\n";
return($ret);
@@ -913,7 +890,6 @@ sub read_options
elsif (/^no-sock$/) { $no_sock=1; }
elsif (/^no-krb5$/) { $no_krb5=1; }
elsif (/^no-ec$/) { $no_ec=1; }
- elsif (/^no-ecdsa$/) { $no_ecdsa=1; }
elsif (/^just-ssl$/) { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1;
$no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;
diff --git a/util/mkdef.pl b/util/mkdef.pl
index fffd1d9a7c..adfd447dd3 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -84,16 +84,14 @@ my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
"RIPEMD",
- "MDC2", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "HMAC", "AES",
+ "MDC2", "RSA", "DSA", "DH", "EC", "HMAC", "AES",
# Envelope "algorithms"
"EVP", "X509", "ASN1_TYPEDEFS",
# Helper "algorithms"
"BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR",
"LOCKING",
# External "algorithms"
- "FP_API", "STDIO", "SOCK", "KRB5",
- # Engines
- "STATIC_ENGINE" );
+ "FP_API", "STDIO", "SOCK", "KRB5" );
my $options="";
open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
@@ -109,8 +107,8 @@ my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;
my $no_cast;
my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;
my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
-my $no_ec; my $no_ecdsa; my $no_ecdh;
-my $no_fp_api; my $no_static_engine;
+my $no_ec;
+my $no_fp_api;
foreach (@ARGV, split(/ /, $options))
{
@@ -166,8 +164,6 @@ foreach (@ARGV, split(/ /, $options))
elsif (/^no-dsa$/) { $no_dsa=1; }
elsif (/^no-dh$/) { $no_dh=1; }
elsif (/^no-ec$/) { $no_ec=1; }
- elsif (/^no-ecdsa$/) { $no_ecdsa=1; }
- elsif (/^no-ecdh$/) { $no_ecdh=1; }
elsif (/^no-hmac$/) { $no_hmac=1; }
elsif (/^no-aes$/) { $no_aes=1; }
elsif (/^no-evp$/) { $no_evp=1; }
@@ -237,8 +233,6 @@ $crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa;
$crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa;
$crypto.=" crypto/dh/dh.h" ; # unless $no_dh;
$crypto.=" crypto/ec/ec.h" ; # unless $no_ec;
-$crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa;
-$crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh;
$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac;
$crypto.=" crypto/engine/engine.h";
@@ -445,7 +439,6 @@ sub do_defs
s/\/\*.*?\*\///gs; # ignore comments
s/{[^{}]*}//gs; # ignore {} blocks
- print STDERR "DEBUG: \$def=\"$def\"\n" if $debug && $def ne "";
print STDERR "DEBUG: \$_=\"$_\"\n" if $debug;
if (/^\#\s*ifndef\s+(.*)/) {
push(@tag,"-");
@@ -713,8 +706,6 @@ sub do_defs
"EXPORT_VAR_AS_FUNCTION",
"FUNCTION");
next;
- } elsif (/^\s*DECLARE_ASN1_NDEF_FUNCTION\s*\(\s*(\w*)\s*\)/) {
- $def .= "int i2d_$1_NDEF(void);";
} elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) {
next;
} elsif (/^\s*DECLARE_PKCS12_STACK_OF\s*\(\s*(\w*)\s*\)/) {
@@ -1050,8 +1041,6 @@ sub is_valid
if ($keyword eq "DSA" && $no_dsa) { return 0; }
if ($keyword eq "DH" && $no_dh) { return 0; }
if ($keyword eq "EC" && $no_ec) { return 0; }
- if ($keyword eq "ECDSA" && $no_ecdsa) { return 0; }
- if ($keyword eq "ECDH" && $no_ecdh) { return 0; }
if ($keyword eq "HMAC" && $no_hmac) { return 0; }
if ($keyword eq "AES" && $no_aes) { return 0; }
if ($keyword eq "EVP" && $no_evp) { return 0; }
@@ -1064,7 +1053,6 @@ sub is_valid
if ($keyword eq "DSO" && $no_dso) { return 0; }
if ($keyword eq "KRB5" && $no_krb5) { return 0; }
if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
- if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
# Nothing recognise as true
return 1;
diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 70d1348a34..29e1404c69 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -30,8 +30,6 @@ my @dirs = (
"crypto/dso",
"crypto/dh",
"crypto/ec",
-"crypto/ecdh",
-"crypto/ecdsa",
"crypto/buffer",
"crypto/bio",
"crypto/stack",
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 334a53f70b..d6e3a11530 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -32,7 +32,6 @@ $ofile="/Fo";
# EXE linking stuff
$link="link";
-$rsc="rc";
$efile="/out:";
$exep='.exe';
if ($no_sock)
diff --git a/util/ssleay.num b/util/ssleay.num
index d027a1c45a..fdea47205d 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -215,5 +215,3 @@ SSL_CTX_set_generate_session_id 264 EXIST::FUNCTION:
SSL_renegotiate_pending 265 EXIST::FUNCTION:
SSL_CTX_set_msg_callback 266 EXIST::FUNCTION:
SSL_set_msg_callback 267 EXIST::FUNCTION:
-SSL_set_tmp_ecdh_callback 268 EXIST::FUNCTION:ECDH
-SSL_CTX_set_tmp_ecdh_callback 269 EXIST::FUNCTION:ECDH
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 06:09:07 +0000