diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:56:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:56:37 -0500 |
| commit | 912b76a1bf2645e74fbca8ba3f27f1a17d510cf5 (patch) | |
| tree | 23b28ce94beb1048fc48c3bd50f5ff4a3db8bb8e /src/common/crypto.h | |
| parent | 0fcb677e8a33462a22500efe2ab528c5be60bff9 (diff) | |
| parent | 2fa9ddb9580fc0d69967c54f16825f14658fd9b9 (diff) | |
| download | tor-912b76a1bf2645e74fbca8ba3f27f1a17d510cf5.tar.gz tor-912b76a1bf2645e74fbca8ba3f27f1a17d510cf5.zip | |
Merge remote branch 'origin/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 f114dd67ab..d50ca7060d 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -250,7 +250,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); |