diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-04 09:34:23 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-04 12:05:38 +0200 |
| commit | 19506bd770f070efb71e34d1803d6f429d7637b0 (patch) | |
| tree | d2d98dbbc7eefbca619257b2c8c85d7341b3d6af /tests/spki-abstract.c | |
| parent | 5b7abfd4b551b7c7b4594a806772eb2f5c31fbfb (diff) | |
| download | gnutls-19506bd770f070efb71e34d1803d6f429d7637b0.tar.gz | |
tests: updated for gnutls_x509_spki_get_rsa_pss_params
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'tests/spki-abstract.c')
| -rw-r--r-- | tests/spki-abstract.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/tests/spki-abstract.c b/tests/spki-abstract.c index 9302cb76bd..768f4c9ce9 100644 --- a/tests/spki-abstract.c +++ b/tests/spki-abstract.c @@ -41,6 +41,8 @@ static void pubkey_check(void) int ret; gnutls_pubkey_t pubkey; gnutls_x509_spki_t spki; + unsigned salt_size; + gnutls_digest_algorithm_t dig; ret = global_init(); if (ret != 0) { @@ -70,9 +72,9 @@ static void pubkey_check(void) ret = gnutls_pubkey_get_spki(pubkey, spki, 0); assert(ret >= 0); - assert(gnutls_x509_spki_get_salt_size(spki) == 32); - assert(gnutls_x509_spki_get_digest_algorithm(spki) == GNUTLS_DIG_SHA256); - assert(gnutls_x509_spki_get_pk_algorithm(spki) == GNUTLS_PK_RSA_PSS); + assert(gnutls_x509_spki_get_rsa_pss_params(spki, &dig, &salt_size) >= 0); + assert(salt_size == 32); + assert(dig == GNUTLS_DIG_SHA256); gnutls_pubkey_deinit(pubkey); gnutls_x509_spki_deinit(spki); @@ -84,6 +86,8 @@ static void key_check(void) int ret; gnutls_privkey_t key; gnutls_x509_spki_t spki; + unsigned salt_size; + gnutls_digest_algorithm_t dig; ret = global_init(); if (ret != 0) { @@ -114,17 +118,21 @@ static void key_check(void) ret = gnutls_privkey_get_spki(key, spki, 0); assert(ret >= 0); - assert(gnutls_x509_spki_get_salt_size(spki) == 32); - assert(gnutls_x509_spki_get_digest_algorithm(spki) == GNUTLS_DIG_SHA256); - assert(gnutls_x509_spki_get_pk_algorithm(spki) == GNUTLS_PK_RSA_PSS); + assert(gnutls_x509_spki_get_rsa_pss_params(spki, &dig, &salt_size) >= 0); + assert(salt_size == 32); + assert(dig == GNUTLS_DIG_SHA256); /* set and get */ - gnutls_x509_spki_set_pk_algorithm(spki, GNUTLS_PK_RSA); - gnutls_x509_spki_set_digest_algorithm(spki, GNUTLS_DIG_SHA1); - gnutls_x509_spki_set_salt_size(spki, 64); - assert(gnutls_x509_spki_get_salt_size(spki) == 64); - assert(gnutls_x509_spki_get_digest_algorithm(spki) == GNUTLS_DIG_SHA1); - assert(gnutls_x509_spki_get_pk_algorithm(spki) == GNUTLS_PK_RSA); + gnutls_x509_spki_set_rsa_pss_params(spki, GNUTLS_DIG_SHA1, 64); + assert(gnutls_x509_spki_get_rsa_pss_params(spki, &dig, &salt_size) >= 0); + assert(salt_size == 64); + assert(dig == GNUTLS_DIG_SHA1); + + /* read one at a time */ + assert(gnutls_x509_spki_get_rsa_pss_params(spki, NULL, &salt_size) >= 0); + assert(salt_size == 64); + assert(gnutls_x509_spki_get_rsa_pss_params(spki, &dig, NULL) >= 0); + assert(dig == GNUTLS_DIG_SHA1); gnutls_privkey_deinit(key); gnutls_x509_spki_deinit(spki); |