diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
| commit | 9f83142591dba5460f2cf09e49f716d5c7238f06 (patch) | |
| tree | 558d1d3430532e7eb0b963e6ceba2b9e63d25cfa /src/common/crypto.h | |
| parent | 469b847c70c7cb801fa806e3336697866c1453d1 (diff) | |
| parent | 30e2d41a650876793b75bef04a2e18cbf5bc3fd6 (diff) | |
| download | tor-9f83142591dba5460f2cf09e49f716d5c7238f06.tar.gz tor-9f83142591dba5460f2cf09e49f716d5c7238f06.zip | |
Merge remote-tracking branch 'public/bug1031'
Diffstat (limited to 'src/common/crypto.h')
| -rw-r--r-- | src/common/crypto.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index 542bc24ed3..0782ee57f1 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -10,8 +10,8 @@ * \brief Headers for crypto.c **/ -#ifndef _TOR_CRYPTO_H -#define _TOR_CRYPTO_H +#ifndef TOR_CRYPTO_H +#define TOR_CRYPTO_H #include <stdio.h> #include "torint.h" @@ -279,11 +279,11 @@ void secret_to_key(char *key_out, size_t key_out_len, const char *secret, struct rsa_st; struct evp_pkey_st; struct dh_st; -struct rsa_st *_crypto_pk_get_rsa(crypto_pk_t *env); -crypto_pk_t *_crypto_new_pk_from_rsa(struct rsa_st *rsa); -struct evp_pkey_st *_crypto_pk_get_evp_pkey(crypto_pk_t *env, +struct rsa_st *crypto_pk_get_rsa_(crypto_pk_t *env); +crypto_pk_t *crypto_new_pk_from_rsa_(struct rsa_st *rsa); +struct evp_pkey_st *crypto_pk_get_evp_pkey_(crypto_pk_t *env, int private); -struct dh_st *_crypto_dh_get_dh(crypto_dh_t *dh); +struct dh_st *crypto_dh_get_dh_(crypto_dh_t *dh); /* Prototypes for private functions only used by crypto.c and test.c*/ void add_spaces_to_fp(char *out, size_t outlen, const char *in); #endif |