diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-02-21 10:51:49 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-02-21 10:51:49 +0100 |
| commit | c1b619f1cb3fc0335a237e1e423d5ced1433dad7 (patch) | |
| tree | cd533f7a307d1cd35a33d3fe1fca0fd2f71fafff /tests/x509sign-verify.c | |
| parent | 0b84e20700cc2c3654719e862beea77093ccdb64 (diff) | |
| download | gnutls-c1b619f1cb3fc0335a237e1e423d5ced1433dad7.tar.gz | |
tests: modified tests with obsolete APIs with their replacement API
Diffstat (limited to 'tests/x509sign-verify.c')
| -rw-r--r-- | tests/x509sign-verify.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c index 2a0f736d3d..8bfc3d7e92 100644 --- 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) |