diff options
| author | teor <teor@torproject.org> | 2020-04-29 22:07:35 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-29 22:08:33 +1000 |
| commit | 3253c357eeae3434da62bf720a451aa19f0ddd32 (patch) | |
| tree | bb7c65bbe1470de8d295cf91af2931cbf9362051 /src/lib | |
| parent | 6eec43161ad9e072d82da88163e748566b39d127 (diff) | |
| download | tor-3253c357eeae3434da62bf720a451aa19f0ddd32.tar.gz tor-3253c357eeae3434da62bf720a451aa19f0ddd32.zip | |
Run "make autostyle"
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/crypt_ops/crypto_rsa_openssl.c | 8 | ||||
| -rw-r--r-- | src/lib/subsys/subsys.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c b/src/lib/crypt_ops/crypto_rsa_openssl.c index d54db43b92..c96ee81fd3 100644 --- a/src/lib/crypt_ops/crypto_rsa_openssl.c +++ b/src/lib/crypt_ops/crypto_rsa_openssl.c @@ -583,15 +583,15 @@ rsa_private_key_too_long(RSA *rsa, int max_bits) dmp1 = RSA_get0_dmp1(rsa); dmq1 = RSA_get0_dmq1(rsa); iqmp = RSA_get0_iqmp(rsa); -#else +#else /* !(OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1)) */ /* The accessors above did not exist in openssl 1.1.0. */ p = q = dmp1 = dmq1 = iqmp = NULL; RSA_get0_key(rsa, &n, &e, &d); -#endif +#endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1) */ if (RSA_bits(rsa) > max_bits) return true; -#else +#else /* !defined(OPENSSL_1_1_API) */ n = rsa->n; e = rsa->e; p = rsa->p; @@ -600,7 +600,7 @@ rsa_private_key_too_long(RSA *rsa, int max_bits) dmp1 = rsa->dmp1; dmq1 = rsa->dmq1; iqmp = rsa->iqmp; -#endif +#endif /* defined(OPENSSL_1_1_API) */ if (n && BN_num_bits(n) > max_bits) return true; diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h index b29015746e..62c0de026d 100644 --- a/src/lib/subsys/subsys.h +++ b/src/lib/subsys/subsys.h @@ -198,7 +198,7 @@ typedef struct subsys_fns_t { **/ #define SUBSYS_DECLARE_LOCATION() \ .location = __FILE__ -#endif +#endif /* !defined(COCCI) */ /** * Lowest allowed subsystem level. |