From bd53a054b1b531850bf52744621c2a35d12221f1 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Wed, 20 Feb 2002 12:28:32 +0000
Subject: [PATCH] Merg in recent changes from the main trunk.

---
 Configure               | 6 +++---
 crypto/aes/Makefile.ssl | 2 +-
 crypto/ebcdic.c         | 2 +-
 test/Makefile.ssl       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Configure b/Configure
index ca85aecc14..68c972a40a 100755
--- 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 099bf0dd28..7fee05e7fc 100644
--- 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 eb46054433..bc968ea807 100644
--- 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 432c654bb4..148af52b9e 100644
--- 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
-- 
2.25.1