WIN32 VC++ build fixes.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 4a00100f3fef33809fe83af816d0de9de949448d..5fb32624f6a00eabd4a64fd8e638722b27dbf474 100755 (executable)
--- 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 f159fd493489caf415347d47e65c4f0d4f12b2f1..fb74fab9b5977406ed3bab9efbe433b17c820ae0 100755 (executable)
--- 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 1140cfb0c5d36fbe23caa732c138a1c53ccca24c..0a08673cdd129d06f9949c4ef5edc5c3b6054a76 100644 (file)
--- 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 6afb977219347365660d4fa1a21d997bcb45454d..3c0bf88270ed7c9370dcf52e183557d1ea9456b5 100755 (executable)
--- 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: