tests: modified tests with obsolete APIs with their replacement API

diff --git a/tests/cve-2009-1415.c b/tests/cve-2009-1415.c
index 8f27ded0137f152c4ab9a491123e7b2d22ff39b3..aac922e1243324f4bdab05d86b78835d8ef9c48a 100644 (file)
--- a/tests/cve-2009-1415.c
+++ b/tests/cve-2009-1415.c
@@ -103,7 +103,7 @@ int main(void)
        if (ret < 0)
                return 1;
 
-       ret = gnutls_pubkey_verify_data(pubkey, 0, &data, &sig);
+       ret = gnutls_pubkey_verify_data2(pubkey, GNUTLS_SIGN_DSA_SHA1, 0, &data, &sig);
        if (ret < 0 && ret != GNUTLS_E_PK_SIG_VERIFY_FAILED)
                return 1;
 

diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c
index 2a0f736d3dc4e4fe8eb5f07fbfa3d3cc1db22ebf..8bfc3d7e9271d0aea78f900be102c9e5aeca1db1 100644 (file)
--- a/tests/x509sign-verify.c
+++ b/tests/x509sign-verify.c
@@ -152,7 +152,6 @@ void doit(void)
        gnutls_x509_crt_t crt;
        gnutls_pubkey_t pubkey;
        gnutls_privkey_t privkey;
-       gnutls_digest_algorithm_t hash_algo;
        gnutls_sign_algorithm_t sign_algo;
        gnutls_datum_t signature;
        gnutls_datum_t signature2;
@@ -216,32 +215,25 @@ void doit(void)
                        fail("gnutls_x509_pubkey_import\n");
 
                ret =
-                   gnutls_pubkey_get_verify_algorithm(pubkey, &signature,
-                                                      &hash_algo);
-               if (ret < 0 || hash_algo != GNUTLS_DIG_SHA1)
-                       fail("gnutls_x509_crt_get_verify_algorithm\n");
+                   gnutls_x509_crt_get_signature_algorithm(crt);
+               if (ret != GNUTLS_SIGN_RSA_SHA1)
+                       fail("gnutls_crt_get_signature_algorithm\n");
 
                ret =
-                   gnutls_pubkey_verify_hash(pubkey, 0, &hash_data,
+                   gnutls_pubkey_verify_hash2(pubkey, GNUTLS_SIGN_RSA_SHA1, 0, &hash_data,
                                              &signature);
                if (ret < 0)
-                       fail("gnutls_x509_pubkey_verify_hash\n");
+                       fail("gnutls_x509_pubkey_verify_hash2\n");
 
                ret =
-                   gnutls_pubkey_get_verify_algorithm(pubkey, &signature2,
-                                                      &hash_algo);
-               if (ret < 0 || hash_algo != GNUTLS_DIG_SHA1)
-                       fail("gnutls_x509_crt_get_verify_algorithm (hashed data)\n");
-
-               ret =
-                   gnutls_pubkey_verify_hash(pubkey, 0, &hash_data,
+                   gnutls_pubkey_verify_hash2(pubkey, GNUTLS_SIGN_RSA_SHA1, 0, &hash_data,
                                              &signature2);
                if (ret < 0)
                        fail("gnutls_x509_pubkey_verify_hash-1 (hashed data)\n");
 
                /* should fail */
                ret =
-                   gnutls_pubkey_verify_hash(pubkey, 0,
+                   gnutls_pubkey_verify_hash2(pubkey, GNUTLS_SIGN_RSA_SHA1, 0,
                                              &invalid_hash_data,
                                              &signature2);
                if (ret != GNUTLS_E_PK_SIG_VERIFY_FAILED)