WIN32 VC++ build fixes.

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"))

util/mkdef.pl

@@ -1226,8 +1226,6 @@ EOO
 
 LIBRARY         $libname	$liboptions
 
-DESCRIPTION     '$description'
-
 EOF
 
 	if ($W16) {

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/)

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: