Adding upstream version 0.17.0.upstream/0.17.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

36 files changed, 1220 insertions, 0 deletions

diff --git a/src/tests/data/test_cli_rnpkeys/g10_list_keys b/src/tests/data/test_cli_rnpkeys/g10_list_keys
new file mode 100644
index 0000000..c4c4b07
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/g10_list_keys
@@ -0,0 +1,72 @@
+23 keys found
+
+pub   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+sub   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+pub   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+
+pub   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+sub   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+
+pub   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+sub   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+
+pub   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+sub   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+
+pub   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+sub   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+pub   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [SC]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256
+sub   256/ECDH 2edabb94d3055f76 2018-04-03 [E]
+      08192b478f740360b74c82cc2edabb94d3055f76
+
+pub   384/ECDSA 6cf2dce85599ada2 2018-04-03 [SC]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384
+sub   384/ECDH cff1bb6f16d28191 2018-04-03 [E]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+
+pub   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [SC]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512
+sub   512/ECDH 20cdaa1482ba79ce 2018-04-03 [E]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+pub   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+sub   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+
+pub   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+sub   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+pub   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+sub   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+
diff --git a/src/tests/data/test_cli_rnpkeys/g10_list_keys_no_bp b/src/tests/data/test_cli_rnpkeys/g10_list_keys_no_bp
new file mode 100644
index 0000000..0632260
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/g10_list_keys_no_bp
@@ -0,0 +1,72 @@
+23 keys found
+
+pub   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+sub   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+pub   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+
+pub   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+sub   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+
+pub   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+sub   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+
+pub   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+sub   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+
+pub   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+sub   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+pub   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [INVALID]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256 [INVALID]
+sub   256/ECDH 2edabb94d3055f76 2018-04-03 [INVALID]
+      08192b478f740360b74c82cc2edabb94d3055f76
+
+pub   384/ECDSA 6cf2dce85599ada2 2018-04-03 [INVALID]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384 [INVALID]
+sub   384/ECDH cff1bb6f16d28191 2018-04-03 [INVALID]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+
+pub   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [INVALID]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512 [INVALID]
+sub   512/ECDH 20cdaa1482ba79ce 2018-04-03 [INVALID]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+pub   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+sub   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+
+pub   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+sub   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+pub   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+sub   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+
diff --git a/src/tests/data/test_cli_rnpkeys/g10_list_keys_sec b/src/tests/data/test_cli_rnpkeys/g10_list_keys_sec
new file mode 100644
index 0000000..9cc47c0
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/g10_list_keys_sec
@@ -0,0 +1,72 @@
+23 keys found
+
+sec   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+ssb   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+sec   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+
+sec   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+ssb   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+
+sec   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+ssb   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+
+sec   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+ssb   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+
+sec   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+ssb   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+sec   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [SC]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256
+ssb   256/ECDH 2edabb94d3055f76 2018-04-03 [E]
+      08192b478f740360b74c82cc2edabb94d3055f76
+
+sec   384/ECDSA 6cf2dce85599ada2 2018-04-03 [SC]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384
+ssb   384/ECDH cff1bb6f16d28191 2018-04-03 [E]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+
+sec   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [SC]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512
+ssb   512/ECDH 20cdaa1482ba79ce 2018-04-03 [E]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+sec   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+ssb   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+
+sec   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+ssb   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+sec   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+ssb   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+
diff --git a/src/tests/data/test_cli_rnpkeys/g10_list_keys_sec_no_bp b/src/tests/data/test_cli_rnpkeys/g10_list_keys_sec_no_bp
new file mode 100644
index 0000000..a2eb7c5
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/g10_list_keys_sec_no_bp
@@ -0,0 +1,72 @@
+23 keys found
+
+sec   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+ssb   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+sec   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+
+sec   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+ssb   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+
+sec   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+ssb   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+
+sec   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+ssb   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+
+sec   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+ssb   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+sec   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [INVALID]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256 [INVALID]
+ssb   256/ECDH 2edabb94d3055f76 2018-04-03 [INVALID]
+      08192b478f740360b74c82cc2edabb94d3055f76
+
+sec   384/ECDSA 6cf2dce85599ada2 2018-04-03 [INVALID]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384 [INVALID]
+ssb   384/ECDH cff1bb6f16d28191 2018-04-03 [INVALID]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+
+sec   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [INVALID]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512 [INVALID]
+ssb   512/ECDH 20cdaa1482ba79ce 2018-04-03 [INVALID]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+sec   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+ssb   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+
+sec   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+ssb   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+sec   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+ssb   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_00000000 b/src/tests/data/test_cli_rnpkeys/getkey_00000000
new file mode 100644
index 0000000..570c3b2
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_00000000
@@ -0,0 +1 @@
+Key(s) not found.
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb
new file mode 100644
index 0000000..09f192d
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb
@@ -0,0 +1,12 @@
+3 keys found
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sec b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sec
new file mode 100644
index 0000000..d69e11d
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sec
@@ -0,0 +1,12 @@
+3 keys found
+
+sec   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+ssb   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+ssb   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sec_y2k38 b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sec_y2k38
new file mode 100644
index 0000000..849e9d2
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sec_y2k38
@@ -0,0 +1,12 @@
+3 keys found
+
+sec   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+ssb   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+ssb   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sig b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sig
new file mode 100644
index 0000000..47a9277
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sig
@@ -0,0 +1,17 @@
+3 keys found
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sig_y2k38 b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sig_y2k38
new file mode 100644
index 0000000..c9db774
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_sig_y2k38
@@ -0,0 +1,17 @@
+3 keys found
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_y2k38 b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_y2k38
new file mode 100644
index 0000000..b82d8ec
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_2fcadf05ffa501bb_y2k38
@@ -0,0 +1,12 @@
+3 keys found
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/getkey_zzzzzzzz b/src/tests/data/test_cli_rnpkeys/getkey_zzzzzzzz
new file mode 100644
index 0000000..570c3b2
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/getkey_zzzzzzzz
@@ -0,0 +1 @@
+Key(s) not found.
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys
new file mode 100644
index 0000000..686501b
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys
@@ -0,0 +1,24 @@
+7 keys found
+
+pub   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+uid           key0-uid1
+uid           key0-uid2
+sub   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sub   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sub   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_sec b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_sec
new file mode 100644
index 0000000..e6e4c0f
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_sec
@@ -0,0 +1,24 @@
+7 keys found
+
+sec   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+uid           key0-uid1
+uid           key0-uid2
+ssb   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+ssb   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+ssb   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+
+sec   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+ssb   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+ssb   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_sec_y2k38 b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_sec_y2k38
new file mode 100644
index 0000000..197714b
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_sec_y2k38
@@ -0,0 +1,24 @@
+7 keys found
+
+sec   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+uid           key0-uid1
+uid           key0-uid2
+ssb   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+ssb   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+ssb   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+
+sec   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+ssb   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+ssb   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_y2k38 b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_y2k38
new file mode 100644
index 0000000..dae5347
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_keys_y2k38
@@ -0,0 +1,24 @@
+7 keys found
+
+pub   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+uid           key0-uid1
+uid           key0-uid2
+sub   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sub   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sub   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+uid           key1-uid2
+uid           key1-uid1
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs
new file mode 100644
index 0000000..eeb0055
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs
@@ -0,0 +1,35 @@
+7 keys found
+
+pub   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid2
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+sub   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+sub   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+sub   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_sec b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_sec
new file mode 100644
index 0000000..a93d26e
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_sec
@@ -0,0 +1,35 @@
+7 keys found
+
+sec   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid2
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+ssb   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+ssb   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+ssb   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+
+sec   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+ssb   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+ssb   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_sec_y2k38 b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_sec_y2k38
new file mode 100644
index 0000000..f10150b
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_sec_y2k38
@@ -0,0 +1,35 @@
+7 keys found
+
+sec   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid2
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+ssb   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+ssb   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+ssb   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+
+sec   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+ssb   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+ssb   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_y2k38 b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_y2k38
new file mode 100644
index 0000000..15b0dae
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_1_list_sigs_y2k38
@@ -0,0 +1,35 @@
+7 keys found
+
+pub   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+uid           key0-uid2
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+sub   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+sub   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+sub   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid0
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_2_list_keys b/src/tests/data/test_cli_rnpkeys/keyring_2_list_keys
new file mode 100644
index 0000000..3709223
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_2_list_keys
@@ -0,0 +1,6 @@
+1 key found
+
+pub   888/RSA dc70c124a50283f1 2001-11-08 [ESCA]
+      c80aa54aa5c6ac73a373687134abe4bd
+uid           pgp2.6.3-test-key
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_2_list_sigs b/src/tests/data/test_cli_rnpkeys/keyring_2_list_sigs
new file mode 100644
index 0000000..e6d0aff
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_2_list_sigs
@@ -0,0 +1,7 @@
+1 key found
+
+pub   888/RSA dc70c124a50283f1 2001-11-08 [ESCA]
+      c80aa54aa5c6ac73a373687134abe4bd
+uid           pgp2.6.3-test-key
+sig           dc70c124a50283f1 2001-11-08 pgp2.6.3-test-key
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_3_list_keys b/src/tests/data/test_cli_rnpkeys/keyring_3_list_keys
new file mode 100644
index 0000000..7772579
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_3_list_keys
@@ -0,0 +1,8 @@
+2 keys found
+
+pub   2048/RSA 4be147bb22df1e60 2017-09-30 [SC] [EXPIRES 2069-09-28]
+      4f2e62b74e6a4cd333bc19004be147bb22df1e60
+uid           test1
+sub   2048/RSA a49bae05c16e8bc8 2017-09-30 [E] [EXPIRES 2069-09-28]
+      10793e367ee867c32e358f2aa49bae05c16e8bc8
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_3_list_keys_y2k38 b/src/tests/data/test_cli_rnpkeys/keyring_3_list_keys_y2k38
new file mode 100644
index 0000000..f4b7e1a
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_3_list_keys_y2k38
@@ -0,0 +1,8 @@
+2 keys found
+
+pub   2048/RSA 4be147bb22df1e60 2017-09-30 [SC] [EXPIRES >=2038-01-19]
+      4f2e62b74e6a4cd333bc19004be147bb22df1e60
+uid           test1
+sub   2048/RSA a49bae05c16e8bc8 2017-09-30 [E] [EXPIRES >=2038-01-19]
+      10793e367ee867c32e358f2aa49bae05c16e8bc8
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_3_list_sigs b/src/tests/data/test_cli_rnpkeys/keyring_3_list_sigs
new file mode 100644
index 0000000..b67ec9c
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_3_list_sigs
@@ -0,0 +1,10 @@
+2 keys found
+
+pub   2048/RSA 4be147bb22df1e60 2017-09-30 [SC] [EXPIRES 2069-09-28]
+      4f2e62b74e6a4cd333bc19004be147bb22df1e60
+uid           test1
+sig           4be147bb22df1e60 2019-10-11 test1
+sub   2048/RSA a49bae05c16e8bc8 2017-09-30 [E] [EXPIRES 2069-09-28]
+      10793e367ee867c32e358f2aa49bae05c16e8bc8
+sig           4be147bb22df1e60 2019-10-11 test1
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_3_list_sigs_y2k38 b/src/tests/data/test_cli_rnpkeys/keyring_3_list_sigs_y2k38
new file mode 100644
index 0000000..02a80b8
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_3_list_sigs_y2k38
@@ -0,0 +1,10 @@
+2 keys found
+
+pub   2048/RSA 4be147bb22df1e60 2017-09-30 [SC] [EXPIRES >=2038-01-19]
+      4f2e62b74e6a4cd333bc19004be147bb22df1e60
+uid           test1
+sig           4be147bb22df1e60 2019-10-11 test1
+sub   2048/RSA a49bae05c16e8bc8 2017-09-30 [E] [EXPIRES >=2038-01-19]
+      10793e367ee867c32e358f2aa49bae05c16e8bc8
+sig           4be147bb22df1e60 2019-10-11 test1
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_5_list_keys b/src/tests/data/test_cli_rnpkeys/keyring_5_list_keys
new file mode 100644
index 0000000..bee0e12
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_5_list_keys
@@ -0,0 +1,8 @@
+2 keys found
+
+pub   256/ECDSA 0e33fd46ff10f19c 2017-11-22 [SC]
+      b6b5e497a177551ecb8862200e33fd46ff10f19c
+uid           test0
+sub   256/ECDH 074131bc8d16c5c9 2017-11-22 [E]
+      481e6a41b10ecd71a477db02074131bc8d16c5c9
+
diff --git a/src/tests/data/test_cli_rnpkeys/keyring_5_list_sigs b/src/tests/data/test_cli_rnpkeys/keyring_5_list_sigs
new file mode 100644
index 0000000..6ff4929
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/keyring_5_list_sigs
@@ -0,0 +1,10 @@
+2 keys found
+
+pub   256/ECDSA 0e33fd46ff10f19c 2017-11-22 [SC]
+      b6b5e497a177551ecb8862200e33fd46ff10f19c
+uid           test0
+sig           0e33fd46ff10f19c 2017-11-22 test0
+sub   256/ECDH 074131bc8d16c5c9 2017-11-22 [E]
+      481e6a41b10ecd71a477db02074131bc8d16c5c9
+sig           0e33fd46ff10f19c 2017-11-22 test0
+
diff --git a/src/tests/data/test_cli_rnpkeys/pubring-malf-cert-permissive-import.txt b/src/tests/data/test_cli_rnpkeys/pubring-malf-cert-permissive-import.txt
new file mode 100644
index 0000000..9c0ab4f
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/pubring-malf-cert-permissive-import.txt
@@ -0,0 +1,34 @@
+7 keys found
+
+pub   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0 [INVALID]
+uid           key0-uid1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+uid           key0-uid2
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+sub   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+sub   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+sub   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES 2083-05-11]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES 2083-05-11]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/pubring-malf-cert-permissive-import.txt_y2k38 b/src/tests/data/test_cli_rnpkeys/pubring-malf-cert-permissive-import.txt_y2k38
new file mode 100644
index 0000000..c5193ba
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/pubring-malf-cert-permissive-import.txt_y2k38
@@ -0,0 +1,34 @@
+7 keys found
+
+pub   1024/RSA 7bc6709b15c23a4a 2017-07-20 [SC]
+      e95a3cbf583aa80a2ccc53aa7bc6709b15c23a4a
+uid           key0-uid0 [INVALID]
+uid           key0-uid1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+uid           key0-uid2
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+sub   1024/RSA 1ed63ee56fadc34d 2017-07-20 [E]
+      e332b27caf4742a11baa677f1ed63ee56fadc34d
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+sub   1024/DSA 1d7e8a5393c997a8 2017-07-20 [S] [EXPIRED 2017-11-20]
+      c5b15209940a7816a7af3fb51d7e8a5393c997a8
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+sub   1024/RSA 8a05b89fad5aded1 2017-07-20 [E]
+      5cd46d2a0bd0b8cfe0b130ae8a05b89fad5aded1
+sig           7bc6709b15c23a4a 2017-07-20 key0-uid1
+
+pub   1024/DSA 2fcadf05ffa501bb 2017-07-20 [SC] [EXPIRES >=2038-01-19]
+      be1c4ab951f4c2f6b604c7f82fcadf05ffa501bb
+uid           key1-uid0
+sig           2fcadf05ffa501bb 2017-07-29 key1-uid0
+uid           key1-uid2
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+uid           key1-uid1
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 54505a936a4a970e 2017-07-20 [E] [EXPIRES >=2038-01-19]
+      a3e94de61a8cb229413d348e54505a936a4a970e
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+sub   1024/ElGamal 326ef111425d14a5 2017-07-20 [E]
+      57f8ed6e5c197db63c60ffaf326ef111425d14a5
+sig           2fcadf05ffa501bb 2017-07-20 key1-uid0
+
diff --git a/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys
new file mode 100644
index 0000000..c4c4b07
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys
@@ -0,0 +1,72 @@
+23 keys found
+
+pub   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+sub   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+pub   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+
+pub   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+sub   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+
+pub   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+sub   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+
+pub   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+sub   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+
+pub   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+sub   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+pub   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [SC]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256
+sub   256/ECDH 2edabb94d3055f76 2018-04-03 [E]
+      08192b478f740360b74c82cc2edabb94d3055f76
+
+pub   384/ECDSA 6cf2dce85599ada2 2018-04-03 [SC]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384
+sub   384/ECDH cff1bb6f16d28191 2018-04-03 [E]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+
+pub   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [SC]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512
+sub   512/ECDH 20cdaa1482ba79ce 2018-04-03 [E]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+pub   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+sub   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+
+pub   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+sub   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+pub   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+sub   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+
diff --git a/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys_no_bp b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys_no_bp
new file mode 100644
index 0000000..0632260
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys_no_bp
@@ -0,0 +1,72 @@
+23 keys found
+
+pub   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+sub   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+pub   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+
+pub   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+sub   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+
+pub   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+sub   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+
+pub   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+sub   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+
+pub   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+sub   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+pub   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [INVALID]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256 [INVALID]
+sub   256/ECDH 2edabb94d3055f76 2018-04-03 [INVALID]
+      08192b478f740360b74c82cc2edabb94d3055f76
+
+pub   384/ECDSA 6cf2dce85599ada2 2018-04-03 [INVALID]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384 [INVALID]
+sub   384/ECDH cff1bb6f16d28191 2018-04-03 [INVALID]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+
+pub   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [INVALID]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512 [INVALID]
+sub   512/ECDH 20cdaa1482ba79ce 2018-04-03 [INVALID]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+pub   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+sub   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+
+pub   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+sub   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+pub   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+sub   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+
diff --git a/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys_sec b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys_sec
new file mode 100644
index 0000000..d30584b
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_keys_sec
@@ -0,0 +1,66 @@
+21 keys found
+
+sec   384/ECDSA 6cf2dce85599ada2 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384
+ssb   256/ECDH 7635401f90d3e533 2018-04-03 [E] [EXPIRES 2019-01-28]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+sec   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+
+sec   2048/DSA c8a10a7d78273e10 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+
+sec   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512
+ssb   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+ssb   384/ECDH e210e3d554a4fad9 2018-04-03 [E] [EXPIRES 2019-01-28]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+ssb   512/ECDH 20cdaa1482ba79ce 2018-04-03 [E] [EXPIRES 2019-01-28]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+sec   255/EdDSA cc786278981b0728 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+
+sec   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256
+
+sec   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+ssb   256/ECDH 37e285e9e9851491 2018-04-03 [E] [EXPIRES 2019-01-28]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+ssb   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E] [EXPIRES 2019-01-28]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+sec   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+ssb   384/ECDH cff1bb6f16d28191 2018-04-03 [E] [EXPIRES 2019-01-28]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+ssb   256/ECDH 2edabb94d3055f76 2018-04-03 [E] [EXPIRES 2019-01-28]
+      08192b478f740360b74c82cc2edabb94d3055f76
+ssb   3072/ElGamal 02a5715c3537717e 2018-04-03 [E] [EXPIRES 2019-01-28]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+sec   3072/RSA 2fb9179118898e8b 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+
+sec   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+
+sec   256/ECDSA 23674f21b2441527 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+ssb   521/ECDH 9853df2f6d297442 2018-04-03 [E] [EXPIRES 2019-01-28]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+
diff --git a/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs
new file mode 100644
index 0000000..cc7dcc1
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs
@@ -0,0 +1,95 @@
+23 keys found
+
+pub   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+sig           c8a10a7d78273e10 2019-02-02 dsa-eg
+sub   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+sig           c8a10a7d78273e10 2019-02-02 dsa-eg
+
+pub   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+sig           cc786278981b0728 2019-02-02 ecc-25519
+
+pub   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+sig           23674f21b2441527 2019-02-02 ecc-p256
+sub   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+sig           23674f21b2441527 2019-02-02 ecc-p256
+
+pub   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+sig           242a3aa5ea85f44a 2019-02-02 ecc-p384
+sub   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+sig           242a3aa5ea85f44a 2019-02-02 ecc-p384
+
+pub   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+sig           2092ca8324263b6a 2019-02-02 ecc-p521
+sub   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+sig           2092ca8324263b6a 2019-02-02 ecc-p521
+
+pub   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+sig           2fb9179118898e8b 2019-02-02 rsa-rsa
+sub   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+sig           2fb9179118898e8b 2019-02-02 rsa-rsa
+
+pub   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [SC]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256
+sig           d0c8a3daf9e0634a 2019-02-02 ecc-bp256
+sub   256/ECDH 2edabb94d3055f76 2018-04-03 [E]
+      08192b478f740360b74c82cc2edabb94d3055f76
+sig           d0c8a3daf9e0634a 2019-02-02 ecc-bp256
+
+pub   384/ECDSA 6cf2dce85599ada2 2018-04-03 [SC]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384
+sig           6cf2dce85599ada2 2019-02-02 ecc-bp384
+sub   384/ECDH cff1bb6f16d28191 2018-04-03 [E]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+sig           6cf2dce85599ada2 2019-02-02 ecc-bp384
+
+pub   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [SC]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512
+sig           aa5c58d14f7b8f48 2019-02-02 ecc-bp512
+sub   512/ECDH 20cdaa1482ba79ce 2018-04-03 [E]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+sig           aa5c58d14f7b8f48 2019-02-02 ecc-bp512
+
+pub   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+sig           941822a0fc1b30a5 2018-10-15 eddsa-x25519
+sub   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+sig           941822a0fc1b30a5 2018-10-15 eddsa-x25519
+
+pub   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+sig           3ea5bb6f9692c1a0 2019-02-02 ecc-p256k1
+sub   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+sig           3ea5bb6f9692c1a0 2019-02-02 ecc-p256k1
+
+pub   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+sig           bd860a52d1899c0f 2021-12-24 rsa-rsa-2
+sub   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+sig           bd860a52d1899c0f 2021-12-24 rsa-rsa-2
+
diff --git a/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs_no_bp b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs_no_bp
new file mode 100644
index 0000000..8581e0a
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs_no_bp
@@ -0,0 +1,95 @@
+23 keys found
+
+pub   2048/DSA c8a10a7d78273e10 2018-04-03 [SC]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+sig           c8a10a7d78273e10 2019-02-02 dsa-eg
+sub   3072/ElGamal 02a5715c3537717e 2018-04-03 [E]
+      3409f96f0c57242540702dba02a5715c3537717e
+sig           c8a10a7d78273e10 2019-02-02 dsa-eg
+
+pub   255/EdDSA cc786278981b0728 2018-04-03 [SC]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+sig           cc786278981b0728 2019-02-02 ecc-25519
+
+pub   256/ECDSA 23674f21b2441527 2018-04-03 [SC]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+sig           23674f21b2441527 2019-02-02 ecc-p256
+sub   256/ECDH 37e285e9e9851491 2018-04-03 [E]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+sig           23674f21b2441527 2019-02-02 ecc-p256
+
+pub   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+sig           242a3aa5ea85f44a 2019-02-02 ecc-p384
+sub   384/ECDH e210e3d554a4fad9 2018-04-03 [E]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+sig           242a3aa5ea85f44a 2019-02-02 ecc-p384
+
+pub   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+sig           2092ca8324263b6a 2019-02-02 ecc-p521
+sub   521/ECDH 9853df2f6d297442 2018-04-03 [E]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+sig           2092ca8324263b6a 2019-02-02 ecc-p521
+
+pub   3072/RSA 2fb9179118898e8b 2018-04-03 [SC]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+sig           2fb9179118898e8b 2019-02-02 rsa-rsa
+sub   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+sig           2fb9179118898e8b 2019-02-02 rsa-rsa
+
+pub   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [INVALID]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256 [INVALID]
+sig           d0c8a3daf9e0634a 2019-02-02 [unknown] [invalid]
+sub   256/ECDH 2edabb94d3055f76 2018-04-03 [INVALID]
+      08192b478f740360b74c82cc2edabb94d3055f76
+sig           d0c8a3daf9e0634a 2019-02-02 [unknown] [invalid]
+
+pub   384/ECDSA 6cf2dce85599ada2 2018-04-03 [INVALID]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384 [INVALID]
+sig           6cf2dce85599ada2 2019-02-02 [unknown] [invalid]
+sub   384/ECDH cff1bb6f16d28191 2018-04-03 [INVALID]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+sig           6cf2dce85599ada2 2019-02-02 [unknown] [invalid]
+
+pub   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [INVALID]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512 [INVALID]
+sig           aa5c58d14f7b8f48 2019-02-02 [unknown] [invalid]
+sub   512/ECDH 20cdaa1482ba79ce 2018-04-03 [INVALID]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+sig           aa5c58d14f7b8f48 2019-02-02 [unknown] [invalid]
+
+pub   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+sig           941822a0fc1b30a5 2018-10-15 eddsa-x25519
+sub   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+sig           941822a0fc1b30a5 2018-10-15 eddsa-x25519
+
+pub   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+sig           3ea5bb6f9692c1a0 2019-02-02 ecc-p256k1
+sub   256/ECDH 7635401f90d3e533 2018-04-03 [E]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+sig           3ea5bb6f9692c1a0 2019-02-02 ecc-p256k1
+
+pub   2048/RSA bd860a52d1899c0f 2021-12-24 [SC]
+      5aa9362aea07de23a726762cbd860a52d1899c0f
+uid           rsa-rsa-2
+sig           bd860a52d1899c0f 2021-12-24 rsa-rsa-2
+sub   2048/RSA 8e08d46a37414996 2021-12-24 [E]
+      ca3e4420cf3d3b62d9ee7c6e8e08d46a37414996
+sig           bd860a52d1899c0f 2021-12-24 rsa-rsa-2
+
diff --git a/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs_sec b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs_sec
new file mode 100644
index 0000000..7d66df0
--- /dev/null
+++ b/src/tests/data/test_cli_rnpkeys/test_stream_key_load_sigs_sec
@@ -0,0 +1,77 @@
+21 keys found
+
+sec   384/ECDSA 6cf2dce85599ada2 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      5b8a254c823ced98decd10ed6cf2dce85599ada2
+uid           ecc-bp384
+sig           6cf2dce85599ada2 2018-04-03 ecc-bp384
+ssb   256/ECDH 7635401f90d3e533 2018-04-03 [E] [EXPIRES 2019-01-28]
+      c263ec4ce2b3772746ed53227635401f90d3e533
+
+sec   256/ECDSA 3ea5bb6f9692c1a0 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      81f772b57d4ebfe7000a66233ea5bb6f9692c1a0
+uid           ecc-p256k1
+sig           3ea5bb6f9692c1a0 2018-04-03 ecc-p256k1
+
+sec   2048/DSA c8a10a7d78273e10 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      091c44ce9cfbc3ff7ec7a64dc8a10a7d78273e10
+uid           dsa-eg
+sig           c8a10a7d78273e10 2018-04-03 dsa-eg
+
+sec   512/ECDSA aa5c58d14f7b8f48 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      4c59ab9272aa6a1f60b85bd0aa5c58d14f7b8f48
+uid           ecc-bp512
+sig           aa5c58d14f7b8f48 2018-04-03 ecc-bp512
+ssb   255/ECDH c711187e594376af 2018-10-15 [E]
+      cfdb2a1f8325cc949ce0b597c711187e594376af
+ssb   384/ECDH e210e3d554a4fad9 2018-04-03 [E] [EXPIRES 2019-01-28]
+      cbc2ac55dcd8e4e34fb2f816e210e3d554a4fad9
+ssb   512/ECDH 20cdaa1482ba79ce 2018-04-03 [E] [EXPIRES 2019-01-28]
+      270a7cd0dc6c2e01dce8603620cdaa1482ba79ce
+
+sec   255/EdDSA cc786278981b0728 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      21fc68274aae3b5de39a4277cc786278981b0728
+uid           ecc-25519
+sig           cc786278981b0728 2018-04-03 ecc-25519
+
+sec   256/ECDSA d0c8a3daf9e0634a 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      0633c5f72a198f51e650e4abd0c8a3daf9e0634a
+uid           ecc-bp256
+sig           d0c8a3daf9e0634a 2018-04-03 ecc-bp256
+
+sec   384/ECDSA 242a3aa5ea85f44a 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      ab25cba042dd924c3acc3ed3242a3aa5ea85f44a
+uid           ecc-p384
+sig           242a3aa5ea85f44a 2018-04-03 ecc-p384
+ssb   256/ECDH 37e285e9e9851491 2018-04-03 [E] [EXPIRES 2019-01-28]
+      40e608afbc8d62cdcc08904f37e285e9e9851491
+ssb   3072/RSA 6e2f73008f8b8d6e 2018-04-03 [E] [EXPIRES 2019-01-28]
+      20fe5b1ab68c2d7210fb08aa6e2f73008f8b8d6e
+
+sec   255/EdDSA 941822a0fc1b30a5 2018-10-15 [SC]
+      4c9738a6f2be4e1a796c9b7b941822a0fc1b30a5
+uid           eddsa-x25519
+sig           941822a0fc1b30a5 2018-10-15 eddsa-x25519
+ssb   384/ECDH cff1bb6f16d28191 2018-04-03 [E] [EXPIRES 2019-01-28]
+      76969ce7033d990931df92b2cff1bb6f16d28191
+ssb   256/ECDH 2edabb94d3055f76 2018-04-03 [E] [EXPIRES 2019-01-28]
+      08192b478f740360b74c82cc2edabb94d3055f76
+ssb   3072/ElGamal 02a5715c3537717e 2018-04-03 [E] [EXPIRES 2019-01-28]
+      3409f96f0c57242540702dba02a5715c3537717e
+
+sec   3072/RSA 2fb9179118898e8b 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      6bc04a5a3ddb35766b9a40d82fb9179118898e8b
+uid           rsa-rsa
+sig           2fb9179118898e8b 2018-04-03 rsa-rsa
+
+sec   521/ECDSA 2092ca8324263b6a 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      4fb39ff6fa4857a4bd7ef5b42092ca8324263b6a
+uid           ecc-p521
+sig           2092ca8324263b6a 2018-04-03 ecc-p521
+
+sec   256/ECDSA 23674f21b2441527 2018-04-03 [SC] [EXPIRES 2019-01-28]
+      b54fdebbb673423a5d0aa54423674f21b2441527
+uid           ecc-p256
+sig           23674f21b2441527 2018-04-03 ecc-p256
+ssb   521/ECDH 9853df2f6d297442 2018-04-03 [E] [EXPIRES 2019-01-28]
+      a9297c86dd0de109e1ebae9c9853df2f6d297442
+