WIN32 VC++ build fixes.
authorDr. Stephen Henson <steve@openssl.org>
Wed, 18 Jul 2007 17:40:49 +0000 (17:40 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 18 Jul 2007 17:40:49 +0000 (17:40 +0000)
util/mk1mf.pl
util/mkdef.pl
util/pl/VC-32.pl
util/ssleay.num

index 4a00100..5fb3262 100755 (executable)
@@ -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"))
index f159fd4..fb74fab 100755 (executable)
@@ -1226,8 +1226,6 @@ EOO
 
 LIBRARY         $libname       $liboptions
 
-DESCRIPTION     '$description'
-
 EOF
 
        if ($W16) {
index 1140cfb..0a08673 100644 (file)
@@ -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/)
index 6afb977..3c0bf88 100755 (executable)
@@ -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: