diff options
Diffstat (limited to 'demos')
-rw-r--r-- | demos/easy_tls/easy-tls.c | 2 | ||||
-rw-r--r-- | demos/engines/ibmca/hw_ibmca.c | 4 | ||||
-rw-r--r-- | demos/engines/zencod/hw_zencod.c | 12 | ||||
-rw-r--r-- | demos/pkcs12/pkwrite.c | 2 | ||||
-rw-r--r-- | demos/sign/sign.c | 2 | ||||
-rw-r--r-- | demos/ssl/cli.cpp | 4 | ||||
-rw-r--r-- | demos/ssl/inetdsrv.cpp | 2 | ||||
-rw-r--r-- | demos/ssl/serv.cpp | 6 |
8 files changed, 17 insertions, 17 deletions
diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c index 5b657803d0..e42d28a8c1 100644 --- a/demos/easy_tls/easy-tls.c +++ b/demos/easy_tls/easy-tls.c @@ -418,7 +418,7 @@ static int tls_init(void *apparg) return 0; SSL_load_error_strings(); - if (!SSL_library_init() /* aka SSLeay_add_ssl_algorithms() */ ) { + if (!SSL_library_init()) { tls_errprintf(1, apparg, "SSL_library_init failed.\n"); return -1; } diff --git a/demos/engines/ibmca/hw_ibmca.c b/demos/engines/ibmca/hw_ibmca.c index 29f8547698..c0f2982272 100644 --- a/demos/engines/ibmca/hw_ibmca.c +++ b/demos/engines/ibmca/hw_ibmca.c @@ -241,14 +241,14 @@ static int bind_helper(ENGINE *e) # ifndef OPENSSL_NO_RSA /* - * We know that the "PKCS1_SSLeay()" functions hook properly to the + * We know that the "PKCS1_OpenSSL()" functions hook properly to the * ibmca-specific mod_exp and mod_exp_crt so we use those functions. NB: * We don't use ENGINE_openssl() or anything "more generic" because * something like the RSAref code may not hook properly, and if you own * one of these cards then you have the right to do RSA operations on it * anyway! */ - meth1 = RSA_PKCS1_SSLeay(); + meth1 = RSA_PKCS1_OpenSSL(); ibmca_rsa.rsa_pub_enc = meth1->rsa_pub_enc; ibmca_rsa.rsa_pub_dec = meth1->rsa_pub_dec; ibmca_rsa.rsa_priv_enc = meth1->rsa_priv_enc; diff --git a/demos/engines/zencod/hw_zencod.c b/demos/engines/zencod/hw_zencod.c index 5f5098083c..132ece04f0 100644 --- a/demos/engines/zencod/hw_zencod.c +++ b/demos/engines/zencod/hw_zencod.c @@ -309,14 +309,14 @@ static int bind_helper(ENGINE *e) } # ifndef OPENSSL_NO_RSA /* - * We know that the "PKCS1_SSLeay()" functions hook properly to the + * We know that the "PKCS1_OpenSSL()" functions hook properly to the * Zencod-specific mod_exp and mod_exp_crt so we use those functions. NB: * We don't use ENGINE_openssl() or anything "more generic" because * something like the RSAref code may not hook properly, and if you own * one of these cards then you have the right to do RSA operations on it * anyway! */ - meth_rsa = RSA_PKCS1_SSLeay(); + meth_rsa = RSA_PKCS1_OpenSSL(); zencod_rsa.rsa_pub_enc = meth_rsa->rsa_pub_enc; zencod_rsa.rsa_pub_dec = meth_rsa->rsa_pub_dec; @@ -358,9 +358,9 @@ static int bind_helper(ENGINE *e) # endif /* - * We use OpenSSL (SSLeay) meth to supply what we don't provide ;-*) + * We use OpenSSL meth to supply what we don't provide ;-*) */ - meth_rand = RAND_SSLeay(); + meth_rand = RAND_OpenSSL(); /* meth_rand->seed ; */ /* zencod_rand.seed = meth_rand->seed ; */ @@ -776,7 +776,7 @@ static int RSA_zencod_rsa_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa) if (RSA_size(rsa) * 8 > ZENBRIDGE_MAX_KEYSIZE_RSA_CRT) { const RSA_METHOD *meth; - meth = RSA_PKCS1_SSLeay(); + meth = RSA_PKCS1_OpenSSL(); return meth->rsa_mod_exp(r0, i, rsa); } else { zen_nb_t y, x, p, q, dmp1, dmq1, iqmp; @@ -827,7 +827,7 @@ static int RSA_zencod_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, if (BN_num_bits(m) > ZENBRIDGE_MAX_KEYSIZE_RSA) { const RSA_METHOD *meth; - meth = RSA_PKCS1_SSLeay(); + meth = RSA_PKCS1_OpenSSL(); return meth->bn_mod_exp(r, a, p, m, ctx, m_ctx); } else { zen_nb_t y, x, e, n; diff --git a/demos/pkcs12/pkwrite.c b/demos/pkcs12/pkwrite.c index 34e82dd6b9..753fbfece8 100644 --- a/demos/pkcs12/pkwrite.c +++ b/demos/pkcs12/pkwrite.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) fprintf(stderr, "Usage: pkwrite infile password name p12file\n"); exit(1); } - SSLeay_add_all_algorithms(); + OpenSSL_add_all_algorithms(); ERR_load_crypto_strings(); if ((fp = fopen(argv[1], "r")) == NULL) { fprintf(stderr, "Error opening file %s\n", argv[1]); diff --git a/demos/sign/sign.c b/demos/sign/sign.c index 22f53fb601..f6aab25d14 100644 --- a/demos/sign/sign.c +++ b/demos/sign/sign.c @@ -57,7 +57,7 @@ */ /* - * sign-it.cpp - Simple test app using SSLeay envelopes to sign data + * sign-it.cpp - Simple test app using EVP envelopes to sign data * 29.9.1996, Sampo Kellomaki <sampo@iki.fi> */ diff --git a/demos/ssl/cli.cpp b/demos/ssl/cli.cpp index 3459f0f93a..fcc4d9d1e9 100644 --- a/demos/ssl/cli.cpp +++ b/demos/ssl/cli.cpp @@ -1,7 +1,7 @@ /* cli.cpp - Minimal ssleay client for Unix 30.9.1996, Sampo Kellomaki <sampo@iki.fi> */ -/* mangled to work with SSLeay-0.9.0b and OpenSSL 0.9.2b +/* mangled to work with OpenSSL 0.9.2b Simplified to be even more minimal 12/98 - 4/99 Wade Scholine <wades@mail.cybg.com> */ @@ -37,7 +37,7 @@ void main () char buf [4096]; SSL_METHOD *meth; - SSLeay_add_ssl_algorithms(); + OpenSSL_add_ssl_algorithms(); meth = TLS_client_method(); SSL_load_error_strings(); ctx = SSL_CTX_new (meth); CHK_NULL(ctx); diff --git a/demos/ssl/inetdsrv.cpp b/demos/ssl/inetdsrv.cpp index efd70d2771..7434030d1a 100644 --- a/demos/ssl/inetdsrv.cpp +++ b/demos/ssl/inetdsrv.cpp @@ -7,7 +7,7 @@ #include <stdio.h> #include <errno.h> -#include "rsa.h" /* SSLeay stuff */ +#include "rsa.h" #include <openssl/crypto.h> #include <openssl/x509.h> #include <openssl/pem.h> diff --git a/demos/ssl/serv.cpp b/demos/ssl/serv.cpp index 9cb77f8275..43ff88ef64 100644 --- a/demos/ssl/serv.cpp +++ b/demos/ssl/serv.cpp @@ -2,7 +2,7 @@ 30.9.1996, Sampo Kellomaki <sampo@iki.fi> */ -/* mangled to work with SSLeay-0.9.0b and OpenSSL 0.9.2b +/* mangled to work with OpenSSL 0.9.2b Simplified to be even more minimal 12/98 - 4/99 Wade Scholine <wades@mail.cybg.com> */ @@ -17,7 +17,7 @@ #include <arpa/inet.h> #include <netdb.h> -#include <openssl/rsa.h> /* SSLeay stuff */ +#include <openssl/rsa.h> #include <openssl/crypto.h> #include <openssl/x509.h> #include <openssl/pem.h> @@ -54,7 +54,7 @@ void main () /* SSL preliminaries. We keep the certificate and key with the context. */ SSL_load_error_strings(); - SSLeay_add_ssl_algorithms(); + OpenSSL_add_ssl_algorithms(); meth = TLS_server_method(); ctx = SSL_CTX_new (meth); if (!ctx) { |