From 4afc024f6a9366fc7fc34b026b8190eafaf65547 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Tue, 20 Jun 2017 12:52:31 +0200 Subject: [PATCH] also test binary import --- src/headers/tomcrypt_pk.h | 5 +++-- tests/rsa_test.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/headers/tomcrypt_pk.h b/src/headers/tomcrypt_pk.h index 9674ef08..58bbefdb 100644 --- a/src/headers/tomcrypt_pk.h +++ b/src/headers/tomcrypt_pk.h @@ -47,8 +47,9 @@ typedef struct { int radix; } ltc_pk_part; -#define PK_PART_HEX(s) &((ltc_pk_part){s, 0, 16}) -#define PK_PART_DEC(s) &((ltc_pk_part){s, 0, 10}) +#define PK_PART_HEX(s) &((ltc_pk_part){s, 0, 16}) +#define PK_PART_DEC(d) &((ltc_pk_part){d, 0, 10}) +#define PK_PART_BIN(b, l) &((ltc_pk_part){b, l, 256}) /* ---- RSA ---- */ #ifdef LTC_MRSA diff --git a/tests/rsa_test.c b/tests/rsa_test.c index 41a88df2..25828d48 100644 --- a/tests/rsa_test.c +++ b/tests/rsa_test.c @@ -181,6 +181,7 @@ static int rsa_compat_test(void) { rsa_key key, pubkey; int stat; + void* mpi; unsigned char buf[1024]; unsigned long len; @@ -280,6 +281,20 @@ static int rsa_compat_test(void) } rsa_free(&key); + /* try import public key from mixed numbers */ + DO(mp_init(&mpi)); + DO(mp_read_radix(mpi, dec_N, 10)); + DO(mp_to_unsigned_bin(mpi, buf)); + len = mp_unsigned_bin_size(mpi); + DO(rsa_import_radix(PK_PART_BIN(buf, len), PK_PART_DEC(dec_e), NULL, NULL, NULL, NULL, NULL, NULL, &key)); + mp_clear(mpi); + len = sizeof(buf); + DO(rsa_export(buf, &len, PK_PUBLIC, &key)); + if (compare_testvector(buf, len, openssl_public_rsa_stripped, sizeof(openssl_public_rsa_stripped), "RSA public export (from mixed)", 0)) { + return 1; + } + rsa_free(&key); + /* try export in SubjectPublicKeyInfo format of the public key */ DO(rsa_import(openssl_public_rsa, sizeof(openssl_public_rsa), &key)); len = sizeof(buf);