diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-30 08:57:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-09-30 08:57:37 -0400 |
| commit | 53116ca0b71898b46a6d678407fb1b03c2ab8a93 (patch) | |
| tree | 40a4595d6ae0a9e49348c90b378924aff293b2d2 /src/lib/crypt_ops/crypto_s2k.c | |
| parent | de66bed604377db23cfa303b83e385ef59121a64 (diff) | |
| download | tor-53116ca0b71898b46a6d678407fb1b03c2ab8a93.tar.gz tor-53116ca0b71898b46a6d678407fb1b03c2ab8a93.zip | |
Re-run "make autostyle" with improved annotate_ifdef_directives
Diffstat (limited to 'src/lib/crypt_ops/crypto_s2k.c')
| -rw-r--r-- | src/lib/crypt_ops/crypto_s2k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/crypt_ops/crypto_s2k.c b/src/lib/crypt_ops/crypto_s2k.c index 5cf98e3e64..361db18927 100644 --- a/src/lib/crypt_ops/crypto_s2k.c +++ b/src/lib/crypt_ops/crypto_s2k.c @@ -285,7 +285,7 @@ secret_to_key_compute_key(uint8_t *key_out, size_t key_out_len, if (rv < 0) return S2K_FAILED; return (int)key_out_len; -#else /* !(defined(ENABLE_OPENSSL)) */ +#else /* !defined(ENABLE_OPENSSL) */ SECItem passItem = { .type = siBuffer, .data = (unsigned char *) secret, .len = (int)secret_len }; @@ -348,7 +348,7 @@ secret_to_key_compute_key(uint8_t *key_out, size_t key_out_len, if (rv != 0) return S2K_FAILED; return (int)key_out_len; -#else /* !(defined(HAVE_SCRYPT)) */ +#else /* !defined(HAVE_SCRYPT) */ return S2K_NO_SCRYPT_SUPPORT; #endif /* defined(HAVE_SCRYPT) */ } |