From 26e789fbfd4e5a7e2789c1577e8eb967de3eba86 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Jan 2012 15:53:30 -0500
Subject: Rename nonconformant identifiers.

Fixes bug 4893.

These changes are pure mechanical, and were generated with this
perl script:

  /usr/bin/perl -w -i.bak -p

  s/crypto_pk_env_t/crypto_pk_t/g;
  s/crypto_dh_env_t/crypto_dh_t/g;
  s/crypto_cipher_env_t/crypto_cipher_t/g;
  s/crypto_digest_env_t/crypto_digest_t/g;

  s/aes_free_cipher/aes_cipher_free/g;
  s/crypto_free_cipher_env/crypto_cipher_free/g;
  s/crypto_free_digest_env/crypto_digest_free/g;
  s/crypto_free_pk_env/crypto_pk_free/g;

  s/_crypto_dh_env_get_dh/_crypto_dh_get_dh/g;
  s/_crypto_new_pk_env_rsa/_crypto_new_pk_from_rsa/g;
  s/_crypto_pk_env_get_evp_pkey/_crypto_pk_get_evp_pkey/g;
  s/_crypto_pk_env_get_rsa/_crypto_pk_get_rsa/g;

  s/crypto_new_cipher_env/crypto_cipher_new/g;
  s/crypto_new_digest_env/crypto_digest_new/g;
  s/crypto_new_digest256_env/crypto_digest256_new/g;
  s/crypto_new_pk_env/crypto_pk_new/g;

  s/crypto_create_crypto_env/crypto_cipher_new/g;

  s/connection_create_listener/connection_listener_new/g;
  s/smartlist_create/smartlist_new/g;
  s/transport_create/transport_new/g;
---
 src/tools/tor-checkkey.c |  6 +++---
 src/tools/tor-gencert.c  | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c
index 94c8cbd44..21de48d01 100644
--- a/src/tools/tor-checkkey.c
+++ b/src/tools/tor-checkkey.c
@@ -15,7 +15,7 @@
 int
 main(int c, char **v)
 {
-  crypto_pk_env_t *env;
+  crypto_pk_t *env;
   char *str;
   RSA *rsa;
   int wantdigest=0;
@@ -56,7 +56,7 @@ main(int c, char **v)
     return 1;
   }
 
-  env = crypto_new_pk_env();
+  env = crypto_pk_new();
   if (crypto_pk_read_public_key_from_string(env, str, strlen(str))<0) {
     fprintf(stderr, "Couldn't parse key.\n");
     return 1;
@@ -69,7 +69,7 @@ main(int c, char **v)
       return 1;
     printf("%s\n",digest);
   } else {
-    rsa = _crypto_pk_env_get_rsa(env);
+    rsa = _crypto_pk_get_rsa(env);
     str = BN_bn2hex(rsa->n);
 
     printf("%s\n", str);
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 57f82b1bc..b5c96e556 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -222,13 +222,13 @@ static RSA *
 generate_key(int bits)
 {
   RSA *rsa = NULL;
-  crypto_pk_env_t *env = crypto_new_pk_env();
+  crypto_pk_t *env = crypto_pk_new();
   if (crypto_pk_generate_key_with_bits(env,bits)<0)
     goto done;
-  rsa = _crypto_pk_env_get_rsa(env);
+  rsa = _crypto_pk_get_rsa(env);
   rsa = RSAPrivateKey_dup(rsa);
  done:
-  crypto_free_pk_env(env);
+  crypto_pk_free(env);
   return rsa;
 }
 
@@ -399,10 +399,10 @@ static int
 get_fingerprint(EVP_PKEY *pkey, char *out)
 {
   int r = 1;
-  crypto_pk_env_t *pk = _crypto_new_pk_env_rsa(EVP_PKEY_get1_RSA(pkey));
+  crypto_pk_t *pk = _crypto_new_pk_from_rsa(EVP_PKEY_get1_RSA(pkey));
   if (pk) {
     r = crypto_pk_get_fingerprint(pk, out, 0);
-    crypto_free_pk_env(pk);
+    crypto_pk_free(pk);
   }
   return r;
 }
@@ -412,10 +412,10 @@ static int
 get_digest(EVP_PKEY *pkey, char *out)
 {
   int r = 1;
-  crypto_pk_env_t *pk = _crypto_new_pk_env_rsa(EVP_PKEY_get1_RSA(pkey));
+  crypto_pk_t *pk = _crypto_new_pk_from_rsa(EVP_PKEY_get1_RSA(pkey));
   if (pk) {
     r = crypto_pk_get_digest(pk, out);
-    crypto_free_pk_env(pk);
+    crypto_pk_free(pk);
   }
   return r;
 }
-- 
cgit v1.2.3