denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Update ECDSA API to OpenSSL 1.1.0

Browse Source
This commit is contained in:
Tobias Brunner
2016-06-29 11:09:37 +02:00
parent 3fb2c8edb7
commit 6688f7986e
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
+16 -3
View File
@@ -27,6 +27,10 @@
#include <openssl/ecdsa.h>
#include <openssl/x509.h>
#if OPENSSL_VERSION_NUMBER < 0x10100000L
OPENSSL_KEY_FALLBACK(ECDSA_SIG, r, s)
#endif
typedef struct private_openssl_ec_public_key_t private_openssl_ec_public_key_t;
/**
@@ -55,14 +59,23 @@ struct private_openssl_ec_public_key_t {
static bool verify_signature(private_openssl_ec_public_key_t *this,
chunk_t hash, chunk_t signature)
{
bool valid = FALSE;
BIGNUM *r, *s;
ECDSA_SIG *sig;
bool valid = FALSE;
sig = ECDSA_SIG_new();
if (sig)
{
/* split the signature chunk in r and s */
if (openssl_bn_split(signature, sig->r, sig->s))
r = BN_new();
s = BN_new();
if (!openssl_bn_split(signature, r, s))
{
BN_free(r);
BN_free(s);
ECDSA_SIG_free(sig);
return FALSE;
}
if (ECDSA_SIG_set0(sig, r, s))
{
valid = (ECDSA_do_verify(hash.ptr, hash.len, sig, this->ec) == 1);
}