torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

i2d_RSAPublicKey advances the pointer it receives past the ASN1-encoded string.

Browse Source 
svn:r1478
This commit is contained in:
Nick Mathewson
2004-04-05 17:10:48 +00:00
parent cebf16eaf0
commit 84b9e90d5f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/crypto.c
+8 -8
View File
@@ -638,12 +638,12 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env,
int crypto_pk_asn1_encode(crypto_pk_env_t *pk, char *dest, int dest_len)
{
int len;
unsigned char *buf, *bufp;
unsigned char *buf, *cp;
len = i2d_RSAPublicKey(pk->key, NULL);
if (len < 0 || len > dest_len)
return -1;
bufp = buf = tor_malloc(len+1);
len = i2d_RSAPublicKey(pk->key, &bufp);
cp = buf = tor_malloc(len+1);
len = i2d_RSAPublicKey(pk->key, &cp);
if (len < 0) {
tor_free(buf);
return -1;
@@ -662,17 +662,17 @@ crypto_pk_env_t *crypto_pk_asn1_decode(const char *str, int len)
{
RSA *rsa;
unsigned char *buf;
const unsigned char *bufp;
bufp = buf = tor_malloc(len);
memcpy(buf,str,len);
/* 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, &buf, len);
unsigned char *cp;
#else
rsa = d2i_RSAPublicKey(NULL, &bufp, len);
const unsigned char *cp;
#endif
cp = buf = tor_malloc(len);
memcpy(buf,str,len);
rsa = d2i_RSAPublicKey(NULL, &cp, len);
tor_free(buf);
if (!rsa)
return NULL; /* XXXX log openssl error */