agorise/c-libp2p
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reformatted for better error handling

Browse source
This commit is contained in:
John Jones 2017-04-27 15:51:30 -05:00
parent 9caba0aa00
commit 910e84dd5c
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crypto/rsa.c
View file

@ -127,7 +127,7 @@ int libp2p_crypto_rsa_generate_keypair(struct RsaPrivateKey* private_key, unsign
mbedtls_ctr_drbg_context ctr_drbg; mbedtls_ctr_drbg_context ctr_drbg;
int exponent = 65537; int exponent = 65537;
int retVal = 1; int retVal = 0;
unsigned char* buffer; unsigned char* buffer;
@ -142,7 +142,6 @@ int libp2p_crypto_rsa_generate_keypair(struct RsaPrivateKey* private_key, unsign
(const unsigned char *) pers, (const unsigned char *) pers,
strlen( pers ) ) ) != 0 ) strlen( pers ) ) ) != 0 )
{ {
retVal = 0;
goto exit; goto exit;
} }
@ -150,13 +149,11 @@ int libp2p_crypto_rsa_generate_keypair(struct RsaPrivateKey* private_key, unsign
mbedtls_rsa_init( &rsa, MBEDTLS_RSA_PKCS_V15, 0 ); mbedtls_rsa_init( &rsa, MBEDTLS_RSA_PKCS_V15, 0 );
// finally, generate the key // finally, generate the key
if( ( retVal = mbedtls_rsa_gen_key( &rsa, mbedtls_ctr_drbg_random, &ctr_drbg, (unsigned int)num_bits_for_keypair, if( mbedtls_rsa_gen_key( &rsa, mbedtls_ctr_drbg_random, &ctr_drbg, (unsigned int)num_bits_for_keypair,
exponent ) ) != 0 ) exponent ) != 0 )
{ {
retVal = 0;
goto exit; goto exit;
} }
retVal = 1;
// fill in values of structures // fill in values of structures
private_key->D = *(rsa.D.p); private_key->D = *(rsa.D.p);
@ -170,9 +167,8 @@ int libp2p_crypto_rsa_generate_keypair(struct RsaPrivateKey* private_key, unsign
size_t buffer_size = 1600; size_t buffer_size = 1600;
buffer = malloc(sizeof(char) * buffer_size); buffer = malloc(sizeof(char) * buffer_size);
retVal = libp2p_crypto_rsa_write_private_key_der(&rsa, buffer, &buffer_size); if (!libp2p_crypto_rsa_write_private_key_der(&rsa, buffer, &buffer_size))
if (retVal == 0) goto exit;
return 0;
// allocate memory for the private key der // allocate memory for the private key der
private_key->der_length = buffer_size; private_key->der_length = buffer_size;
@ -180,16 +176,20 @@ int libp2p_crypto_rsa_generate_keypair(struct RsaPrivateKey* private_key, unsign
// add in the der to the buffer // add in the der to the buffer
memcpy(private_key->der, &buffer[1600-buffer_size], buffer_size); memcpy(private_key->der, &buffer[1600-buffer_size], buffer_size);
exit: if (!libp2p_crypto_rsa_private_key_fill_public_key(private_key))
if (buffer != NULL) goto exit;
free(buffer);
retVal = 1;
exit:
mbedtls_rsa_free( &rsa ); mbedtls_rsa_free( &rsa );
mbedtls_ctr_drbg_free( &ctr_drbg ); mbedtls_ctr_drbg_free( &ctr_drbg );
mbedtls_entropy_free( &entropy ); mbedtls_entropy_free( &entropy );
if (buffer != NULL)
if (retVal != 0) { free(buffer);
// now do the public key. if (retVal == 0) {
retVal = libp2p_crypto_rsa_private_key_fill_public_key(private_key); // anything allocated should be cleaned up, as we're erroring out
libp2p_crypto_rsa_rsa_private_key_free(private_key);
private_key = NULL;
} }
return retVal; return retVal;