diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:17:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:17:23 -0400 |
| commit | 0cf327dc7874ae0a021054b78cbb7b24a11aa8fe (patch) | |
| tree | 7c07a17e88ebb7b6d979540dc35c2ce9f4fd1bd1 /src/common/crypto.c | |
| parent | e4d2177d31225f5884dd94038b457dfd9954b11b (diff) | |
| parent | a4e9d672924f027c3e66220a8f70427d42154fe2 (diff) | |
| download | tor-0cf327dc7874ae0a021054b78cbb7b24a11aa8fe.tar tor-0cf327dc7874ae0a021054b78cbb7b24a11aa8fe.tar.gz | |
Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4
Diffstat (limited to 'src/common/crypto.c')
| -rw-r--r-- | src/common/crypto.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 22d57c7c8..cfa11cbaa 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; } } @@ -1294,23 +1294,6 @@ crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out, int add_space) return 0; } -/** Return true iff <b>s</b> is in the correct format for a fingerprint. - */ -int -crypto_pk_check_fingerprint_syntax(const char *s) -{ - int i; - for (i = 0; i < FINGERPRINT_LEN; ++i) { - if ((i%5) == 4) { - if (!TOR_ISSPACE(s[i])) return 0; - } else { - if (!TOR_ISXDIGIT(s[i])) return 0; - } - } - if (s[FINGERPRINT_LEN]) return 0; - return 1; -} - /* symmetric crypto */ /** Return a pointer to the key set for the cipher in <b>env</b>. |