Skip to content

Commit 3475ebd

Browse files
ejohnstownejohnstown
committed
Add DoUserAuthRequestRsaCert sig-parse test
Run the DoUserAuthRequestRsa vectors through the X.509 path to pin that a raw signature with a high leading bit is accepted via the RFC 6187 branch. keys/ has no RSA certificate, so the test embeds a self-signed cert made from keys/hansel-key-rsa.pem (valid until May 2048).
1 parent 1888440 commit 3475ebd

3 files changed

Lines changed: 182 additions & 0 deletions

File tree

‎src/internal.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18345,6 +18345,18 @@ int wolfSSH_TestDoUserAuthRequestRsa(WOLFSSH* ssh,
1834518345
digest, digestSz);
1834618346
}
1834718347

18348+
#ifdef WOLFSSH_CERTS
18349+
18350+
int wolfSSH_TestDoUserAuthRequestRsaCert(WOLFSSH* ssh,
18351+
WS_UserAuthData_PublicKey* pk, int hashId, byte* digest,
18352+
word32 digestSz)
18353+
{
18354+
return DoUserAuthRequestRsaCert(ssh, pk, (enum wc_HashType)hashId,
18355+
digest, digestSz);
18356+
}
18357+
18358+
#endif /* WOLFSSH_CERTS */
18359+
1834818360
#endif /* !WOLFSSH_NO_RSA */
1834918361

1835018362
#ifndef WOLFSSH_NO_ECDSA

‎tests/unit.c‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3727,6 +3727,165 @@ static int test_DoUserAuthRequestRsa(void)
37273727
return failures;
37283728
}
37293729

