openssl-engine-0.9.6a merge

5 files changed, 98 insertions, 68 deletions

diff --git a/lib/libssl/src/util/clean-depend.pl b/lib/libssl/src/util/clean-depend.pl
index af676af7514..0193e726fee 100644
--- a/lib/libssl/src/util/clean-depend.pl
+++ b/lib/libssl/src/util/clean-depend.pl
@@ -15,8 +15,8 @@ while(<STDIN>) {
     my ($file,$deps)=/^(.*): (.*)$/;
     next if !defined $deps;
     my @deps=split ' ',$deps;
-    @deps=grep(!/^\/usr\/include/,@deps);
-    @deps=grep(!/^\/usr\/lib\/gcc-lib/,@deps);
+    @deps=grep(!/^\//,@deps);
+    @deps=grep(!/^\\$/,@deps);
     push @{$files{$file}},@deps;
 }
 
diff --git a/lib/libssl/src/util/libeay.num b/lib/libssl/src/util/libeay.num
index e8eebbf50c4..84ae840804a 100644
--- a/lib/libssl/src/util/libeay.num
+++ b/lib/libssl/src/util/libeay.num
@@ -301,8 +301,8 @@ EVP_des_ede_cfb                         308	EXIST::FUNCTION:DES
 EVP_des_ede_ofb                         309	EXIST::FUNCTION:DES
 EVP_des_ofb                             310	EXIST::FUNCTION:DES
 EVP_desx_cbc                            311	EXIST::FUNCTION:DES
-EVP_dss                                 312	EXIST::FUNCTION:DSA
-EVP_dss1                                313	EXIST::FUNCTION:DSA
+EVP_dss                                 312	EXIST::FUNCTION:DSA,SHA
+EVP_dss1                                313	EXIST::FUNCTION:DSA,SHA
 EVP_enc_null                            314	EXIST::FUNCTION:
 EVP_get_cipherbyname                    315	EXIST::FUNCTION:
 EVP_get_digestbyname                    316	EXIST::FUNCTION:
@@ -779,7 +779,7 @@ des_ede3_cfb64_encrypt                  786	EXIST::FUNCTION:DES
 des_ede3_ofb64_encrypt                  787	EXIST::FUNCTION:DES
 des_enc_read                            788	EXIST::FUNCTION:DES
 des_enc_write                           789	EXIST::FUNCTION:DES
-des_encrypt                             790	EXIST::FUNCTION:DES
+des_encrypt1                            790	EXIST::FUNCTION:DES
 des_encrypt2                            791	EXIST::FUNCTION:DES
 des_encrypt3                            792	EXIST::FUNCTION:DES
 des_fcrypt                              793	EXIST::FUNCTION:DES
@@ -926,7 +926,7 @@ PKCS7_add_signature                     938	EXIST::FUNCTION:
 PKCS7_cert_from_signer_info             939	EXIST::FUNCTION:
 PKCS7_get_signer_info                   940	EXIST::FUNCTION:
 EVP_delete_alias                        941	NOEXIST::FUNCTION:
-EVP_mdc2                                942	EXIST::FUNCTION:
+EVP_mdc2                                942	EXIST::FUNCTION:MDC2
 PEM_read_bio_RSAPublicKey               943	EXIST::FUNCTION:RSA
 PEM_write_bio_RSAPublicKey              944	EXIST::FUNCTION:RSA
 d2i_RSAPublicKey_bio                    945	EXIST::FUNCTION:RSA
@@ -1870,61 +1870,64 @@ X509_keyid_set1                         2460	EXIST::FUNCTION:
 BIO_next                                2461	EXIST::FUNCTION:
 DSO_METHOD_vms                          2462	EXIST::FUNCTION:
 BIO_f_linebuffer                        2463	EXIST:VMS:FUNCTION:
-ERR_load_ENGINE_strings                 2464	EXIST::FUNCTION:
-ENGINE_set_DSA                          2465	EXIST::FUNCTION:
-ENGINE_get_finish_function              2466	EXIST::FUNCTION:
-ENGINE_get_default_RSA                  2467	EXIST::FUNCTION:
-ENGINE_get_BN_mod_exp                   2468	EXIST::FUNCTION:
-DSA_get_default_openssl_method          2469	EXIST::FUNCTION:DSA
-ENGINE_set_DH                           2470	EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp_crt       2471	EXIST:!VMS:FUNCTION:
-ENGINE_set_def_BN_mod_exp_crt           2471	EXIST:VMS:FUNCTION:
-ENGINE_init                             2472	EXIST::FUNCTION:
-DH_get_default_openssl_method           2473	EXIST::FUNCTION:DH
-RSA_set_default_openssl_method          2474	EXIST::FUNCTION:RSA
-ENGINE_finish                           2475	EXIST::FUNCTION:
-ENGINE_load_public_key                  2476	EXIST::FUNCTION:
-ENGINE_get_DH                           2477	EXIST::FUNCTION:
-ENGINE_ctrl                             2478	EXIST::FUNCTION:
-ENGINE_get_init_function                2479	EXIST::FUNCTION:
-ENGINE_set_init_function                2480	EXIST::FUNCTION:
-ENGINE_set_default_DSA                  2481	EXIST::FUNCTION:
-ENGINE_get_name                         2482	EXIST::FUNCTION:
-ENGINE_get_last                         2483	EXIST::FUNCTION:
-ENGINE_get_prev                         2484	EXIST::FUNCTION:
-ENGINE_get_default_DH                   2485	EXIST::FUNCTION:
-ENGINE_get_RSA                          2486	EXIST::FUNCTION:
-ENGINE_set_default                      2487	EXIST::FUNCTION:
-ENGINE_get_RAND                         2488	EXIST::FUNCTION:
-ENGINE_get_first                        2489	EXIST::FUNCTION:
-ENGINE_by_id                            2490	EXIST::FUNCTION:
-ENGINE_set_finish_function              2491	EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp_crt       2492	EXIST:!VMS:FUNCTION:
-ENGINE_get_def_BN_mod_exp_crt           2492	EXIST:VMS:FUNCTION:
-RSA_get_default_openssl_method          2493	EXIST::FUNCTION:RSA
-ENGINE_set_RSA                          2494	EXIST::FUNCTION:
-ENGINE_load_private_key                 2495	EXIST::FUNCTION:
-ENGINE_set_default_RAND                 2496	EXIST::FUNCTION:
-ENGINE_set_BN_mod_exp                   2497	EXIST::FUNCTION:
-ENGINE_remove                           2498	EXIST::FUNCTION:
-ENGINE_free                             2499	EXIST::FUNCTION:
-ENGINE_get_BN_mod_exp_crt               2500	EXIST::FUNCTION:
-ENGINE_get_next                         2501	EXIST::FUNCTION:
-ENGINE_set_name                         2502	EXIST::FUNCTION:
-ENGINE_get_default_DSA                  2503	EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp           2504	EXIST::FUNCTION:
-ENGINE_set_default_RSA                  2505	EXIST::FUNCTION:
-ENGINE_get_default_RAND                 2506	EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp           2507	EXIST::FUNCTION:
-ENGINE_set_RAND                         2508	EXIST::FUNCTION:
-ENGINE_set_id                           2509	EXIST::FUNCTION:
-ENGINE_set_BN_mod_exp_crt               2510	EXIST::FUNCTION:
-ENGINE_set_default_DH                   2511	EXIST::FUNCTION:
-ENGINE_new                              2512	EXIST::FUNCTION:
-ENGINE_get_id                           2513	EXIST::FUNCTION:
-DSA_set_default_openssl_method          2514	EXIST::FUNCTION:DSA
-ENGINE_add                              2515	EXIST::FUNCTION:
-DH_set_default_openssl_method           2516	EXIST::FUNCTION:DH
-ENGINE_get_DSA                          2517	EXIST::FUNCTION:
-ENGINE_get_ctrl_function                2518	EXIST::FUNCTION:
-ENGINE_set_ctrl_function                2519	EXIST::FUNCTION:
+BN_bntest_rand                          2464	EXIST::FUNCTION:
+OPENSSL_issetugid                       2465	EXIST::FUNCTION:
+BN_rand_range                           2466	EXIST::FUNCTION:
+ERR_load_ENGINE_strings                 2467	EXIST::FUNCTION:
+ENGINE_set_DSA                          2468	EXIST::FUNCTION:
+ENGINE_get_finish_function              2469	EXIST::FUNCTION:
+ENGINE_get_default_RSA                  2470	EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp                   2471	EXIST::FUNCTION:
+DSA_get_default_openssl_method          2472	EXIST::FUNCTION:DSA
+ENGINE_set_DH                           2473	EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp_crt       2474	EXIST:!VMS:FUNCTION:
+ENGINE_set_def_BN_mod_exp_crt           2474	EXIST:VMS:FUNCTION:
+ENGINE_init                             2475	EXIST::FUNCTION:
+DH_get_default_openssl_method           2476	EXIST::FUNCTION:DH
+RSA_set_default_openssl_method          2477	EXIST::FUNCTION:RSA
+ENGINE_finish                           2478	EXIST::FUNCTION:
+ENGINE_load_public_key                  2479	EXIST::FUNCTION:
+ENGINE_get_DH                           2480	EXIST::FUNCTION:
+ENGINE_ctrl                             2481	EXIST::FUNCTION:
+ENGINE_get_init_function                2482	EXIST::FUNCTION:
+ENGINE_set_init_function                2483	EXIST::FUNCTION:
+ENGINE_set_default_DSA                  2484	EXIST::FUNCTION:
+ENGINE_get_name                         2485	EXIST::FUNCTION:
+ENGINE_get_last                         2486	EXIST::FUNCTION:
+ENGINE_get_prev                         2487	EXIST::FUNCTION:
+ENGINE_get_default_DH                   2488	EXIST::FUNCTION:
+ENGINE_get_RSA                          2489	EXIST::FUNCTION:
+ENGINE_set_default                      2490	EXIST::FUNCTION:
+ENGINE_get_RAND                         2491	EXIST::FUNCTION:
+ENGINE_get_first                        2492	EXIST::FUNCTION:
+ENGINE_by_id                            2493	EXIST::FUNCTION:
+ENGINE_set_finish_function              2494	EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp_crt       2495	EXIST:!VMS:FUNCTION:
+ENGINE_get_def_BN_mod_exp_crt           2495	EXIST:VMS:FUNCTION:
+RSA_get_default_openssl_method          2496	EXIST::FUNCTION:RSA
+ENGINE_set_RSA                          2497	EXIST::FUNCTION:
+ENGINE_load_private_key                 2498	EXIST::FUNCTION:
+ENGINE_set_default_RAND                 2499	EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp                   2500	EXIST::FUNCTION:
+ENGINE_remove                           2501	EXIST::FUNCTION:
+ENGINE_free                             2502	EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp_crt               2503	EXIST::FUNCTION:
+ENGINE_get_next                         2504	EXIST::FUNCTION:
+ENGINE_set_name                         2505	EXIST::FUNCTION:
+ENGINE_get_default_DSA                  2506	EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp           2507	EXIST::FUNCTION:
+ENGINE_set_default_RSA                  2508	EXIST::FUNCTION:
+ENGINE_get_default_RAND                 2509	EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp           2510	EXIST::FUNCTION:
+ENGINE_set_RAND                         2511	EXIST::FUNCTION:
+ENGINE_set_id                           2512	EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp_crt               2513	EXIST::FUNCTION:
+ENGINE_set_default_DH                   2514	EXIST::FUNCTION:
+ENGINE_new                              2515	EXIST::FUNCTION:
+ENGINE_get_id                           2516	EXIST::FUNCTION:
+DSA_set_default_openssl_method          2517	EXIST::FUNCTION:DSA
+ENGINE_add                              2518	EXIST::FUNCTION:
+DH_set_default_openssl_method           2519	EXIST::FUNCTION:DH
+ENGINE_get_DSA                          2520	EXIST::FUNCTION:
+ENGINE_get_ctrl_function                2521	EXIST::FUNCTION:
+ENGINE_set_ctrl_function                2522	EXIST::FUNCTION:
diff --git a/lib/libssl/src/util/mkdef.pl b/lib/libssl/src/util/mkdef.pl
index cc41a1813e5..ba453358cf9 100644
--- a/lib/libssl/src/util/mkdef.pl
+++ b/lib/libssl/src/util/mkdef.pl
@@ -119,7 +119,7 @@ foreach (@ARGV, split(/ /, $options))
 	elsif (/^no-rc4$/)      { $no_rc4=1; }
 	elsif (/^no-rc5$/)      { $no_rc5=1; }
 	elsif (/^no-idea$/)     { $no_idea=1; }
-	elsif (/^no-des$/)      { $no_des=1; }
+	elsif (/^no-des$/)      { $no_des=1; $no_mdc2=1; }
 	elsif (/^no-bf$/)       { $no_bf=1; }
 	elsif (/^no-cast$/)     { $no_cast=1; }
 	elsif (/^no-md2$/)      { $no_md2=1; }
@@ -705,7 +705,8 @@ EOF
 		} else {
 			(my $n, my $i) = split /\\/, $nums{$s};
 			my %pf = ();
-			my @p = split(/,/, ($i =~ /^.*?:(.*?):/,$1));
+			my @p = split(/,/, ($i =~ /^[^:]*:([^:]*):/,$1));
+			my @a = split(/,/, ($i =~ /^[^:]*:[^:]*:[^:]*:([^:]*)/,$1));
 			# @p_purged must contain hardware platforms only
 			my @p_purged = ();
 			foreach $ptmp (@p) {
@@ -727,7 +728,26 @@ EOF
 				|| (!$negatives
 				    && ($rsaref || !grep(/^RSAREF$/,@p)))
 				|| ($negatives
-				    && (!$rsaref || !grep(/^!RSAREF$/,@p))))) {
+				    && (!$rsaref || !grep(/^!RSAREF$/,@p))))
+			    && (!@a || (!$no_rc2 || !grep(/^RC2$/,@a)))
+			    && (!@a || (!$no_rc4 || !grep(/^RC4$/,@a)))
+			    && (!@a || (!$no_rc5 || !grep(/^RC5$/,@a)))
+			    && (!@a || (!$no_idea || !grep(/^IDEA$/,@a)))
+			    && (!@a || (!$no_des || !grep(/^DES$/,@a)))
+			    && (!@a || (!$no_bf || !grep(/^BF$/,@a)))
+			    && (!@a || (!$no_cast || !grep(/^CAST$/,@a)))
+			    && (!@a || (!$no_md2 || !grep(/^MD2$/,@a)))
+			    && (!@a || (!$no_md4 || !grep(/^MD4$/,@a)))
+			    && (!@a || (!$no_md5 || !grep(/^MD5$/,@a)))
+			    && (!@a || (!$no_sha || !grep(/^SHA$/,@a)))
+			    && (!@a || (!$no_ripemd || !grep(/^RIPEMD$/,@a)))
+			    && (!@a || (!$no_mdc2 || !grep(/^MDC2$/,@a)))
+			    && (!@a || (!$no_rsa || !grep(/^RSA$/,@a)))
+			    && (!@a || (!$no_dsa || !grep(/^DSA$/,@a)))
+			    && (!@a || (!$no_dh || !grep(/^DH$/,@a)))
+			    && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a)))
+			    && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a)))
+			    ) {
 				printf OUT "    %s%-40s@%d\n",($W32)?"":"_",$s,$n;
 #			} else {
 #				print STDERR "DEBUG: \"$sym\" (@p):",
diff --git a/lib/libssl/src/util/mklink.pl b/lib/libssl/src/util/mklink.pl
index d7b997ada72..9e9c9a51467 100644
--- a/lib/libssl/src/util/mklink.pl
+++ b/lib/libssl/src/util/mklink.pl
@@ -48,8 +48,13 @@ foreach $dirname (@from_path) {
 my $to = join('/', @to_path);
 
 my $file;
+$symlink_exists=eval {symlink("",""); 1};
 foreach $file (@files) {
     my $err = "";
-    symlink("$to/$file", "$from/$file") or $err = " [$!]";
+    if ($symlink_exists) {
+	symlink("$to/$file", "$from/$file") or $err = " [$!]";
+    } else {
+	system ("cp", "$file", "$from/$file") and $err = " [$!]";
+    }
     print $file . " => $from/$file$err\n";
 }
diff --git a/lib/libssl/src/util/pod2man.pl b/lib/libssl/src/util/pod2man.pl
index f5ec0767ed4..c6b64add602 100644
--- a/lib/libssl/src/util/pod2man.pl
+++ b/lib/libssl/src/util/pod2man.pl
@@ -416,6 +416,8 @@ if ($name ne 'something') {
 			warn "$0: Improper man page - malformed NAME header in paragraph $. of $ARGV[0]\n"
 		    }
 		    else {
+			$n[0] =~ s/\n/ /;
+			$n[1] =~ s/\n/ /;
 			%namedesc = @n;
 		    }
 		}