From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Mar 2004 22:42:26 +0000 (+0000)
Subject: Jump through a hoop, suppress a warning
X-Git-Tag: tor-0.0.6incompat-merged~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c31f5505daca8383a6738c4a2ecbc3ea38091c5a;p=thirdparty%2Ftor.git

Jump through a hoop, suppress a warning


svn:r1398
---

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 53c261b142..cdf827d0dd 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -664,7 +664,14 @@ int crypto_pk_asn1_encode(crypto_pk_env_t *pk, char *dest, int dest_len)
 crypto_pk_env_t *crypto_pk_asn1_decode(const char *str, int len)
 {
   RSA *rsa;
+  /* This ifdef suppresses a type warning.  Take out the first case once
+   * everybody is using openssl 0.9.7 or later.
+   */
+#if OPENSSL_VERSION_NUMBER < 0x00907000l
+  rsa = d2i_RSAPublicKey(NULL, (unsigned char**)&str, len);
+#else
   rsa = d2i_RSAPublicKey(NULL, (const unsigned char**)&str, len);
+#endif
   if (!rsa)
     return NULL; /* XXXX log openssl error */
   return _crypto_new_pk_env_rsa(rsa);