diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-07-18 17:40:49 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-07-18 17:40:49 +0000 |
| commit | 0d7dba92c806cd120b06aa24fc86f8f56aaecf2c (patch) | |
| tree | 86e2421409e9645bffd10eb9c671653e0a6fd8ec | |
| parent | ce1390aedca795c113815f7b6b816181eef2b92e (diff) | |
WIN32 VC++ build fixes.
| -rwxr-xr-x | util/mk1mf.pl | 1 | ||||
| -rwxr-xr-x | util/mkdef.pl | 2 | ||||
| -rw-r--r-- | util/pl/VC-32.pl | 2 | ||||
| -rwxr-xr-x | util/ssleay.num | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 4a00100f3f..5fb32624f6 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -646,6 +646,7 @@ foreach (values %lib_nam) if (($rc4_enc_obj ne "") && ($_ eq "CRYPTO")) { $lib_obj =~ s/\s\S*\/rc4_enc\S*/ \$(RC4_ENC_OBJ)/; + $lib_obj =~ s/\s\S*\/rc4_skey\S*//; $rules.=&do_asm_rule($rc4_enc_obj,$rc4_enc_src); } if (($rc5_enc_obj ne "") && ($_ eq "CRYPTO")) diff --git a/util/mkdef.pl b/util/mkdef.pl index f159fd4934..fb74fab9b5 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -1226,8 +1226,6 @@ EOO LIBRARY $libname $liboptions -DESCRIPTION '$description' - EOF if ($W16) { diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 1140cfb0c5..0a08673cdd 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -198,7 +198,7 @@ if (!$no_asm) $whirlpool_asm_src='crypto\whrlpool\asm\wp_win32.asm'; $cpuid_asm_obj='crypto\cpu_win32.obj'; $cpuid_asm_src='crypto\cpu_win32.asm'; - $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM -DWHIRLPOOL_ASM"; + $cflags.=" -DOPENSSL_CPUID_OBJ -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM -DWHIRLPOOL_ASM"; } if ($shlib && $FLAVOR !~ /CE/) diff --git a/util/ssleay.num b/util/ssleay.num index 6afb977219..3c0bf88270 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -249,3 +249,7 @@ SSL_get_servername 297 EXIST::FUNCTION:TLSEXT SSL_get_servername_type 298 EXIST::FUNCTION:TLSEXT SSL_CTX_set_psk_server_callback 299 EXIST::FUNCTION:PSK SSL_get_psk_identity 300 EXIST::FUNCTION:PSK +PEM_write_bio_SSL_SESSION 301 EXIST::FUNCTION: +PEM_read_SSL_SESSION 302 EXIST:!WIN16:FUNCTION: +PEM_read_bio_SSL_SESSION 303 EXIST::FUNCTION: +PEM_write_SSL_SESSION 304 EXIST:!WIN16:FUNCTION: |