Commit b0700d2c authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Replace "SSLeay" in API with OpenSSL 



All instances of SSLeay (any combination of case) were replaced with
the case-equivalent OpenSSL.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 87d9cafa

CHANGES

+4 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,10 @@ 
     also been removed.

     also been removed.

     [Matt Caswell]

     [Matt Caswell]





  *) All instances of the string "ssleay" in the public API were replaced

     with OpenSSL (case-matching; e.g., OPENSSL_VERSION for #define's)

     [Rich Salz]



  *) The demo files in crypto/threads were moved to demo/threads.

  *) The demo files in crypto/threads were moved to demo/threads.

     [Rich Salz]

     [Rich Salz]

apps/CA.com

+4 −19
Original line number Original line Diff line number Diff line
@@ -10,29 +10,14 @@ $! At the end of that grab newreq.pem and newcert.pem (one has the key 
$! and the other the certificate) and cat them together and that is what

$! and the other the certificate) and cat them together and that is what

$! you want/need ... I'll make even this a little cleaner later.

$! you want/need ... I'll make even this a little cleaner later.

$!

$!

$!

$! default openssl.cnf file has setup as per the following

$! 12-Jan-96 tjh    Added more things ... including CA -signcert which

$!                  converts a certificate to a request and then signs it.

$! 10-Jan-96 eay    Fixed a few more bugs and added the SSLEAY_CONFIG

$!                 environment variable so this can be driven from

$!                 a script.

$! 25-Jul-96 eay    Cleaned up filenames some more.

$! 11-Jun-96 eay    Fixed a few filename missmatches.

$! 03-May-96 eay    Modified to use 'openssl cmd' instead of 'cmd'.

$! 18-Apr-96 tjh    Original hacking

$!

$! Tim Hudson

$! tjh@cryptsoft.com

$!

$!

$! default ssleay.cnf file has setup as per the following

$! demoCA ... where everything is stored

$! demoCA ... where everything is stored

$

$

$ IF F$TYPE(SSLEAY_CONFIG) .EQS. "" THEN SSLEAY_CONFIG := SSLLIB:SSLEAY.CNF

$ IF F$TYPE(OPENSSL_CONFIG) .EQS. "" THEN OPENSSL_CONFIG := SSLLIB:OPENSSL.CNF

$

$

$ DAYS   = "-days 365"

$ DAYS   = "-days 365"

$ REQ    = openssl + " req " + SSLEAY_CONFIG

$ REQ    = openssl + " req " + OPENSSL_CONFIG

$ CA     = openssl + " ca " + SSLEAY_CONFIG

$ CA     = openssl + " ca " + OPENSSL_CONFIG

$ VERIFY = openssl + " verify"

$ VERIFY = openssl + " verify"

$ X509   = openssl + " x509"

$ X509   = openssl + " x509"

$ PKCS12 = openssl + " pkcs12"

$ PKCS12 = openssl + " pkcs12"

apps/CA.pl.in

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,11 +16,11 @@ if(defined $ENV{'OPENSSL'}) { 




my $verbose = 1;

my $verbose = 1;





my $SSLEAY_CONFIG = $ENV{"SSLEAY_CONFIG"};

my $OPENSSL_CONFIG = $ENV{"OPENSSL_CONFIG"};

my $DAYS = "-days 365";

my $DAYS = "-days 365";

my $CADAYS = "-days 1095";	# 3 years

my $CADAYS = "-days 1095";	# 3 years

my $REQ = "$openssl req $SSLEAY_CONFIG";

my $REQ = "$openssl req $OPENSSL_CONFIG";

my $CA = "$openssl ca $SSLEAY_CONFIG";

my $CA = "$openssl ca $OPENSSL_CONFIG";

my $VERIFY = "$openssl verify";

my $VERIFY = "$openssl verify";

my $X509 = "$openssl x509";

my $X509 = "$openssl x509";

my $PKCS12 = "$openssl pkcs12";

my $PKCS12 = "$openssl pkcs12";

apps/openssl.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -217,8 +217,7 @@ static char *make_config_name() 
    size_t len;

    size_t len;

    char *p;

    char *p;





    if ((t = getenv("OPENSSL_CONF")) != NULL

    if ((t = getenv("OPENSSL_CONF")) != NULL)

        || (t = getenv("SSLEAY_CONF")) != NULL)

        return BUF_strdup(t);

        return BUF_strdup(t);





    t = X509_get_default_cert_area();

    t = X509_get_default_cert_area();

apps/s_server.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2719,7 +2719,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context) 
                     "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");

                     "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");

            BIO_puts(io, "<HTML><BODY BGCOLOR=\"#ffffff\">\n");

            BIO_puts(io, "<HTML><BODY BGCOLOR=\"#ffffff\">\n");

            BIO_puts(io, "<pre>\n");

            BIO_puts(io, "<pre>\n");

/*                      BIO_puts(io,SSLeay_version(SSLEAY_VERSION));*/

/*                      BIO_puts(io,OpenSSL_version(OPENSSL_VERSION));*/

            BIO_puts(io, "\n");

            BIO_puts(io, "\n");

            for (i = 0; i < local_argc; i++) {

            for (i = 0; i < local_argc; i++) {

                const char *myp;

                const char *myp;