Skip to content

Commit 92e1bdc

Browse files
ejohnstownpadelsbach
ejohnstown
authored and
padelsbach
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 db62bed commit 92e1bdc

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
@@ -4201,6 +4201,165 @@ static int test_DoUserAuthRequestRsa(void)
42014201
return failures;
42024202
}
42034203

4204+
#ifdef WOLFSSH_CERTS
4205+
4206+
/* DoUserAuthRequestRsaCert() parses the signature blob the same way as
4207+
* DoUserAuthRequestRsa(), but takes the public key from an X.509
4208+
* certificate. This is a self-signed certificate made from
4209+
* keys/hansel-key-rsa.pem, the same key as the vectors above, so the
4210+
* digest and signature blob are reused. */
4211+
static const byte userAuthRsaCertDer[] = {
4212+
0x30, 0x82, 0x03, 0xFB, 0x30, 0x82, 0x02, 0xE3, 0xA0, 0x03, 0x02, 0x01,
4213+
0x02, 0x02, 0x14, 0x1C, 0x71, 0x06, 0xEC, 0x89, 0xF3, 0x37, 0x6F, 0xE7,
4214+
0xBB, 0x3C, 0xE2, 0x74, 0x54, 0x43, 0x1F, 0x75, 0x0A, 0xED, 0xD5, 0x30,
4215+
0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x0B,
4216+
0x05, 0x00, 0x30, 0x81, 0x8C, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55,
4217+
0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03,
4218+
0x55, 0x04, 0x08, 0x0C, 0x02, 0x57, 0x41, 0x31, 0x10, 0x30, 0x0E, 0x06,
4219+
0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65, 0x61, 0x74, 0x74, 0x6C,
4220+
0x65, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x0B,
4221+
0x77, 0x6F, 0x6C, 0x66, 0x53, 0x53, 0x4C, 0x20, 0x49, 0x6E, 0x63, 0x31,
4222+
0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x0B, 0x44, 0x65,
4223+
0x76, 0x65, 0x6C, 0x6F, 0x70, 0x6D, 0x65, 0x6E, 0x74, 0x31, 0x0F, 0x30,
4224+
0x0D, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x06, 0x48, 0x61, 0x6E, 0x73,
4225+
0x65, 0x6C, 0x31, 0x21, 0x30, 0x1F, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,
4226+
0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x12, 0x68, 0x61, 0x6E, 0x73, 0x65,
4227+
0x6C, 0x40, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2E, 0x63, 0x6F,
4228+
0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x32, 0x36, 0x30, 0x36, 0x31, 0x32, 0x31,
4229+
0x37, 0x34, 0x35, 0x30, 0x39, 0x5A, 0x17, 0x0D, 0x34, 0x38, 0x30, 0x35,
4230+
0x30, 0x37, 0x31, 0x37, 0x34, 0x35, 0x30, 0x39, 0x5A, 0x30, 0x81, 0x8C,
4231+
0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55,
4232+
0x53, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x02,
4233+
0x57, 0x41, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C,
4234+
0x07, 0x53, 0x65, 0x61, 0x74, 0x74, 0x6C, 0x65, 0x31, 0x14, 0x30, 0x12,
4235+
0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x0B, 0x77, 0x6F, 0x6C, 0x66, 0x53,
4236+
0x53, 0x4C, 0x20, 0x49, 0x6E, 0x63, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03,
4237+
0x55, 0x04, 0x0B, 0x0C, 0x0B, 0x44, 0x65, 0x76, 0x65, 0x6C, 0x6F, 0x70,
4238+
0x6D, 0x65, 0x6E, 0x74, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04,
4239+
0x03, 0x0C, 0x06, 0x48, 0x61, 0x6E, 0x73, 0x65, 0x6C, 0x31, 0x21, 0x30,
4240+
0x1F, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01,
4241+
0x16, 0x12, 0x68, 0x61, 0x6E, 0x73, 0x65, 0x6C, 0x40, 0x65, 0x78, 0x61,
4242+
0x6D, 0x70, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x82, 0x01, 0x22,
4243+
0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01,
4244+
0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0F, 0x00, 0x30, 0x82, 0x01, 0x0A,
4245+
0x02, 0x82, 0x01, 0x01, 0x00, 0xBD, 0x3F, 0x76, 0x45, 0xA3, 0x03, 0xAC,
4246+
0x38, 0xD5, 0xC7, 0x0F, 0x93, 0x30, 0x5A, 0x20, 0x9C, 0x89, 0x7C, 0xAD,
4247+
0x05, 0x16, 0x46, 0x86, 0x83, 0x0D, 0x8A, 0x2B, 0x16, 0x4A, 0x05, 0x2C,
4248+
0xE4, 0x77, 0x47, 0x70, 0x00, 0xAE, 0x1D, 0x83, 0xE2, 0xD9, 0x6E, 0x99,
4249+
0xD4, 0xF0, 0x45, 0x98, 0x15, 0x93, 0xF6, 0x87, 0x4E, 0xAC, 0x64, 0x63,
4250+
0xA1, 0x95, 0xC9, 0x7C, 0x30, 0xE8, 0x3E, 0x2F, 0xA3, 0xF1, 0x24, 0x9F,
4251+
0x0C, 0x6B, 0x1C, 0xFE, 0x1B, 0x02, 0x99, 0xCD, 0xC6, 0xA7, 0x6C, 0x84,
4252+
0x85, 0x46, 0x54, 0x12, 0x40, 0xE1, 0xB4, 0xE5, 0xF2, 0xAA, 0x39, 0xEC,
4253+
0xD6, 0x27, 0x24, 0x0B, 0xD1, 0xA1, 0xE2, 0xEF, 0x34, 0x69, 0x25, 0x6D,
4254+
0xC0, 0x74, 0x67, 0x25, 0x98, 0x7D, 0xC4, 0xF8, 0x52, 0xAB, 0x9B, 0x4B,
4255+
0x3A, 0x12, 0x1D, 0xE1, 0xE3, 0xFA, 0xD6, 0xCF, 0x9A, 0xE6, 0x9C, 0x23,
4256+
0x4E, 0x39, 0xC4, 0x84, 0x16, 0x88, 0x3D, 0x42, 0x4E, 0xD8, 0x2F, 0xCC,
4257+
0xD2, 0x91, 0x67, 0x9D, 0xB6, 0x71, 0x2A, 0x02, 0x65, 0x5F, 0xBB, 0x75,
4258+
0x0E, 0x8C, 0xBB, 0x87, 0x97, 0x97, 0xC6, 0xF8, 0xB2, 0x98, 0xE2, 0x2F,
4259+
0x68, 0x26, 0x4A, 0x53, 0xEC, 0x79, 0x3A, 0x8A, 0x5F, 0xCC, 0xCF, 0xF0,
4260+
0x16, 0x47, 0xB2, 0xD0, 0x43, 0xD6, 0x36, 0x6C, 0xC8, 0xE7, 0x2F, 0xFE,
4261+
0xA7, 0x35, 0x39, 0x69, 0xFB, 0x1D, 0x78, 0x45, 0x9D, 0x89, 0x00, 0xC8,
4262+
0x41, 0xCF, 0x34, 0x1F, 0xA3, 0xF3, 0xF1, 0xFB, 0x28, 0x14, 0xFB, 0xD8,
4263+
0x48, 0x6F, 0xAC, 0xE3, 0xFC, 0x33, 0xD1, 0xDB, 0xAE, 0xEF, 0x27, 0x9E,
4264+
0x57, 0x56, 0x29, 0xA2, 0x1A, 0x3A, 0xE5, 0x9A, 0xFE, 0xA4, 0x49, 0xC8,
4265+
0x7F, 0xB7, 0x4E, 0xD0, 0x1F, 0x04, 0x6E, 0x58, 0x16, 0xB7, 0xEB, 0x9D,
4266+
0xF8, 0x92, 0x3C, 0xC2, 0xB0, 0x21, 0x7C, 0x4E, 0x31, 0x02, 0x03, 0x01,
4267+
0x00, 0x01, 0xA3, 0x53, 0x30, 0x51, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D,
4268+
0x0E, 0x04, 0x16, 0x04, 0x14, 0x67, 0x59, 0x9C, 0xD7, 0x16, 0x3F, 0xE6,
4269+
0x98, 0x47, 0x4F, 0xAE, 0x62, 0x4F, 0xAE, 0x27, 0x3A, 0xE8, 0xF6, 0x40,
4270+
0xAE, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D, 0x23, 0x04, 0x18, 0x30, 0x16,
4271+
0x80, 0x14, 0x67, 0x59, 0x9C, 0xD7, 0x16, 0x3F, 0xE6, 0x98, 0x47, 0x4F,
4272+
0xAE, 0x62, 0x4F, 0xAE, 0x27, 0x3A, 0xE8, 0xF6, 0x40, 0xAE, 0x30, 0x0F,
4273+
0x06, 0x03, 0x55, 0x1D, 0x13, 0x01, 0x01, 0xFF, 0x04, 0x05, 0x30, 0x03,
4274+
0x01, 0x01, 0xFF, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
4275+
0x0D, 0x01, 0x01, 0x0B, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x77,
4276+
0x70, 0xC5, 0x15, 0xFE, 0xF8, 0x2D, 0xCB, 0x5C, 0x18, 0x36, 0x87, 0xC9,
4277+
0x82, 0xFD, 0x6D, 0x3C, 0x78, 0xD8, 0xCF, 0xEB, 0x71, 0xFD, 0xEB, 0xD7,
4278+
0x05, 0x9A, 0xAE, 0xBE, 0xE1, 0x55, 0xCF, 0xE9, 0x04, 0xE3, 0xF1, 0xAE,
4279+
0x30, 0xDE, 0x19, 0xC3, 0x5E, 0x25, 0xDE, 0xB7, 0x39, 0x21, 0x57, 0x82,
4280+
0xD5, 0x98, 0xD6, 0x19, 0x49, 0x9D, 0x9F, 0xDE, 0x07, 0x9D, 0xEE, 0xB1,
4281+
0x24, 0xBD, 0x3E, 0xFD, 0xBA, 0x27, 0xA2, 0x9D, 0x0C, 0x08, 0x77, 0xA7,
4282+
0xB1, 0xFA, 0x6E, 0x36, 0xAA, 0xAE, 0x1F, 0xFA, 0xF6, 0xAE, 0x0A, 0x72,
4283+
0x48, 0x5C, 0x89, 0xD6, 0x4F, 0x10, 0x80, 0x3A, 0x2A, 0xA8, 0x6C, 0x00,
4284+
0x06, 0x41, 0x0B, 0xA6, 0xAA, 0x20, 0xE5, 0xEB, 0x38, 0xD4, 0xF7, 0x67,
4285+
0xCC, 0x40, 0x05, 0x61, 0xF9, 0x89, 0x8A, 0xF0, 0xCB, 0x03, 0xD9, 0x19,
4286+
0x8D, 0x63, 0x53, 0xB7, 0x2C, 0x53, 0x13, 0xA5, 0x3C, 0x5B, 0x5D, 0xDA,
4287+
0x20, 0x96, 0xDD, 0x7F, 0xF8, 0x63, 0x5A, 0x47, 0x59, 0x10, 0x48, 0xA7,
4288+
0x35, 0x84, 0xF2, 0x61, 0x4C, 0x3E, 0xAC, 0xE6, 0x06, 0x90, 0x96, 0x07,
4289+
0xA3, 0x7B, 0x2D, 0x36, 0xEF, 0x5D, 0xD0, 0x5C, 0x0A, 0x1C, 0x4D, 0xA2,
4290+
0x81, 0x18, 0xE3, 0x22, 0xFB, 0xBF, 0x9B, 0x12, 0x68, 0xAD, 0x6A, 0xCD,
4291+
0xF2, 0x72, 0xD3, 0xBA, 0x24, 0x63, 0xCC, 0x45, 0x47, 0xDE, 0x83, 0xD6,
4292+
0x8A, 0x94, 0xD2, 0xC1, 0xDC, 0xAB, 0xFD, 0x4E, 0xF0, 0x11, 0x21, 0xB9,
4293+
0x0F, 0xF3, 0xEE, 0x87, 0xF9, 0x03, 0x1A, 0xB4, 0x75, 0x21, 0x81, 0xDA,
4294+
0x2E, 0x1D, 0x82, 0x63, 0x26, 0x34, 0x56, 0x91, 0x2D, 0xDC, 0xFD, 0x0A,
4295+
0xF2, 0x3F, 0xBA, 0x44, 0xCD, 0x81, 0x53, 0x1F, 0x8B, 0xD3, 0x38, 0x22,
4296+
0x02, 0x05, 0x85, 0x35, 0x41, 0x50, 0xE8, 0x48, 0x6E, 0xE3, 0x7D, 0xA9,
4297+
0xFE, 0x5C, 0x39,
4298+
};
4299+
4300+
static int test_DoUserAuthRequestRsaCert(void)
4301+
{
4302+
WOLFSSH_CTX* ctx = NULL;
4303+
WOLFSSH* ssh = NULL;
4304+
const UserAuthRsaTestVector* tv;
4305+
int tc = (int)(sizeof(userAuthRsaTestVectors)
4306+
/ sizeof(userAuthRsaTestVectors[0]));
4307+
int i;
4308+
int ret;
4309+
int failures = 0;
4310+
4311+
if ((userAuthRsaSigBlob[RSA_SIG_BLOB_SIG] & 0x80) == 0) {
4312+
fprintf(stderr, "\tuserAuthRsaSigBlob needs its high bit set\n");
4313+
return 1;
4314+
}
4315+
4316+
ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_SERVER, NULL);
4317+
if (ctx == NULL)
4318+
return 1;
4319+
ssh = wolfSSH_new(ctx);
4320+
if (ssh == NULL) {
4321+
wolfSSH_CTX_free(ctx);
4322+
return 1;
4323+
}
4324+
4325+
for (i = 0, tv = userAuthRsaTestVectors; i < tc; i++, tv++) {
4326+
byte sigBlob[sizeof(userAuthRsaSigBlob)];
4327+
byte digest[sizeof(userAuthRsaDigest)];
4328+
WS_UserAuthData_PublicKey pk;
4329+
4330+
WMEMCPY(sigBlob, userAuthRsaSigBlob, sizeof(sigBlob));
4331+
WMEMCPY(digest, userAuthRsaDigest, sizeof(digest));
4332+
if (tv->patchSz > 0)
4333+
WMEMCPY(sigBlob + tv->patchIdx, tv->patch, tv->patchSz);
4334+
if (tv->flipIdx > 0)
4335+
sigBlob[tv->flipIdx] ^= 0x01;
4336+
4337+
WMEMSET(&pk, 0, sizeof(pk));
4338+
pk.publicKeyType = (const byte*)"x509v3-ssh-rsa";
4339+
pk.publicKeyTypeSz = 14;
4340+
pk.publicKey = userAuthRsaCertDer;
4341+
pk.publicKeySz = (word32)sizeof(userAuthRsaCertDer);
4342+
pk.hasSignature = 1;
4343+
pk.signature = sigBlob;
4344+
pk.signatureSz = (word32)sizeof(sigBlob);
4345+
4346+
ret = wolfSSH_TestDoUserAuthRequestRsaCert(ssh, &pk, WC_HASH_TYPE_SHA,
4347+
digest, (word32)sizeof(digest));
4348+
if (ret != tv->expected) {
4349+
fprintf(stderr, "\t[%d] \"%s\" FAIL: got %d, expected %d\n",
4350+
i, tv->name, ret, tv->expected);
4351+
failures++;
4352+
}
4353+
}
4354+
4355+
wolfSSH_free(ssh);
4356+
wolfSSH_CTX_free(ctx);
4357+
4358+
return failures;
4359+
}
4360+
4361+
#endif /* WOLFSSH_CERTS */
4362+
42044363
#endif /* !WOLFSSH_NO_RSA && !WOLFSSH_NO_SSH_RSA_SHA1 */
42054364

42064365
#endif /* WOLFSSH_TEST_INTERNAL */
@@ -4343,6 +4502,12 @@ int wolfSSH_UnitTest(int argc, char** argv)
43434502
printf("DoUserAuthRequestRsa: %s\n",
43444503
(unitResult == 0 ? "SUCCESS" : "FAILED"));
43454504
testResult = testResult || unitResult;
4505+
#ifdef WOLFSSH_CERTS
4506+
unitResult = test_DoUserAuthRequestRsaCert();
4507+
printf("DoUserAuthRequestRsaCert: %s\n",
4508+
(unitResult == 0 ? "SUCCESS" : "FAILED"));
4509+
testResult = testResult || unitResult;
4510+
#endif
43464511
#endif
43474512
#if !defined(WOLFSSH_NO_ECDSA_SHA2_NISTP256)
43484513
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)