diff options
author | Rich Salz <rsalz@akamai.com> | 2015-10-27 15:11:48 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-10-30 17:21:42 -0400 |
commit | b0700d2c8de79252ba605748a075cf2e5d670da1 (patch) | |
tree | 80d8b70286dfab4ef907cf1ac388f691821b0f2e /engines | |
parent | 87d9cafa332bd006086b56dc645c03fe7cfed654 (diff) |
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 <levitte@openssl.org>
Diffstat (limited to 'engines')
-rw-r--r-- | engines/e_capi.c | 2 | ||||
-rw-r--r-- | engines/e_chil.c | 4 | ||||
-rw-r--r-- | engines/e_gmp.c | 2 | ||||
-rw-r--r-- | engines/e_ubsec.c | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/e_capi.c b/engines/e_capi.c index 5256768835..a38592b5f6 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -472,7 +472,7 @@ static int capi_init(ENGINE *e) /* Setup RSA_METHOD */ rsa_capi_idx = RSA_get_ex_new_index(0, NULL, NULL, NULL, 0); - ossl_rsa_meth = RSA_PKCS1_SSLeay(); + ossl_rsa_meth = RSA_PKCS1_OpenSSL(); capi_rsa_method.rsa_pub_enc = ossl_rsa_meth->rsa_pub_enc; capi_rsa_method.rsa_pub_dec = ossl_rsa_meth->rsa_pub_dec; capi_rsa_method.rsa_mod_exp = ossl_rsa_meth->rsa_mod_exp; diff --git a/engines/e_chil.c b/engines/e_chil.c index 0764c01db2..54c6b913c1 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -376,14 +376,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 * cswift-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(); hwcrhk_rsa.rsa_pub_enc = meth1->rsa_pub_enc; hwcrhk_rsa.rsa_pub_dec = meth1->rsa_pub_dec; hwcrhk_rsa.rsa_priv_enc = meth1->rsa_priv_enc; diff --git a/engines/e_gmp.c b/engines/e_gmp.c index dd72759ebf..7888c2b231 100644 --- a/engines/e_gmp.c +++ b/engines/e_gmp.c @@ -170,7 +170,7 @@ static int bind_helper(ENGINE *e) return 0; # ifndef OPENSSL_NO_RSA - meth1 = RSA_PKCS1_SSLeay(); + meth1 = RSA_PKCS1_OpenSSL(); e_gmp_rsa.rsa_pub_enc = meth1->rsa_pub_enc; e_gmp_rsa.rsa_pub_dec = meth1->rsa_pub_dec; e_gmp_rsa.rsa_priv_enc = meth1->rsa_priv_enc; diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c index 34be930821..ef070b04db 100644 --- a/engines/e_ubsec.c +++ b/engines/e_ubsec.c @@ -233,14 +233,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 * Broadcom-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(); ubsec_rsa.rsa_pub_enc = meth1->rsa_pub_enc; ubsec_rsa.rsa_pub_dec = meth1->rsa_pub_dec; ubsec_rsa.rsa_priv_enc = meth1->rsa_priv_enc; @@ -611,7 +611,7 @@ static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, /* * Do in software as hardware failed. */ - const RSA_METHOD *meth = RSA_PKCS1_SSLeay(); + const RSA_METHOD *meth = RSA_PKCS1_OpenSSL(); to_return = (*meth->rsa_mod_exp) (r0, I, rsa, ctx); } err: @@ -679,7 +679,7 @@ static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, /* Do in software if the key is too large for the hardware. */ if (BN_num_bits(m) > max_key_len) { - const RSA_METHOD *meth = RSA_PKCS1_SSLeay(); + const RSA_METHOD *meth = RSA_PKCS1_OpenSSL(); ret = (*meth->bn_mod_exp) (r, a, p, m, ctx, m_ctx); } else { ret = ubsec_mod_exp(r, a, p, m, ctx); @@ -978,7 +978,7 @@ static int ubsec_rand_bytes(unsigned char *buf, int num) const RAND_METHOD *meth; UBSECerr(UBSEC_F_UBSEC_RAND_BYTES, UBSEC_R_UNIT_FAILURE); num = p_UBSEC_ubsec_bits_to_bytes(num); - meth = RAND_SSLeay(); + meth = RAND_OpenSSL(); meth->seed(buf, num); ret = meth->bytes(buf, num); goto err; @@ -994,7 +994,7 @@ static int ubsec_rand_bytes(unsigned char *buf, int num) p_UBSEC_ubsec_close(fd); num = p_UBSEC_ubsec_bits_to_bytes(num); - meth = RAND_SSLeay(); + meth = RAND_OpenSSL(); meth->seed(buf, num); ret = meth->bytes(buf, num); |