This patch set fixes various aspects of --without-openssl. It is primarily intended to allow Gentoo users to install both OpenSSL 1.1 and OpenSSH at the same time without using LibreSSL. This patch set was tested with OpenSSL 1.1.0h and with firejail --blacklist=/usr/include/openssl on Gentoo Linux. It was not tested with OpenSSL 1.0 or without --without-openssl. `make tests` passes except for test_hostkeys: regress/unittests/hostkeys/test_iterate.c:108 test #1 "hostkeys_iterate all with key parse" - entry 2/27, file line 2 ASSERT_LONG LONG_EQ(l->linenum, expected->l.linenum) failed: l->linenum = 2 / 0x2 expected->l.linenum = 4 / 0x4 I suspect this also affects compilation with OpenSSL 1.0 without --without-openssl. If so, I hope someone else will fix it for me. In case of objections, these patches are sorted in order of increasing ugliness/invasiveness. Patch 1 can be applied by itself, and patch 2 requires only patch 1, but patches 3 and 4 logically require each other (patch 3 is useless without patch 4). Patches 1 and 2 should not affect compilation with OpenSSL 1.0 or LibreSSL, but as stated above, patch 4 probably breaks it. Alex Xu (4): Fix --without-openssl with OpenSSL 1.1 Fix --without-openssl without OpenSSL installed Regenerate testdata to aes-256-ctr Fix --without-openssl tests auth.h | 3 +- authfd.h | 2 - buffer.h | 4 ++ cipher.c | 2 + cipher.h | 3 ++ dh.h | 3 ++ kex.h | 8 ++- kexc25519.c | 2 + monitor_wrap.h | 2 + myproposal.h | 2 +- regress/unittests/bitmap/tests.c | 33 +++++++++++- regress/unittests/hostkeys/test_iterate.c | 22 ++++++++ regress/unittests/kex/test_kex.c | 6 +++ .../sshbuf/test_sshbuf_getput_crypto.c | 3 +- .../sshbuf/test_sshbuf_getput_fuzz.c | 3 +- regress/unittests/sshbuf/tests.c | 4 ++ regress/unittests/sshkey/common.c | 4 ++ regress/unittests/sshkey/common.h | 3 +- regress/unittests/sshkey/test_file.c | 7 ++- regress/unittests/sshkey/test_fuzz.c | 6 ++- regress/unittests/sshkey/test_sshkey.c | 8 +++ regress/unittests/sshkey/testdata/dsa_1 | 20 ++++---- .../unittests/sshkey/testdata/dsa_1-cert.fp | 2 +- .../unittests/sshkey/testdata/dsa_1-cert.pub | 2 +- regress/unittests/sshkey/testdata/dsa_1.fp | 2 +- regress/unittests/sshkey/testdata/dsa_1.fp.bb | 2 +- .../unittests/sshkey/testdata/dsa_1.param.g | 2 +- .../sshkey/testdata/dsa_1.param.priv | 2 +- .../unittests/sshkey/testdata/dsa_1.param.pub | 2 +- regress/unittests/sshkey/testdata/dsa_1.pub | 2 +- regress/unittests/sshkey/testdata/dsa_1_pw | 22 ++++---- regress/unittests/sshkey/testdata/dsa_2 | 20 ++++---- regress/unittests/sshkey/testdata/dsa_2.fp | 2 +- regress/unittests/sshkey/testdata/dsa_2.fp.bb | 2 +- regress/unittests/sshkey/testdata/dsa_2.pub | 2 +- regress/unittests/sshkey/testdata/dsa_n | 20 ++++---- regress/unittests/sshkey/testdata/dsa_n_pw | 38 +++++++------- regress/unittests/sshkey/testdata/ecdsa_1 | 6 +-- .../unittests/sshkey/testdata/ecdsa_1-cert.fp | 2 +- .../sshkey/testdata/ecdsa_1-cert.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_1.fp | 2 +- .../unittests/sshkey/testdata/ecdsa_1.fp.bb | 2 +- .../sshkey/testdata/ecdsa_1.param.priv | 2 +- .../sshkey/testdata/ecdsa_1.param.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_1.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_1_pw | 8 +-- regress/unittests/sshkey/testdata/ecdsa_2 | 10 ++-- regress/unittests/sshkey/testdata/ecdsa_2.fp | 2 +- .../unittests/sshkey/testdata/ecdsa_2.fp.bb | 2 +- .../sshkey/testdata/ecdsa_2.param.priv | 2 +- .../sshkey/testdata/ecdsa_2.param.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_2.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_n | 6 +-- regress/unittests/sshkey/testdata/ecdsa_n_pw | 14 +++--- regress/unittests/sshkey/testdata/ed25519_1 | 8 +-- .../sshkey/testdata/ed25519_1-cert.fp | 2 +- .../sshkey/testdata/ed25519_1-cert.pub | 2 +- .../unittests/sshkey/testdata/ed25519_1.fp | 2 +- .../unittests/sshkey/testdata/ed25519_1.fp.bb | 2 +- .../unittests/sshkey/testdata/ed25519_1.pub | 2 +- .../unittests/sshkey/testdata/ed25519_1_pw | 12 ++--- regress/unittests/sshkey/testdata/ed25519_2 | 8 +-- .../unittests/sshkey/testdata/ed25519_2.fp | 2 +- .../unittests/sshkey/testdata/ed25519_2.fp.bb | 2 +- .../unittests/sshkey/testdata/ed25519_2.pub | 2 +- regress/unittests/sshkey/testdata/rsa1_1.fp | 1 - .../unittests/sshkey/testdata/rsa1_1.fp.bb | 1 - .../unittests/sshkey/testdata/rsa1_1.param.n | 1 - regress/unittests/sshkey/testdata/rsa1_1.pub | 1 - regress/unittests/sshkey/testdata/rsa1_2.fp | 1 - .../unittests/sshkey/testdata/rsa1_2.fp.bb | 1 - .../unittests/sshkey/testdata/rsa1_2.param.n | 1 - regress/unittests/sshkey/testdata/rsa1_2.pub | 1 - regress/unittests/sshkey/testdata/rsa_1 | 26 +++++----- .../unittests/sshkey/testdata/rsa_1-cert.fp | 2 +- .../unittests/sshkey/testdata/rsa_1-cert.pub | 2 +- regress/unittests/sshkey/testdata/rsa_1.fp | 2 +- regress/unittests/sshkey/testdata/rsa_1.fp.bb | 2 +- .../unittests/sshkey/testdata/rsa_1.param.n | 2 +- .../unittests/sshkey/testdata/rsa_1.param.p | 2 +- .../unittests/sshkey/testdata/rsa_1.param.q | 2 +- regress/unittests/sshkey/testdata/rsa_1.pub | 2 +- regress/unittests/sshkey/testdata/rsa_1_pw | 28 +++++------ regress/unittests/sshkey/testdata/rsa_2 | 50 +++++++++---------- regress/unittests/sshkey/testdata/rsa_2.fp | 2 +- regress/unittests/sshkey/testdata/rsa_2.fp.bb | 2 +- .../unittests/sshkey/testdata/rsa_2.param.n | 2 +- .../unittests/sshkey/testdata/rsa_2.param.p | 2 +- .../unittests/sshkey/testdata/rsa_2.param.q | 2 +- regress/unittests/sshkey/testdata/rsa_2.pub | 2 +- regress/unittests/sshkey/testdata/rsa_n | 26 +++++----- regress/unittests/sshkey/testdata/rsa_n_pw | 30 +++++------ regress/unittests/sshkey/tests.c | 4 ++ regress/unittests/test_helper/test_helper.c | 6 +++ regress/unittests/test_helper/test_helper.h | 12 +++++ ssh-add.c | 2 + ssh-keyscan.c | 2 + ssh_api.c | 4 ++ sshbuf-getput-crypto.c | 3 +- 99 files changed, 372 insertions(+), 241 deletions(-) delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp.bb delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.param.n delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.pub delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp.bb delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.param.n delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.pub -- 2.17.1
One function declaration was removed, determined to be unused by `grep'.
---
authfd.h | 2 --
buffer.h | 4 ++++
kex.h | 8 +++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/authfd.h b/authfd.h
index ab954ffc..848dbb32 100644
--- a/authfd.h
+++ b/authfd.h
@@ -36,8 +36,6 @@ int ssh_update_card(int sock, int add, const char *reader_id,
const char *pin, u_int life, u_int confirm);
int ssh_remove_all_identities(int sock, int version);
-int ssh_decrypt_challenge(int sock, struct sshkey* key, BIGNUM *challenge,
- u_char session_id[16], u_char response[16]);
int ssh_agent_sign(int sock, const struct sshkey *key,
u_char **sigp, size_t *lenp,
const u_char *data, size_t datalen, const char *alg, u_int compat);
diff --git a/buffer.h b/buffer.h
index 56174394..0e788a2b 100644
--- a/buffer.h
+++ b/buffer.h
@@ -47,11 +47,13 @@ int buffer_get_ret(Buffer *, void *, u_int);
int buffer_consume_ret(Buffer *, u_int);
int buffer_consume_end_ret(Buffer *, u_int);
+#ifdef WITH_OPENSSL
#include <openssl/objects.h>
#include <openssl/bn.h>
void buffer_put_bignum2(Buffer *, const BIGNUM *);
void buffer_get_bignum2(Buffer *, BIGNUM *);
void buffer_put_bignum2_from_string(Buffer *, const u_char *, u_int);
+#endif
u_short buffer_get_short(Buffer *);
void buffer_put_short(Buffer *, u_short);
@@ -73,8 +75,10 @@ void buffer_put_cstring(Buffer *, const char *);
#define buffer_skip_string(b) (void)buffer_get_string_ptr(b, NULL);
+#ifdef WITH_OPENSSL
int buffer_put_bignum2_ret(Buffer *, const BIGNUM *);
int buffer_get_bignum2_ret(Buffer *, BIGNUM *);
+#endif
int buffer_get_short_ret(u_short *, Buffer *);
int buffer_get_int_ret(u_int *, Buffer *);
int buffer_get_int64_ret(u_int64_t *, Buffer *);
diff --git a/kex.h b/kex.h
index 01bb3986..ac4f0241 100644
--- a/kex.h
+++ b/kex.h
@@ -158,10 +158,12 @@ struct kex {
const u_char *, size_t, const char *, u_int);
int (*kex[KEX_MAX])(struct ssh *);
/* kex specific state */
+#ifdef WITH_OPENSSL
DH *dh; /* DH */
- u_int min, max, nbits; /* GEX */
EC_KEY *ec_client_key; /* ECDH */
const EC_GROUP *ec_group; /* ECDH */
+#endif
+ u_int min, max, nbits; /* GEX */
u_char c25519_client_key[CURVE25519_SIZE]; /* 25519 */
u_char c25519_client_pubkey[CURVE25519_SIZE]; /* 25519 */
};
@@ -184,7 +186,9 @@ int kex_send_kexinit(struct ssh *);
int kex_input_kexinit(int, u_int32_t, struct ssh *);
int kex_input_ext_info(int, u_int32_t, struct ssh *);
int kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *);
+#ifdef WITH_OPENSSL
int kex_derive_keys_bn(struct ssh *, u_char *, u_int, const BIGNUM *);
+#endif
int kex_send_newkeys(struct ssh *);
int kex_start_rekex(struct ssh *);
@@ -197,6 +201,7 @@ int kexecdh_server(struct ssh *);
int kexc25519_client(struct ssh *);
int kexc25519_server(struct ssh *);
+#ifdef WITH_OPENSSL
int kex_dh_hash(int, const char *, const char *,
const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
@@ -211,6 +216,7 @@ int kexgex_hash(int, const char *, const char *,
int kex_ecdh_hash(int, const EC_GROUP *, const char *, const char *,
const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
const EC_POINT *, const EC_POINT *, const BIGNUM *, u_char *, size_t *);
+#endif
int kex_c25519_hash(int, const char *, const char *,
const u_char *, size_t, const u_char *, size_t,
--
2.17.1
---
auth.h | 3 ++-
cipher.c | 2 ++
cipher.h | 3 +++
dh.h | 3 +++
kexc25519.c | 2 ++
monitor_wrap.h | 2 ++
myproposal.h | 2 +-
ssh-add.c | 2 ++
ssh-keyscan.c | 2 ++
ssh_api.c | 4 ++++
sshbuf-getput-crypto.c | 3 ++-
11 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/auth.h b/auth.h
index 29491df9..4fcbcde7 100644
--- a/auth.h
+++ b/auth.h
@@ -30,8 +30,9 @@
#include <signal.h>
+#ifdef WITH_OPENSSL
#include <openssl/rsa.h>
-
+#endif
#ifdef HAVE_LOGIN_CAP
#include <login_cap.h>
#endif
diff --git a/cipher.c b/cipher.c
index a72682a8..c439e66a 100644
--- a/cipher.c
+++ b/cipher.c
@@ -55,7 +55,9 @@
struct sshcipher_ctx {
int plaintext;
int encrypt;
+#ifdef WITH_OPENSSL
EVP_CIPHER_CTX *evp;
+#endif
struct chachapoly_ctx cp_ctx; /* XXX union with evp? */
struct aesctr_ctx ac_ctx; /* XXX union with evp? */
const struct sshcipher *cipher;
diff --git a/cipher.h b/cipher.h
index dc7ecf11..d9d93608 100644
--- a/cipher.h
+++ b/cipher.h
@@ -38,7 +38,10 @@
#define CIPHER_H
#include <sys/types.h>
+#ifdef WITH_OPENSSL
#include <openssl/evp.h>
+#endif
+
#include "cipher-chachapoly.h"
#include "cipher-aesctr.h"
diff --git a/dh.h b/dh.h
index bcd485cf..6e296773 100644
--- a/dh.h
+++ b/dh.h
@@ -26,6 +26,8 @@
#ifndef DH_H
#define DH_H
+#ifdef WITH_OPENSSL
+
struct dhgroup {
int size;
BIGNUM *g;
@@ -76,5 +78,6 @@ u_int dh_estimate(int);
#define MODULI_TESTS_JACOBI (0x08)
#define MODULI_TESTS_ELLIPTIC (0x10)
+#endif /* WITH_OPENSSL */
#endif
diff --git a/kexc25519.c b/kexc25519.c
index 0897b8c5..6a54cf9b 100644
--- a/kexc25519.c
+++ b/kexc25519.c
@@ -32,8 +32,10 @@
#include <signal.h>
#include <string.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
#include <openssl/evp.h>
+#endif
#include "sshbuf.h"
#include "ssh2.h"
diff --git a/monitor_wrap.h b/monitor_wrap.h
index 76233270..7ab3cc0f 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -40,7 +40,9 @@ struct sshauthopt;
void mm_log_handler(LogLevel, const char *, void *);
int mm_is_monitor(void);
+#ifdef WITH_OPENSSL
DH *mm_choose_dh(int, int, int);
+#endif
int mm_key_sign(struct sshkey *, u_char **, u_int *, const u_char *, u_int,
const char *);
void mm_inform_authserv(char *, char *);
diff --git a/myproposal.h b/myproposal.h
index c255147a..f8d276da 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -24,6 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef WITH_OPENSSL
#include <openssl/opensslv.h>
/* conditional algorithm support */
@@ -82,7 +83,6 @@
# define SHA2_HMAC_MODES
#endif
-#ifdef WITH_OPENSSL
# ifdef HAVE_EVP_SHA256
# define KEX_CURVE25519_METHODS \
"curve25519-sha256," \
diff --git a/ssh-add.c b/ssh-add.c
index adcc4599..d9e1118f 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -40,8 +40,10 @@
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef WITH_OPENSSL
#include <openssl/evp.h>
#include "openbsd-compat/openssl-compat.h"
+#endif
#include <errno.h>
#include <fcntl.h>
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 38b1c548..47da5f67 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -19,7 +19,9 @@
#include <netinet/in.h>
#include <arpa/inet.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
+#endif
#include <netdb.h>
#include <errno.h>
diff --git a/ssh_api.c b/ssh_api.c
index c84b4e71..e60e6740 100644
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -48,7 +48,9 @@ int _ssh_host_key_sign(struct sshkey *, struct sshkey *,
int use_privsep = 0;
int mm_sshkey_sign(struct sshkey *, u_char **, u_int *,
u_char *, u_int, char *, u_int);
+#ifdef WITH_OPENSSL
DH *mm_choose_dh(int, int, int);
+#endif
/* Define these two variables here so that they are part of the library */
u_char *session_id2 = NULL;
@@ -61,11 +63,13 @@ mm_sshkey_sign(struct sshkey *key, u_char **sigp, u_int
*lenp,
return (-1);
}
+#ifdef WITH_OPENSSL
DH *
mm_choose_dh(int min, int nbits, int max)
{
return (NULL);
}
+#endif
/* API */
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index d0d791b5..d7926b6e 100644
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef WITH_OPENSSL
#define SSHBUF_INTERNAL
#include "includes.h"
@@ -221,4 +222,4 @@ sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v)
EC_KEY_get0_group(v));
}
#endif /* OPENSSL_HAS_ECC */
-
+#endif /* WITH_OPENSSL */
--
2.17.1
No associated code change, just OpenSSH 7.6. Fixes --without-openssl tests. --- regress/unittests/sshkey/testdata/dsa_1 | 20 ++++---- .../unittests/sshkey/testdata/dsa_1-cert.fp | 2 +- .../unittests/sshkey/testdata/dsa_1-cert.pub | 2 +- regress/unittests/sshkey/testdata/dsa_1.fp | 2 +- regress/unittests/sshkey/testdata/dsa_1.fp.bb | 2 +- .../unittests/sshkey/testdata/dsa_1.param.g | 2 +- .../sshkey/testdata/dsa_1.param.priv | 2 +- .../unittests/sshkey/testdata/dsa_1.param.pub | 2 +- regress/unittests/sshkey/testdata/dsa_1.pub | 2 +- regress/unittests/sshkey/testdata/dsa_1_pw | 22 ++++---- regress/unittests/sshkey/testdata/dsa_2 | 20 ++++---- regress/unittests/sshkey/testdata/dsa_2.fp | 2 +- regress/unittests/sshkey/testdata/dsa_2.fp.bb | 2 +- regress/unittests/sshkey/testdata/dsa_2.pub | 2 +- regress/unittests/sshkey/testdata/dsa_n | 20 ++++---- regress/unittests/sshkey/testdata/dsa_n_pw | 38 +++++++------- regress/unittests/sshkey/testdata/ecdsa_1 | 6 +-- .../unittests/sshkey/testdata/ecdsa_1-cert.fp | 2 +- .../sshkey/testdata/ecdsa_1-cert.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_1.fp | 2 +- .../unittests/sshkey/testdata/ecdsa_1.fp.bb | 2 +- .../sshkey/testdata/ecdsa_1.param.priv | 2 +- .../sshkey/testdata/ecdsa_1.param.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_1.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_1_pw | 8 +-- regress/unittests/sshkey/testdata/ecdsa_2 | 10 ++-- regress/unittests/sshkey/testdata/ecdsa_2.fp | 2 +- .../unittests/sshkey/testdata/ecdsa_2.fp.bb | 2 +- .../sshkey/testdata/ecdsa_2.param.priv | 2 +- .../sshkey/testdata/ecdsa_2.param.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_2.pub | 2 +- regress/unittests/sshkey/testdata/ecdsa_n | 6 +-- regress/unittests/sshkey/testdata/ecdsa_n_pw | 14 +++--- regress/unittests/sshkey/testdata/ed25519_1 | 8 +-- .../sshkey/testdata/ed25519_1-cert.fp | 2 +- .../sshkey/testdata/ed25519_1-cert.pub | 2 +- .../unittests/sshkey/testdata/ed25519_1.fp | 2 +- .../unittests/sshkey/testdata/ed25519_1.fp.bb | 2 +- .../unittests/sshkey/testdata/ed25519_1.pub | 2 +- .../unittests/sshkey/testdata/ed25519_1_pw | 12 ++--- regress/unittests/sshkey/testdata/ed25519_2 | 8 +-- .../unittests/sshkey/testdata/ed25519_2.fp | 2 +- .../unittests/sshkey/testdata/ed25519_2.fp.bb | 2 +- .../unittests/sshkey/testdata/ed25519_2.pub | 2 +- regress/unittests/sshkey/testdata/rsa1_1.fp | 1 - .../unittests/sshkey/testdata/rsa1_1.fp.bb | 1 - .../unittests/sshkey/testdata/rsa1_1.param.n | 1 - regress/unittests/sshkey/testdata/rsa1_1.pub | 1 - regress/unittests/sshkey/testdata/rsa1_2.fp | 1 - .../unittests/sshkey/testdata/rsa1_2.fp.bb | 1 - .../unittests/sshkey/testdata/rsa1_2.param.n | 1 - regress/unittests/sshkey/testdata/rsa1_2.pub | 1 - regress/unittests/sshkey/testdata/rsa_1 | 26 +++++----- .../unittests/sshkey/testdata/rsa_1-cert.fp | 2 +- .../unittests/sshkey/testdata/rsa_1-cert.pub | 2 +- regress/unittests/sshkey/testdata/rsa_1.fp | 2 +- regress/unittests/sshkey/testdata/rsa_1.fp.bb | 2 +- .../unittests/sshkey/testdata/rsa_1.param.n | 2 +- .../unittests/sshkey/testdata/rsa_1.param.p | 2 +- .../unittests/sshkey/testdata/rsa_1.param.q | 2 +- regress/unittests/sshkey/testdata/rsa_1.pub | 2 +- regress/unittests/sshkey/testdata/rsa_1_pw | 28 +++++------ regress/unittests/sshkey/testdata/rsa_2 | 50 +++++++++---------- regress/unittests/sshkey/testdata/rsa_2.fp | 2 +- regress/unittests/sshkey/testdata/rsa_2.fp.bb | 2 +- .../unittests/sshkey/testdata/rsa_2.param.n | 2 +- .../unittests/sshkey/testdata/rsa_2.param.p | 2 +- .../unittests/sshkey/testdata/rsa_2.param.q | 2 +- regress/unittests/sshkey/testdata/rsa_2.pub | 2 +- regress/unittests/sshkey/testdata/rsa_n | 26 +++++----- regress/unittests/sshkey/testdata/rsa_n_pw | 30 +++++------ 71 files changed, 221 insertions(+), 229 deletions(-) delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.fp.bb delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.param.n delete mode 100644 regress/unittests/sshkey/testdata/rsa1_1.pub delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.fp.bb delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.param.n delete mode 100644 regress/unittests/sshkey/testdata/rsa1_2.pub diff --git a/regress/unittests/sshkey/testdata/dsa_1 b/regress/unittests/sshkey/testdata/dsa_1 index d3f24824..53f701d2 100644 --- a/regress/unittests/sshkey/testdata/dsa_1 +++ b/regress/unittests/sshkey/testdata/dsa_1 @@ -1,12 +1,12 @@ -----BEGIN DSA PRIVATE KEY----- -MIIBvAIBAAKBgQD6kutNFRsHTwEAv6d39Lhsqy1apdHBZ9c2HfyRr7WmypyGIy2m -Ka43vzXI8CNwmRSYs+A6d0vJC7Pl+f9QzJ/04NWOA+MiwfurwrR3CRe61QRYb8Py -mcHOxueHs95IcjrbIPNn86cjnPP5qvv/guUzCjuww4zBdJOXpligrGt2XwIVAKMD -/50qQy7j8JaMk+1+Xtg1pK01AoGBAO7l9QVVbSSoy5lq6cOtvpf8UlwOa6+zBwbl -o4gmFd1RwX1yWkA8kQ7RrhCSg8Hc6mIGnKRgKRli/3LgbSfZ0obFJehkRtEWtN4P -h8fVUeS74iQbIwFQeKlYHIlNTRoGtAbdi3nHdV+BBkEQc1V3rjqYqhjOoz/yNsgz -LND26HrdAoGBAOdXpyfmobEBaOqZAuvgj1P0uhjG2P31Ufurv22FWPBU3A9qrkxb -OXwE0LwvjCvrsQV/lrYhJz/tiys40VeahulWZE5SAHMXGIf95LiLSgaXMjko7joo -t+LK84ltLymwZ4QMnYjnZSSclf1UuyQMcUtb34+I0u9Ycnyhp2mSFsQtAhRYIbQ5 -KfXsZuBPuWe5FJz3ldaEgw=+MIIBvAIBAAKBgQCU5/WwxULHAmDGPG2CpFXoc4kMr0ZuB8MDz12QGBTl+JpQ2n6X +SqZb8QL9IMVK7+bpWyhApAC5n01UKip60XS/pSvwqeyZesBm9Iz/Fa2YMUfWBJaL +bnKHz7Ai66kOMURMpdaXnkGSnteddywXB4IQA2/zc8lNUxhqwtWongJ0vQIVAPFN +Q5XDvjSY5rp/M0o3Nz/3Z9CJAoGBAIDt+CsBuSf083efohNxVA7cjrUOqrsL9SJE +OVG6JAMaO3oJ3ETb+WyYJW1uJUY8ht5a9tu1RZSGvkBoLQHFENEx6mkZZDPgEICr +5+fpO2gTty2z2gtJLZOowdxmrnQLb9H2tVTAjiKzTp8xJbWARNmHCcxAgjZ1Iomk +b/IZHtjdAoGBAI7NnMXv15fVOxl2TSnr5qr8dT+FSriNvada3C2UYzl6pJrpHRC3 +QHtQnoC/VZQBKZdUan6Rq7heKz37sR80v+jFK5op3r4Ts+Ifpxtlhovyrpt4MFvm +7GuLSMeoRYEPRYU0b27+etFwC7Jwd7aTMkxSXfU/rrucGd+uLKE3eb3+AhQ9of3F +sfU97m0Rr5/0Taj9pD6aOQ= -----END DSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/dsa_1-cert.fp b/regress/unittests/sshkey/testdata/dsa_1-cert.fp index 75ff0e9c..02370cb2 100644 --- a/regress/unittests/sshkey/testdata/dsa_1-cert.fp +++ b/regress/unittests/sshkey/testdata/dsa_1-cert.fp @@ -1 +1 @@ -SHA256:kOLgXSoAT8O5T6r36n5NJUYigbux1d7gdH/rmWiJm6s +SHA256:kjeoaiLlTPYwqx/V2QPybCiI/a6eb6+YAjhN+Hg4/lg diff --git a/regress/unittests/sshkey/testdata/dsa_1-cert.pub b/regress/unittests/sshkey/testdata/dsa_1-cert.pub index e768db1e..e4359b4b 100644 --- a/regress/unittests/sshkey/testdata/dsa_1-cert.pub +++ b/regress/unittests/sshkey/testdata/dsa_1-cert.pub @@ -1 +1 @@ -ssh-dss-cert-v01 at openssh.com AAAAHHNzaC1kc3MtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgdTlbNU9Hn9Qng3FHxwH971bxCIoq1ern/QWFFDWXgmYAAACBAPqS600VGwdPAQC/p3f0uGyrLVql0cFn1zYd/JGvtabKnIYjLaYprje/NcjwI3CZFJiz4Dp3S8kLs+X5/1DMn/Tg1Y4D4yLB+6vCtHcJF7rVBFhvw/KZwc7G54ez3khyOtsg82fzpyOc8/mq+/+C5TMKO7DDjMF0k5emWKCsa3ZfAAAAFQCjA/+dKkMu4/CWjJPtfl7YNaStNQAAAIEA7uX1BVVtJKjLmWrpw62+l/xSXA5rr7MHBuWjiCYV3VHBfXJaQDyRDtGuEJKDwdzqYgacpGApGWL/cuBtJ9nShsUl6GRG0Ra03g+Hx9VR5LviJBsjAVB4qVgciU1NGga0Bt2Lecd1X4EGQRBzVXeuOpiqGM6jP/I2yDMs0Pboet0AAACBAOdXpyfmobEBaOqZAuvgj1P0uhjG2P31Ufurv22FWPBU3A9qrkxbOXwE0LwvjCvrsQV/lrYhJz/tiys40VeahulWZE5SAHMXGIf95LiLSgaXMjko7joot+LK84ltLymwZ4QMnYjnZSSclf1UuyQMcUtb34+I0u9Ycnyhp2mSFsQtAAAAAAAAAAYAAAACAAAABmp1bGl1cwAAABIAAAAFaG9zdDEAAAAFaG9zdDIAAAAANowB8AAAAABNHmBwAAAAAAAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACBThupGO0X+FLQhbz8CoKPwc7V3JNsQuGtlsgN+F7SMGQAAAFMAAAALc3NoLWVkMjU1MTkAAABAh/z1LIdNL1b66tQ8t9DY9BTB3BQKpTKmc7ezyFKLwl96yaIniZwD9Ticdbe/8i/Li3uCFE3EAt8NAIv9zff8Bg== DSA test key #1 +ssh-dss-cert-v01 at openssh.com AAAAHHNzaC1kc3MtY2VydC12MDFAb3BlbnNzaC5jb20AAAAg7WLsbKaEXoAQhkXcLATZF1D6f+8sHc5Rk8Zt88Vr0VUAAACBAJTn9bDFQscCYMY8bYKkVehziQyvRm4HwwPPXZAYFOX4mlDafpdKplvxAv0gxUrv5ulbKECkALmfTVQqKnrRdL+lK/Cp7Jl6wGb0jP8VrZgxR9YElotucofPsCLrqQ4xREyl1peeQZKe1513LBcHghADb/NzyU1TGGrC1aieAnS9AAAAFQDxTUOVw740mOa6fzNKNzc/92fQiQAAAIEAgO34KwG5J/Tzd5+iE3FUDtyOtQ6quwv1IkQ5UbokAxo7egncRNv5bJglbW4lRjyG3lr227VFlIa+QGgtAcUQ0THqaRlkM+AQgKvn5+k7aBO3LbPaC0ktk6jB3GaudAtv0fa1VMCOIrNOnzEltYBE2YcJzECCNnUiiaRv8hke2N0AAACBAI7NnMXv15fVOxl2TSnr5qr8dT+FSriNvada3C2UYzl6pJrpHRC3QHtQnoC/VZQBKZdUan6Rq7heKz37sR80v+jFK5op3r4Ts+Ifpxtlhovyrpt4MFvm7GuLSMeoRYEPRYU0b27+etFwC7Jwd7aTMkxSXfU/rrucGd+uLKE3eb3+AAAAAAAAAAYAAAACAAAABmp1bGl1cwAAABIAAAAFaG9zdDEAAAAFaG9zdDIAAAAANoxWUAAAAABNHrTQAAAAAAAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACBo4U5p/3E89gaG13Ed24Y8FNnO6/8+qCeJtM0rIwfwqgAAAFMAAAALc3NoLWVkMjU1MTkAAABAQYj8NHK3m0B2oL+tVQKCfYTMdvZEBK5niwRfVtcjEXdtyuuyxBL8sRBXRhw5tWr34VUO+jR67PnLFOXWBoRHCA== DSA test key #1 diff --git a/regress/unittests/sshkey/testdata/dsa_1.fp b/regress/unittests/sshkey/testdata/dsa_1.fp index 75ff0e9c..02370cb2 100644 --- a/regress/unittests/sshkey/testdata/dsa_1.fp +++ b/regress/unittests/sshkey/testdata/dsa_1.fp @@ -1 +1 @@ -SHA256:kOLgXSoAT8O5T6r36n5NJUYigbux1d7gdH/rmWiJm6s +SHA256:kjeoaiLlTPYwqx/V2QPybCiI/a6eb6+YAjhN+Hg4/lg diff --git a/regress/unittests/sshkey/testdata/dsa_1.fp.bb b/regress/unittests/sshkey/testdata/dsa_1.fp.bb index ba37776e..84620ad7 100644 --- a/regress/unittests/sshkey/testdata/dsa_1.fp.bb +++ b/regress/unittests/sshkey/testdata/dsa_1.fp.bb @@ -1 +1 @@ -xetag-todiz-mifah-torec-mynyv-cyvit-gopon-pygag-rupic-cenav-bexax +xenac-malus-pukyp-zykeb-navol-rymud-kanuz-rykif-verik-cebop-vyxix diff --git a/regress/unittests/sshkey/testdata/dsa_1.param.g b/regress/unittests/sshkey/testdata/dsa_1.param.g index e51c3f9f..5bb80542 100644 --- a/regress/unittests/sshkey/testdata/dsa_1.param.g +++ b/regress/unittests/sshkey/testdata/dsa_1.param.g @@ -1 +1 @@ -00eee5f505556d24a8cb996ae9c3adbe97fc525c0e6bafb30706e5a3882615dd51c17d725a403c910ed1ae109283c1dcea62069ca460291962ff72e06d27d9d286c525e86446d116b4de0f87c7d551e4bbe2241b23015078a9581c894d4d1a06b406dd8b79c7755f81064110735577ae3a98aa18cea33ff236c8332cd0f6e87add +0080edf82b01b927f4f3779fa21371540edc8eb50eaabb0bf522443951ba24031a3b7a09dc44dbf96c98256d6e25463c86de5af6dbb5459486be40682d01c510d131ea69196433e01080abe7e7e93b6813b72db3da0b492d93a8c1dc66ae740b6fd1f6b554c08e22b34e9f3125b58044d98709cc408236752289a46ff2191ed8dd diff --git a/regress/unittests/sshkey/testdata/dsa_1.param.priv b/regress/unittests/sshkey/testdata/dsa_1.param.priv index 4f743314..1dfb59e2 100644 --- a/regress/unittests/sshkey/testdata/dsa_1.param.priv +++ b/regress/unittests/sshkey/testdata/dsa_1.param.priv @@ -1 +1 @@ -5821b43929f5ec66e04fb967b9149cf795d68483 +3da1fdc5b1f53dee6d11af9ff44da8fda43e9a39 diff --git a/regress/unittests/sshkey/testdata/dsa_1.param.pub b/regress/unittests/sshkey/testdata/dsa_1.param.pub index ba0313be..d5c40dcf 100644 --- a/regress/unittests/sshkey/testdata/dsa_1.param.pub +++ b/regress/unittests/sshkey/testdata/dsa_1.param.pub @@ -1 +1 @@ -00e757a727e6a1b10168ea9902ebe08f53f4ba18c6d8fdf551fbabbf6d8558f054dc0f6aae4c5b397c04d0bc2f8c2bebb1057f96b621273fed8b2b38d1579a86e956644e520073171887fde4b88b4a0697323928ee3a28b7e2caf3896d2f29b067840c9d88e765249c95fd54bb240c714b5bdf8f88d2ef58727ca1a7699216c42d +008ecd9cc5efd797d53b19764d29ebe6aafc753f854ab88dbda75adc2d9463397aa49ae91d10b7407b509e80bf5594012997546a7e91abb85e2b3dfbb11f34bfe8c52b9a29debe13b3e21fa71b65868bf2ae9b78305be6ec6b8b48c7a845810f4585346f6efe7ad1700bb27077b693324c525df53faebb9c19dfae2ca13779bdfe diff --git a/regress/unittests/sshkey/testdata/dsa_1.pub b/regress/unittests/sshkey/testdata/dsa_1.pub index 41cae2f6..5b1ac682 100644 --- a/regress/unittests/sshkey/testdata/dsa_1.pub +++ b/regress/unittests/sshkey/testdata/dsa_1.pub @@ -1 +1 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBAPqS600VGwdPAQC/p3f0uGyrLVql0cFn1zYd/JGvtabKnIYjLaYprje/NcjwI3CZFJiz4Dp3S8kLs+X5/1DMn/Tg1Y4D4yLB+6vCtHcJF7rVBFhvw/KZwc7G54ez3khyOtsg82fzpyOc8/mq+/+C5TMKO7DDjMF0k5emWKCsa3ZfAAAAFQCjA/+dKkMu4/CWjJPtfl7YNaStNQAAAIEA7uX1BVVtJKjLmWrpw62+l/xSXA5rr7MHBuWjiCYV3VHBfXJaQDyRDtGuEJKDwdzqYgacpGApGWL/cuBtJ9nShsUl6GRG0Ra03g+Hx9VR5LviJBsjAVB4qVgciU1NGga0Bt2Lecd1X4EGQRBzVXeuOpiqGM6jP/I2yDMs0Pboet0AAACBAOdXpyfmobEBaOqZAuvgj1P0uhjG2P31Ufurv22FWPBU3A9qrkxbOXwE0LwvjCvrsQV/lrYhJz/tiys40VeahulWZE5SAHMXGIf95LiLSgaXMjko7joot+LK84ltLymwZ4QMnYjnZSSclf1UuyQMcUtb34+I0u9Ycnyhp2mSFsQt DSA test key #1 +ssh-dss AAAAB3NzaC1kc3MAAACBAJTn9bDFQscCYMY8bYKkVehziQyvRm4HwwPPXZAYFOX4mlDafpdKplvxAv0gxUrv5ulbKECkALmfTVQqKnrRdL+lK/Cp7Jl6wGb0jP8VrZgxR9YElotucofPsCLrqQ4xREyl1peeQZKe1513LBcHghADb/NzyU1TGGrC1aieAnS9AAAAFQDxTUOVw740mOa6fzNKNzc/92fQiQAAAIEAgO34KwG5J/Tzd5+iE3FUDtyOtQ6quwv1IkQ5UbokAxo7egncRNv5bJglbW4lRjyG3lr227VFlIa+QGgtAcUQ0THqaRlkM+AQgKvn5+k7aBO3LbPaC0ktk6jB3GaudAtv0fa1VMCOIrNOnzEltYBE2YcJzECCNnUiiaRv8hke2N0AAACBAI7NnMXv15fVOxl2TSnr5qr8dT+FSriNvada3C2UYzl6pJrpHRC3QHtQnoC/VZQBKZdUan6Rq7heKz37sR80v+jFK5op3r4Ts+Ifpxtlhovyrpt4MFvm7GuLSMeoRYEPRYU0b27+etFwC7Jwd7aTMkxSXfU/rrucGd+uLKE3eb3+ DSA test key #1 diff --git a/regress/unittests/sshkey/testdata/dsa_1_pw b/regress/unittests/sshkey/testdata/dsa_1_pw index 24c73039..7e643c1d 100644 --- a/regress/unittests/sshkey/testdata/dsa_1_pw +++ b/regress/unittests/sshkey/testdata/dsa_1_pw @@ -1,15 +1,15 @@ -----BEGIN DSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: AES-128-CBC,BC8386C373B22EB7F00ADC821D5D8BE9 +DEK-Info: AES-128-CBC,91DC9A17869C29E10007F1C0404C0BEB -+HDV2DQ09sxrIAeXTz9r3YFuPRa2hk1+NGcr3ETkXbC6KiZ14wpTnGTloKwaQjIW -eXTa9mpCOWAoohgvsVb+hOuOlP7AfeHu1IXV4EAS+GDpkiV5UxlCXXwqlD75Buu4 -wwDd/p4SWzILH3WGjDk5JIXoxWNY13LHwC7Q6gtGJx4AicUG7YBRTXMIBDa/Kh77 -6o2rFETKmp4VHBvHbakmiETfptdM8bbWxKWeY2vakThyESgeofsLoTOQCIwlEfJC -s2D/KYL65C8VbHYgIoSLTQnooO45DDyxIuhCqP+H23mhv9vB1Od3nc2atgHj/XFs -dcOPFkF/msDRYqxY3V0AS6+jpKwFodZ7g/hyGcyPxOkzlJVuKoKuH6P5PyQ69Gx0 -iqri0xEPyABr7kGlXNrjjctojX+B4WwSnjg/2euXXWFXCRalIdA7ErATTiQbGOx7 -Vd6Gn8PZbSy1MkqEDrZRip0pfAFJYI/8GXPC75BpnRsrVlfhtrngbW+kBP35LzaN -l2K+RQ3gSB3iFoqNb1Kuu6T5MZlyVl5H2dVlJSeb1euQ2OycXdDoFTyJ4AiyWS7w -Vlh8zeJnso5QRDjMwx99pZilbbuFGSLsahiGEveFc6o+Y99O7eonMkv/CSNfw86HsxoerAhZ73XeXTrSzshQqKIMyopb+BgjQBry3GuBAUy/ +kFYEhWznmYCnqNE59qPluRSrT1gELm3vwCV1L/3KEdpdl+vXybidLcH6Fr8d+nJ8 +9nLKZJruArlwpOg8RfeZ7g8rCDaHCIvfbLHIhuILptGovFuMdWs/q4uRRaXv4g5H +rJA94wuMl8q0g4w0Zujp/w3ax0uJ22Av+ttC8l13LHR98Y9etgvCYI2EOizdDm5C +AomLiZfTMVv5eUTnzlkYQJR4CCM1Xa+lH1xlfzgn0Z9ASvKebasqzyEQ8ORW/EVI +K1mcPd3nqurnYnp8eGOm7o3q5oeCPNOP8nTl8aI/dBZR5tqanxSk0a/dpbAKEJZ2 +fuLUjnIb1/9dcf5hDBq27AP93vhQqKc+67s9WmJ/uEXiL1O0ZPqVFzGkP4Sr/MZh +4sG+r7Iu9sThjyLV31sQxV/6hp0+tEHT8ztePll4gcHHqYT/ZorxgGcRLSjJPPhd +5SSQWtFob88Tsigtn7oNtmc/sORT8bV2/VjbcYuxdQQfQgAIXULmyTHVDPzUgsxM +v5aSrrrFskDNtH7JwhmwXCsv7cmBsx90BNbKKZS7ztE -----END DSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/dsa_2 b/regress/unittests/sshkey/testdata/dsa_2 index 3cc9631a..54c29e33 100644 --- a/regress/unittests/sshkey/testdata/dsa_2 +++ b/regress/unittests/sshkey/testdata/dsa_2 @@ -1,12 +1,12 @@ -----BEGIN DSA PRIVATE KEY----- -MIIBvQIBAAKBgQCbyPXNdHeLsjpobPVCMkfagBkt15Zsltqf/PGNP1y1cuz7rsTX -ZekQwUkSTNm5coqXe+ZOw2O4tjobJDd60I1/VPgaB0NYlQR9Hn87M284WD4f6VY+ -aunHmP134a8ybG5G4NqVNF3ihvxAR2pVITqb7kE46r2uYZNcNlHI8voRCwIVAMcP -bwqFNsQbH5pJyZW30wj4KVZ3AoGBAIK98BVeKQVf8qDFqx9ovMuNgVSxpd+N0Yta -5ZEy1OI2ziu5RhjueIM2K7Gq2Mnp38ob1AM53BUxqlcBJaHEDa6rj6yvuMgW9oCJ -dImBM8sIFxfBbXNbpJiMaDwa6WyT84OkpDE6uuAepTMnWOUWkUVkAiyokHDUGXkG -GyoQblbXAoGBAIsf7TaZ804sUWwRV0wI8DYx+hxD5QdrfYPYMtL2fHn3lICimGt0 -FTtUZ25jKg0E0DMBPdET6ZEHB3ZZkR8hFoUzZhdnyJMu3UjVtgaV88Ue3PrXxchk -0W2jHPaAgQU3JIWzo8HFIFqvC/HEL+EyW3rBTY2uXM3XGI+YcWSA4ZrZAhUAsY2f -bDFNzgZ4DaZ9wLRzTgOswPU+MIIBugIBAAKBgQDLjdTwUi6At36DLoh8P8dC1twOTslw2lAX36ELIdscVFgOfCvN +K1zf4F5qwWgCZgvDMzgJWskLjsZV8/zNh7l6SBHPE6AD0kZ2AqVjl5DqpbO56hEf +5cqMl3SYX+inetpbFRyFP3kmJVLObI89tuNMSKnyiRRkv0Pm+NmVrWYe7wIVAJZF +Aqq/S2K8RxRuVDHq42vo3fFDAoGALnZDKTmtg3Jr+krwjLS0sFFN06gUXkMp/ZHF +wBH60b5dt24Myh8igEmIAhKerqImtP0CsGze8LNX7YY/EOwHKTUgF83Ps/Dr7Dt8 +ERi/VrnH6SuE9ptrYlqW1MXnSqHZBjdw20rbnCqta1LIen+6C79PrmZiQxfRHZr9 +2Zr3epgCgYA0jGvXwNBKyb0BYkOnn2SOZsJKECUqhw0zLrgylhLKTPB/l03p51gC +mHKx4lOjg68OxuwYpZ1vNFKud+UAwgBSPxr4b6YaPB1B/j335rnI1WaCs4RbhaZ8 +jCrgXvg25sAlZwHB1DMG9V25qTsF1zBJgbmdZnW1+HqAbQRCoH30awIUGCWsnIxz +TpNhf7jENLDsJBVYCGg -----END DSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/dsa_2.fp b/regress/unittests/sshkey/testdata/dsa_2.fp index 51fbeb4d..65b8cd0a 100644 --- a/regress/unittests/sshkey/testdata/dsa_2.fp +++ b/regress/unittests/sshkey/testdata/dsa_2.fp @@ -1 +1 @@ -SHA256:ecwhWcXgpdBxZ2e+OjpRRY7dqXHHCD62BGtoVQQBwCk +SHA256:2RD7K3n457eNSSogEcp4KnySzzJ6oIJYyQ4BHBco3T8 diff --git a/regress/unittests/sshkey/testdata/dsa_2.fp.bb b/regress/unittests/sshkey/testdata/dsa_2.fp.bb index 4d908ee3..6ae6bc9a 100644 --- a/regress/unittests/sshkey/testdata/dsa_2.fp.bb +++ b/regress/unittests/sshkey/testdata/dsa_2.fp.bb @@ -1 +1 @@ -xeser-megad-pocan-rozit-belup-tapoh-fapif-kyvit-vonav-cehab-naxax +xinah-karag-sanih-kysyp-karad-cylag-luboz-zybic-valoz-vohyg-coxyx diff --git a/regress/unittests/sshkey/testdata/dsa_2.pub b/regress/unittests/sshkey/testdata/dsa_2.pub index 77bb555d..20e86084 100644 --- a/regress/unittests/sshkey/testdata/dsa_2.pub +++ b/regress/unittests/sshkey/testdata/dsa_2.pub @@ -1 +1 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBAJvI9c10d4uyOmhs9UIyR9qAGS3XlmyW2p/88Y0/XLVy7PuuxNdl6RDBSRJM2blyipd75k7DY7i2OhskN3rQjX9U+BoHQ1iVBH0efzszbzhYPh/pVj5q6ceY/XfhrzJsbkbg2pU0XeKG/EBHalUhOpvuQTjqva5hk1w2Ucjy+hELAAAAFQDHD28KhTbEGx+aScmVt9MI+ClWdwAAAIEAgr3wFV4pBV/yoMWrH2i8y42BVLGl343Ri1rlkTLU4jbOK7lGGO54gzYrsarYyenfyhvUAzncFTGqVwElocQNrquPrK+4yBb2gIl0iYEzywgXF8Ftc1ukmIxoPBrpbJPzg6SkMTq64B6lMydY5RaRRWQCLKiQcNQZeQYbKhBuVtcAAACBAIsf7TaZ804sUWwRV0wI8DYx+hxD5QdrfYPYMtL2fHn3lICimGt0FTtUZ25jKg0E0DMBPdET6ZEHB3ZZkR8hFoUzZhdnyJMu3UjVtgaV88Ue3PrXxchk0W2jHPaAgQU3JIWzo8HFIFqvC/HEL+EyW3rBTY2uXM3XGI+YcWSA4ZrZ DSA test key #2 +ssh-dss AAAAB3NzaC1kc3MAAACBAMuN1PBSLoC3foMuiHw/x0LW3A5OyXDaUBffoQsh2xxUWA58K80rXN/gXmrBaAJmC8MzOAlayQuOxlXz/M2HuXpIEc8ToAPSRnYCpWOXkOqls7nqER/lyoyXdJhf6Kd62lsVHIU/eSYlUs5sjz2240xIqfKJFGS/Q+b42ZWtZh7vAAAAFQCWRQKqv0tivEcUblQx6uNr6N3xQwAAAIAudkMpOa2Dcmv6SvCMtLSwUU3TqBReQyn9kcXAEfrRvl23bgzKHyKASYgCEp6uoia0/QKwbN7ws1fthj8Q7AcpNSAXzc+z8OvsO3wRGL9WucfpK4T2m2tiWpbUxedKodkGN3DbStucKq1rUsh6f7oLv0+uZmJDF9Edmv3Zmvd6mAAAAIA0jGvXwNBKyb0BYkOnn2SOZsJKECUqhw0zLrgylhLKTPB/l03p51gCmHKx4lOjg68OxuwYpZ1vNFKud+UAwgBSPxr4b6YaPB1B/j335rnI1WaCs4RbhaZ8jCrgXvg25sAlZwHB1DMG9V25qTsF1zBJgbmdZnW1+HqAbQRCoH30aw== DSA test key #2 diff --git a/regress/unittests/sshkey/testdata/dsa_n b/regress/unittests/sshkey/testdata/dsa_n index d3f24824..53f701d2 100644 --- a/regress/unittests/sshkey/testdata/dsa_n +++ b/regress/unittests/sshkey/testdata/dsa_n @@ -1,12 +1,12 @@ -----BEGIN DSA PRIVATE KEY----- -MIIBvAIBAAKBgQD6kutNFRsHTwEAv6d39Lhsqy1apdHBZ9c2HfyRr7WmypyGIy2m -Ka43vzXI8CNwmRSYs+A6d0vJC7Pl+f9QzJ/04NWOA+MiwfurwrR3CRe61QRYb8Py -mcHOxueHs95IcjrbIPNn86cjnPP5qvv/guUzCjuww4zBdJOXpligrGt2XwIVAKMD -/50qQy7j8JaMk+1+Xtg1pK01AoGBAO7l9QVVbSSoy5lq6cOtvpf8UlwOa6+zBwbl -o4gmFd1RwX1yWkA8kQ7RrhCSg8Hc6mIGnKRgKRli/3LgbSfZ0obFJehkRtEWtN4P -h8fVUeS74iQbIwFQeKlYHIlNTRoGtAbdi3nHdV+BBkEQc1V3rjqYqhjOoz/yNsgz -LND26HrdAoGBAOdXpyfmobEBaOqZAuvgj1P0uhjG2P31Ufurv22FWPBU3A9qrkxb -OXwE0LwvjCvrsQV/lrYhJz/tiys40VeahulWZE5SAHMXGIf95LiLSgaXMjko7joo -t+LK84ltLymwZ4QMnYjnZSSclf1UuyQMcUtb34+I0u9Ycnyhp2mSFsQtAhRYIbQ5 -KfXsZuBPuWe5FJz3ldaEgw=+MIIBvAIBAAKBgQCU5/WwxULHAmDGPG2CpFXoc4kMr0ZuB8MDz12QGBTl+JpQ2n6X +SqZb8QL9IMVK7+bpWyhApAC5n01UKip60XS/pSvwqeyZesBm9Iz/Fa2YMUfWBJaL +bnKHz7Ai66kOMURMpdaXnkGSnteddywXB4IQA2/zc8lNUxhqwtWongJ0vQIVAPFN +Q5XDvjSY5rp/M0o3Nz/3Z9CJAoGBAIDt+CsBuSf083efohNxVA7cjrUOqrsL9SJE +OVG6JAMaO3oJ3ETb+WyYJW1uJUY8ht5a9tu1RZSGvkBoLQHFENEx6mkZZDPgEICr +5+fpO2gTty2z2gtJLZOowdxmrnQLb9H2tVTAjiKzTp8xJbWARNmHCcxAgjZ1Iomk +b/IZHtjdAoGBAI7NnMXv15fVOxl2TSnr5qr8dT+FSriNvada3C2UYzl6pJrpHRC3 +QHtQnoC/VZQBKZdUan6Rq7heKz37sR80v+jFK5op3r4Ts+Ifpxtlhovyrpt4MFvm +7GuLSMeoRYEPRYU0b27+etFwC7Jwd7aTMkxSXfU/rrucGd+uLKE3eb3+AhQ9of3F +sfU97m0Rr5/0Taj9pD6aOQ= -----END DSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/dsa_n_pw b/regress/unittests/sshkey/testdata/dsa_n_pw index 24ac299a..12af9440 100644 --- a/regress/unittests/sshkey/testdata/dsa_n_pw +++ b/regress/unittests/sshkey/testdata/dsa_n_pw @@ -1,21 +1,21 @@ -----BEGIN OPENSSH PRIVATE KEY----- -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 -----END OPENSSH PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ecdsa_1 b/regress/unittests/sshkey/testdata/ecdsa_1 index 80382b62..a1d2a8eb 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1 +++ b/regress/unittests/sshkey/testdata/ecdsa_1 @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIPPNyUAnjvFr+eT/7t/IyjuQQd/aLFiTY92LB9gIjyrMoAoGCCqGSM49 -AwEHoUQDQgAEDFlblkOrW9ydKVhtM+9AY3c9saBE7SG3lFx38nBavkADDaI9jh3/ -kvG/Jt9vpm22qwoklTCGDfzCkXkIKaWlBw=+MHcCAQEEIBgLeMS7UuRYwJzahQ/PL42tsIxvdN3Q/yoK6GphQvbqoAoGCCqGSM49 +AwEHoUQDQgAEBso217p8WHMmaPQGEZBXjVQ7zpg6TbffJ4AnjbAlhvzuE3QcTDQJ +AK7vxfu84UC9Mnckh9FgYAvokQZ57kq/cA= -----END EC PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ecdsa_1-cert.fp b/regress/unittests/sshkey/testdata/ecdsa_1-cert.fp index e48304f6..be75da49 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1-cert.fp +++ b/regress/unittests/sshkey/testdata/ecdsa_1-cert.fp @@ -1 +1 @@ -SHA256:8ty77fOpABat1y88aNdclQTfU+lVvWe7jYZGw8VYtfg +SHA256:4UlTw4hhz2NCBuX1yejWD+mdpUFdtPZsjdew3ty2I/Q diff --git a/regress/unittests/sshkey/testdata/ecdsa_1-cert.pub b/regress/unittests/sshkey/testdata/ecdsa_1-cert.pub index 55e2a256..f0f0e772 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1-cert.pub +++ b/regress/unittests/sshkey/testdata/ecdsa_1-cert.pub @@ -1 +1 @@ -ecdsa-sha2-nistp256-cert-v01 at openssh.com AAAAKGVjZHNhLXNoYTItbmlzdHAyNTYtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgOtFRnMigkGliaYfPmX5IidVWfV3tRH6lqRXv0l8bvKoAAAAIbmlzdHAyNTYAAABBBAxZW5ZDq1vcnSlYbTPvQGN3PbGgRO0ht5Rcd/JwWr5AAw2iPY4d/5Lxvybfb6ZttqsKJJUwhg38wpF5CCmlpQcAAAAAAAAABwAAAAIAAAAGanVsaXVzAAAAEgAAAAVob3N0MQAAAAVob3N0MgAAAAA2jAHwAAAAAE0eYHAAAAAAAAAAAAAAAAAAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAxZW5ZDq1vcnSlYbTPvQGN3PbGgRO0ht5Rcd/JwWr5AAw2iPY4d/5Lxvybfb6ZttqsKJJUwhg38wpF5CCmlpQcAAABkAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAABJAAAAIHbxGwTnue7KxhHXGFvRcxBnekhQ3Qx84vV/Vs4oVCrpAAAAIQC7vk2+d14aS7td7kVXLQn392oALjEBzMZoDvT1vT/zOA== ECDSA test key #1 +ecdsa-sha2-nistp256-cert-v01 at openssh.com AAAAKGVjZHNhLXNoYTItbmlzdHAyNTYtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgK7ilT5BqEJ/2iQuibT5ySRYF9fRxd25TVcWu9z8cAr8AAAAIbmlzdHAyNTYAAABBBAbKNte6fFhzJmj0BhGQV41UO86YOk233yeAJ42wJYb87hN0HEw0CQCu78X7vOFAvTJ3JIfRYGAL6JEGee5Kv3AAAAAAAAAABwAAAAIAAAAGanVsaXVzAAAAEgAAAAVob3N0MQAAAAVob3N0MgAAAAA2jFZQAAAAAE0etNAAAAAAAAAAAAAAAAAAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAbKNte6fFhzJmj0BhGQV41UO86YOk233yeAJ42wJYb87hN0HEw0CQCu78X7vOFAvTJ3JIfRYGAL6JEGee5Kv3AAAABjAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAABIAAAAIHCgqTObrUzdPGhGgXX8/9q9aDk9HazaNKm/1iUtWnRrAAAAICOhmmouE3dNJ5XqrF5GPwV1eo1cZEkXu5pu+NTi3/df ECDSA test key #1 diff --git a/regress/unittests/sshkey/testdata/ecdsa_1.fp b/regress/unittests/sshkey/testdata/ecdsa_1.fp index e48304f6..be75da49 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1.fp +++ b/regress/unittests/sshkey/testdata/ecdsa_1.fp @@ -1 +1 @@ -SHA256:8ty77fOpABat1y88aNdclQTfU+lVvWe7jYZGw8VYtfg +SHA256:4UlTw4hhz2NCBuX1yejWD+mdpUFdtPZsjdew3ty2I/Q diff --git a/regress/unittests/sshkey/testdata/ecdsa_1.fp.bb b/regress/unittests/sshkey/testdata/ecdsa_1.fp.bb index fa23c33c..18b362b2 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1.fp.bb +++ b/regress/unittests/sshkey/testdata/ecdsa_1.fp.bb @@ -1 +1 @@ -xibah-vocun-sogyn-byhen-rivem-hegyh-luneh-dozyr-vatyf-dufid-myxyx +xitid-tesuz-kezet-calyv-setom-zumuh-duryn-fezyb-tasot-mesyg-fyxux diff --git a/regress/unittests/sshkey/testdata/ecdsa_1.param.priv b/regress/unittests/sshkey/testdata/ecdsa_1.param.priv index dc908ad7..69f2dc32 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1.param.priv +++ b/regress/unittests/sshkey/testdata/ecdsa_1.param.priv @@ -1 +1 @@ -00f3cdc940278ef16bf9e4ffeedfc8ca3b9041dfda2c589363dd8b07d8088f2acc +180b78c4bb52e458c09cda850fcf2f8dadb08c6f74ddd0ff2a0ae86a6142f6ea diff --git a/regress/unittests/sshkey/testdata/ecdsa_1.param.pub b/regress/unittests/sshkey/testdata/ecdsa_1.param.pub index 71c9584d..f68ec583 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1.param.pub +++ b/regress/unittests/sshkey/testdata/ecdsa_1.param.pub @@ -1 +1 @@ -040c595b9643ab5bdc9d29586d33ef4063773db1a044ed21b7945c77f2705abe40030da23d8e1dff92f1bf26df6fa66db6ab0a249530860dfcc291790829a5a507 +0406ca36d7ba7c58732668f4061190578d543bce983a4db7df2780278db02586fcee13741c4c340900aeefc5fbbce140bd32772487d160600be8910679ee4abf70 diff --git a/regress/unittests/sshkey/testdata/ecdsa_1.pub b/regress/unittests/sshkey/testdata/ecdsa_1.pub index 84a71f97..4a483eb1 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1.pub +++ b/regress/unittests/sshkey/testdata/ecdsa_1.pub @@ -1 +1 @@ -ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAxZW5ZDq1vcnSlYbTPvQGN3PbGgRO0ht5Rcd/JwWr5AAw2iPY4d/5Lxvybfb6ZttqsKJJUwhg38wpF5CCmlpQc= ECDSA test key #1 +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAbKNte6fFhzJmj0BhGQV41UO86YOk233yeAJ42wJYb87hN0HEw0CQCu78X7vOFAvTJ3JIfRYGAL6JEGee5Kv3A= ECDSA test key #1 diff --git a/regress/unittests/sshkey/testdata/ecdsa_1_pw b/regress/unittests/sshkey/testdata/ecdsa_1_pw index 5c83a658..1e573dae 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_1_pw +++ b/regress/unittests/sshkey/testdata/ecdsa_1_pw @@ -1,8 +1,8 @@ -----BEGIN EC PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: AES-128-CBC,7BA38DE00F67851E4207216809C3BB15 +DEK-Info: AES-128-CBC,5BB4158366081A19FE7BD557D456CDD7 -8QkFoZHQkj9a2mt032sp+WKaJ1fwteqWDd4RpAW9OzDgqzMx1QO43qJgBDTfhzjt -M2Q8YfiGjfBEYpg4kCbacfcV68DEV4z6Ll7rIzzzO7OfWUNL++brD64vKx4z6f46 -+sn4nbZTXilpkzi/nmPDVzrNmTSywA8T7Yf0QcBUxks+de1zueGFfyGQ6SqroKE3d9u7DqOv2ZENmS5enxw8P9x/4yd5130GTrKfPN5EP89a +OSIh/2lk7jHAUjd664/T94VYG68yKdTDJb/+op3k3wT4suioME44jZU69nbESxtD +I7FArFHhj+vcO60sVWJCY9dX+lghS4ygzhMBF+4ot5M -----END EC PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ecdsa_2 b/regress/unittests/sshkey/testdata/ecdsa_2 index 0f4e844d..98cf05bb 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_2 +++ b/regress/unittests/sshkey/testdata/ecdsa_2 @@ -1,7 +1,7 @@ -----BEGIN EC PRIVATE KEY----- -MIHcAgEBBEIBqBtN7e6Essd3dlsgISViPCXXC0atlNkGtoMgSQdBTKVUfeJOi4lc -RZaXJdXnqWUqI/KEsH8h8QN4YcB8ugmAcc+gBwYFK4EEACOhgYkDgYYABAHZ2VNy -oDedBwqsdzY+kkNptc9DrtRCVmO6cULLj+691MhItqVqTMJbTFlI4MnAg9PoGTF/ -0KmLJfy8vSffXGKqqwGKcFNtd1XCo+7Qu9tXbxron9g6Dmu7y8jaLkixcwZwnwLs -6GmA9qZGuiAfOGV0Gf9/u98sr+vikOa4Ow5JFDTw5g=+MIHcAgEBBEIA0EoYDLAQ0gNsGDCAx/B1aYYDF+ZKbWoyGHDGU6b5F1tCKx/ib/x1 +iHL7Y8xKSHsHm3xfktxE9FILq04X7x5YuSygBwYFK4EEACOhgYkDgYYABADUAiuw +u9nGJ5Cu0V20WmvV6dYx0+wSumk04kAYqgiAANxk745JjXV0PncvAP0/RSwA9FzJ +GYP5RhC19gtFhlZ/FwGTGcojgwV9QIJqLh5XgqpcM2tY8X6FKQgc0Z+wlP6GzX16 +K9Ap13lqr/rqZ9UO2GDQyM7eqXaABSWK/X4teQm1kw= -----END EC PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ecdsa_2.fp b/regress/unittests/sshkey/testdata/ecdsa_2.fp index 581e48ae..a01f640c 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_2.fp +++ b/regress/unittests/sshkey/testdata/ecdsa_2.fp @@ -1 +1 @@ -SHA256:ed8YniRHA6qCrErCRnzrWxPHxYuA62a+CAFYUVxJgaI +SHA256:3L7PtaPacbhXNdPqSgmSOWJwQcFc9ht6+9fzhFJV+S8 diff --git a/regress/unittests/sshkey/testdata/ecdsa_2.fp.bb b/regress/unittests/sshkey/testdata/ecdsa_2.fp.bb index e1cc664c..8dcec990 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_2.fp.bb +++ b/regress/unittests/sshkey/testdata/ecdsa_2.fp.bb @@ -1 +1 @@ -xufag-danul-putub-mokin-pugaz-covid-dofag-nihuz-sysab-genar-zaxyx +xusek-gycuh-kesym-magyr-voneg-canok-fuvih-cezun-kanoz-lafap-fexux diff --git a/regress/unittests/sshkey/testdata/ecdsa_2.param.priv b/regress/unittests/sshkey/testdata/ecdsa_2.param.priv index dd898d9a..9c85c899 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_2.param.priv +++ b/regress/unittests/sshkey/testdata/ecdsa_2.param.priv @@ -1 +1 @@ -01a81b4dedee84b2c777765b202125623c25d70b46ad94d906b683204907414ca5547de24e8b895c45969725d5e7a9652a23f284b07f21f1037861c07cba098071cf +00d04a180cb010d2036c183080c7f07569860317e64a6d6a321870c653a6f9175b422b1fe26ffc758872fb63cc4a487b079b7c5f92dc44f4520bab4e17ef1e58b92c diff --git a/regress/unittests/sshkey/testdata/ecdsa_2.param.pub b/regress/unittests/sshkey/testdata/ecdsa_2.param.pub index 94301c99..6ceef9b1 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_2.param.pub +++ b/regress/unittests/sshkey/testdata/ecdsa_2.param.pub @@ -1 +1 @@ -0401d9d95372a0379d070aac77363e924369b5cf43aed4425663ba7142cb8feebdd4c848b6a56a4cc25b4c5948e0c9c083d3e819317fd0a98b25fcbcbd27df5c62aaab018a70536d7755c2a3eed0bbdb576f1ae89fd83a0e6bbbcbc8da2e48b17306709f02ece86980f6a646ba201f38657419ff7fbbdf2cafebe290e6b83b0e491434f0e6 +0400d4022bb0bbd9c62790aed15db45a6bd5e9d631d3ec12ba6934e24018aa088000dc64ef8e498d75743e772f00fd3f452c00f45cc91983f94610b5f60b4586567f17019319ca2383057d40826a2e1e5782aa5c336b58f17e8529081cd19fb094fe86cd7d7a2bd029d7796aaffaea67d50ed860d0c8cedea9768005258afd7e2d7909b593 diff --git a/regress/unittests/sshkey/testdata/ecdsa_2.pub b/regress/unittests/sshkey/testdata/ecdsa_2.pub index be9d84bf..9c873721 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_2.pub +++ b/regress/unittests/sshkey/testdata/ecdsa_2.pub @@ -1 +1 @@ -ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHZ2VNyoDedBwqsdzY+kkNptc9DrtRCVmO6cULLj+691MhItqVqTMJbTFlI4MnAg9PoGTF/0KmLJfy8vSffXGKqqwGKcFNtd1XCo+7Qu9tXbxron9g6Dmu7y8jaLkixcwZwnwLs6GmA9qZGuiAfOGV0Gf9/u98sr+vikOa4Ow5JFDTw5g== ECDSA test key #2 +ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBADUAiuwu9nGJ5Cu0V20WmvV6dYx0+wSumk04kAYqgiAANxk745JjXV0PncvAP0/RSwA9FzJGYP5RhC19gtFhlZ/FwGTGcojgwV9QIJqLh5XgqpcM2tY8X6FKQgc0Z+wlP6GzX16K9Ap13lqr/rqZ9UO2GDQyM7eqXaABSWK/X4teQm1kw== ECDSA test key #2 diff --git a/regress/unittests/sshkey/testdata/ecdsa_n b/regress/unittests/sshkey/testdata/ecdsa_n index 80382b62..a1d2a8eb 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_n +++ b/regress/unittests/sshkey/testdata/ecdsa_n @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIPPNyUAnjvFr+eT/7t/IyjuQQd/aLFiTY92LB9gIjyrMoAoGCCqGSM49 -AwEHoUQDQgAEDFlblkOrW9ydKVhtM+9AY3c9saBE7SG3lFx38nBavkADDaI9jh3/ -kvG/Jt9vpm22qwoklTCGDfzCkXkIKaWlBw=+MHcCAQEEIBgLeMS7UuRYwJzahQ/PL42tsIxvdN3Q/yoK6GphQvbqoAoGCCqGSM49 +AwEHoUQDQgAEBso217p8WHMmaPQGEZBXjVQ7zpg6TbffJ4AnjbAlhvzuE3QcTDQJ +AK7vxfu84UC9Mnckh9FgYAvokQZ57kq/cA= -----END EC PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ecdsa_n_pw b/regress/unittests/sshkey/testdata/ecdsa_n_pw index 36b7fa78..1816d14d 100644 --- a/regress/unittests/sshkey/testdata/ecdsa_n_pw +++ b/regress/unittests/sshkey/testdata/ecdsa_n_pw @@ -1,9 +1,9 @@ -----BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABC4UwEov5 -z0RrCm7AMCxbuiAAAAEAAAAAEAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlz -dHAyNTYAAABBBAxZW5ZDq1vcnSlYbTPvQGN3PbGgRO0ht5Rcd/JwWr5AAw2iPY4d/5Lxvy -bfb6ZttqsKJJUwhg38wpF5CCmlpQcAAACgbCnAklQTHrf5qiHiMxKYwQJ7k/X9mp4fXD4v -xUbgNZiXSxN26mn8mC2rH+WA6Lk3CexR/hrtLI2ndpBsYu1h6HhVkOwwm3Kd/PMKArCupW -l6sYEabrT0EghXR/3aDEZvj79hgKSdu3RpayLvMdbCR8k1cg0/mDmR9hicWfeJ61n/IH05 -tUR268+0BVRW9kDhh/cuv8tVY4L09jCCQ6CpsA=+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDPRYX3g2 +Ona4E/HkCI74WbAAAAEAAAAAEAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlz +dHAyNTYAAABBBAbKNte6fFhzJmj0BhGQV41UO86YOk233yeAJ42wJYb87hN0HEw0CQCu78 +X7vOFAvTJ3JIfRYGAL6JEGee5Kv3AAAACgIZs1lqOhLGJ9ltHvBAaix5AQDBnKhhY9rg5p +A7vZi777lm7KpYDQNvzGfoHdhQsaYxo/x9tTUYmkAazxxnjxnJTusha8IkIUiKVsklNrcR +psqd/aHLdM/HauxbEC9ErE/8T/UD15r0HBxRNO8OxDVLvCTCIdtjg8SJZYMhGoFX4LLPUs +lhGHGnp4OfQ4hAxs8wNCDIju6WosTd8VU0XNbA= -----END OPENSSH PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ed25519_1 b/regress/unittests/sshkey/testdata/ed25519_1 index 6b0ae01c..c350a0fe 100644 --- a/regress/unittests/sshkey/testdata/ed25519_1 +++ b/regress/unittests/sshkey/testdata/ed25519_1 @@ -1,7 +1,7 @@ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACBThupGO0X+FLQhbz8CoKPwc7V3JNsQuGtlsgN+F7SMGQAAAJjnj4Ao54+A -KAAAAAtzc2gtZWQyNTUxOQAAACBThupGO0X+FLQhbz8CoKPwc7V3JNsQuGtlsgN+F7SMGQ -AAAED3KgoDbjR54V7bdNpfKlQY5m20UK1QaHytkCR+6rZEDFOG6kY7Rf4UtCFvPwKgo/Bz -tXck2xC4a2WyA34XtIwZAAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg=+QyNTUxOQAAACBo4U5p/3E89gaG13Ed24Y8FNnO6/8+qCeJtM0rIwfwqgAAAJjHk1CFx5NQ +hQAAAAtzc2gtZWQyNTUxOQAAACBo4U5p/3E89gaG13Ed24Y8FNnO6/8+qCeJtM0rIwfwqg +AAAED9nlU8KybLFPsZDUBQ7iMGheFoZAPHtcncK7tcRlAj+WjhTmn/cTz2BobXcR3bhjwU +2c7r/z6oJ4m0zSsjB/CqAAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg= -----END OPENSSH PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ed25519_1-cert.fp b/regress/unittests/sshkey/testdata/ed25519_1-cert.fp index a9674e2b..292e5d72 100644 --- a/regress/unittests/sshkey/testdata/ed25519_1-cert.fp +++ b/regress/unittests/sshkey/testdata/ed25519_1-cert.fp @@ -1 +1 @@ -SHA256:L3k/oJubblSY0lB9Ulsl7emDMnRPKm/8udf2ccwk560 +SHA256:Ib2xhfwv96EZ76TFAf412mFC9Tj9If0R3EzgoaMsvRw diff --git a/regress/unittests/sshkey/testdata/ed25519_1-cert.pub b/regress/unittests/sshkey/testdata/ed25519_1-cert.pub index 649b4e80..bdbb2b48 100644 --- a/regress/unittests/sshkey/testdata/ed25519_1-cert.pub +++ b/regress/unittests/sshkey/testdata/ed25519_1-cert.pub @@ -1 +1 @@ -ssh-ed25519-cert-v01 at openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIIxzuxl4z3uwAIslne8Huft+1n1IhHAlNbWZkQyyECCGAAAAIFOG6kY7Rf4UtCFvPwKgo/BztXck2xC4a2WyA34XtIwZAAAAAAAAAAgAAAACAAAABmp1bGl1cwAAABIAAAAFaG9zdDEAAAAFaG9zdDIAAAAANowB8AAAAABNHmBwAAAAAAAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACBThupGO0X+FLQhbz8CoKPwc7V3JNsQuGtlsgN+F7SMGQAAAFMAAAALc3NoLWVkMjU1MTkAAABABGTn+Bmz86Ajk+iqKCSdP5NClsYzn4alJd0V5bizhP0Kumc/HbqQfSt684J1WdSzih+EjvnTgBhK9jTBKb90AQ== ED25519 test key #1 +ssh-ed25519-cert-v01 at openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIC0Rg1c6uaSKyysPHO+txiYAMceR+poMC1O6xOCYdps6AAAAIGjhTmn/cTz2BobXcR3bhjwU2c7r/z6oJ4m0zSsjB/CqAAAAAAAAAAgAAAACAAAABmp1bGl1cwAAABIAAAAFaG9zdDEAAAAFaG9zdDIAAAAANoxWUAAAAABNHrTQAAAAAAAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACBo4U5p/3E89gaG13Ed24Y8FNnO6/8+qCeJtM0rIwfwqgAAAFMAAAALc3NoLWVkMjU1MTkAAABADAF5beo+pKdvZADtseAmr9yFOFgHe9Pbhvo8i9pfhMclzpZqIbN24q0a/hzB3QBhTm3PC4BsY7+4EGuQ15OJBg== ED25519 test key #1 diff --git a/regress/unittests/sshkey/testdata/ed25519_1.fp b/regress/unittests/sshkey/testdata/ed25519_1.fp index a9674e2b..292e5d72 100644 --- a/regress/unittests/sshkey/testdata/ed25519_1.fp +++ b/regress/unittests/sshkey/testdata/ed25519_1.fp @@ -1 +1 @@ -SHA256:L3k/oJubblSY0lB9Ulsl7emDMnRPKm/8udf2ccwk560 +SHA256:Ib2xhfwv96EZ76TFAf412mFC9Tj9If0R3EzgoaMsvRw diff --git a/regress/unittests/sshkey/testdata/ed25519_1.fp.bb b/regress/unittests/sshkey/testdata/ed25519_1.fp.bb index 309f2daf..c2b86ff3 100644 --- a/regress/unittests/sshkey/testdata/ed25519_1.fp.bb +++ b/regress/unittests/sshkey/testdata/ed25519_1.fp.bb @@ -1 +1 @@ -xubop-rekyd-bakal-nubuf-pahaf-gicuh-logeb-gocif-petod-galip-fuxux +xebot-leref-vohuz-tebic-vehur-padib-bucaz-femos-mulok-marib-zyxax diff --git a/regress/unittests/sshkey/testdata/ed25519_1.pub b/regress/unittests/sshkey/testdata/ed25519_1.pub index e533059e..2b58e856 100644 --- a/regress/unittests/sshkey/testdata/ed25519_1.pub +++ b/regress/unittests/sshkey/testdata/ed25519_1.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFOG6kY7Rf4UtCFvPwKgo/BztXck2xC4a2WyA34XtIwZ ED25519 test key #1 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGjhTmn/cTz2BobXcR3bhjwU2c7r/z6oJ4m0zSsjB/Cq ED25519 test key #1 diff --git a/regress/unittests/sshkey/testdata/ed25519_1_pw b/regress/unittests/sshkey/testdata/ed25519_1_pw index c3b7ae7f..e69ab9e2 100644 --- a/regress/unittests/sshkey/testdata/ed25519_1_pw +++ b/regress/unittests/sshkey/testdata/ed25519_1_pw @@ -1,8 +1,8 @@ -----BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABCus+kaow -AUjHphacvRp98dAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIFOG6kY7Rf4UtCFv -PwKgo/BztXck2xC4a2WyA34XtIwZAAAAoJaqqgiYQuElraJAmYOm7Tb4nJ3eI4oj9mQ52M -/Yd+ION2Ur1v8BDewpDX+LHEYgKHo3Mlmcn2UyF+QJ+7xUCW7QCtk/4szrJzw74DlEl6mH -T8PT/f/av7PpECBD/YD3NoDlB9OWm/Q4sHcxfBEKfTGD7s2Onn71HgrdEOPqd4Sj/IQigR -drfjtXEMlD32k9n3dd2eS9x7AHWYaGFEMkOcY+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABCg+ONH6t +rTDNyXDfLLUZLPAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIGjhTmn/cTz2BobX +cR3bhjwU2c7r/z6oJ4m0zSsjB/CqAAAAoG0yEB5cCkoPb2fN687bnWAw1Qfw+dNIrdft7G ++SYZhM7KuyyXnlxZ8w1Q0jYug7u0BDTlePebwP64t5dXVO1nrql8SbK45jcQMKSM+hACem +CNkna5j8fQTJqVxJNqPLCvRF9bYUgE/xu/1OHtGCdF6d/E7aplDAo79IpZoOgEmppm8cAP +HCbMzzdBUl43Bm+n+gStp4VWD74h9fysLPkMc -----END OPENSSH PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ed25519_2 b/regress/unittests/sshkey/testdata/ed25519_2 index e4aed639..23f5874c 100644 --- a/regress/unittests/sshkey/testdata/ed25519_2 +++ b/regress/unittests/sshkey/testdata/ed25519_2 @@ -1,7 +1,7 @@ -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACDPVKyLnm3eZE0lm0IfM3Uy9AsdGSBtozcoCt21blYBCwAAAJix1mBGsdZg -RgAAAAtzc2gtZWQyNTUxOQAAACDPVKyLnm3eZE0lm0IfM3Uy9AsdGSBtozcoCt21blYBCw -AAAECZEQHXs18o3DKjhUYaTyt+bUbhqfMeqmsKjYyFvzGVgs9UrIuebd5kTSWbQh8zdTL0 -Cx0ZIG2jNygK3bVuVgELAAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg=+QyNTUxOQAAACB+aoRDVezCfOS1laee+vdXny6l17ha/ZyFgh6qno9ZPwAAAJgzzTapM802 +qQAAAAtzc2gtZWQyNTUxOQAAACB+aoRDVezCfOS1laee+vdXny6l17ha/ZyFgh6qno9ZPw +AAAECFdNSPB1ITK+aAPui5xG1ruK7QhBsxdElQpUg4AdOJv35qhENV7MJ85LWVp57691ef +LqXXuFr9nIWCHqqej1k/AAAAE0VEMjU1MTkgdGVzdCBrZXkgIzEBAg= -----END OPENSSH PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/ed25519_2.fp b/regress/unittests/sshkey/testdata/ed25519_2.fp index 04966267..5c556fed 100644 --- a/regress/unittests/sshkey/testdata/ed25519_2.fp +++ b/regress/unittests/sshkey/testdata/ed25519_2.fp @@ -1 +1 @@ -SHA256:vMbaARqVciRgXyZPNHDo+P5p5WK5yWG1Oo6VC35Bomw +SHA256:wm2OUTUBRHZX4h4gpy8gMZL8pxcyN7M2hwPzdzLgNww diff --git a/regress/unittests/sshkey/testdata/ed25519_2.fp.bb b/regress/unittests/sshkey/testdata/ed25519_2.fp.bb index abba7890..c781729b 100644 --- a/regress/unittests/sshkey/testdata/ed25519_2.fp.bb +++ b/regress/unittests/sshkey/testdata/ed25519_2.fp.bb @@ -1 +1 @@ -xuces-bapyb-vikob-zesyv-budod-nupip-kebon-tacyc-fofed-lezic-soxax +xubil-mezeg-tafyk-bigyd-doviz-hizof-ziget-mybyz-catid-lanig-kaxix diff --git a/regress/unittests/sshkey/testdata/ed25519_2.pub b/regress/unittests/sshkey/testdata/ed25519_2.pub index af34236e..960c6752 100644 --- a/regress/unittests/sshkey/testdata/ed25519_2.pub +++ b/regress/unittests/sshkey/testdata/ed25519_2.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM9UrIuebd5kTSWbQh8zdTL0Cx0ZIG2jNygK3bVuVgEL ED25519 test key #1 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH5qhENV7MJ85LWVp57691efLqXXuFr9nIWCHqqej1k/ ED25519 test key #1 diff --git a/regress/unittests/sshkey/testdata/rsa1_1.fp b/regress/unittests/sshkey/testdata/rsa1_1.fp deleted file mode 100644 index 21b3d1a9..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_1.fp +++ /dev/null @@ -1 +0,0 @@ -SHA256:/kk7K9S9kwYFiFilnZYFwCsQJweI/SGQVR2nIa8VBhE diff --git a/regress/unittests/sshkey/testdata/rsa1_1.fp.bb b/regress/unittests/sshkey/testdata/rsa1_1.fp.bb deleted file mode 100644 index 62991b3e..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_1.fp.bb +++ /dev/null @@ -1 +0,0 @@ -xilil-nabyf-gynih-duheb-gokyp-bofet-nekac-bosod-lozin-kuvyh-poxix diff --git a/regress/unittests/sshkey/testdata/rsa1_1.param.n b/regress/unittests/sshkey/testdata/rsa1_1.param.n deleted file mode 100644 index 9a2549bb..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_1.param.n +++ /dev/null @@ -1 +0,0 @@ -00ce8ca77a556eba887f9a866c084a6402785354a81c10854d343181fa09351223a65f99915f8433d11a9c41677d307c03c3a39865b83e7172d2c1d878333c980438d6e4462106a0065cd75cfea7ca7f21538bf2f43f2af49cacee51b22e3bdcc5e87b59cc691f7c6942a77ef13bfdfb24300777b727348d0ba7900ba06b886729 diff --git a/regress/unittests/sshkey/testdata/rsa1_1.pub b/regress/unittests/sshkey/testdata/rsa1_1.pub deleted file mode 100644 index f665b0d6..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_1.pub +++ /dev/null @@ -1 +0,0 @@ -1024 65537 145043942670517902781741650890610683756045780348507433188994725700923246927874581962206512480287863636935077725837494808988986557337885675565086448774391442851909709751605441036910145362277967349042489937363543710406342212883803780768870873303921572812138116796733586484633244057911618360651775855949808953129 RSA1 test key #1 diff --git a/regress/unittests/sshkey/testdata/rsa1_2.fp b/regress/unittests/sshkey/testdata/rsa1_2.fp deleted file mode 100644 index 00516d52..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_2.fp +++ /dev/null @@ -1 +0,0 @@ -SHA256:JaOeRCnLl/TLe7vn1+aQ4ONyKZCUhK5x3k4VHilmbpE diff --git a/regress/unittests/sshkey/testdata/rsa1_2.fp.bb b/regress/unittests/sshkey/testdata/rsa1_2.fp.bb deleted file mode 100644 index b4989a58..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_2.fp.bb +++ /dev/null @@ -1 +0,0 @@ -xipag-zohut-zepuk-pisyv-kamog-pupus-netud-tudis-melup-cynov-gaxox diff --git a/regress/unittests/sshkey/testdata/rsa1_2.param.n b/regress/unittests/sshkey/testdata/rsa1_2.param.n deleted file mode 100644 index 25d438d0..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_2.param.n +++ /dev/null @@ -1 +0,0 @@ -00cab091b57a154740c1bb7020f46a21a19dc40f647db2aab1babd30cabe241f0437391e68376ba35e48c624b8eaf6b59424d4c1a848c9fd1ef5cdc7c1b7f5e5df23b7ad513b79021286d38c52fdfae35656659e8649b2bf8bedf7c99664e45534007bd1c5dc3de1dafdf2d34ad087155951aa0f3d500b36d0d804bbccdef15ab31ca3dd40bdf5196065a97f397ef576caffb606be8232f6e0614aea0e979b9584296673fabb1dbd9f3212495c428842a2ab1f1768dd424fb6fdceeeab9126cacdfc834f0a0d09ba73ad8360d183ba85bb1565555cc6a536eb8d06df1a1e841107c021ae28a2d8b3465f9d8b58ef4045aea1c4ad7f8bf639574d6b142af67b4eb3 diff --git a/regress/unittests/sshkey/testdata/rsa1_2.pub b/regress/unittests/sshkey/testdata/rsa1_2.pub deleted file mode 100644 index acab6dda..00000000 --- a/regress/unittests/sshkey/testdata/rsa1_2.pub +++ /dev/null @@ -1 +0,0 @@ -2048 65537 25587207108642486834576012232250034427766229965612147538722032399009467293691448851087324679403117563681753304072089087252850866332601294130674473984011813227791089686736237645788471744456489819306046398653719249100878753563464696688916667605969658659855996383142110932332560049231682024775766802333675397528993897914717996946881193454997890776063024953924432026083898531677702536941151535135950834711001926404724453460085864892836473957600610133803037286539329764689125111700732309717375455919436557475211197800228646235077584780367991159670572954337165006813357814232200750568307753718414790655085790471723847208627 RSA1 test key #2 diff --git a/regress/unittests/sshkey/testdata/rsa_1 b/regress/unittests/sshkey/testdata/rsa_1 index 5de3f842..98f447d6 100644 --- a/regress/unittests/sshkey/testdata/rsa_1 +++ b/regress/unittests/sshkey/testdata/rsa_1 @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18u -d6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKd -NSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wIDAQAB -AoGAXyj5mpjmbD+YlxGIWz/zrM4hGsWgd4VteKEJxT6MMI4uzCRpkMd0ck8oHiwZ -GAI/SwUzIsgtONQuH3AXVsUgghW4Ynn+8ksEv0IZ918WDMDwqvqkyrVzsOsZzqYj -Pf8DUDKCpwFjnlknJ04yvWBZvVhWtY4OiZ8GV0Ttsu3k+GECQQD1YHfvBb5FdJBv -Uhde2Il+jaFia8mwVVNNaiD2ECxXx6CzGz54ZLEB9NPVfDUZK8lJ4UJDqelWNh3i -PF3RefWDAkEA1CVBzAFL4mNwpleVPzrfy69xP3gWOa26MxM/GE6zx9jC7HgQ3KPa -WKdG/FuHs085aTRDaDLmGcZ8IvMuu7NgKQJAcIOKmxR0Gd8IN7NZugjqixggb0Pj -mLKXXwESGiJyYtHL0zTj4Uqyi6Ya2GJ66o7UXscmnmYz828fJtTtZBdbRwJBALfi -C2QvA32Zv/0PEXibKXy996WSC4G3ShwXZKtHHKHvCxY5BDSbehk59VesZrVPyG2e -NYdOBxD0cIlCzJE56/ECQAndVkxvO8hwyEFGGwF3faHIAe/OxVb+MjaU25//Pe1/ -h/e6tlCk4w9CODpyV685gV394eYwMcGDcIkipTNUDZs+MIICXAIBAAKBgQCkjZjf6gpnWvN2pYz7gmbJaeK4EDlWrLqG7tyXZoBpC6uefh7V +JHi29nO5wOpwu6gvCgbsqwA6CZbvLKCdY+X5vEjjta0U8GGtOCxVDxscAE6Gkri+ +TgRbrbbSalzt6svdPS86TV8YK3gZrGefs3YxYH8vLjphIXoxhDWDHiLHgQIDAQAB +AoGAPQ5hA+w2MgVYQtTIi+Xlt6Q3QG6cp+FtUHW+mdqpmNCAvE01qYZf2Bt38xt2 +oZ+vlsyUpyoH6oD2ZQZdDiksAjaI0HCYWcbi0zypBD9UKDf3YO3LzhCkfTXyt1kD +JcR2QfTehKnWMggVlWNTUGdWUKZ100MeGz+tR0F7O0rh+oUCQQDUbCo9oDfAY8kN +3KIzVzAkz3GZMMMZ3ji1Syt2Pq9vFU48ICdcZ0Uiur4xgRM3eH8hyJwUMsFIEsb0 +fQMA6rezAkEAxk93GTrwgM5Q0NA7NV9C0yGWWMRLoUW7RM9FmNlaiyASjk2KDAaI +ZqO3tqXetWwOsLjkw9YZQYbtFdZeopcp+wJAT2eHerXTYVVrqITbFPn4gyoQOsVh +iN/qrspEmtTf21RJhGw4inAIBe1sfzDSsB+Y1lYZEevPGFP8jxPT9ZnHxQJASlEd +YOclmh+3SYm/ppC8ikLcBQgLD7UCKRdEDbPmqpyqV4nXYgpQs6ZHArvGalbEapXf +pURm0pet4bEkZeogYQJBALGOROA2EEN7EaEOZfU/SE9tRHeZWpqxZInEMdpbCTBr +PXCHxWu0f8HaaJCBDg/nfc+qTconD2PEs3KA+JyPf5w -----END RSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/rsa_1-cert.fp b/regress/unittests/sshkey/testdata/rsa_1-cert.fp index 79f380a2..f5cf61d7 100644 --- a/regress/unittests/sshkey/testdata/rsa_1-cert.fp +++ b/regress/unittests/sshkey/testdata/rsa_1-cert.fp @@ -1 +1 @@ -SHA256:l6itGumSMcRBBAFteCgmjQBIXqLK/jFGUH3viHX1RmE +SHA256:nOEm43EMeh1biiICxyZSyc2VZKKMhgpXO+1HfvH5EPo diff --git a/regress/unittests/sshkey/testdata/rsa_1-cert.pub b/regress/unittests/sshkey/testdata/rsa_1-cert.pub index 3bacf3c8..24da6a68 100644 --- a/regress/unittests/sshkey/testdata/rsa_1-cert.pub +++ b/regress/unittests/sshkey/testdata/rsa_1-cert.pub @@ -1 +1 @@ -ssh-rsa-cert-v01 at openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAg98LhS2EHxLOWCLopZPwHdg/RJXusnkOqQXSc9R7aITkAAAADAQABAAAAgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18ud6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKdNSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wAAAAAAAAAFAAAAAgAAAAZqdWxpdXMAAAASAAAABWhvc3QxAAAABWhvc3QyAAAAADaMAfAAAAAATR5gcAAAAAAAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgU4bqRjtF/hS0IW8/AqCj8HO1dyTbELhrZbIDfhe0jBkAAABTAAAAC3NzaC1lZDI1NTE5AAAAQI3QGlUCzC07KorupxpDkkGy6tniaZ8EvBflzvv+itXWNchGvfUeHmVT6aX0sRqehdz/lR+GmXRoZBhofwh0qAM= RSA test key #1 +ssh-rsa-cert-v01 at openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgsQKm+jijGQErH22huGeBeAmI2LMg77r6KSyMdSVJjCQAAAADAQABAAAAgQCkjZjf6gpnWvN2pYz7gmbJaeK4EDlWrLqG7tyXZoBpC6uefh7VJHi29nO5wOpwu6gvCgbsqwA6CZbvLKCdY+X5vEjjta0U8GGtOCxVDxscAE6Gkri+TgRbrbbSalzt6svdPS86TV8YK3gZrGefs3YxYH8vLjphIXoxhDWDHiLHgQAAAAAAAAAFAAAAAgAAAAZqdWxpdXMAAAASAAAABWhvc3QxAAAABWhvc3QyAAAAADaMVlAAAAAATR600AAAAAAAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgaOFOaf9xPPYGhtdxHduGPBTZzuv/PqgnibTNKyMH8KoAAABTAAAAC3NzaC1lZDI1NTE5AAAAQOMMjqA2HhuPfKF2/+joG+sVElsCRkhvUZI4n5VuYFEB+7MeWnCEDtIR+cI9rmSzTOjdPrJr6df1sJUQB9MgPQ8= RSA test key #1 diff --git a/regress/unittests/sshkey/testdata/rsa_1.fp b/regress/unittests/sshkey/testdata/rsa_1.fp index 79f380a2..f5cf61d7 100644 --- a/regress/unittests/sshkey/testdata/rsa_1.fp +++ b/regress/unittests/sshkey/testdata/rsa_1.fp @@ -1 +1 @@ -SHA256:l6itGumSMcRBBAFteCgmjQBIXqLK/jFGUH3viHX1RmE +SHA256:nOEm43EMeh1biiICxyZSyc2VZKKMhgpXO+1HfvH5EPo diff --git a/regress/unittests/sshkey/testdata/rsa_1.fp.bb b/regress/unittests/sshkey/testdata/rsa_1.fp.bb index 45bacd51..283b60fe 100644 --- a/regress/unittests/sshkey/testdata/rsa_1.fp.bb +++ b/regress/unittests/sshkey/testdata/rsa_1.fp.bb @@ -1 +1 @@ -xosis-fodod-votot-dibum-ryvac-rediz-naruf-votun-kevis-halis-gexux +xuloh-gizyt-fykan-zatol-myvoh-kesap-cubod-vatun-kenal-naneh-nyxex diff --git a/regress/unittests/sshkey/testdata/rsa_1.param.n b/regress/unittests/sshkey/testdata/rsa_1.param.n index 49337121..d6d39bf4 100644 --- a/regress/unittests/sshkey/testdata/rsa_1.param.n +++ b/regress/unittests/sshkey/testdata/rsa_1.param.n @@ -1 +1 @@ -00cb5799544edec5ac00ec781fc21a1119ce9a288e3116e72f3e78fbcba6998adcc98c235f2e77abf1ce92b76f064b624552c9f2582341e622e1a176eef232b5bac1bf3881babc0b7d57a1ef4439170852e192bc329d3523354a39610eab916e50c507c913a2a5f2c7596aad779c5f297121438bd2313ebb4ad4d7debba43271fb +00a48d98dfea0a675af376a58cfb8266c969e2b8103956acba86eedc976680690bab9e7e1ed52478b6f673b9c0ea70bba82f0a06ecab003a0996ef2ca09d63e5f9bc48e3b5ad14f061ad382c550f1b1c004e8692b8be4e045badb6d26a5cedeacbdd3d2f3a4d5f182b7819ac679fb37631607f2f2e3a61217a318435831e22c781 diff --git a/regress/unittests/sshkey/testdata/rsa_1.param.p b/regress/unittests/sshkey/testdata/rsa_1.param.p index 4783d215..d02bfdfd 100644 --- a/regress/unittests/sshkey/testdata/rsa_1.param.p +++ b/regress/unittests/sshkey/testdata/rsa_1.param.p @@ -1 +1 @@ -00f56077ef05be4574906f52175ed8897e8da1626bc9b055534d6a20f6102c57c7a0b31b3e7864b101f4d3d57c35192bc949e14243a9e956361de23c5dd179f583 +00d46c2a3da037c063c90ddca233573024cf719930c319de38b54b2b763eaf6f154e3c20275c674522babe31811337787f21c89c1432c14812c6f47d0300eab7b3 diff --git a/regress/unittests/sshkey/testdata/rsa_1.param.q b/regress/unittests/sshkey/testdata/rsa_1.param.q index 00fc8a2d..0cdd1c70 100644 --- a/regress/unittests/sshkey/testdata/rsa_1.param.q +++ b/regress/unittests/sshkey/testdata/rsa_1.param.q @@ -1 +1 @@ -00d42541cc014be26370a657953f3adfcbaf713f781639adba33133f184eb3c7d8c2ec7810dca3da58a746fc5b87b34f396934436832e619c67c22f32ebbb36029 +00c64f77193af080ce50d0d03b355f42d3219658c44ba145bb44cf4598d95a8b20128e4d8a0c068866a3b7b6a5deb56c0eb0b8e4c3d6194186ed15d65ea29729fb diff --git a/regress/unittests/sshkey/testdata/rsa_1.pub b/regress/unittests/sshkey/testdata/rsa_1.pub index 23ef872e..5012d161 100644 --- a/regress/unittests/sshkey/testdata/rsa_1.pub +++ b/regress/unittests/sshkey/testdata/rsa_1.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18ud6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKdNSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+w== RSA test key #1 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCkjZjf6gpnWvN2pYz7gmbJaeK4EDlWrLqG7tyXZoBpC6uefh7VJHi29nO5wOpwu6gvCgbsqwA6CZbvLKCdY+X5vEjjta0U8GGtOCxVDxscAE6Gkri+TgRbrbbSalzt6svdPS86TV8YK3gZrGefs3YxYH8vLjphIXoxhDWDHiLHgQ== RSA test key #1 diff --git a/regress/unittests/sshkey/testdata/rsa_1_pw b/regress/unittests/sshkey/testdata/rsa_1_pw index b4c06745..378c36a4 100644 --- a/regress/unittests/sshkey/testdata/rsa_1_pw +++ b/regress/unittests/sshkey/testdata/rsa_1_pw @@ -1,18 +1,18 @@ -----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: AES-128-CBC,0C3F819F6EEA66A471BAEEDDA8171606 +DEK-Info: AES-128-CBC,BD756C011352DBF085364FB3158F1B8A -AhQNxgw7Z2un3dpm6KPHF1u5qVvOczm0yiTyPK4U11B3TTRhXOHdzPLAcKMX71Xq -fmLm2/JIZATUbLTaysLKIQlmAgtpmXoKLv9b90R3AXLophgToZzOLpvlQTCt+y9G -0E3QQZG/LFy9BLNyw6uD5cy0RHT3FQb5VQDwfBvR/I+K3qWBFLlb7Rw9bCujYczu -D3bimcDj/k6YkrWVsEa81Ch5RF2RClOYufti6bsvc4xIsB0Kd++vokER+kXFuQqf -Tl0Jz+SG0kr9QtjVvkhBtSxzJ6/olAosoUySQ5hqsB8iECufBgp1KelXqsHFJQXy -gCvVmGiivFUinX0rKOuWCHTplsSKQ9BnPSwDAAs8A7ZLcTXcLs/hMQ5r6fmOYfNN -YthhjZyE2ciJO0lydGJUJMb5aJUak0rl+uINRlYCHTRLVwmCOmpfqz9SfcJb1ieU -4Us8NR+pXJar4U0+C2wVlNJkAdpL6GvYxN6vp7vLa+BiFwIZOQozswacIZk/ScXm -QL9rmWug51RCmDeenX46WTEZeB0o0+xi60sDEDhhe4+iNYcJu5L0BJ5lqRFe3I5n -HRRv1mBEjbF2fDcg/ChYfOXsc4gDivH2nObabeASuMFZyadmXfA8tnXRZf+7Wuy/ -LZGYbM2xLeEyV3ss16WBHuIqexDt04OEZvs0jN90zj6Yv7qKCB975bdOcuKkN2Nn -n9lA11R2pgsCs6COp9rYiWXkXZeDf3sW6kdcEV+/SzkVsv4JlHcsIzgk4WGVF/E/ -ZkU4J9AvSdJPzEQDM+yszp0eeUow4+SAgpuNTqZiUO/2UUVbsr3qvlYMoCixhFAN +aLmfLIYFwswKrKHvAx/FvWcW/+J8sTQvYv2pJ8nLW6uh130+vk0W4kzUdBxSniUt +QnfPflFka3FilYOZUTNWV26EJtxt2eevUrSzYliNYjYshGn9feXrpPleaZVa/cuE +KEtCQ71XYFgE6cqy5itm2VUgsmGmW3lt0VCf4oOSq+SDCr05obqMM8XSFlipwu2U +k3awTqIXK64Ubw2ySIveGsUKFSkZHVUbsDXsBSwtzmKz69mhtps27ENkmwCed30x +eP+9Z6kkN9FAygXHrH5K57mLuS2iCaNJQ0qrPAJQVWtNYh7ijUG/qS/WVNXsz2iN +tQ7dQhfz2dBbWYitNHLjHEt/a5ThRdj7z/8NCPRIMy8G8/7BJvd1fQeW3yYmROU/ +Czbm4hI/HM6t7Djqhw9pxcaV8CfzPvtVJdFM9jyfad753RghnSFeQHTH7O35yYBQ +JLB0HwcKLCqwwSjqIhTqNPZOuF7U2Z8oJEygMiRtjPihPcl/mwmHuw7YurEN5znf +O63E5zFHVNx9NGsJcxstJ5DLs+B+R8dKqgUFk2BaWj2PlPxrxuMri1B4RAmN+pzH +9kGgXbB8qfv1n81Yu+6kZ+/jio6vKNkbr7kE+0fhWILshNvy4SnytHFuMdeR4G9X +sQxXk/bWNRcJaUJNhevYESS71jyP5jgd+6SBrbQgznb8+I6/nlSKPSdtO+Z7ePZB +lAgxk2LJvRu065ioPw2oLvxuM5LWiw2EvJlghNQkLjTeU2ijRAvTztQNGVMuRGLp +Hc7JSX9tMg9aeA0mZC5p661mRfGI6O6dsgqv/FWjq+Rt6Ux0RYM66jwgtG/Phelr -----END RSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/rsa_2 b/regress/unittests/sshkey/testdata/rsa_2 index 2441d52b..f425b69a 100644 --- a/regress/unittests/sshkey/testdata/rsa_2 +++ b/regress/unittests/sshkey/testdata/rsa_2 @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/rsa_2.fp b/regress/unittests/sshkey/testdata/rsa_2.fp index 4659639d..a61a991e 100644 --- a/regress/unittests/sshkey/testdata/rsa_2.fp +++ b/regress/unittests/sshkey/testdata/rsa_2.fp @@ -1 +1 @@ -SHA256:NoQh0XBUuYUSWqnzOzOBnfpgJTRWLMj7BlWAb8IbjeE +SHA256:GMS3ZdRunJZThqn+SZGxm5StBwbdNLLjXAqtqZDJkMw diff --git a/regress/unittests/sshkey/testdata/rsa_2.fp.bb b/regress/unittests/sshkey/testdata/rsa_2.fp.bb index e9d1e4a5..d35f2e8d 100644 --- a/regress/unittests/sshkey/testdata/rsa_2.fp.bb +++ b/regress/unittests/sshkey/testdata/rsa_2.fp.bb @@ -1 +1 @@ -xogit-gupof-mydon-hocep-zuval-feson-rarif-cefar-tobar-ryvap-kuxex +xumak-sibaf-lobih-tabuv-kuvat-myzac-ganik-lunoz-hubof-fykad-kexax diff --git a/regress/unittests/sshkey/testdata/rsa_2.param.n b/regress/unittests/sshkey/testdata/rsa_2.param.n index a669dbf0..e36c2614 100644 --- a/regress/unittests/sshkey/testdata/rsa_2.param.n +++ b/regress/unittests/sshkey/testdata/rsa_2.param.n @@ -1 +1 @@ -00f4d1145e9efc4809262f8f9e023e260733ce8e4f9c7023d5ce44d1fa66497724f09090011d4378727e1ada44e687b12bf8df025c2b22ab120e57519f1f67f068288194e117790262fdc323c6bf645563b81610ba97552a6ef3d476b5025198c54c0f7f021f4c2a093ba8662ae528c4de9fac9f818b85129baa6abd2e388780c9a406ebff6b54a58adfab5c7cced85f1f1f98648de1e2bf2615830e3968dbc609ed9145f6e9a1e5b6991b6022fef2f7049ec2de9a9a11035d2a3f17a9a4a80ef15629f3ae8e4d7adb445cba3dd6d03d1dbe9feb1fcc73f1890cd5d32a1a56086789eb17969c079f0d939158063b63d61bb80c61109562f502f9356a05380d02eb +00ab0110245aa93e6f8757c16aeba0a4c57fe438558bbf0a3cad46213449ff42cc760a3c3435e3bfd416847dc1495a32a81d66a77c408f10f8af9b35271696ec86a12c6481813f562befe9de70c25104fd3162b80634a2d9180003463726dbff8ffcac1201d8b3c02eb524b0dfb6dfc861c194cc7e0653a01463e29fa6af65484df15521e01ffae75005b678ad6a4023e7c936641e18c0dd96b754b4996839927964c0b630d3bfaac1e0e632188de04e1cd741ab2b5e7c7987f4fa32cc1e6d71960f0a1c01ed5dac5a253a18baa962c4ddc941bd90ccc9c7f28b23807f8e285495457c29330d76fd53e96dae3404979b6cf9fe62efae4723eb3cf36c04dbe5c49b diff --git a/regress/unittests/sshkey/testdata/rsa_2.param.p b/regress/unittests/sshkey/testdata/rsa_2.param.p index be7c1c36..a1848323 100644 --- a/regress/unittests/sshkey/testdata/rsa_2.param.p +++ b/regress/unittests/sshkey/testdata/rsa_2.param.p @@ -1 +1 @@ -00fb82dee3474e88898acebcf23b8a970737490ea07abe5f7c0837c9a36111ca4792f3ad759945fc27d7f78c5accca2ffd8a85c24be949274ab17f8f797b9aaa76f584f28d617e6de3953d46307fa31ec12108ffdab3f105fb3df54156f4728fe07b1598bbb5c5e260d4f73d8b29532bfc6b9f07d8899f87ec819571c8b38e7a87 +00dbe50cfb241268e5afd96fe3be59f443c5826e5a045a71d8d881364a3983bd02107bdb20dd9116a726806dbd5a328a5339a76a78e229c2573ec4ebacbb5a13df475d5c59d82671622e25c4667b249b8d7679c324c5fa4d2062892979d40aee829a71da4826a2ebc8c7f9748ef17c6844f9e2bb2db90880ba84179fd42ef70659 diff --git a/regress/unittests/sshkey/testdata/rsa_2.param.q b/regress/unittests/sshkey/testdata/rsa_2.param.q index 6f2c542d..145feee2 100644 --- a/regress/unittests/sshkey/testdata/rsa_2.param.q +++ b/regress/unittests/sshkey/testdata/rsa_2.param.q @@ -1 +1 @@ -00f92f9f57e501dc41cc91ff3b4ad7a2283612d66c0d130f639d4c18376a54e5b5e1939f4d5966bb43929e448a426dadc1fae84cf0d56f64d8df04d1badcfc1fdc8e156d5cd4dcf860ec936fc166261136156010f6df10a70525867d7989fef6752fd8db6faf3fe018bbbc1fa862fb4155445e1a398468d78b4e77884bdf5c197d +00c714f827d7fe59bef5fcbed463a27131124255154a30a3bc15b92d33a9d2bd60fe5b660ea4dcb635cdefe9b1bb44c2cb00c804ae43b10ab28c0eaf3a19ce3569367073b2b9918467cf37ad9e3cbc113f3e421d6d6aed896decde0d4c2bfc4eec971b746212434d65495bae7e137f662ffc49382270363a88ac856be2c1212c13 diff --git a/regress/unittests/sshkey/testdata/rsa_2.pub b/regress/unittests/sshkey/testdata/rsa_2.pub index 3322fbc9..3f391e3d 100644 --- a/regress/unittests/sshkey/testdata/rsa_2.pub +++ b/regress/unittests/sshkey/testdata/rsa_2.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD00RRenvxICSYvj54CPiYHM86OT5xwI9XORNH6Zkl3JPCQkAEdQ3hyfhraROaHsSv43wJcKyKrEg5XUZ8fZ/BoKIGU4Rd5AmL9wyPGv2RVY7gWELqXVSpu89R2tQJRmMVMD38CH0wqCTuoZirlKMTen6yfgYuFEpuqar0uOIeAyaQG6/9rVKWK36tcfM7YXx8fmGSN4eK/JhWDDjlo28YJ7ZFF9umh5baZG2Ai/vL3BJ7C3pqaEQNdKj8XqaSoDvFWKfOujk1620Rcuj3W0D0dvp/rH8xz8YkM1dMqGlYIZ4nrF5acB58Nk5FYBjtj1hu4DGEQlWL1Avk1agU4DQLr RSA test key #2 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrARAkWqk+b4dXwWrroKTFf+Q4VYu/CjytRiE0Sf9CzHYKPDQ147/UFoR9wUlaMqgdZqd8QI8Q+K+bNScWluyGoSxkgYE/Vivv6d5wwlEE/TFiuAY0otkYAANGNybb/4/8rBIB2LPALrUksN+238hhwZTMfgZToBRj4p+mr2VITfFVIeAf+udQBbZ4rWpAI+fJNmQeGMDdlrdUtJloOZJ5ZMC2MNO/qsHg5jIYjeBOHNdBqytefHmH9PoyzB5tcZYPChwB7V2sWiU6GLqpYsTdyUG9kMzJx/KLI4B/jihUlUV8KTMNdv1T6W2uNASXm2z5/mLvrkcj6zzzbATb5cSb RSA test key #2 diff --git a/regress/unittests/sshkey/testdata/rsa_n b/regress/unittests/sshkey/testdata/rsa_n index 5de3f842..98f447d6 100644 --- a/regress/unittests/sshkey/testdata/rsa_n +++ b/regress/unittests/sshkey/testdata/rsa_n @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18u -d6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKd -NSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wIDAQAB -AoGAXyj5mpjmbD+YlxGIWz/zrM4hGsWgd4VteKEJxT6MMI4uzCRpkMd0ck8oHiwZ -GAI/SwUzIsgtONQuH3AXVsUgghW4Ynn+8ksEv0IZ918WDMDwqvqkyrVzsOsZzqYj -Pf8DUDKCpwFjnlknJ04yvWBZvVhWtY4OiZ8GV0Ttsu3k+GECQQD1YHfvBb5FdJBv -Uhde2Il+jaFia8mwVVNNaiD2ECxXx6CzGz54ZLEB9NPVfDUZK8lJ4UJDqelWNh3i -PF3RefWDAkEA1CVBzAFL4mNwpleVPzrfy69xP3gWOa26MxM/GE6zx9jC7HgQ3KPa -WKdG/FuHs085aTRDaDLmGcZ8IvMuu7NgKQJAcIOKmxR0Gd8IN7NZugjqixggb0Pj -mLKXXwESGiJyYtHL0zTj4Uqyi6Ya2GJ66o7UXscmnmYz828fJtTtZBdbRwJBALfi -C2QvA32Zv/0PEXibKXy996WSC4G3ShwXZKtHHKHvCxY5BDSbehk59VesZrVPyG2e -NYdOBxD0cIlCzJE56/ECQAndVkxvO8hwyEFGGwF3faHIAe/OxVb+MjaU25//Pe1/ -h/e6tlCk4w9CODpyV685gV394eYwMcGDcIkipTNUDZs+MIICXAIBAAKBgQCkjZjf6gpnWvN2pYz7gmbJaeK4EDlWrLqG7tyXZoBpC6uefh7V +JHi29nO5wOpwu6gvCgbsqwA6CZbvLKCdY+X5vEjjta0U8GGtOCxVDxscAE6Gkri+ +TgRbrbbSalzt6svdPS86TV8YK3gZrGefs3YxYH8vLjphIXoxhDWDHiLHgQIDAQAB +AoGAPQ5hA+w2MgVYQtTIi+Xlt6Q3QG6cp+FtUHW+mdqpmNCAvE01qYZf2Bt38xt2 +oZ+vlsyUpyoH6oD2ZQZdDiksAjaI0HCYWcbi0zypBD9UKDf3YO3LzhCkfTXyt1kD +JcR2QfTehKnWMggVlWNTUGdWUKZ100MeGz+tR0F7O0rh+oUCQQDUbCo9oDfAY8kN +3KIzVzAkz3GZMMMZ3ji1Syt2Pq9vFU48ICdcZ0Uiur4xgRM3eH8hyJwUMsFIEsb0 +fQMA6rezAkEAxk93GTrwgM5Q0NA7NV9C0yGWWMRLoUW7RM9FmNlaiyASjk2KDAaI +ZqO3tqXetWwOsLjkw9YZQYbtFdZeopcp+wJAT2eHerXTYVVrqITbFPn4gyoQOsVh +iN/qrspEmtTf21RJhGw4inAIBe1sfzDSsB+Y1lYZEevPGFP8jxPT9ZnHxQJASlEd +YOclmh+3SYm/ppC8ikLcBQgLD7UCKRdEDbPmqpyqV4nXYgpQs6ZHArvGalbEapXf +pURm0pet4bEkZeogYQJBALGOROA2EEN7EaEOZfU/SE9tRHeZWpqxZInEMdpbCTBr +PXCHxWu0f8HaaJCBDg/nfc+qTconD2PEs3KA+JyPf5w -----END RSA PRIVATE KEY----- diff --git a/regress/unittests/sshkey/testdata/rsa_n_pw b/regress/unittests/sshkey/testdata/rsa_n_pw index dc18373b..9282a794 100644 --- a/regress/unittests/sshkey/testdata/rsa_n_pw +++ b/regress/unittests/sshkey/testdata/rsa_n_pw @@ -1,17 +1,17 @@ -----BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABAFw/Wg/V -I5SAXWj/HJr9qeAAAAEAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDLV5lUTt7F -rADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18ud6vxzpK3bwZLYkVSyfJYI0HmIuGhdu -7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKdNSM1SjlhDquRblDFB8kToqXyx1lqrXecXylx -IUOL0jE+u0rU1967pDJx+wAAAgD1iSGiMlMJt2VH4kx5yr0wCJS+4UOmX0bxKO7UH5Jcul -K5eaSe5ZoKE7hTYBaz0K5dRF/0fqLsvVZlE4quDjFLN6Hyavgn2W/QM7SUqBHgRMal9pgH -LnxX6mFNWJ+4yb7f3bcbVIdgmMm3sT9Xjwaf5xgzNlR2mkUWtFwjyQh6FxUo5apNzqNBwO -l2Q4xfmyZTp1s++pStQ/su6obXpxnE2Nx5G/D84ZL5iWl+njUy/MvJTazHRbiTSyihU+UA -mUr5ZNuP3WUYY+h3KVlHpYHJYB7l3AMTKuPMFLhY9V7BJ+DuKPaqBgX4hvRzY0eVQiFr61 -ovjWjvfu1ulx550JqdYCgH2PpP0E89OQne35Cxs9QPThfe8DKojC9YquYh9zmVTvr7kNiE -Soluk/7oKpQIDaC+/SRk7AJ2e3Cbt1lXyGNn37PuqaaC/apaF/DOD6Yig9aClS7jOUrT96 -56trFAYfHEIKbRCUSMCiM1+x6HOLYf5ROrGE9KxT3kUD9XMsMpTva+cPpHUpbGpXcYE10N -MyYDz+V5M2/ZoIdEhscJNQ3UnhaZpeEaqcOyNyo90n3Dnaw/WpMDD/kNMGfm8daTaYInnQ -QnwA2gwlYfpTAqxE71oXgOuGmtA0yqJB4778Xq26Pb+B7/mZZZe6n0FVmiNC+ZG37ZGOw/ -iGL9e2Sxzw=+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABBQbinsI+ +TlmYyOzJ2gbJ9pAAAAEAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQCkjZjf6gpn +WvN2pYz7gmbJaeK4EDlWrLqG7tyXZoBpC6uefh7VJHi29nO5wOpwu6gvCgbsqwA6CZbvLK +CdY+X5vEjjta0U8GGtOCxVDxscAE6Gkri+TgRbrbbSalzt6svdPS86TV8YK3gZrGefs3Yx +YH8vLjphIXoxhDWDHiLHgQAAAgADHmr5WHJ3rDjr+qqbTOSl558cKMW6BdAlHk3VyFzBD9 +EJ7vs6VztAqVjNHCjjIPCQCedPrdNGb4QKB17Kr0y6s5271yr9lomhFJXB8bE2jQCKu5Go +1gRHnMFoC/QZRX9DqTp3QWQmtFMwQSEHcYB+5ckmR3dwmRvjFVjys1eZYmbUJQj49SpRcI +0Ri0xvyzSVEvuuavtNJ457ZWZvvNhdR0EW3FE+ROiJMqvGXaZdbWu7c0/2ahjD7N1/rkoi +WjlVbrZJqSYuogrmP9CjjnkjbeFnkUjETiGkVZGZvX8NTWfbKo/Ma9VZeACWMY4hGtZB/7 +RF9zhIrcTw2OEUIBqyG5HwErmkraUk7pe7wB3U/xKGoCB4k4Oub+rTyBuevkWPaAePwRB5 +lV/US3X+DQKY/cKr3cBOpIeAnTJgv3T3X1B/TQjsFAXILgkxMhmo9OIPW3sU/fSCMS3eoQ +KE1BSvTQaMVBs2Iga+vnnEgLq/MmKHh/4NP5RSmRZyrLvaYqraGOHYKIuN1D3HZxacYkWK +QgkbqcT87qXB8INwk7neTUEShR4Z931CXp2890YUobrzgiQSOGOubIuuaM2QhhpFOwo1Kd +ltTXz8K+Do9RViHQ/yKGTkuRQ1ew3JKoEx+f2B4UTEr3HAFVGaulh7KZaxU/swuszTAvIH +/xlMIONGXw= -----END OPENSSH PRIVATE KEY----- -- 2.17.1
---
regress/unittests/bitmap/tests.c | 33 ++++++++++++++++++-
regress/unittests/hostkeys/test_iterate.c | 22 +++++++++++++
regress/unittests/kex/test_kex.c | 6 ++++
.../sshbuf/test_sshbuf_getput_crypto.c | 3 +-
.../sshbuf/test_sshbuf_getput_fuzz.c | 3 +-
regress/unittests/sshbuf/tests.c | 4 +++
regress/unittests/sshkey/common.c | 4 +++
regress/unittests/sshkey/common.h | 3 +-
regress/unittests/sshkey/test_file.c | 7 +++-
regress/unittests/sshkey/test_fuzz.c | 6 +++-
regress/unittests/sshkey/test_sshkey.c | 8 +++++
regress/unittests/sshkey/tests.c | 4 +++
regress/unittests/test_helper/test_helper.c | 6 ++++
regress/unittests/test_helper/test_helper.h | 12 +++++++
14 files changed, 115 insertions(+), 6 deletions(-)
diff --git a/regress/unittests/bitmap/tests.c b/regress/unittests/bitmap/tests.c
index 23025f90..ead89601 100644
--- a/regress/unittests/bitmap/tests.c
+++ b/regress/unittests/bitmap/tests.c
@@ -16,7 +16,9 @@
#include <stdlib.h>
#include <string.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
+#endif
#include "../test_helper/test_helper.h"
@@ -28,7 +30,9 @@ void
tests(void)
{
struct bitmap *b;
+#ifdef WITH_OPENSSL
BIGNUM *bn;
+#endif
size_t len;
int i, j, k, n;
u_char bbuf[1024], bnbuf[1024];
@@ -37,8 +41,10 @@ tests(void)
TEST_START("bitmap_new");
b = bitmap_new();
ASSERT_PTR_NE(b, NULL);
+#ifdef WITH_OPENSSL
bn = BN_new();
ASSERT_PTR_NE(bn, NULL);
+#endif
TEST_DONE();
TEST_START("bitmap_set_bit / bitmap_test_bit");
@@ -46,23 +52,32 @@ tests(void)
for (j = -1; j < NTESTS; j++) {
for (k = -1; k < NTESTS; k++) {
bitmap_zero(b);
+#ifdef WITH_OPENSSL
BN_clear(bn);
+#endif
test_subtest_info("set %d/%d/%d", i, j, k);
/* Set bits */
if (i >= 0) {
ASSERT_INT_EQ(bitmap_set_bit(b, i), 0);
+#ifdef WITH_OPENSSL
ASSERT_INT_EQ(BN_set_bit(bn, i), 1);
+#endif
}
if (j >= 0) {
ASSERT_INT_EQ(bitmap_set_bit(b, j), 0);
+#ifdef WITH_OPENSSL
ASSERT_INT_EQ(BN_set_bit(bn, j), 1);
+#endif
}
if (k >= 0) {
ASSERT_INT_EQ(bitmap_set_bit(b, k), 0);
+#ifdef WITH_OPENSSL
ASSERT_INT_EQ(BN_set_bit(bn, k), 1);
+#endif
}
+#ifdef WITH_OPENSSL
/* Check perfect match between bitmap and bn */
test_subtest_info("match %d/%d/%d", i, j, k);
for (n = 0; n < NTESTS; n++) {
@@ -76,6 +91,7 @@ tests(void)
(int)bitmap_nbits(b));
ASSERT_INT_EQ(BN_num_bytes(bn),
(int)bitmap_nbytes(b));
+#endif /* WITH_OPENSSL */
/* Test serialisation */
test_subtest_info("serialise %d/%d/%d",
@@ -86,10 +102,12 @@ tests(void)
sizeof(bbuf)), 0);
for (n = len; n < (int)sizeof(bbuf); n++)
ASSERT_U8_EQ(bbuf[n], 0xfc);
+#ifdef WITH_OPENSSL
r = BN_bn2bin(bn, bnbuf);
ASSERT_INT_GE(r, 0);
ASSERT_INT_EQ(r, (int)len);
ASSERT_MEM_EQ(bbuf, bnbuf, len);
+#endif
/* Test deserialisation */
test_subtest_info("deserialise %d/%d/%d",
@@ -97,39 +115,52 @@ tests(void)
bitmap_zero(b);
ASSERT_INT_EQ(bitmap_from_string(b, bnbuf,
len), 0);
+#ifdef WITH_OPENSSL
for (n = 0; n < NTESTS; n++) {
ASSERT_INT_EQ(BN_is_bit_set(bn, n),
bitmap_test_bit(b, n));
}
+#endif
/* Test clearing bits */
test_subtest_info("clear %d/%d/%d",
i, j, k);
for (n = 0; n < NTESTS; n++) {
ASSERT_INT_EQ(bitmap_set_bit(b, n), 0);
+#ifdef WITH_OPENSSL
ASSERT_INT_EQ(BN_set_bit(bn, n), 1);
+#endif
}
if (i >= 0) {
bitmap_clear_bit(b, i);
+#ifdef WITH_OPENSSL
BN_clear_bit(bn, i);
+#endif
}
if (j >= 0) {
bitmap_clear_bit(b, j);
+#ifdef WITH_OPENSSL
BN_clear_bit(bn, j);
+#endif
}
if (k >= 0) {
bitmap_clear_bit(b, k);
+#ifdef WITH_OPENSSL
BN_clear_bit(bn, k);
+#endif
}
+#ifdef WITH_OPENSSL
for (n = 0; n < NTESTS; n++) {
ASSERT_INT_EQ(BN_is_bit_set(bn, n),
bitmap_test_bit(b, n));
}
+#endif
}
}
}
bitmap_free(b);
+#ifdef WITH_OPENSSL
BN_free(bn);
+#endif
TEST_DONE();
}
-
diff --git a/regress/unittests/hostkeys/test_iterate.c
b/regress/unittests/hostkeys/test_iterate.c
index 751825dd..489bc70f 100644
--- a/regress/unittests/hostkeys/test_iterate.c
+++ b/regress/unittests/hostkeys/test_iterate.c
@@ -166,6 +166,7 @@ struct expected expected_full[] = {
NULL, /* deserialised key */
NULL, /* comment */
} },
+#ifdef WITH_OPENSSL
{ "dsa_1.pub" , -1, -1, 0, HKF_MATCH_HOST, 0, 0, -1, {
NULL,
2,
@@ -192,6 +193,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ECDSA #1",
} },
+#endif
{ "ed25519_1.pub" , -1, -1, 0, HKF_MATCH_HOST, 0, 0, -1, {
NULL,
4,
@@ -205,6 +207,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ED25519 #1",
} },
+#ifdef WITH_OPENSSL
{ "rsa_1.pub" , -1, -1, 0, HKF_MATCH_HOST, 0, 0, -1, {
NULL,
5,
@@ -218,6 +221,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"RSA #1",
} },
+#endif
{ NULL, -1, -1, 0, 0, 0, 0, -1, {
NULL,
6,
@@ -244,6 +248,7 @@ struct expected expected_full[] = {
NULL,
NULL,
} },
+#ifdef WITH_OPENSSL
{ "dsa_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP,
HKF_MATCH_IP, -1, {
NULL,
8,
@@ -270,6 +275,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ECDSA #2",
} },
+#endif
{ "ed25519_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP,
HKF_MATCH_IP, -1, {
NULL,
10,
@@ -283,6 +289,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ED25519 #2",
} },
+#ifdef WITH_OPENSSL
{ "rsa_2.pub" , -1, -1, HKF_MATCH_HOST, 0, HKF_MATCH_IP,
HKF_MATCH_IP, -1, {
NULL,
11,
@@ -296,6 +303,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"RSA #2",
} },
+#endif
{ NULL, -1, -1, 0, 0, 0, 0, -1, {
NULL,
12,
@@ -322,6 +330,7 @@ struct expected expected_full[] = {
NULL,
NULL,
} },
+#ifdef WITH_OPENSSL
{ "dsa_3.pub" , -1, -1, HKF_MATCH_HOST, HKF_MATCH_HOST,
HKF_MATCH_IP, HKF_MATCH_IP, -1, {
NULL,
14,
@@ -348,6 +357,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ECDSA #3",
} },
+#endif
{ "ed25519_3.pub" , -1, -1, HKF_MATCH_HOST, HKF_MATCH_HOST,
HKF_MATCH_IP, HKF_MATCH_IP, -1, {
NULL,
16,
@@ -361,6 +371,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ED25519 #3",
} },
+#ifdef WITH_OPENSSL
{ "rsa_3.pub" , -1, -1, HKF_MATCH_HOST, HKF_MATCH_HOST,
HKF_MATCH_IP, HKF_MATCH_IP, -1, {
NULL,
17,
@@ -374,6 +385,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"RSA #3",
} },
+#endif
{ NULL, -1, -1, 0, 0, 0, 0, -1, {
NULL,
18,
@@ -400,6 +412,7 @@ struct expected expected_full[] = {
NULL,
NULL,
} },
+#ifdef WITH_OPENSSL
{ "dsa_5.pub" , -1, -1, 0, HKF_MATCH_HOST|HKF_MATCH_HOST_HASHED, 0,
0, -1, {
NULL,
20,
@@ -426,6 +439,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ECDSA #5",
} },
+#endif
{ "ed25519_5.pub" , -1, -1, 0, HKF_MATCH_HOST|HKF_MATCH_HOST_HASHED,
0, 0, -1, {
NULL,
22,
@@ -439,6 +453,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ED25519 #5",
} },
+#ifdef WITH_OPENSSL
{ "rsa_5.pub" , -1, -1, 0, HKF_MATCH_HOST|HKF_MATCH_HOST_HASHED, 0,
0, -1, {
NULL,
23,
@@ -452,6 +467,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"RSA #5",
} },
+#endif
{ NULL, -1, -1, 0, 0, 0, 0, -1, {
NULL,
24,
@@ -470,6 +486,7 @@ struct expected expected_full[] = {
* hostname and addresses in the pre-hashed known_hosts are split
* to separate lines.
*/
+#ifdef WITH_OPENSSL
{ "dsa_6.pub" , -1, -1, HKF_MATCH_HOST|HKF_MATCH_HOST_HASHED, 0, 0,
0, -1, {
NULL,
25,
@@ -548,6 +565,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ECDSA #6",
} },
+#endif
{ "ed25519_6.pub" , -1, -1, HKF_MATCH_HOST|HKF_MATCH_HOST_HASHED, 0,
0, 0, -1, {
NULL,
31,
@@ -587,6 +605,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ED25519 #6",
} },
+#ifdef WITH_OPENSSL
{ "rsa_6.pub" , -1, -1, HKF_MATCH_HOST|HKF_MATCH_HOST_HASHED, 0, 0,
0, -1, {
NULL,
34,
@@ -626,6 +645,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"RSA #6",
} },
+#endif
{ NULL, -1, -1, 0, 0, 0, 0, -1, {
NULL,
37,
@@ -678,6 +698,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"ED25519 #4",
} },
+#ifdef WITH_OPENSSL
{ "ecdsa_4.pub" , -1, -1, HKF_MATCH_HOST, 0, 0, 0, -1, {
NULL,
41,
@@ -704,6 +725,7 @@ struct expected expected_full[] = {
NULL, /* filled at runtime */
"DSA #4",
} },
+#endif
{ NULL, -1, -1, 0, 0, 0, 0, -1, {
NULL,
43,
diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index 6e5999bb..73e9af79 100644
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -145,12 +145,14 @@ do_kex_with_key(char *kex, int keytype, int bits)
sshbuf_free(state);
ASSERT_PTR_NE(server2->kex, NULL);
/* XXX we need to set the callbacks */
+#ifdef WITH_OPENSSL
server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
server2->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
#ifdef OPENSSL_HAS_ECC
server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
+#endif
#endif
server2->kex->kex[KEX_C25519_SHA256] = kexc25519_server;
server2->kex->load_host_public_key =
server->kex->load_host_public_key;
@@ -178,10 +180,12 @@ do_kex_with_key(char *kex, int keytype, int bits)
static void
do_kex(char *kex)
{
+#ifdef WITH_OPENSSL
do_kex_with_key(kex, KEY_RSA, 2048);
do_kex_with_key(kex, KEY_DSA, 1024);
#ifdef OPENSSL_HAS_ECC
do_kex_with_key(kex, KEY_ECDSA, 256);
+#endif
#endif
do_kex_with_key(kex, KEY_ED25519, 256);
}
@@ -190,6 +194,7 @@ void
kex_tests(void)
{
do_kex("curve25519-sha256 at libssh.org");
+#ifdef WITH_OPENSSL
#ifdef OPENSSL_HAS_ECC
do_kex("ecdh-sha2-nistp256");
do_kex("ecdh-sha2-nistp384");
@@ -199,4 +204,5 @@ kex_tests(void)
do_kex("diffie-hellman-group-exchange-sha1");
do_kex("diffie-hellman-group14-sha1");
do_kex("diffie-hellman-group1-sha1");
+#endif /* WITH_OPENSSL */
}
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
index a68e1329..58ec1561 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
@@ -5,6 +5,7 @@
* Placed in the public domain
*/
+#ifdef WITH_OPENSSL
#include "includes.h"
#include <sys/types.h>
@@ -406,4 +407,4 @@ sshbuf_getput_crypto_tests(void)
TEST_DONE();
#endif
}
-
+#endif
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
index c6b5c29d..2a5e1977 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
@@ -5,6 +5,7 @@
* Placed in the public domain
*/
+#ifdef WITH_OPENSSL
#include "includes.h"
#include <sys/types.h>
@@ -127,4 +128,4 @@ sshbuf_getput_fuzz_tests(void)
TEST_DONE();
TEST_ONERROR(NULL, NULL);
}
-
+#endif /* WITH_OPENSSL */
diff --git a/regress/unittests/sshbuf/tests.c b/regress/unittests/sshbuf/tests.c
index 1557e434..21495b6b 100644
--- a/regress/unittests/sshbuf/tests.c
+++ b/regress/unittests/sshbuf/tests.c
@@ -20,9 +20,13 @@ tests(void)
{
sshbuf_tests();
sshbuf_getput_basic_tests();
+#ifdef WITH_OPENSSL
sshbuf_getput_crypto_tests();
+#endif
sshbuf_misc_tests();
sshbuf_fuzz_tests();
+#ifdef WITH_OPENSSL
sshbuf_getput_fuzz_tests();
+#endif
sshbuf_fixed();
}
diff --git a/regress/unittests/sshkey/common.c
b/regress/unittests/sshkey/common.c
index b598f05c..ba13edd7 100644
--- a/regress/unittests/sshkey/common.c
+++ b/regress/unittests/sshkey/common.c
@@ -19,6 +19,7 @@
#include <string.h>
#include <unistd.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
@@ -26,6 +27,7 @@
#ifdef OPENSSL_HAS_NISTP256
# include <openssl/ec.h>
#endif
+#endif /* WITH_OPENSSL */
#include "../test_helper/test_helper.h"
@@ -70,6 +72,7 @@ load_text_file(const char *name)
return ret;
}
+#ifdef WITH_OPENSSL
BIGNUM *
load_bignum(const char *name)
{
@@ -81,4 +84,5 @@ load_bignum(const char *name)
sshbuf_free(buf);
return ret;
}
+#endif /* WITH_OPENSSL */
diff --git a/regress/unittests/sshkey/common.h
b/regress/unittests/sshkey/common.h
index bf7d19dc..f5b6ffa9 100644
--- a/regress/unittests/sshkey/common.h
+++ b/regress/unittests/sshkey/common.h
@@ -11,6 +11,7 @@ struct sshbuf *load_file(const char *name);
/* Load a text file into a buffer */
struct sshbuf *load_text_file(const char *name);
+#ifdef WITH_OPENSSL
/* Load a bignum from a file */
BIGNUM *load_bignum(const char *name);
-
+#endif
diff --git a/regress/unittests/sshkey/test_file.c
b/regress/unittests/sshkey/test_file.c
index 99b7e21c..336cfbca 100644
--- a/regress/unittests/sshkey/test_file.c
+++ b/regress/unittests/sshkey/test_file.c
@@ -19,6 +19,7 @@
#include <string.h>
#include <unistd.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
@@ -26,6 +27,7 @@
#ifdef OPENSSL_HAS_NISTP256
# include <openssl/ec.h>
#endif
+#endif
#include "../test_helper/test_helper.h"
@@ -44,14 +46,16 @@ sshkey_file_tests(void)
{
struct sshkey *k1, *k2;
struct sshbuf *buf, *pw;
+#ifdef WITH_OPENSSL
BIGNUM *a, *b, *c;
+#endif
char *cp;
TEST_START("load passphrase");
pw = load_text_file("pw");
TEST_DONE();
-
+#ifdef WITH_OPENSSL
TEST_START("parse RSA from private");
buf = load_file("rsa_1");
ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL),
0);
@@ -332,6 +336,7 @@ sshkey_file_tests(void)
sshkey_free(k1);
#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
TEST_START("parse Ed25519 from private");
buf = load_file("ed25519_1");
diff --git a/regress/unittests/sshkey/test_fuzz.c
b/regress/unittests/sshkey/test_fuzz.c
index d3b0c92b..a714e72e 100644
--- a/regress/unittests/sshkey/test_fuzz.c
+++ b/regress/unittests/sshkey/test_fuzz.c
@@ -19,6 +19,7 @@
#include <string.h>
#include <unistd.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
@@ -26,6 +27,7 @@
#ifdef OPENSSL_HAS_NISTP256
# include <openssl/ec.h>
#endif
+#endif /* WITH_OPENSSL */
#include "../test_helper/test_helper.h"
@@ -104,7 +106,7 @@ sshkey_fuzz_tests(void)
struct fuzz *fuzz;
int r;
-
+#ifdef WITH_OPENSSL
TEST_START("fuzz RSA private");
buf = load_file("rsa_1");
fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
@@ -347,6 +349,8 @@ sshkey_fuzz_tests(void)
TEST_DONE();
#endif
+#endif /* WITH_OPENSSL */
+
TEST_START("fuzz Ed25519 sig");
buf = load_file("ed25519_1");
ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL),
0);
diff --git a/regress/unittests/sshkey/test_sshkey.c
b/regress/unittests/sshkey/test_sshkey.c
index 1aa608f9..19e20b06 100644
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -16,12 +16,14 @@
#include <stdlib.h>
#include <string.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256)
# include <openssl/ec.h>
#endif
+#endif
#include "../test_helper/test_helper.h"
@@ -193,6 +195,7 @@ sshkey_tests(void)
sshkey_free(k1);
TEST_DONE();
+#ifdef WITH_OPENSSL
TEST_START("new/free KEY_RSA");
k1 = sshkey_new(KEY_RSA);
ASSERT_PTR_NE(k1, NULL);
@@ -413,6 +416,7 @@ sshkey_tests(void)
sshkey_free(ke);
#endif
sshkey_free(kf);
+#endif /* WITH_OPENSSL */
TEST_START("certify key");
ASSERT_INT_EQ(sshkey_load_public(test_data_file("ed25519_1.pub"),
@@ -457,6 +461,7 @@ sshkey_tests(void)
sshbuf_reset(b);
TEST_DONE();
+#ifdef WITH_OPENSSL
TEST_START("sign and verify RSA");
k1 = get_private("rsa_1");
ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_2.pub"),
&k2,
@@ -503,6 +508,7 @@ sshkey_tests(void)
sshkey_free(k2);
TEST_DONE();
#endif
+#endif /* WITH_OPENSSL */
TEST_START("sign and verify ED25519");
k1 = get_private("ed25519_1");
@@ -513,6 +519,7 @@ sshkey_tests(void)
sshkey_free(k2);
TEST_DONE();
+#ifdef WITH_OPENSSL
TEST_START("nested certificate");
ASSERT_INT_EQ(sshkey_load_cert(test_data_file("rsa_1"), &k1),
0);
ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_1.pub"),
&k2,
@@ -527,5 +534,6 @@ sshkey_tests(void)
sshkey_free(k3);
sshbuf_free(b);
TEST_DONE();
+#endif /* WITH_OPENSSL */
}
diff --git a/regress/unittests/sshkey/tests.c b/regress/unittests/sshkey/tests.c
index 13f265cd..c3434566 100644
--- a/regress/unittests/sshkey/tests.c
+++ b/regress/unittests/sshkey/tests.c
@@ -7,7 +7,9 @@
#include "includes.h"
+#ifdef WITH_OPENSSL
#include <openssl/evp.h>
+#endif
#include "../test_helper/test_helper.h"
@@ -18,8 +20,10 @@ void sshkey_fuzz_tests(void);
void
tests(void)
{
+#ifdef WITH_OPENSSL
OpenSSL_add_all_algorithms();
ERR_load_CRYPTO_strings();
+#endif
sshkey_tests();
sshkey_file_tests();
diff --git a/regress/unittests/test_helper/test_helper.c
b/regress/unittests/test_helper/test_helper.c
index 866f3495..39d45a89 100644
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -34,7 +34,9 @@
#include <unistd.h>
#include <signal.h>
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
+#endif
#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) &&
!defined(BROKEN_STRNVIS)
# include <vis.h>
@@ -260,6 +262,7 @@ test_subtest_info(const char *fmt, ...)
va_end(ap);
}
+#ifdef WITH_OPENSSL
void
ssl_err_check(const char *file, int line)
{
@@ -272,6 +275,7 @@ ssl_err_check(const char *file, int line)
file, line, ERR_error_string(openssl_error, NULL));
abort();
}
+#endif
static const char *
pred_name(enum test_predicate p)
@@ -314,6 +318,7 @@ test_header(const char *file, int line, const char *a1,
const char *a2,
a2 != NULL ? ", " : "", a2 != NULL ? a2 :
"");
}
+#ifdef WITH_OPENSSL
void
assert_bignum(const char *file, int line, const char *a1, const char *a2,
const BIGNUM *aa1, const BIGNUM *aa2, enum test_predicate pred)
@@ -326,6 +331,7 @@ assert_bignum(const char *file, int line, const char *a1,
const char *a2,
fprintf(stderr, "%12s = 0x%s\n", a2, BN_bn2hex(aa2));
test_die();
}
+#endif
void
assert_string(const char *file, int line, const char *a1, const char *a2,
diff --git a/regress/unittests/test_helper/test_helper.h
b/regress/unittests/test_helper/test_helper.h
index 6da0066e..f0a1efb3 100644
--- a/regress/unittests/test_helper/test_helper.h
+++ b/regress/unittests/test_helper/test_helper.h
@@ -27,8 +27,10 @@
# include <stdint.h>
#endif
+#ifdef WITH_OPENSSL
#include <openssl/bn.h>
#include <openssl/err.h>
+#endif
enum test_predicate {
TEST_EQ, TEST_NE, TEST_LT, TEST_LE, TEST_GT, TEST_GE
@@ -48,9 +50,11 @@ int test_is_quiet(void);
void test_subtest_info(const char *fmt, ...)
__attribute__((format(printf, 1, 2)));
void ssl_err_check(const char *file, int line);
+#ifdef WITH_OPENSSL
void assert_bignum(const char *file, int line,
const char *a1, const char *a2,
const BIGNUM *aa1, const BIGNUM *aa2, enum test_predicate pred);
+#endif
void assert_string(const char *file, int line,
const char *a1, const char *a2,
const char *aa1, const char *aa2, enum test_predicate pred);
@@ -99,8 +103,10 @@ void assert_u64(const char *file, int line,
#define TEST_ONERROR(f, c) set_onerror_func(f, c)
#define SSL_ERR_CHECK() ssl_err_check(__FILE__, __LINE__)
+#ifdef WITH_OPENSSL
#define ASSERT_BIGNUM_EQ(a1, a2) \
assert_bignum(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_EQ)
+#endif
#define ASSERT_STRING_EQ(a1, a2) \
assert_string(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_EQ)
#define ASSERT_MEM_EQ(a1, a2, l) \
@@ -132,8 +138,10 @@ void assert_u64(const char *file, int line,
#define ASSERT_U64_EQ(a1, a2) \
assert_u64(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_EQ)
+#ifdef WITH_OPENSSL
#define ASSERT_BIGNUM_NE(a1, a2) \
assert_bignum(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_NE)
+#endif
#define ASSERT_STRING_NE(a1, a2) \
assert_string(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_NE)
#define ASSERT_MEM_NE(a1, a2, l) \
@@ -163,8 +171,10 @@ void assert_u64(const char *file, int line,
#define ASSERT_U64_NE(a1, a2) \
assert_u64(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_NE)
+#ifdef WITH_OPENSSL
#define ASSERT_BIGNUM_LT(a1, a2) \
assert_bignum(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LT)
+#endif
#define ASSERT_STRING_LT(a1, a2) \
assert_string(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LT)
#define ASSERT_MEM_LT(a1, a2, l) \
@@ -250,8 +260,10 @@ void assert_u64(const char *file, int line,
#define ASSERT_U64_GT(a1, a2) \
assert_u64(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GT)
+#ifdef WITH_OPENSSL
#define ASSERT_BIGNUM_GE(a1, a2) \
assert_bignum(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GE)
+#endif
#define ASSERT_STRING_GE(a1, a2) \
assert_string(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GE)
#define ASSERT_MEM_GE(a1, a2, l) \
--
2.17.1