aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-19 09:07:08 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-21 12:24:08 -0400
commit824009cde52d40c937c23670b71e9c5b28d2e1f3 (patch)
tree10287f5e1112ee6172b9897164cdceb7d219d3c1 /src/tools
parent38212d2e40a1eae9f65c1a695e478854177c0783 (diff)
downloadtor-824009cde52d40c937c23670b71e9c5b28d2e1f3.tar.gz
tor-824009cde52d40c937c23670b71e9c5b28d2e1f3.zip
Rename openssl-bridging functions in crypto_rsa
These functions exist only to expose RSA keys to other places in Tor that use OpenSSL; let's be specific about their purpose.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/tor-gencert.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 63e24d922c..e0ac3dec80 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -239,8 +239,7 @@ generate_key(int bits)
crypto_pk_t *env = crypto_pk_new();
if (crypto_pk_generate_key_with_bits(env,bits)<0)
goto done;
- rsa = crypto_pk_get_rsa_(env);
- rsa = RSAPrivateKey_dup(rsa);
+ rsa = crypto_pk_get_openssl_rsa_(env);
done:
crypto_pk_free(env);
return rsa;
@@ -416,7 +415,7 @@ static int
get_fingerprint(EVP_PKEY *pkey, char *out)
{
int r = -1;
- crypto_pk_t *pk = crypto_new_pk_from_rsa_(EVP_PKEY_get1_RSA(pkey));
+ crypto_pk_t *pk = crypto_new_pk_from_openssl_rsa_(EVP_PKEY_get1_RSA(pkey));
if (pk) {
r = crypto_pk_get_fingerprint(pk, out, 0);
crypto_pk_free(pk);
@@ -429,7 +428,7 @@ static int
get_digest(EVP_PKEY *pkey, char *out)
{
int r = -1;
- crypto_pk_t *pk = crypto_new_pk_from_rsa_(EVP_PKEY_get1_RSA(pkey));
+ crypto_pk_t *pk = crypto_new_pk_from_openssl_rsa_(EVP_PKEY_get1_RSA(pkey));
if (pk) {
r = crypto_pk_get_digest(pk, out);
crypto_pk_free(pk);