summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-09-21 10:33:44 -0700
committerAndy Williams <andy@andywilliams.me>2016-11-20 09:47:15 +0000
commit848545818d1273b980d6a5ea038cdc1890e6b609 (patch)
tree8ecedec6e73f2b26baf59d44d137e40857143bed
parent8e2b550cc46afb5def5332c3a5f009728fe14f72 (diff)
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 a34fdff..cf9ef71 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,
679 gnutls_datum_t datum; 679 gnutls_datum_t datum;
680 gnutls_datum_t signature; 680 gnutls_datum_t signature;
681 gnutls_pubkey_t pubkey; 681 gnutls_pubkey_t pubkey;
682 gnutls_digest_algorithm_t hash_algo;
683 unsigned char *hash; 682 unsigned char *hash;
684 gcry_md_hd_t md; 683 gcry_md_hd_t md;
685 int err; 684 int err;
@@ -717,10 +716,10 @@ eet_identity_check(const void *data_base,
717 if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0) 716 if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0)
718 goto on_error; 717 goto on_error;
719 718
720 if (gnutls_pubkey_get_verify_algorithm(pubkey, &signature, &hash_algo) < 0) 719 if (gnutls_pubkey_verify_hash2(pubkey,
721 goto on_error; 720 gnutls_x509_crt_get_signature_algorithm(cert),
722 721 0,
723 if (gnutls_pubkey_verify_hash(pubkey, 0, &datum, &signature) < 0) 722 &datum, &signature) < 0)
724 goto on_error; 723 goto on_error;
725 724
726 if (sha1) 725 if (sha1)