Change names of ordinals and libs, libeay => libcrypto and ssleay => libssl

Reviewed-by: Rich Salz <rsalz@openssl.org>

8 files changed, 18 insertions, 18 deletions

diff --git a/ms/32all.bat b/ms/32all.bat
index aaab9b0c9d..309dfd9f3f 100755
--- a/ms/32all.bat
+++ b/ms/32all.bat
@@ -6,8 +6,8 @@ perl util\mk1mf.pl %OPTS% debug VC-WIN32 >d32.mak
 perl util\mk1mf.pl %OPTS% VC-WIN32 >32.mak
 perl util\mk1mf.pl %OPTS% debug dll VC-WIN32 >d32dll.mak
 perl util\mk1mf.pl %OPTS% dll VC-WIN32 >32dll.mak
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
+perl util\mkdef.pl 32 libssl > ms\libssl32.def
 
 nmake -f d32.mak
 @if errorlevel 1 goto end
diff --git a/ms/do_ms.bat b/ms/do_ms.bat
index 55014d3fc3..396395f3b3 100755
--- a/ms/do_ms.bat
+++ b/ms/do_ms.bat
@@ -7,5 +7,5 @@ perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
 perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
 :skipce
 
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
+perl util\mkdef.pl 32 libssl > ms\libssl32.def
diff --git a/ms/do_nasm.bat b/ms/do_nasm.bat
index 7b3f3edbf0..b75ac14049 100755
--- a/ms/do_nasm.bat
+++ b/ms/do_nasm.bat
@@ -4,5 +4,5 @@ perl util\mk1mf.pl nasm VC-WIN32 >ms\nt.mak
 perl util\mk1mf.pl dll nasm VC-WIN32 >ms\ntdll.mak
 perl util\mk1mf.pl nasm BC-NT >ms\bcb.mak
 
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
+perl util\mkdef.pl 32 libssl > ms\libssl32.def
diff --git a/ms/do_nt.bat b/ms/do_nt.bat
index e2d525e05d..77e7ea6525 100755
--- a/ms/do_nt.bat
+++ b/ms/do_nt.bat
@@ -3,5 +3,5 @@ perl util\mkfiles.pl >MINFO
 perl util\mk1mf.pl no-asm VC-NT >ms\nt.mak
 perl util\mk1mf.pl dll no-asm VC-NT >ms\ntdll.mak
 
-perl util\mkdef.pl libeay NT > ms\libeay32.def
-perl util\mkdef.pl ssleay NT > ms\ssleay32.def
+perl util\mkdef.pl libcrypto NT > ms\libcrypto32.def
+perl util\mkdef.pl libssl NT > ms\libssl32.def
diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat
index 8768dc61be..6219a48e68 100755
--- a/ms/do_win64a.bat
+++ b/ms/do_win64a.bat
@@ -15,5 +15,5 @@ ml64 -c -Foms\uptable.obj ms\uptable.asm
 perl util\mk1mf.pl VC-WIN64A >ms\nt.mak
 perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
 
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
+perl util\mkdef.pl 32 libssl > ms\libssl32.def
diff --git a/ms/do_win64i.bat b/ms/do_win64i.bat
index 088f5e1d0a..d542d85f77 100755
--- a/ms/do_win64i.bat
+++ b/ms/do_win64i.bat
@@ -5,5 +5,5 @@ ias -o ms\uptable.obj ms\uptable.asm
 perl util\mk1mf.pl VC-WIN64I >ms\nt.mak
 perl util\mk1mf.pl dll VC-WIN64I >ms\ntdll.mak
 
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
+perl util\mkdef.pl 32 libssl > ms\libssl32.def
diff --git a/ms/mw.bat b/ms/mw.bat
index 35e00a4508..b844a08003 100644
--- a/ms/mw.bat
+++ b/ms/mw.bat
@@ -5,9 +5,9 @@
 perl util\mkfiles.pl >MINFO
 perl util\mk1mf.pl Mingw32 >ms\mingw32.mak
 @rem DLL definition files
-perl util\mkdef.pl 32 libeay >ms\libeay32.def
+perl util\mkdef.pl 32 libcrypto >ms\libcrypto32.def
 if errorlevel 1 goto end
-perl util\mkdef.pl 32 ssleay >ms\ssleay32.def
+perl util\mkdef.pl 32 libssl >ms\libssl32.def
 if errorlevel 1 goto end
 
 @rem Build the libraries
@@ -15,9 +15,9 @@ make -f ms/mingw32.mak
 if errorlevel 1 goto end
 
 @rem Generate the DLLs and input libraries
-dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32
+dllwrap --dllname libcrypto32.dll --output-lib out/libcrypto32.a --def ms/libcrypto32.def out/libcrypto.a -lws2_32 -lgdi32
 if errorlevel 1 goto end
-dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
+dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/libssl32.def out/libssl.a out/libcrypto32.a
 if errorlevel 1 goto end
 
 echo Done compiling OpenSSL
diff --git a/ms/testce.bat b/ms/testce.bat
index 9b309e4b6e..c8602329e0 100644
--- a/ms/testce.bat
+++ b/ms/testce.bat
@@ -13,8 +13,8 @@ set CERUN_PASS_ENV=OPENSSL_CONF HOME
 rem run this from inside the bin directory
 
 rem Copy the DLL's (though they'll only exist if we're in out32dll)
-if exist libeay32.dll cecopy libeay32.dll CE:\OpenSSL
-if exist ssleay32.dll cecopy ssleay32.dll CE:\OpenSSL
+if exist libcrypto32.dll cecopy libcrypto32.dll CE:\OpenSSL
+if exist libssl32.dll cecopy libssl32.dll CE:\OpenSSL
 
 echo rsa_test
 call %test%\testce2 rsa_test