diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:54:28 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:54:28 -0500 |
| commit | 2fa9ddb9580fc0d69967c54f16825f14658fd9b9 (patch) | |
| tree | 6022eea472e9dabd0bcbf2ed07d77aa114471e75 /src/common/crypto.h | |
| parent | e6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13 (diff) | |
| parent | e80bdfb4a02c6f8313baec6e9b00ec3baac3da87 (diff) | |
| download | tor-2fa9ddb9580fc0d69967c54f16825f14658fd9b9.tar.gz tor-2fa9ddb9580fc0d69967c54f16825f14658fd9b9.zip | |
Merge remote branch 'public/bug2378' into maint-0.2.2
Diffstat (limited to 'src/common/crypto.h')
| -rw-r--r-- | src/common/crypto.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index 7134956731..05185f3f18 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -249,7 +249,6 @@ struct evp_pkey_st; struct dh_st; struct rsa_st *_crypto_pk_env_get_rsa(crypto_pk_env_t *env); crypto_pk_env_t *_crypto_new_pk_env_rsa(struct rsa_st *rsa); -crypto_pk_env_t *_crypto_new_pk_env_evp_pkey(struct evp_pkey_st *pkey); struct evp_pkey_st *_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env, int private); struct dh_st *_crypto_dh_env_get_dh(crypto_dh_env_t *dh); |