Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-14 00:49:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing compilation with openssl-1.1.0 (part 1)

Browse Source
This commit is contained in:
csoler 2017-02-18 14:40:44 +01:00
parent cda3c744af
commit 63a221007c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openpgpsdk/src/openpgpsdk/openssl_crypto.c
View File

@ -45,10 +45,17 @@ void test_secret_key(const ops_secret_key_t *skey)
{ {
RSA* test=RSA_new(); RSA* test=RSA_new();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
test->n=BN_dup(skey->public_key.key.rsa.n); test->n=BN_dup(skey->public_key.key.rsa.n);
test->e=BN_dup(skey->public_key.key.rsa.e); test->e=BN_dup(skey->public_key.key.rsa.e);
test->d=BN_dup(skey->key.rsa.d); test->d=BN_dup(skey->key.rsa.d);
#else
RSA_set0_key(test,
BN_dup(skey->public_key.key.rsa.n),
BN_dup(skey->public_key.key.rsa.e),
BN_dup(skey->key.rsa.d));
#endif
test->p=BN_dup(skey->key.rsa.p); test->p=BN_dup(skey->key.rsa.p);
test->q=BN_dup(skey->key.rsa.q); test->q=BN_dup(skey->key.rsa.q);
@ -392,8 +399,13 @@ ops_boolean_t ops_dsa_verify(const unsigned char *hash,size_t hash_length,
int ret; int ret;
osig=DSA_SIG_new(); osig=DSA_SIG_new();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
osig->r=sig->r; osig->r=sig->r;
osig->s=sig->s; osig->s=sig->s;
#else
DSA_SIG_set0(osig,sig->r,sig->s) ;
#endif
if(BN_num_bits(dsa->q) != 160) if(BN_num_bits(dsa->q) != 160)
{ {