diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-08-10 11:26:34 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-08-10 13:28:47 +0200 |
| commit | a7a26ab1d1e26f34f94dd0466d390a5ecff8ed48 (patch) | |
| tree | 8998a8225326c75e7b7a9518786ff7b8cca6d47f | |
| parent | d9eff7f6010f8237f3549e304bf62823807b64d6 (diff) | |
| download | gnutls-a7a26ab1d1e26f34f94dd0466d390a5ecff8ed48.tar.gz | |
tests: updated string to keys tests for new internal API
| -rw-r--r-- | lib/libgnutls.map | 1 | ||||
| -rw-r--r-- | tests/pkcs12_s2k.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/libgnutls.map b/lib/libgnutls.map index f12580d39f..e6f9fcd120 100644 --- a/lib/libgnutls.map +++ b/lib/libgnutls.map @@ -969,6 +969,7 @@ GNUTLS_PRIVATE { _gnutls_mpi_release; # Internal symbols needed by tests/pkcs12_s2k: _gnutls_pkcs12_string_to_key; + mac_to_entry; _gnutls_bin2hex; local: *; diff --git a/tests/pkcs12_s2k.c b/tests/pkcs12_s2k.c index 0d11c293c6..847aa9a4f3 100644 --- a/tests/pkcs12_s2k.c +++ b/tests/pkcs12_s2k.c @@ -118,7 +118,7 @@ void doit(void) x = 0; for (i = 1; i < 4; i++) { for (j = 0; j < 3; j++) { - rc = _gnutls_pkcs12_string_to_key(i, salt[j], + rc = _gnutls_pkcs12_string_to_key(mac_to_entry(GNUTLS_MAC_SHA1), i, salt[j], strlen((char *) salt[j]), j + i + 15, @@ -145,7 +145,7 @@ void doit(void) printf("\n"); for (i = 0; i < sizeof(tv) / sizeof(tv[0]); i++) { - rc = _gnutls_pkcs12_string_to_key(tv[i].id, tv[i].salt, 8, + rc = _gnutls_pkcs12_string_to_key(mac_to_entry(GNUTLS_MAC_SHA1), tv[i].id, tv[i].salt, 8, tv[i].iter, tv[i].password, tv[i].keylen, key); |