summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-06-21 19:31:15 +0200
committerStef Walter <stefw@collabora.co.uk>2011-07-06 12:49:26 +0200
commit2cc2ab90a6b96ea75dfe4d6413e41539075e8f8a (patch)
treea1db8f143238562bdbc17dca4fc8bce165470ff3 /tests
parentf1ca5d5b57909534d8b21f9be455c94ca57e6636 (diff)
Rename p11_kit_pin_read_pinfile to p11_kit_pin_retrieve
* Fix up duplicate register logic as well.
Diffstat (limited to 'tests')
-rw-r--r--tests/pin-test.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/pin-test.c b/tests/pin-test.c
index 7f1bc08..344fe6b 100644
--- a/tests/pin-test.c
+++ b/tests/pin-test.c
@@ -96,9 +96,9 @@ test_pin_read (CuTest *tc)
&data, destroy_data);
uri = p11_kit_uri_new ();
- ret = p11_kit_pin_read_pinfile ("/the/pinfile", uri, "The token",
- P11_KIT_PIN_FLAGS_USER_LOGIN,
- buffer, sizeof (buffer));
+ ret = p11_kit_pin_retrieve ("/the/pinfile", uri, "The token",
+ P11_KIT_PIN_FLAGS_USER_LOGIN,
+ buffer, sizeof (buffer));
p11_kit_uri_free (uri);
CuAssertIntEquals (tc, 1, ret);
@@ -116,9 +116,9 @@ test_pin_read_no_match (CuTest *tc)
int ret;
uri = p11_kit_uri_new ();
- ret = p11_kit_pin_read_pinfile ("/the/pinfile", uri, "The token",
- P11_KIT_PIN_FLAGS_USER_LOGIN,
- buffer, sizeof (buffer));
+ ret = p11_kit_pin_retrieve ("/the/pinfile", uri, "The token",
+ P11_KIT_PIN_FLAGS_USER_LOGIN,
+ buffer, sizeof (buffer));
p11_kit_uri_free (uri);
CuAssertIntEquals (tc, 0, ret);
@@ -141,9 +141,9 @@ test_pin_register_duplicate (CuTest *tc)
p11_kit_pin_register_callback ("/the/pinfile", callback_other,
value, NULL);
- ret = p11_kit_pin_read_pinfile ("/the/pinfile", uri, "The token",
- P11_KIT_PIN_FLAGS_USER_LOGIN,
- buffer, sizeof (buffer));
+ ret = p11_kit_pin_retrieve ("/the/pinfile", uri, "The token",
+ P11_KIT_PIN_FLAGS_USER_LOGIN,
+ buffer, sizeof (buffer));
CuAssertIntEquals (tc, 1, ret);
CuAssertStrEquals (tc, "secret", buffer);
@@ -151,9 +151,9 @@ test_pin_register_duplicate (CuTest *tc)
p11_kit_pin_unregister_callback ("/the/pinfile", callback_other,
value);
- ret = p11_kit_pin_read_pinfile ("/the/pinfile", uri, "The token",
- P11_KIT_PIN_FLAGS_USER_LOGIN,
- buffer, sizeof (buffer));
+ ret = p11_kit_pin_retrieve ("/the/pinfile", uri, "The token",
+ P11_KIT_PIN_FLAGS_USER_LOGIN,
+ buffer, sizeof (buffer));
CuAssertIntEquals (tc, 1, ret);
CuAssertStrEquals (tc, "one", buffer);
@@ -161,7 +161,7 @@ test_pin_register_duplicate (CuTest *tc)
p11_kit_pin_unregister_callback ("/the/pinfile", callback_one,
&data);
- ret = p11_kit_pin_read_pinfile ("/the/pinfile", uri, "The token",
+ ret = p11_kit_pin_retrieve ("/the/pinfile", uri, "The token",
P11_KIT_PIN_FLAGS_USER_LOGIN,
buffer, sizeof (buffer));
@@ -184,9 +184,9 @@ test_pin_register_fallback (CuTest *tc)
p11_kit_pin_register_callback (P11_KIT_PIN_FALLBACK, callback_one,
&data, destroy_data);
- ret = p11_kit_pin_read_pinfile ("/the/pinfile", uri, "The token",
- P11_KIT_PIN_FLAGS_USER_LOGIN,
- buffer, sizeof (buffer));
+ ret = p11_kit_pin_retrieve ("/the/pinfile", uri, "The token",
+ P11_KIT_PIN_FLAGS_USER_LOGIN,
+ buffer, sizeof (buffer));
CuAssertIntEquals (tc, 1, ret);
CuAssertStrEquals (tc, "one", buffer);
@@ -194,9 +194,9 @@ test_pin_register_fallback (CuTest *tc)
p11_kit_pin_register_callback ("/the/pinfile", callback_other,
value, NULL);
- ret = p11_kit_pin_read_pinfile ("/the/pinfile", uri, "The token",
- P11_KIT_PIN_FLAGS_USER_LOGIN,
- buffer, sizeof (buffer));
+ ret = p11_kit_pin_retrieve ("/the/pinfile", uri, "The token",
+ P11_KIT_PIN_FLAGS_USER_LOGIN,
+ buffer, sizeof (buffer));
CuAssertIntEquals (tc, 1, ret);
CuAssertStrEquals (tc, "secret", buffer);