summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-09-21 10:33:44 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-09-21 10:33:44 -0700
commit6f42992b4f1110f44d2db57cd6fe42559cfffdc2 (patch)
tree7f3559dfed7852929b707573b0f3c4807ec8ce14
parenta24734d80ac6902eb85e8c90ad98208eb948c779 (diff)
downloadefl-6f42992b4f1110f44d2db57cd6fe42559cfffdc2.tar.gz
eet: fix gnutls support with newer version.
-rw-r--r--src/lib/eet/eet_cipher.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
index a34fdfff4b..cf9ef71a56 100644
--- a/src/lib/eet/eet_cipher.c
+++ b/src/lib/eet/eet_cipher.c
@@ -679,7 +679,6 @@ eet_identity_check(const void *data_base,
gnutls_datum_t datum;
gnutls_datum_t signature;
gnutls_pubkey_t pubkey;
- gnutls_digest_algorithm_t hash_algo;
unsigned char *hash;
gcry_md_hd_t md;
int err;
@@ -717,10 +716,10 @@ eet_identity_check(const void *data_base,
if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0)
goto on_error;
- if (gnutls_pubkey_get_verify_algorithm(pubkey, &signature, &hash_algo) < 0)
- goto on_error;
-
- if (gnutls_pubkey_verify_hash(pubkey, 0, &datum, &signature) < 0)
+ if (gnutls_pubkey_verify_hash2(pubkey,
+ gnutls_x509_crt_get_signature_algorithm(cert),
+ 0,
+ &datum, &signature) < 0)
goto on_error;
if (sha1)