aboutsummaryrefslogtreecommitdiff
path: root/openssl/util
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/util')
-rw-r--r--openssl/util/libeay.num22
-rw-r--r--openssl/util/mkdef.pl6
-rw-r--r--openssl/util/pl/VC-32.pl38
3 files changed, 34 insertions, 32 deletions
diff --git a/openssl/util/libeay.num b/openssl/util/libeay.num
index 007e1f8ba..6f3067ae2 100644
--- a/openssl/util/libeay.num
+++ b/openssl/util/libeay.num
@@ -3752,7 +3752,7 @@ TS_REQ_set_policy_id 4138 EXIST::FUNCTION:
d2i_TS_RESP_fp 4139 EXIST::FUNCTION:
ENGINE_get_pkey_asn1_meth_engine 4140 EXIST:!VMS:FUNCTION:ENGINE
ENGINE_get_pkey_asn1_meth_eng 4140 EXIST:VMS:FUNCTION:ENGINE
-WHIRLPOOL_Init 4141 EXIST::FUNCTION:WHIRLPOOL
+WHIRLPOOL_Init 4141 EXIST:!VMSVAX:FUNCTION:WHIRLPOOL
TS_RESP_set_status_info 4142 EXIST::FUNCTION:
EVP_PKEY_keygen 4143 EXIST::FUNCTION:
EVP_DigestSignInit 4144 EXIST::FUNCTION:
@@ -3761,7 +3761,7 @@ TS_REQ_dup 4146 EXIST::FUNCTION:
GENERAL_NAME_dup 4147 EXIST::FUNCTION:
ASN1_SEQUENCE_ANY_it 4148 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
ASN1_SEQUENCE_ANY_it 4148 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-WHIRLPOOL 4149 EXIST::FUNCTION:WHIRLPOOL
+WHIRLPOOL 4149 EXIST:!VMSVAX:FUNCTION:WHIRLPOOL
X509_STORE_get1_crls 4150 EXIST::FUNCTION:
ENGINE_get_pkey_asn1_meth 4151 EXIST::FUNCTION:ENGINE
EVP_PKEY_asn1_new 4152 EXIST::FUNCTION:
@@ -3812,7 +3812,7 @@ DSO_global_lookup 4195 EXIST::FUNCTION:
TS_CONF_set_tsa_name 4196 EXIST::FUNCTION:
i2d_ASN1_SET_ANY 4197 EXIST::FUNCTION:
ENGINE_load_gost 4198 EXIST::FUNCTION:ENGINE,GOST,STATIC_ENGINE
-WHIRLPOOL_BitUpdate 4199 EXIST::FUNCTION:WHIRLPOOL
+WHIRLPOOL_BitUpdate 4199 EXIST:!VMSVAX:FUNCTION:WHIRLPOOL
ASN1_PCTX_get_flags 4200 EXIST::FUNCTION:
TS_TST_INFO_get_ext_by_NID 4201 EXIST::FUNCTION:
TS_RESP_new 4202 EXIST::FUNCTION:
@@ -3861,10 +3861,10 @@ EVP_PKEY_meth_set_sign 4243 EXIST::FUNCTION:
CRYPTO_THREADID_current 4244 EXIST::FUNCTION:
EVP_PKEY_decrypt_init 4245 EXIST::FUNCTION:
NETSCAPE_X509_free 4246 EXIST::FUNCTION:
-i2b_PVK_bio 4247 EXIST::FUNCTION:
+i2b_PVK_bio 4247 EXIST::FUNCTION:RC4
EVP_PKEY_print_private 4248 EXIST::FUNCTION:
GENERAL_NAME_get0_value 4249 EXIST::FUNCTION:
-b2i_PVK_bio 4250 EXIST::FUNCTION:
+b2i_PVK_bio 4250 EXIST::FUNCTION:RC4
ASN1_UTCTIME_adj 4251 EXIST::FUNCTION:
TS_TST_INFO_new 4252 EXIST::FUNCTION:
EVP_MD_do_all_sorted 4253 EXIST::FUNCTION:
@@ -3975,7 +3975,7 @@ X509_PUBKEY_get0_param 4356 EXIST::FUNCTION:
TS_MSG_IMPRINT_dup 4357 EXIST::FUNCTION:
PKCS7_print_ctx 4358 EXIST::FUNCTION:
i2d_TS_REQ_bio 4359 EXIST::FUNCTION:
-EVP_whirlpool 4360 EXIST::FUNCTION:WHIRLPOOL
+EVP_whirlpool 4360 EXIST:!VMSVAX:FUNCTION:WHIRLPOOL
EVP_PKEY_asn1_set_param 4361 EXIST::FUNCTION:
EVP_PKEY_meth_set_encrypt 4362 EXIST::FUNCTION:
ASN1_PCTX_set_flags 4363 EXIST::FUNCTION:
@@ -3986,7 +3986,7 @@ ENGINE_register_all_pkey_meths 4367 EXIST::FUNCTION:ENGINE
TS_RESP_CTX_set_status_info_cond 4368 EXIST:!VMS:FUNCTION:
TS_RESP_CTX_set_stat_info_cond 4368 EXIST:VMS:FUNCTION:
EVP_PKEY_verify 4369 EXIST::FUNCTION:
-WHIRLPOOL_Final 4370 EXIST::FUNCTION:WHIRLPOOL
+WHIRLPOOL_Final 4370 EXIST:!VMSVAX:FUNCTION:WHIRLPOOL
X509_CRL_METHOD_new 4371 EXIST::FUNCTION:
EVP_DigestSignFinal 4372 EXIST::FUNCTION:
TS_RESP_CTX_set_def_policy 4373 EXIST::FUNCTION:
@@ -4068,7 +4068,7 @@ ERR_remove_thread_state 4445 EXIST::FUNCTION:
EVP_PKEY_meth_add0 4446 EXIST::FUNCTION:
TS_TST_INFO_set_tsa 4447 EXIST::FUNCTION:
EVP_PKEY_meth_new 4448 EXIST::FUNCTION:
-WHIRLPOOL_Update 4449 EXIST::FUNCTION:WHIRLPOOL
+WHIRLPOOL_Update 4449 EXIST:!VMSVAX:FUNCTION:WHIRLPOOL
TS_CONF_set_accuracy 4450 EXIST::FUNCTION:
ASN1_PCTX_set_oid_flags 4451 EXIST::FUNCTION:
ESS_SIGNING_CERT_dup 4452 EXIST::FUNCTION:
@@ -4173,6 +4173,8 @@ X509_STORE_CTX_get0_cur_issuer 4546 EXIST:VMS:FUNCTION:
X509_issuer_name_hash_old 4547 EXIST::FUNCTION:MD5
X509_subject_name_hash_old 4548 EXIST::FUNCTION:MD5
EVP_CIPHER_CTX_copy 4549 EXIST::FUNCTION:
-UI_method_get_prompt_constructor 4550 EXIST::FUNCTION:
-UI_method_set_prompt_constructor 4551 EXIST::FUNCTION:
+UI_method_get_prompt_constructor 4550 EXIST:!VMS:FUNCTION:
+UI_method_get_prompt_constructr 4550 EXIST:VMS:FUNCTION:
+UI_method_set_prompt_constructor 4551 EXIST:!VMS:FUNCTION:
+UI_method_set_prompt_constructr 4551 EXIST:VMS:FUNCTION:
EVP_read_pw_string_min 4552 EXIST::FUNCTION:
diff --git a/openssl/util/mkdef.pl b/openssl/util/mkdef.pl
index 1d579c897..a4a17e3ae 100644
--- a/openssl/util/mkdef.pl
+++ b/openssl/util/mkdef.pl
@@ -978,6 +978,12 @@ sub do_defs
$platform{"SHA512_Update"} = "!VMSVAX";
$platform{"SHA512_Final"} = "!VMSVAX";
$platform{"SHA512"} = "!VMSVAX";
+ $platform{"WHIRLPOOL_Init"} = "!VMSVAX";
+ $platform{"WHIRLPOOL"} = "!VMSVAX";
+ $platform{"WHIRLPOOL_BitUpdate"} = "!VMSVAX";
+ $platform{"EVP_whirlpool"} = "!VMSVAX";
+ $platform{"WHIRLPOOL_Final"} = "!VMSVAX";
+ $platform{"WHIRLPOOL_Update"} = "!VMSVAX";
# Info we know about
diff --git a/openssl/util/pl/VC-32.pl b/openssl/util/pl/VC-32.pl
index c024f0268..9461d1a25 100644
--- a/openssl/util/pl/VC-32.pl
+++ b/openssl/util/pl/VC-32.pl
@@ -123,15 +123,15 @@ else # Win32
}
$mlflags='';
-$out_def="out32"; $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
-$tmp_def="tmp32"; $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
+$out_def ="\$(OUT_D)"; $out_def.="dll" if ($shlib);
+ $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
+$tmp_def ="\$(TMP_D)"; $tmp_def.="dll" if ($shlib);
+ $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
$inc_def="inc32";
if ($debug)
{
$cflags=$dbg_cflags.$base_cflags;
- $lflags.=" /debug";
- $mlflags.=' /debug';
}
else
{
@@ -139,6 +139,11 @@ else
$cdflags=$dbg_cflags.$base_cflags;
}
+# generate symbols.pdb unconditionally
+$app_cflag.=" /Zi /Fd$tmp_def/app";
+$lib_cflag.=" /Zi /Fd$tmp_def/lib";
+$lflags.=" /debug";
+
$obj='.obj';
$asm_suffix='.asm';
$ofile="/Fo";
@@ -179,18 +184,15 @@ $lfile='/out:';
$shlib_ex_obj="";
$app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
if ($FLAVOR =~ /WIN64A/) {
- if (`nasm -v` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
- $asm='nasm -f win64 -DNEAR -Ox';
- $asm.=' -g' if $debug;
+ if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
+ $asm='nasm -f win64 -DNEAR -Ox -g';
$afile='-o ';
} else {
- $asm='ml64 /c /Cp /Cx';
- $asm.=" /Zi" if $debug;
+ $asm='ml64 /c /Cp /Cx /Zi';
$afile='/Fo';
}
} elsif ($FLAVOR =~ /WIN64I/) {
- $asm='ias';
- $asm.=" -d debug" if $debug;
+ $asm='ias -d debug';
$afile="-o ";
} elsif ($nasm) {
my $ver=`nasm -v 2>NUL`;
@@ -200,8 +202,7 @@ if ($FLAVOR =~ /WIN64A/) {
$asmtype="win32n";
$afile='-o ';
} else {
- $asm='ml /nologo /Cp /coff /c /Cx';
- $asm.=" /Zi" if $debug;
+ $asm='ml /nologo /Cp /coff /c /Cx /Zi';
$afile='/Fo';
$asmtype="win32";
}
@@ -234,9 +235,7 @@ if (!$no_asm)
if ($shlib && $FLAVOR !~ /CE/)
{
$mlflags.=" $lflags /dll";
- $lib_cflag=" -D_WINDLL";
- $out_def="out32dll";
- $tmp_def="tmp32dll";
+ $lib_cflag.=" -D_WINDLL";
#
# Engage Applink...
#
@@ -266,14 +265,9 @@ elsif ($shlib && $FLAVOR =~ /CE/)
{
$mlflags.=" $lflags /dll";
$lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));
- $lib_cflag=" -D_WINDLL -D_DLL";
- $out_def='out32dll_$(TARGETCPU)';
- $tmp_def='tmp32dll_$(TARGETCPU)';
+ $lib_cflag.=" -D_WINDLL -D_DLL";
}
-$cflags.=" /Fd\$(OUT_D)";
-$cdflags.=" /Fd\$(OUT_D)";
-
sub do_lib_rule
{
local($objs,$target,$name,$shlib)=@_;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 16:31:06 +0000