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

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

diff --git a/Configurations/README.design b/Configurations/README.design
index 8b94e220e30306918ac18a7f0986450d2b414943..5a28ef3271c3155e29794dd86135510301a52f6c 100644 (file)
--- a/Configurations/README.design
+++ b/Configurations/README.design
@@ -296,12 +296,12 @@ section above would be digested into a %unified_info table:
                 "libcrypto" =>
                     [
                         "crypto",
-                        "util/libeay.num",
+                        "util/libcrypto.num",
                     ],
                 "libssl" =>
                     [
                         "ssl",
-                        "util/ssleay.num",
+                        "util/libssl.num",
                     ],
             },
         "programs" =>
@@ -442,7 +442,7 @@ etc.
                   this library.  'ordinals' MAY be present, and when
                   it is, its value is an array where the word is
                   "crypto" or "ssl" and the file is one of the ordinal
-                  files util/libeay.num or util/ssleay.num in the
+                  files util/libcrypto.num or util/libssl.num in the
                   source directory.
 
                   This function has a choice; it can use the
@@ -515,7 +515,7 @@ following calls:
                  lib => "libssl",
                  objs => [ "ssl/tls.o" ],
                  deps => [ "libcrypto" ]
-                 ordinals => [ "ssl", "util/ssleay.num" ]);
+                 ordinals => [ "ssl", "util/libssl.num" ]);
 
     obj2lib(lib => "libssl"
             objs => [ "ssl/tls.o" ]);

diff --git a/Configure b/Configure
index cf4902322549621f015eab7d10d4be0375abdfa6..305820b6f1236f8821185ecb1a699e75be1b15b0 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1457,9 +1457,9 @@ EOF
                 my %known_ordinals =
                     (
                      crypto =>
-                     cleanfile($sourced, catfile("util", "libeay.num"), $blddir),
+                     cleanfile($sourced, catfile("util", "libcrypto.num"), $blddir),
                      ssl =>
-                     cleanfile($sourced, catfile("util", "ssleay.num"), $blddir)
+                     cleanfile($sourced, catfile("util", "libssl.num"), $blddir)
                     );
                 my $o = $known_ordinals{$_};
                 die "Ordinals for $ddest defined more than once\n"
@@ -1815,11 +1815,11 @@ BEGIN
            VALUE "FileDescription", "OpenSSL Shared Library\\0"
            VALUE "FileVersion", "$config{version}\\0"
 #if defined(CRYPTO)
-           VALUE "InternalName", "libeay32\\0"
-           VALUE "OriginalFilename", "libeay32.dll\\0"
+           VALUE "InternalName", "libcrypto32\\0"
+           VALUE "OriginalFilename", "libcrypto32.dll\\0"
 #elif defined(SSL)
-           VALUE "InternalName", "ssleay32\\0"
-           VALUE "OriginalFilename", "ssleay32.dll\\0"
+           VALUE "InternalName", "libssl32\\0"
+           VALUE "OriginalFilename", "libssl32.dll\\0"
 #endif
            VALUE "ProductName", "The OpenSSL Toolkit\\0"
            VALUE "ProductVersion", "$config{version}\\0"

diff --git a/INSTALL.WIN b/INSTALL.WIN
index d57923886c59dc46483f2bd43b5d12161844e735..084388e7a6079bfc9a4dd11b691876ddb7304f28 100644 (file)
--- a/INSTALL.WIN
+++ b/INSTALL.WIN
@@ -80,7 +80,7 @@
  By default in 1.1.0 OpenSSL will compile builtin ENGINES into separate shared
  libraries. If you specify the "enable-static-engine" option on the command line
  to Configure the shared library build (ms\ntdll.mak) will compile the engines
- into libeay32.dll instead.
+ into libcrypto32.dll instead.
 
  You can also build a static version of the library using the Makefile
  ms\nt.mak
@@ -160,7 +160,7 @@
    possible targets include x86_64-w64-mingw32- and i686-w64-mingw32-.
 
    libcrypto.a and libssl.a are the static libraries. To use the DLLs,
-   link with libeay32.a and libssl32.a instead.
+   link with libcrypto32.a and libssl32.a instead.
 
  Linking your application
  ------------------------

diff --git a/Makefile.in b/Makefile.in
index 4286eb9dbcc530a14a7645969c6a3888dcc8c6f5..9fcdb394a6bcd08b5bda1014eda211b75cee8995 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -510,10 +510,10 @@ errors:
        $(PERL) util/mkerr.pl -recurse -write
        (cd engines; $(MAKE) PERL=$(PERL) errors)
 
-ordinals: util/libeay.num util/ssleay.num test_ordinals TABLE
-util/libeay.num::
+ordinals: util/libcrypto.num util/libssl.num test_ordinals TABLE
+util/libcrypto.num::
        $(PERL) util/mkdef.pl crypto update
-util/ssleay.num::
+util/libssl.num::
        $(PERL) util/mkdef.pl ssl update
 test_ordinals:
        TOP=$(TOP) PERL=$(PERL) $(PERL) test/run_tests.pl test_ordinals

diff --git a/doc/crypto/OPENSSL_init_crypto.pod b/doc/crypto/OPENSSL_init_crypto.pod
index 4da655167c391063c9cbd7fa724e248e42211c10..e701b1d703b5f93b8f6534aba1e063bd1da9cba9 100644 (file)
--- a/doc/crypto/OPENSSL_init_crypto.pod
+++ b/doc/crypto/OPENSSL_init_crypto.pod
@@ -199,7 +199,7 @@ object can be released with OPENSSL_INIT_free() when done.
 Resources local to a thread are deallocated automatically when the thread exits
 (e.g. in a pthreads environment, when pthread_exit() is called). On Windows
 platforms this is done in response to a DLL_THREAD_DETACH message being sent to
-the libeay32.dll entry point. Some windows functions may cause threads to exit
+the libcrypto32.dll entry point. Some windows functions may cause threads to exit
 without sending this message (for example ExitProcess()). If the application
 uses such functions, then the application must free up OpenSSL resources
 directly via a call to OPENSSL_thread_stop(). Similarly this message will

diff --git a/ms/32all.bat b/ms/32all.bat
index aaab9b0c9da1940497fc2677aa0a1ae869dda400..309dfd9f3f8dc385969c5ed9bc10cc8085ddaa4d 100755 (executable)
--- 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 55014d3fc3394ffedb64a1452035e80349566d31..396395f3b3caf6c735aed3cc4fd207ac187e6573 100755 (executable)
--- 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 7b3f3edbf03478f0e50c52b5ce18bd26fdfbecc9..b75ac14049a8a355201c9418311086a84a82e2fe 100755 (executable)
--- 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 e2d525e05d8d0767f7ca953530abdcf76c68e2d1..77e7ea65255de72ec1b58c240bcc4e05508e911e 100755 (executable)
--- 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 8768dc61be20529dbb1d4f629974c51a7121f98e..6219a48e684a3020903d057bcb58bf8aef448510 100755 (executable)
--- 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 088f5e1d0a84a4e3a5406ee610e6af37850ab454..d542d85f77b0f8665b056aee9c1f12a40f0ab903 100755 (executable)
--- 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 35e00a4508210009f758b7337b5336adbd7de722..b844a080039478743485c3f0b3b5cc37a05d4b86 100644 (file)
--- 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 9b309e4b6e534402ea9a47ca435540eae72c1841..c8602329e02c7c60a648734433959e20a1511439 100644 (file)
--- 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

diff --git a/test/recipes/01-test_ordinals.t b/test/recipes/01-test_ordinals.t
index ffda0f705c86d4b6806a6b613e931e46fa18dd7a..070181d9a6a3358666b62163ab8ef1ad0d4374d9 100755 (executable)
--- a/test/recipes/01-test_ordinals.t
+++ b/test/recipes/01-test_ordinals.t
@@ -59,8 +59,8 @@ setup("test_ordinals");
 
 plan tests => 2;
 
-ok(testordinals(srctop_file("util", "libeay.num")), "Test libeay.num");
-ok(testordinals(srctop_file("util", "ssleay.num")), "Test ssleay.num");
+ok(testordinals(srctop_file("util", "libcrypto.num")), "Test libcrypto.num");
+ok(testordinals(srctop_file("util", "libssl.num")), "Test libssl.num");
 
 sub testordinals
 {

diff --git a/util/do_ms.sh b/util/do_ms.sh
index 515b074cffbc5b82beb6dddc410f3e9323dc6dc1..e82fc11a9d07c1a14cc9795f35010b218bfe0591 100755 (executable)
--- a/util/do_ms.sh
+++ b/util/do_ms.sh
@@ -13,7 +13,7 @@ perl util/mk1mf.pl dll VC-WIN32 >ms/ntdll.mak
 perl util/mk1mf.pl Mingw32 >ms/mingw32.mak
 perl util/mk1mf.pl Mingw32-files >ms/mingw32f.mak
 
-perl util/mkdef.pl 16 libeay > ms/libeay16.def
-perl util/mkdef.pl 32 libeay > ms/libeay32.def
-perl util/mkdef.pl 16 ssleay > ms/ssleay16.def
-perl util/mkdef.pl 32 ssleay > ms/ssleay32.def
+perl util/mkdef.pl 16 libcrypto > ms/libcrypto16.def
+perl util/mkdef.pl 32 libcrypto > ms/libcrypto32.def
+perl util/mkdef.pl 16 libssl > ms/libssl16.def
+perl util/mkdef.pl 32 libssl > ms/libssl32.def

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 409a39019f94a26871b337b3e85a1bc63a3c4bfd..07117e93a998ba0fb24421b3fa48f12fb53bf4e5 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -5,7 +5,7 @@
 # It does this by parsing the header files and looking for the
 # prototyped functions: it then prunes the output.
 #
-# Intermediary files are created, call libeay.num and ssleay.num,
+# Intermediary files are created, call libcrypto.num and libssl.num,
 # The format of these files is:
 #
 #      routine-name    nnnn    vers    info
@@ -44,8 +44,8 @@ use File::Spec::Functions;
 
 my $debug=0;
 
-my $crypto_num= catfile($config{sourcedir},"util","libeay.num");
-my $ssl_num=    catfile($config{sourcedir},"util","ssleay.num");
+my $crypto_num= catfile($config{sourcedir},"util","libcrypto.num");
+my $ssl_num=    catfile($config{sourcedir},"util","libssl.num");
 my $libname;
 
 my $do_update = 0;
@@ -159,12 +159,12 @@ foreach (@ARGV, split(/ /, $config{options}))
                $zlib = 1;
        }
 
-       $do_ssl=1 if $_ eq "ssleay";
+       $do_ssl=1 if $_ eq "libssl";
        if ($_ eq "ssl") {
                $do_ssl=1; 
                $libname=$_
        }