3730+
#ifdef WOLFSSH_CERTS
3731+
3732+
/* DoUserAuthRequestRsaCert() parses the signature blob the same way as
3733+
* DoUserAuthRequestRsa(), but takes the public key from an X.509
3734+
* certificate. This is a self-signed certificate made from
3735+
* keys/hansel-key-rsa.pem, the same key as the vectors above, so the
3736+
* digest and signature blob are reused. */
3737+
static const byte userAuthRsaCertDer[] = {
3738+
0x30, 0x82, 0x03, 0xFB, 0x30, 0x82, 0x02, 0xE3, 0xA0, 0x03, 0x02, 0x01,
3739+
0x02, 0x02, 0x14, 0x1C, 0x71, 0x06, 0xEC, 0x89, 0xF3, 0x37, 0x6F, 0xE7,
3740+
0xBB, 0x3C, 0xE2, 0x74, 0x54, 0x43, 0x1F, 0x75, 0x0A, 0xED, 0xD5, 0x30,
3741+
0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x0B,
3742+
0x05, 0x00, 0x30, 0x81, 0x8C, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55,
3743+
0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03,
3744+
0x55, 0x04, 0x08, 0x0C, 0x02, 0x57, 0x41, 0x31, 0x10, 0x30, 0x0E, 0x06,
3745+
0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65, 0x61, 0x74, 0x74, 0x6C,
3746+
0x65, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x0B,
3747+
0x77, 0x6F, 0x6C, 0x66, 0x53, 0x53, 0x4C, 0x20, 0x49, 0x6E, 0x63, 0x31,
3748+
0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x0B, 0x44, 0x65,
3749+
0x76, 0x65, 0x6C, 0x6F, 0x70, 0x6D, 0x65, 0x6E, 0x74, 0x31, 0x0F, 0x30,
3750+
0x0D, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x06, 0x48, 0x61, 0x6E, 0x73,
3751+
0x65, 0x6C, 0x31, 0x21, 0x30, 0x1F, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,
3752+
0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x12, 0x68, 0x61, 0x6E, 0x73, 0x65,
3753+
0x6C, 0x40, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2E, 0x63, 0x6F,
3754+
0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x32, 0x36, 0x30, 0x36, 0x31, 0x32, 0x31,
3755+
0x37, 0x34, 0x35, 0x30, 0x39, 0x5A, 0x17, 0x0D, 0x34, 0x38, 0x30, 0x35,
3756+
0x30, 0x37, 0x31, 0x37, 0x34, 0x35, 0x30, 0x39, 0x5A, 0x30, 0x81, 0x8C,
3757+
0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55,
3758+
0x53, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x02,
3759+
0x57, 0x41, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C,
3760+
0x07, 0x53, 0x65, 0x61, 0x74, 0x74, 0x6C, 0x65, 0x31, 0x14, 0x30, 0x12,
3761+
0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x0B, 0x77, 0x6F, 0x6C, 0x66, 0x53,
3762+
0x53, 0x4C, 0x20, 0x49, 0x6E, 0x63, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03,
3763+
0x55, 0x04, 0x0B, 0x0C, 0x0B, 0x44, 0x65, 0x76, 0x65, 0x6C, 0x6F, 0x70,
3764+
0x6D, 0x65, 0x6E, 0x74, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04,
3765+
0x03, 0x0C, 0x06, 0x48, 0x61, 0x6E, 0x73, 0x65, 0x6C, 0x31, 0x21, 0x30,
3766+
0x1F, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01,
3767+
0x16, 0x12, 0x68, 0x61, 0x6E, 0x73, 0x65, 0x6C, 0x40, 0x65, 0x78, 0x61,
3768+
0x6D, 0x70, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x82, 0x01, 0x22,
3769+
0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01,
3770+
0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0F, 0x00, 0x30, 0x82, 0x01, 0x0A,
3771+
0x02, 0x82, 0x01, 0x01, 0x00, 0xBD, 0x3F, 0x76, 0x45, 0xA3, 0x03, 0xAC,
3772+
0x38, 0xD5, 0xC7, 0x0F, 0x93, 0x30, 0x5A, 0x20, 0x9C, 0x89, 0x7C, 0xAD,
3773+
0x05, 0x16, 0x46, 0x86, 0x83, 0x0D, 0x8A, 0x2B, 0x16, 0x4A, 0x05, 0x2C,
3774+
0xE4, 0x77, 0x47, 0x70, 0x00, 0xAE, 0x1D, 0x83, 0xE2, 0xD9, 0x6E, 0x99,
3775+
0xD4, 0xF0, 0x45, 0x98, 0x15, 0x93, 0xF6, 0x87, 0x4E, 0xAC, 0x64, 0x63,
3776+
0xA1, 0x95, 0xC9, 0x7C, 0x30, 0xE8, 0x3E, 0x2F, 0xA3, 0xF1, 0x24, 0x9F,
3777+
0x0C, 0x6B, 0x1C, 0xFE, 0x1B, 0x02, 0x99, 0xCD, 0xC6, 0xA7, 0x6C, 0x84,
3778+
0x85, 0x46, 0x54, 0x12, 0x40, 0xE1, 0xB4, 0xE5, 0xF2, 0xAA, 0x39, 0xEC,
3779+
0xD6, 0x27, 0x24, 0x0B, 0xD1, 0xA1, 0xE2, 0xEF, 0x34, 0x69, 0x25, 0x6D,
3780+
0xC0, 0x74, 0x67, 0x25, 0x98, 0x7D, 0xC4, 0xF8, 0x52, 0xAB, 0x9B, 0x4B,
3781+
0x3A, 0x12, 0x1D, 0xE1, 0xE3, 0xFA, 0xD6, 0xCF, 0x9A, 0xE6, 0x9C, 0x23,
3782+
0x4E, 0x39, 0xC4, 0x84, 0x16, 0x88, 0x3D, 0x42, 0x4E, 0xD8, 0x2F, 0xCC,
3783+
0xD2, 0x91, 0x67, 0x9D, 0xB6, 0x71, 0x2A, 0x02, 0x65, 0x5F, 0xBB, 0x75,
3784+
0x0E, 0x8C, 0xBB, 0x87, 0x97, 0x97, 0xC6, 0xF8, 0xB2, 0x98, 0xE2, 0x2F,
3785+
0x68, 0x26, 0x4A, 0x53, 0xEC, 0x79, 0x3A, 0x8A, 0x5F, 0xCC, 0xCF, 0xF0,
3786+
0x16, 0x47, 0xB2, 0xD0, 0x43, 0xD6, 0x36, 0x6C, 0xC8, 0xE7, 0x2F, 0xFE,
3787+
0xA7, 0x35, 0x39, 0x69, 0xFB, 0x1D, 0x78, 0x45, 0x9D, 0x89, 0x00, 0xC8,
3788+
0x41, 0xCF, 0x34, 0x1F, 0xA3, 0xF3, 0xF1, 0xFB, 0x28, 0x14, 0xFB, 0xD8,
3789+
0x48, 0x6F, 0xAC, 0xE3, 0xFC, 0x33, 0xD1, 0xDB, 0xAE, 0xEF, 0x27, 0x9E,
3790+
0x57, 0x56, 0x29, 0xA2, 0x1A, 0x3A, 0xE5, 0x9A, 0xFE, 0xA4, 0x49, 0xC8,
3791+
0x7F, 0xB7, 0x4E, 0xD0, 0x1F, 0x04, 0x6E, 0x58, 0x16, 0xB7, 0xEB, 0x9D,
3792+
0xF8, 0x92, 0x3C, 0xC2, 0xB0, 0x21, 0x7C, 0x4E, 0x31, 0x02, 0x03, 0x01,
3793+
0x00, 0x01, 0xA3, 0x53, 0x30, 0x51, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D,
3794+
0x0E, 0x04, 0x16, 0x04, 0x14, 0x67, 0x59, 0x9C, 0xD7, 0x16, 0x3F, 0xE6,
3795+
0x98, 0x47, 0x4F, 0xAE, 0x62, 0x4F, 0xAE, 0x27, 0x3A, 0xE8, 0xF6, 0x40,
3796+
0xAE, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D, 0x23, 0x04, 0x18, 0x30, 0x16,
3797+
0x80, 0x14, 0x67, 0x59, 0x9C, 0xD7, 0x16, 0x3F, 0xE6, 0x98, 0x47, 0x4F,
3798+
0xAE, 0x62, 0x4F, 0xAE, 0x27, 0x3A, 0xE8, 0xF6, 0x40, 0xAE, 0x30, 0x0F,
3799+
0x06, 0x03, 0x55, 0x1D, 0x13, 0x01, 0x01, 0xFF, 0x04, 0x05, 0x30, 0x03,
3800+
0x01, 0x01, 0xFF, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
3801+
0x0D, 0x01, 0x01, 0x0B, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x77,
3802+
0x70, 0xC5, 0x15, 0xFE, 0xF8, 0x2D, 0xCB, 0x5C, 0x18, 0x36, 0x87, 0xC9,
3803+
0x82, 0xFD, 0x6D, 0x3C, 0x78, 0xD8, 0xCF, 0xEB, 0x71, 0xFD, 0xEB, 0xD7,
3804+
0x05, 0x9A, 0xAE, 0xBE, 0xE1, 0x55, 0xCF, 0xE9, 0x04, 0xE3, 0xF1, 0xAE,
3805+
0x30, 0xDE, 0x19, 0xC3, 0x5E, 0x25, 0xDE, 0xB7, 0x39, 0x21, 0x57, 0x82,
3806+
0xD5, 0x98, 0xD6, 0x19, 0x49, 0x9D, 0x9F, 0xDE, 0x07, 0x9D, 0xEE, 0xB1,
3807+
0x24, 0xBD, 0x3E, 0xFD, 0xBA, 0x27, 0xA2, 0x9D, 0x0C, 0x08, 0x77, 0xA7,
3808+
0xB1, 0xFA, 0x6E, 0x36, 0xAA, 0xAE, 0x1F, 0xFA, 0xF6, 0xAE, 0x0A, 0x72,
3809+
0x48, 0x5C, 0x89, 0xD6, 0x4F, 0x10, 0x80, 0x3A, 0x2A, 0xA8, 0x6C, 0x00,
3810+
0x06, 0x41, 0x0B, 0xA6, 0xAA, 0x20, 0xE5, 0xEB, 0x38, 0xD4, 0xF7, 0x67,
3811+
0xCC, 0x40, 0x05, 0x61, 0xF9, 0x89, 0x8A, 0xF0, 0xCB, 0x03, 0xD9, 0x19,
3812+
0x8D, 0x63, 0x53, 0xB7, 0x2C, 0x53, 0x13, 0xA5, 0x3C, 0x5B, 0x5D, 0xDA,
3813+
0x20, 0x96, 0xDD, 0x7F, 0xF8, 0x63, 0x5A, 0x47, 0x59, 0x10, 0x48, 0xA7,
3814+
0x35, 0x84, 0xF2, 0x61, 0x4C, 0x3E, 0xAC, 0xE6, 0x06, 0x90, 0x96, 0x07,
3815+
0xA3, 0x7B, 0x2D, 0x36, 0xEF, 0x5D, 0xD0, 0x5C, 0x0A, 0x1C, 0x4D, 0xA2,
3816+
0x81, 0x18, 0xE3, 0x22, 0xFB, 0xBF, 0x9B, 0x12, 0x68, 0xAD, 0x6A, 0xCD,
3817+
0xF2, 0x72, 0xD3, 0xBA, 0x24, 0x63, 0xCC, 0x45, 0x47, 0xDE, 0x83, 0xD6,
3818+
0x8A, 0x94, 0xD2, 0xC1, 0xDC, 0xAB, 0xFD, 0x4E, 0xF0, 0x11, 0x21, 0xB9,
3819+
0x0F, 0xF3, 0xEE, 0x87, 0xF9, 0x03, 0x1A, 0xB4, 0x75, 0x21, 0x81, 0xDA,
3820+
0x2E, 0x1D, 0x82, 0x63, 0x26, 0x34, 0x56, 0x91, 0x2D, 0xDC, 0xFD, 0x0A,
3821+
0xF2, 0x3F, 0xBA, 0x44, 0xCD, 0x81, 0x53, 0x1F, 0x8B, 0xD3, 0x38, 0x22,
3822+
0x02, 0x05, 0x85, 0x35, 0x41, 0x50, 0xE8, 0x48, 0x6E, 0xE3, 0x7D, 0xA9,
3823+
0xFE, 0x5C, 0x39,
3824+
};
3825+
3826+
static int test_DoUserAuthRequestRsaCert(void)
3827+
{
3828+
WOLFSSH_CTX* ctx = NULL;
3829+
WOLFSSH* ssh = NULL;
3830+
const UserAuthRsaTestVector* tv;
3831+
int tc = (int)(sizeof(userAuthRsaTestVectors)
3832+
/ sizeof(userAuthRsaTestVectors[0]));
3833+
int i;
3834+
int ret;
3835+
int failures = 0;
3836+
3837+
if ((userAuthRsaSigBlob[RSA_SIG_BLOB_SIG] & 0x80) == 0) {
3838+
fprintf(stderr, "\tuserAuthRsaSigBlob needs its high bit set\n");
3839+
return 1;
3840+
}
3841+
3842+
ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_SERVER, NULL);
3843+
if (ctx == NULL)
3844+
return 1;
3845+
ssh = wolfSSH_new(ctx);
3846+
if (ssh == NULL) {
3847+
wolfSSH_CTX_free(ctx);
3848+
return 1;
3849+
}
3850+
3851+
for (i = 0, tv = userAuthRsaTestVectors; i < tc; i++, tv++) {
3852+
byte sigBlob[sizeof(userAuthRsaSigBlob)];
3853+
byte digest[sizeof(userAuthRsaDigest)];
3854+
WS_UserAuthData_PublicKey pk;
3855+
3856+
WMEMCPY(sigBlob, userAuthRsaSigBlob, sizeof(sigBlob));
3857+
WMEMCPY(digest, userAuthRsaDigest, sizeof(digest));
3858+
if (tv->patchSz > 0)
3859+
WMEMCPY(sigBlob + tv->patchIdx, tv->patch, tv->patchSz);
3860+
if (tv->flipIdx > 0)
3861+
sigBlob[tv->flipIdx] ^= 0x01;
3862+
3863+
WMEMSET(&pk, 0, sizeof(pk));
3864+
pk.publicKeyType = (const byte*)"x509v3-ssh-rsa";
3865+
pk.publicKeyTypeSz = 14;
3866+
pk.publicKey = userAuthRsaCertDer;
3867+
pk.publicKeySz = (word32)sizeof(userAuthRsaCertDer);
3868+
pk.hasSignature = 1;
3869+
pk.signature = sigBlob;
3870+
pk.signatureSz = (word32)sizeof(sigBlob);
3871+
3872+
ret = wolfSSH_TestDoUserAuthRequestRsaCert(ssh, &pk, WC_HASH_TYPE_SHA,
3873+
digest, (word32)sizeof(digest));
3874+
if (ret != tv->expected) {
3875+
fprintf(stderr, "\t[%d] \"%s\" FAIL: got %d, expected %d\n",
3876+
i, tv->name, ret, tv->expected);
3877+
failures++;
3878+
}
3879+
}
3880+
3881+
wolfSSH_free(ssh);
3882+
wolfSSH_CTX_free(ctx);
3883+
3884+
return failures;
3885+
}
3886+
3887+
#endif /* WOLFSSH_CERTS */
3888+
37303889
#endif /* !WOLFSSH_NO_RSA && !WOLFSSH_NO_SSH_RSA_SHA1 */
37313890

