nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Jump through a hoop, suppress a warning

Browse Source 
svn:r1398
This commit is contained in:
Nick Mathewson 2004-03-30 22:42:26 +00:00
parent 96a86ef14d
commit c31f5505da
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/crypto.c
View File

@ -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) crypto_pk_env_t *crypto_pk_asn1_decode(const char *str, int len)
{ {
RSA *rsa; 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); rsa = d2i_RSAPublicKey(NULL, (const unsigned char**)&str, len);
#endif
if (!rsa) if (!rsa)
return NULL; /* XXXX log openssl error */ return NULL; /* XXXX log openssl error */
return _crypto_new_pk_env_rsa(rsa); return _crypto_new_pk_env_rsa(rsa);