From b0700d2c8de79252ba605748a075cf2e5d670da1 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 27 Oct 2015 15:11:48 -0400 Subject: Replace "SSLeay" in API with OpenSSL All instances of SSLeay (any combination of case) were replaced with the case-equivalent OpenSSL. Reviewed-by: Richard Levitte --- apps/CA.com | 23 ++++------------------- apps/CA.pl.in | 6 +++--- apps/openssl.c | 3 +-- apps/s_server.c | 2 +- apps/speed.c | 8 ++++---- apps/version.c | 14 +++++++------- 6 files changed, 20 insertions(+), 36 deletions(-) (limited to 'apps') diff --git a/apps/CA.com b/apps/CA.com index 2c0d465274..95925d3111 100644 --- a/apps/CA.com +++ b/apps/CA.com @@ -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 $! you want/need ... I'll make even this a little cleaner later. $! -$! -$! 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 +$! default openssl.cnf file has setup as per the following $! 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" -$ REQ = openssl + " req " + SSLEAY_CONFIG -$ CA = openssl + " ca " + SSLEAY_CONFIG +$ REQ = openssl + " req " + OPENSSL_CONFIG +$ CA = openssl + " ca " + OPENSSL_CONFIG $ VERIFY = openssl + " verify" $ X509 = openssl + " x509" $ PKCS12 = openssl + " pkcs12" diff --git a/apps/CA.pl.in b/apps/CA.pl.in index 5c8cdd09f2..a814ebf3c2 100644 --- a/apps/CA.pl.in +++ b/apps/CA.pl.in @@ -16,11 +16,11 @@ if(defined $ENV{'OPENSSL'}) { my $verbose = 1; -my $SSLEAY_CONFIG = $ENV{"SSLEAY_CONFIG"}; +my $OPENSSL_CONFIG = $ENV{"OPENSSL_CONFIG"}; my $DAYS = "-days 365"; my $CADAYS = "-days 1095"; # 3 years -my $REQ = "$openssl req $SSLEAY_CONFIG"; -my $CA = "$openssl ca $SSLEAY_CONFIG"; +my $REQ = "$openssl req $OPENSSL_CONFIG"; +my $CA = "$openssl ca $OPENSSL_CONFIG"; my $VERIFY = "$openssl verify"; my $X509 = "$openssl x509"; my $PKCS12 = "$openssl pkcs12"; diff --git a/apps/openssl.c b/apps/openssl.c index 2b0425bf0a..1fd3e73a48 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -217,8 +217,7 @@ static char *make_config_name() size_t len; char *p; - if ((t = getenv("OPENSSL_CONF")) != NULL - || (t = getenv("SSLEAY_CONF")) != NULL) + if ((t = getenv("OPENSSL_CONF")) != NULL) return BUF_strdup(t); t = X509_get_default_cert_area(); diff --git a/apps/s_server.c b/apps/s_server.c index aa01d43fb1..4848fbe3b8 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -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"); BIO_puts(io, "\n"); BIO_puts(io, "
\n");
-/*                      BIO_puts(io,SSLeay_version(SSLEAY_VERSION));*/
+/*                      BIO_puts(io,OpenSSL_version(OPENSSL_VERSION));*/
             BIO_puts(io, "\n");
             for (i = 0; i < local_argc; i++) {
                 const char *myp;
diff --git a/apps/speed.c b/apps/speed.c
index faa3e159ae..68530b1634 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -869,7 +869,7 @@ int speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_RSA
 # ifndef RSA_NULL
         if (strcmp(*argv, "openssl") == 0) {
-            RSA_set_default_method(RSA_PKCS1_SSLeay());
+            RSA_set_default_method(RSA_PKCS1_OpenSSL());
             continue;
         }
 # endif
@@ -2041,8 +2041,8 @@ int speed_main(int argc, char **argv)
  show_res:
 #endif
     if (!mr) {
-        printf("%s\n", SSLeay_version(SSLEAY_VERSION));
-        printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
+        printf("%s\n", OpenSSL_version(OPENSSL_VERSION));
+        printf("%s\n", OpenSSL_version(OPENSSL_BUILT_ON));
         printf("options:");
         printf("%s ", BN_options());
 #ifndef OPENSSL_NO_MD2
@@ -2063,7 +2063,7 @@ int speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_BF
         printf("%s ", BF_options());
 #endif
-        printf("\n%s\n", SSLeay_version(SSLEAY_CFLAGS));
+        printf("\n%s\n", OpenSSL_version(OPENSSL_CFLAGS));
     }
 
     if (pr_header) {
diff --git a/apps/version.c b/apps/version.c
index 1fa7cfe536..073aa93939 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -193,17 +193,17 @@ int version_main(int argc, char **argv)
         version = 1;
 
     if (version) {
-        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
-            printf("%s\n", SSLeay_version(SSLEAY_VERSION));
+        if (OpenSSL_version_num() == OPENSSL_VERSION_NUMBER) {
+            printf("%s\n", OpenSSL_version(OPENSSL_VERSION));
         } else {
             printf("%s (Library: %s)\n",
-                   OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+                   OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
         }
     }
     if (date)
-        printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
+        printf("%s\n", OpenSSL_version(OPENSSL_BUILT_ON));
     if (platform)
-        printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
+        printf("%s\n", OpenSSL_version(OPENSSL_PLATFORM));
     if (options) {
         printf("options:  ");
         printf("%s ", BN_options());
@@ -225,9 +225,9 @@ int version_main(int argc, char **argv)
         printf("\n");
     }
     if (cflags)
-        printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
+        printf("%s\n", OpenSSL_version(OPENSSL_CFLAGS));
     if (dir)
-        printf("%s\n", SSLeay_version(SSLEAY_DIR));
+        printf("%s\n", OpenSSL_version(OPENSSL_DIR));
     ret = 0;
  end:
     return (ret);
-- 
cgit v1.2.3