Merg in recent changes from the main trunk.

diff --git a/Configure b/Configure
index ca85aecc14b564e61b90bbb975e5eea3a07fccd9..68c972a40a1b36af0421fe1e59f00cbd045553f0 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -904,11 +904,11 @@ my $bn_ops = $fields[$idx_bn_ops];
 my $bn_obj = $fields[$idx_bn_obj];
 my $des_obj = $fields[$idx_des_obj];
 my $bf_obj = $fields[$idx_bf_obj];
-my $md5_obj = $fields[$idx_md5_obj];
-my $sha1_obj = $fields[$idx_sha1_obj];
+$md5_obj = $fields[$idx_md5_obj];
+$sha1_obj = $fields[$idx_sha1_obj];
 my $cast_obj = $fields[$idx_cast_obj];
 my $rc4_obj = $fields[$idx_rc4_obj];
-my $rmd160_obj = $fields[$idx_rmd160_obj];
+$rmd160_obj = $fields[$idx_rmd160_obj];
 my $rc5_obj = $fields[$idx_rc5_obj];
 my $dso_scheme = $fields[$idx_dso_scheme];
 my $shared_target = $fields[$idx_shared_target];

diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl
index 099bf0dd28731482f3c857143fbc112b0a0a6547..7fee05e7fcc73246b6434fad9d96c45deabfc342 100644 (file)
--- a/crypto/aes/Makefile.ssl
+++ b/crypto/aes/Makefile.ssl
@@ -54,7 +54,7 @@ files:
 links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-       @#$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+       @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install: installs

diff --git a/crypto/ebcdic.c b/crypto/ebcdic.c
index eb460544339cb6cef77a5214bece576f18ecc112..bc968ea807f26e386d291785a8a5eebe8b15499b 100644 (file)
--- a/crypto/ebcdic.c
+++ b/crypto/ebcdic.c
@@ -212,7 +212,7 @@ ascii2ebcdic(void *dest, const void *srce, size_t count)
 
 #else /*CHARSET_EBCDIC*/
 #include <openssl/opensslconf.h>
-#if defined(PEDANTIC) || defined(OPENSSL_SYS_VMS)
+#if defined(PEDANTIC) || defined(__DECC)
 static void *dummy=&dummy;
 #endif
 #endif

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 432c654bb45ac25c888436774b41f25bcc3b5eed..148af52b9e733db9cdd4778b471dd34a3d92346b 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -256,8 +256,8 @@ test_ca:
        fi
 
 test_rd: #$(RDTEST)
-       @echo "test Rijndael"
-       #./$(RDTEST)
+#      @echo "test Rijndael"
+#      ./$(RDTEST)
 
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff