Commit 6928b617 authored by Richard Levitte's avatar Richard Levitte
Browse files

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



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 65963bbe

Configurations/README.design

+4 −4
Original line number Diff line number Diff line
@@ -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" ]);

Configure

+6 −6
Original line number Diff line number Diff line
@@ -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"

INSTALL.WIN

+2 −2
Original line number Diff line number Diff line
@@ -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

 ------------------------

Makefile.in

+3 −3
Original line number Diff line number Diff line
@@ -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

doc/crypto/OPENSSL_init_crypto.pod

+1 −1
Original line number Diff line number Diff line
@@ -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