diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 12:17:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 12:17:24 -0400 |
| commit | df4fa92a88dbeadcc85ea28ac52af006e9e1466a (patch) | |
| tree | 860b5700c73de5a6702c8a4ebec0b7bd6bf86ed6 /src/tools | |
| parent | a427a7c479d633ad74819729eb2412c5c5e9e97e (diff) | |
| parent | 71aacbe427e2d0c2b970bdc81db4f96c506dd7f3 (diff) | |
| download | tor-df4fa92a88dbeadcc85ea28ac52af006e9e1466a.tar.gz tor-df4fa92a88dbeadcc85ea28ac52af006e9e1466a.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tor-checkkey.c | 11 | ||||
| -rw-r--r-- | src/tools/tor-gencert.c | 22 |
2 files changed, 32 insertions, 1 deletions
diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index ed68bdf52c..8e957c2540 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -9,6 +9,7 @@ #include "torlog.h" #include "util.h" #include "compat.h" +#include "compat_openssl.h" #include <openssl/bn.h> #include <openssl/rsa.h> @@ -70,7 +71,15 @@ main(int c, char **v) printf("%s\n",digest); } else { rsa = crypto_pk_get_rsa_(env); - str = BN_bn2hex(rsa->n); + + BIGNUM *rsa_n; +#ifdef OPENSSL_1_1_API + BIGNUM *rsa_e, *rsa_d; + RSA_get0_key(rsa, &rsa_n, &rsa_e, &rsa_d); +#else + rsa_n = rsa->n; +#endif + str = BN_bn2hex(rsa_n); printf("%s\n", str); } diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 7781966024..8e9aadcb18 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -13,6 +13,20 @@ #include <unistd.h> #endif +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice in + * x509.h and x509_vfy.h. Suppress the GCC warning so we can build with + * -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/evp.h> #include <openssl/pem.h> #include <openssl/rsa.h> @@ -20,6 +34,14 @@ #include <openssl/obj_mac.h> #include <openssl/err.h> +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif +#endif + #include <errno.h> #if 0 #include <stdlib.h> |