-       $do_crypto=1 if $_ eq "libeay";
+       $do_crypto=1 if $_ eq "libcrypto";
        if ($_ eq "crypto") {
                $do_crypto=1;
                $libname=$_;
@@ -202,10 +202,10 @@ foreach (@ARGV, split(/ /, $config{options}))
 
 if (!$libname) { 
        if ($do_ssl) {
-               $libname="SSLEAY";
+               $libname="LIBSSL";
        }
        if ($do_crypto) {
-               $libname="LIBEAY";
+               $libname="LIBCRYPTO";
        }
 }
 
@@ -299,34 +299,34 @@ $crypto.=" include/openssl/kdf.h";
 
 my $symhacks="include/openssl/symhacks.h";
 
-my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks);
-my @crypto_symbols = &do_defs("LIBEAY", $crypto, $symhacks);
+my @ssl_symbols = &do_defs("LIBSSL", $ssl, $symhacks);
+my @crypto_symbols = &do_defs("LIBCRYPTO", $crypto, $symhacks);
 
 if ($do_update) {
 
 if ($do_ssl == 1) {
 
-       &maybe_add_info("SSLEAY",*ssl_list,@ssl_symbols);
+       &maybe_add_info("LIBSSL",*ssl_list,@ssl_symbols);
        if ($do_rewrite == 1) {
                open(OUT, ">$ssl_num");
-               &rewrite_numbers(*OUT,"SSLEAY",*ssl_list,@ssl_symbols);
+               &rewrite_numbers(*OUT,"LIBSSL",*ssl_list,@ssl_symbols);
        } else {
                open(OUT, ">>$ssl_num");
        }
-       &update_numbers(*OUT,"SSLEAY",*ssl_list,$max_ssl,@ssl_symbols);
+       &update_numbers(*OUT,"LIBSSL",*ssl_list,$max_ssl,@ssl_symbols);
        close OUT;
 }
 
 if($do_crypto == 1) {
 
-       &maybe_add_info("LIBEAY",*crypto_list,@crypto_symbols);
+       &maybe_add_info("LIBCRYPTO",*crypto_list,@crypto_symbols);
        if ($do_rewrite == 1) {
                open(OUT, ">$crypto_num");
-               &rewrite_numbers(*OUT,"LIBEAY",*crypto_list,@crypto_symbols);
+               &rewrite_numbers(*OUT,"LIBCRYPTO",*crypto_list,@crypto_symbols);
        } else {
                open(OUT, ">>$crypto_num");
        }
-       &update_numbers(*OUT,"LIBEAY",*crypto_list,$max_crypto,@crypto_symbols);
+       &update_numbers(*OUT,"LIBCRYPTO",*crypto_list,$max_crypto,@crypto_symbols);
        close OUT;
 } 
 
@@ -346,10 +346,10 @@ if($do_crypto == 1) {
 int main()
 {
 EOF
-       &print_test_file(*STDOUT,"SSLEAY",*ssl_list,$do_ctestall,@ssl_symbols)
+       &print_test_file(*STDOUT,"LIBSSL",*ssl_list,$do_ctestall,@ssl_symbols)
                if $do_ssl == 1;
 
-       &print_test_file(*STDOUT,"LIBEAY",*crypto_list,$do_ctestall,@crypto_symbols)
+       &print_test_file(*STDOUT,"LIBCRYPTO",*crypto_list,$do_ctestall,@crypto_symbols)
                if $do_crypto == 1;
 
        print "}\n";

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index 57384bba1e7c1df9d04da882af33c237c8857a27..ef21b585857cdc05ec33d6f693d46c2fc0e734c2 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -2,8 +2,8 @@
 # Borland C++ builder 3 and 4 -- Janez Jere <jj@void.si>
 #
 
-$ssl=  "ssleay32";
-$crypto="libeay32";
+$ssl=  "libssl32";
+$crypto="libcrypto32";
 
 $o='\\';
 $cp='copy';

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 8c7c9f8a132e67b29909e31f47b648cf18289fb3..8ed650857eca4a941fe0673fab59c8e5d553c5a2 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -3,17 +3,17 @@
 # Win64 and WinCE [follow $FLAVOR variable to trace the differences].
 #
 
-$ssl=  "ssleay32";
-$crypto="libeay32";
+$ssl=  "libssl32";
+$crypto="libcrypto32";
 
 if ($fips && !$shlib)
        {
-       $crypto="libeayfips32";
-       $crypto_compat = "libeaycompat32.lib";
+       $crypto="libcryptofips32";
+       $crypto_compat = "libcryptocompat32.lib";
        }
 else
        {
-       $crypto="libeay32";
+       $crypto="libcrypto32";
        }
 
 if ($fipscanisterbuild)

diff --git a/util/pl/netware.pl b/util/pl/netware.pl
index d4361e6d406e3c9d3859dba0c4781cb71bc086b8..070c7aa79c59917e439d7ebe92da6b6a3c0f5412 100644 (file)
--- a/util/pl/netware.pl
+++ b/util/pl/netware.pl
@@ -90,8 +90,8 @@ $include_path = join(" -I", split(/;/, $include_path));
 # check for gcc compiler
 $gnuc = $ENV{"GNUC"};
 
-#$ssl=   "ssleay32";
-#$crypto="libeay32";
+#$ssl=   "libssl32";
+#$crypto="libcrypto32";
 
 if ($gnuc)
 {