diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-23 23:03:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-23 23:05:25 -0500 |
| commit | 365e302f6153a99fc79b7bad8fafa1d61e839e55 (patch) | |
| tree | 0531c91adde79e847808ed3768083c205967fe43 /src/common | |
| parent | 337e32f5b8f5f3b310da20bf0135f17d06efb3ab (diff) | |
| download | tor-365e302f6153a99fc79b7bad8fafa1d61e839e55.tar.gz tor-365e302f6153a99fc79b7bad8fafa1d61e839e55.zip | |
Remove a bunch of unused macro definitions
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto.c | 4 | ||||
| -rw-r--r-- | src/common/util.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 22d57c7c8a..84688aee4c 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -113,8 +113,8 @@ crypto_get_rsa_padding_overhead(int padding) { switch (padding) { - case RSA_PKCS1_OAEP_PADDING: return 42; - case RSA_PKCS1_PADDING: return 11; + case RSA_PKCS1_OAEP_PADDING: return PKCS1_OAEP_PADDING_OVERHEAD; + case RSA_PKCS1_PADDING: return PKCS1_PADDING_OVERHEAD; default: tor_assert(0); return -1; } } diff --git a/src/common/util.h b/src/common/util.h index ac88f1ca1c..c6e1c1aadf 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -112,7 +112,6 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, #define tor_malloc(size) tor_malloc_(size DMALLOC_ARGS) #define tor_malloc_zero(size) tor_malloc_zero_(size DMALLOC_ARGS) #define tor_calloc(nmemb,size) tor_calloc_(nmemb, size DMALLOC_ARGS) -#define tor_malloc_roundup(szp) _tor_malloc_roundup(szp DMALLOC_ARGS) #define tor_realloc(ptr, size) tor_realloc_(ptr, size DMALLOC_ARGS) #define tor_strdup(s) tor_strdup_(s DMALLOC_ARGS) #define tor_strndup(s, n) tor_strndup_(s, n DMALLOC_ARGS) |