Skip to content

Commit

Permalink
[crypto] Fix RSA keygen tests.
Browse files Browse the repository at this point in the history 
A previous change to the hash function handling for RSA sign/verify
silently broke the keygen tests (which don't get tested in CI because
they're extremely slow). This fixes those tests.

Signed-off-by: Jade Philipoom <[email protected]>
  • Loading branch information
@jadephilipoom
jadephilipoom committed Nov 15, 2023
1 parent 3860cdd commit 5bf2604
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 12 deletions.
3 changes: 3 additions & 0 deletions sw/device/tests/crypto/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ opentitan_test(
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
},
deps = [
"//sw/device/lib/crypto/impl:hash",
"//sw/device/lib/crypto/impl:rsa",
"//sw/device/lib/runtime:log",
"//sw/device/lib/testing:entropy_testutils",
Expand Down Expand Up @@ -350,6 +351,7 @@ opentitan_test(
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
},
deps = [
"//sw/device/lib/crypto/impl:hash",
"//sw/device/lib/crypto/impl:rsa",
"//sw/device/lib/runtime:log",
"//sw/device/lib/testing:entropy_testutils",
Expand Down Expand Up @@ -387,6 +389,7 @@ opentitan_test(
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
},
deps = [
"//sw/device/lib/crypto/impl:hash",
"//sw/device/lib/crypto/impl:rsa",
"//sw/device/lib/runtime:log",
"//sw/device/lib/testing:entropy_testutils",
Expand Down
20 changes: 14 additions & 6 deletions sw/device/tests/crypto/rsa_2048_keygen_functest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "sw/device/lib/base/memory.h"
#include "sw/device/lib/crypto/drivers/otbn.h"
#include "sw/device/lib/crypto/include/datatypes.h"
#include "sw/device/lib/crypto/include/hash.h"
#include "sw/device/lib/crypto/include/rsa.h"
#include "sw/device/lib/runtime/log.h"
#include "sw/device/lib/testing/entropy_testutils.h"
Expand All @@ -15,6 +16,8 @@
#define MODULE_ID MAKE_MODULE_ID('t', 's', 't')

enum {
/* Number of words for a SHA-256 digest. */
kSha256DigestWords = 256 / 32,
/* Number of bytes for RSA-2048 modulus and private exponent. */
kRsa2048NumBytes = 2048 / 8,
/* Number of words for RSA-2048 modulus and private exponent. */
Expand Down Expand Up @@ -95,10 +98,16 @@ status_t keygen_then_sign_test(void) {
}
TRY_CHECK(d_large_enough);

crypto_const_byte_buf_t msg_buf = {
.len = kTestMessageLen,
.data = kTestMessage,
// Hash the message.
crypto_const_byte_buf_t msg_buf = {.data = kTestMessage,
.len = kTestMessageLen};
uint32_t msg_digest_data[kSha256DigestWords];
hash_digest_t msg_digest = {
.data = msg_digest_data,
.len = ARRAYSIZE(msg_digest_data),
.mode = kHashModeSha256,
};
TRY(otcrypto_hash(msg_buf, &msg_digest));

uint32_t sig[kRsa2048NumWords];
crypto_word32_buf_t sig_buf = {
Expand All @@ -112,16 +121,15 @@ status_t keygen_then_sign_test(void) {

// Generate a signature.
LOG_INFO("Starting signature generation...");
TRY(otcrypto_rsa_sign(&private_key, msg_buf, kRsaPaddingPkcs, kRsaHashSha256,
&sig_buf));
TRY(otcrypto_rsa_sign(&private_key, &msg_digest, kRsaPaddingPkcs, &sig_buf));
LOG_INFO("Signature generation complete.");
LOG_INFO("OTBN instruction count: %u", otbn_instruction_count_get());

// Try to verify the signature. If something is wrong with the key (nonprime
// p and q, incorrect d), then this is likely to fail.
LOG_INFO("Starting signature verification...");
hardened_bool_t verification_result;
TRY(otcrypto_rsa_verify(&public_key, msg_buf, kRsaPaddingPkcs, kRsaHashSha256,
TRY(otcrypto_rsa_verify(&public_key, &msg_digest, kRsaPaddingPkcs,
const_sig_buf, &verification_result));
LOG_INFO("Signature verification complete.");
LOG_INFO("OTBN instruction count: %u", otbn_instruction_count_get());
Expand Down
16 changes: 13 additions & 3 deletions sw/device/tests/crypto/rsa_3072_keygen_functest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "sw/device/lib/base/memory.h"
#include "sw/device/lib/crypto/drivers/otbn.h"
#include "sw/device/lib/crypto/include/datatypes.h"
#include "sw/device/lib/crypto/include/hash.h"
#include "sw/device/lib/crypto/include/rsa.h"
#include "sw/device/lib/runtime/log.h"
#include "sw/device/lib/testing/entropy_testutils.h"
Expand All @@ -15,6 +16,8 @@
#define MODULE_ID MAKE_MODULE_ID('t', 's', 't')

enum {
/* Number of words for a SHA-512 digest. */
kSha512DigestWords = 512 / 32,
/* Number of bytes for RSA-3072 modulus and private exponent. */
kRsa3072NumBytes = 3072 / 8,
/* Number of words for RSA-3072 modulus and private exponent. */
Expand Down Expand Up @@ -95,10 +98,18 @@ status_t keygen_then_sign_test(void) {
}
TRY_CHECK(d_large_enough);

// Hash the message.
crypto_const_byte_buf_t msg_buf = {
.len = kTestMessageLen,
.data = kTestMessage,
};
uint32_t msg_digest_data[kSha512DigestWords];
hash_digest_t msg_digest = {
.data = msg_digest_data,
.len = ARRAYSIZE(msg_digest_data),
.mode = kHashModeSha512,
};
TRY(otcrypto_hash(msg_buf, &msg_digest));

uint32_t sig[kRsa3072NumWords];
crypto_word32_buf_t sig_buf = {
Expand All @@ -112,16 +123,15 @@ status_t keygen_then_sign_test(void) {

// Generate a signature.
LOG_INFO("Starting signature generation...");
TRY(otcrypto_rsa_sign(&private_key, msg_buf, kRsaPaddingPkcs, kRsaHashSha512,
&sig_buf));
TRY(otcrypto_rsa_sign(&private_key, &msg_digest, kRsaPaddingPkcs, &sig_buf));
LOG_INFO("Signature generation complete.");
LOG_INFO("OTBN instruction count: %u", otbn_instruction_count_get());

// Try to verify the signature. If something is wrong with the key (nonprime
// p and q, incorrect d), then this is likely to fail.
LOG_INFO("Starting signature verification...");
hardened_bool_t verification_result;
TRY(otcrypto_rsa_verify(&public_key, msg_buf, kRsaPaddingPkcs, kRsaHashSha512,
TRY(otcrypto_rsa_verify(&public_key, &msg_digest, kRsaPaddingPkcs,
const_sig_buf, &verification_result));
LOG_INFO("Signature verification complete.");
LOG_INFO("OTBN instruction count: %u", otbn_instruction_count_get());
Expand Down
16 changes: 13 additions & 3 deletions sw/device/tests/crypto/rsa_4096_keygen_functest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "sw/device/lib/base/memory.h"
#include "sw/device/lib/crypto/drivers/otbn.h"
#include "sw/device/lib/crypto/include/datatypes.h"
#include "sw/device/lib/crypto/include/hash.h"
#include "sw/device/lib/crypto/include/rsa.h"
#include "sw/device/lib/runtime/log.h"
#include "sw/device/lib/testing/entropy_testutils.h"
Expand All @@ -15,6 +16,8 @@
#define MODULE_ID MAKE_MODULE_ID('t', 's', 't')

enum {
/* Number of words for a SHA-512 digest. */
kSha512DigestWords = 512 / 32,
/* Number of bytes for RSA-4096 modulus and private exponent. */
kRsa4096NumBytes = 4096 / 8,
/* Number of words for RSA-4096 modulus and private exponent. */
Expand Down Expand Up @@ -95,10 +98,18 @@ status_t keygen_then_sign_test(void) {
}
TRY_CHECK(d_large_enough);

// Hash the message.
crypto_const_byte_buf_t msg_buf = {
.len = kTestMessageLen,
.data = kTestMessage,
};
uint32_t msg_digest_data[kSha512DigestWords];
hash_digest_t msg_digest = {
.data = msg_digest_data,
.len = ARRAYSIZE(msg_digest_data),
.mode = kHashModeSha512,
};
TRY(otcrypto_hash(msg_buf, &msg_digest));

uint32_t sig[kRsa4096NumWords];
crypto_word32_buf_t sig_buf = {
Expand All @@ -112,16 +123,15 @@ status_t keygen_then_sign_test(void) {

// Generate a signature.
LOG_INFO("Starting signature generation...");
TRY(otcrypto_rsa_sign(&private_key, msg_buf, kRsaPaddingPkcs, kRsaHashSha512,
&sig_buf));
TRY(otcrypto_rsa_sign(&private_key, &msg_digest, kRsaPaddingPkcs, &sig_buf));
LOG_INFO("Signature generation complete.");
LOG_INFO("OTBN instruction count: %u", otbn_instruction_count_get());

// Try to verify the signature. If something is wrong with the key (nonprime
// p and q, incorrect d), then this is likely to fail.
LOG_INFO("Starting signature verification...");
hardened_bool_t verification_result;
TRY(otcrypto_rsa_verify(&public_key, msg_buf, kRsaPaddingPkcs, kRsaHashSha512,
TRY(otcrypto_rsa_verify(&public_key, &msg_digest, kRsaPaddingPkcs,
const_sig_buf, &verification_result));
LOG_INFO("Signature verification complete.");
LOG_INFO("OTBN instruction count: %u", otbn_instruction_count_get());
Expand Down

0 comments on commit 5bf2604

Please sign in to comment.