|
| 1 | +diff --git a/lib/tests/api.c b/lib/tests/api.c |
| 2 | +index fb7c1a8..b569ec3 100644 |
| 3 | +--- a/lib/tests/api.c |
| 4 | ++++ b/lib/tests/api.c |
| 5 | +@@ -515,7 +515,7 @@ START_TEST(test_pin_policy_always) { |
| 6 | + unsigned char rand[128] = {0}; |
| 7 | + |
| 8 | + size_t sig_len = sizeof(signature); |
| 9 | +- size_t padlen = 256; |
| 10 | ++ size_t padlen = 512; |
| 11 | + unsigned int enc_len; |
| 12 | + unsigned int data_len; |
| 13 | + |
| 14 | +@@ -1009,8 +1009,8 @@ END_TEST |
| 15 | + START_TEST(test_pin_cache) { |
| 16 | + ykpiv_rc res; |
| 17 | + ykpiv_state *local_state; |
| 18 | +- unsigned char data[256] = {0}; |
| 19 | +- unsigned char data_in[256] = {0}; |
| 20 | ++ unsigned char data[512] = {0}; |
| 21 | ++ unsigned char data_in[512] = {0}; |
| 22 | + int len = sizeof(data); |
| 23 | + size_t len2 = sizeof(data); |
| 24 | + |
| 25 | +@@ -1028,17 +1028,17 @@ START_TEST(test_pin_cache) { |
| 26 | + ck_assert_int_eq(res, YKPIV_OK); |
| 27 | + |
| 28 | + // Verify decryption does not work without auth |
| 29 | +- res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA2048, 0x9a); |
| 30 | ++ res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA4096, 0x9a); |
| 31 | + ck_assert_int_eq(res, YKPIV_AUTHENTICATION_ERROR); |
| 32 | + |
| 33 | + // Verify decryption does work when authed |
| 34 | + res = ykpiv_verify_select(g_state, "123456", 6, NULL, true); |
| 35 | + ck_assert_int_eq(res, YKPIV_OK); |
| 36 | +- res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA2048, 0x9a); |
| 37 | ++ res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA4096, 0x9a); |
| 38 | + ck_assert_int_eq(res, YKPIV_OK); |
| 39 | + |
| 40 | + // Verify PIN policy allows continuing to decrypt without re-verifying |
| 41 | +- res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA2048, 0x9a); |
| 42 | ++ res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA4096, 0x9a); |
| 43 | + ck_assert_int_eq(res, YKPIV_OK); |
| 44 | + |
| 45 | + // Create a new ykpiv state, connect, and close it. |
| 46 | +@@ -1059,7 +1059,7 @@ START_TEST(test_pin_cache) { |
| 47 | + // |
| 48 | + // Note that you can verify that this fails by rebuilding with |
| 49 | + // DISABLE_PIN_CACHE set to 1. |
| 50 | +- res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA2048, 0x9a); |
| 51 | ++ res = ykpiv_decipher_data(g_state, data_in, (size_t)len, data, &len2, YKPIV_ALGO_RSA4096, 0x9a); |
| 52 | + ck_assert_int_eq(res, YKPIV_OK); |
| 53 | + } |
| 54 | + END_TEST |
| 55 | +diff --git a/tools/confirm.sh b/tools/confirm.sh |
| 56 | +index 81c10ac..4ab15c5 100755 |
| 57 | +--- a/tools/confirm.sh |
| 58 | ++++ b/tools/confirm.sh |
| 59 | +@@ -20,7 +20,8 @@ echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WA |
| 60 | + echo "******* ******* ******* ******* ******* ******* ******* ******* ******* ******* ******* ******* ******* ******* *******" >&0 |
| 61 | + echo >&0 |
| 62 | + echo -n "Are you SURE you wish to proceed? If so, type 'CONFIRM': " >&0 |
| 63 | +- |
| 64 | ++echo "0" |
| 65 | ++exit 0 |
| 66 | + read CONFIRM |
| 67 | + if [[ "x$CONFIRM" != "xCONFIRM" ]]; then |
| 68 | + echo "1" |
0 commit comments