37323891
#endif /* WOLFSSH_TEST_INTERNAL */
@@ -3869,6 +4028,12 @@ int wolfSSH_UnitTest(int argc, char** argv)
38694028
printf("DoUserAuthRequestRsa: %s\n",
38704029
(unitResult == 0 ? "SUCCESS" : "FAILED"));
38714030
testResult = testResult || unitResult;
4031+
#ifdef WOLFSSH_CERTS
4032+
unitResult = test_DoUserAuthRequestRsaCert();
4033+
printf("DoUserAuthRequestRsaCert: %s\n",
4034+
(unitResult == 0 ? "SUCCESS" : "FAILED"));
4035+
testResult = testResult || unitResult;
4036+
#endif
38724037
#endif
38734038
#if !defined(WOLFSSH_NO_ECDSA_SHA2_NISTP256)
38744039
unitResult = test_ParseECCPubKey();

‎wolfssh/internal.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,6 +1427,11 @@ enum WS_MessageIdLimits {
14271427
WOLFSSH_API int wolfSSH_TestDoUserAuthRequestRsa(WOLFSSH* ssh,
14281428
WS_UserAuthData_PublicKey* pk, int hashId, byte* digest,
14291429
word32 digestSz);
1430+
#ifdef WOLFSSH_CERTS
1431+
WOLFSSH_API int wolfSSH_TestDoUserAuthRequestRsaCert(WOLFSSH* ssh,
1432+
WS_UserAuthData_PublicKey* pk, int hashId, byte* digest,
1433+
word32 digestSz);
1434+
#endif /* WOLFSSH_CERTS */
14301435
#endif /* !WOLFSSH_NO_RSA */
14311436
#ifndef WOLFSSH_NO_ECDSA
14321437
WOLFSSH_API int wolfSSH_TestParseECCPubKey(WOLFSSH* ssh, byte* pubKey,

0 commit comments

Comments
 (0)