Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-04-25 17:39:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing compilation for openssl-1.1.0 (part 2)

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

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

@ -49,15 +49,17 @@ void test_secret_key(const ops_secret_key_t *skey)
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);
test->p=BN_dup(skey->key.rsa.p);
test->q=BN_dup(skey->key.rsa.q);
#else #else
RSA_set0_key(test, RSA_set0_key(test,
BN_dup(skey->public_key.key.rsa.n), BN_dup(skey->public_key.key.rsa.n),
BN_dup(skey->public_key.key.rsa.e), BN_dup(skey->public_key.key.rsa.e),
BN_dup(skey->key.rsa.d)); BN_dup(skey->key.rsa.d));
#endif
test->p=BN_dup(skey->key.rsa.p); RSA_set0_factors(test, BN_dup(skey->key.rsa.p), BN_dup(skey->key.rsa.q));
test->q=BN_dup(skey->key.rsa.q); #endif
assert(RSA_check_key(test)==1); assert(RSA_check_key(test)==1);
RSA_free(test); RSA_free(test);
@ -401,10 +403,10 @@ ops_boolean_t ops_dsa_verify(const unsigned char *hash,size_t hash_length,
osig=DSA_SIG_new(); osig=DSA_SIG_new();
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if OPENSSL_VERSION_NUMBER < 0x10100000L
osig->r=sig->r; osig->r=BN_dup(sig->r);
osig->s=sig->s; osig->s=BN_dup(sig->s);
#else #else
DSA_SIG_set0(osig,sig->r,sig->s) ; DSA_SIG_set0(osig,BN_dup(sig->r),BN_dup(sig->s)) ;
#endif #endif
if(BN_num_bits(dsa->q) != 160) if(BN_num_bits(dsa->q) != 160)
@ -414,15 +416,18 @@ ops_boolean_t ops_dsa_verify(const unsigned char *hash,size_t hash_length,
fprintf(stderr,"(WW) ops_dsa_verify: openssl does only supports 'q' of 160 bits. Current is %d bits.\n",BN_num_bits(dsa->q)) ; fprintf(stderr,"(WW) ops_dsa_verify: openssl does only supports 'q' of 160 bits. Current is %d bits.\n",BN_num_bits(dsa->q)) ;
already_said=ops_true ; already_said=ops_true ;
} }
osig->r=osig->s=NULL;
DSA_SIG_free(osig); DSA_SIG_free(osig);
return ops_false ; return ops_false ;
} }
odsa=DSA_new(); odsa=DSA_new();
odsa->p=dsa->p; #if OPENSSL_VERSION_NUMBER < 0x10100000L
odsa->q=dsa->q; odsa->p=BN_dup(dsa->p);
odsa->g=dsa->g; odsa->q=BN_dup(dsa->q);
odsa->g=BN_dup(dsa->g);
#else
DSA_set0_pqg(BN_dup(dsa->p),BN_dup(dsa->q),BN_dup(dsa->g));
#endif
odsa->pub_key=dsa->y; odsa->pub_key=dsa->y;
if (debug) if (debug)
@ -457,10 +462,8 @@ ops_boolean_t ops_dsa_verify(const unsigned char *hash,size_t hash_length,
return ops_false ; return ops_false ;
} }
odsa->p=odsa->q=odsa->g=odsa->pub_key=NULL; odsa->pub_key=NULL;
DSA_free(odsa); DSA_free(odsa);
osig->r=osig->s=NULL;
DSA_SIG_free(osig); DSA_SIG_free(osig);
return ret != 0; return ret != 0;