WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add ssh server extended key usage parsing and missing ssh extended key parsing to asn template from asn orig

pull/11361/head
JacobBarthelmeh 2026-09-02 23:03:51 -06:00
parent 9a192651a6
commit c3ac2f6da4
7 changed files with 97 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/asn1_oid_sum.pl
View File

@ -958,6 +958,7 @@ my @eku_ocsp_sign = ( 1, 3, 6, 1, 5, 5, 7, 3, 9 );
my @eku_ssh_client_auth = ( 1, 3, 6, 1, 5, 5, 7, 3, 21 );
my @eku_ssh_mscl = ( 1, 3, 6, 1, 4, 1, 311, 20, 2, 2 );
my @eku_ssh_kp_client_auth = ( 1, 3, 6, 1, 5, 2, 3, 4 );
my @eku_ssh_server_auth = ( 1, 3, 6, 1, 5, 5, 7, 3, 22 );
my @ekus = (
{ name => "EKU_ANY", oid => \@eku_any },
@ -970,6 +971,7 @@ my @ekus = (
{ name => "EKU_SSH_CLIENT_AUTH", oid => \@eku_ssh_client_auth },
{ name => "EKU_SSH_MSCL", oid => \@eku_ssh_mscl },
{ name => "EKU_SSH_KP_CLIENT_AUTH", oid => \@eku_ssh_kp_client_auth },
{ name => "EKU_SSH_SERVER_AUTH", oid => \@eku_ssh_server_auth },
);
print_sum_enum("ExtKeyUsage", "_OID", \@ekus);

63
tests/api/test_asn.c
View File

@ -3547,6 +3547,69 @@ int test_wc_DecodeKeyUsage_decipherOnly(void)
return EXPECT_RESULT();
}
#if defined(WOLFSSL_WOLFSSH) && !defined(NO_ASN) && !defined(NO_CERTS) && \
defined(HAVE_ECC) && !defined(NO_ECC256) && !defined(NO_SHA256)
#define TEST_EXTKEYUSAGE_SSH
#endif
/*
* id-kp-secureShellClient and id-kp-secureShellServer (RFC 6187) are decoded
* into extExtKeyUsageSsh, not extExtKeyUsage. Parse a self-signed P-256 cert
* whose only key purposes are those two and check both bits land.
*/
int test_wc_DecodeExtKeyUsage_ssh(void)
{
EXPECT_DECLS;
#ifdef TEST_EXTKEYUSAGE_SSH
static const unsigned char sshEkuCert[] = {
0x30, 0x82, 0x01, 0x89, 0x30, 0x82, 0x01, 0x2f, 0xa0, 0x03, 0x02, 0x01,
0x02, 0x02, 0x09, 0x00, 0xc3, 0xf3, 0x13, 0xd2, 0x5f, 0x80, 0x6d, 0xd6,
0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02,
0x30, 0x31, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x0a,
0x0c, 0x07, 0x77, 0x6f, 0x6c, 0x66, 0x53, 0x53, 0x4c, 0x31, 0x10, 0x30,
0x0e, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x07, 0x73, 0x73, 0x68, 0x2d,
0x65, 0x6b, 0x75, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x36, 0x30, 0x39, 0x30,
0x33, 0x30, 0x34, 0x35, 0x34, 0x34, 0x36, 0x5a, 0x18, 0x0f, 0x32, 0x31,
0x32, 0x36, 0x30, 0x38, 0x31, 0x30, 0x30, 0x34, 0x35, 0x34, 0x34, 0x36,
0x5a, 0x30, 0x31, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06,
0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04,
0x0a, 0x0c, 0x07, 0x77, 0x6f, 0x6c, 0x66, 0x53, 0x53, 0x4c, 0x31, 0x10,
0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x07, 0x73, 0x73, 0x68,
0x2d, 0x65, 0x6b, 0x75, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xfe, 0x1b, 0x76, 0x35, 0xdc,
0x20, 0x18, 0xc2, 0x9c, 0x30, 0x2f, 0xa7, 0x69, 0x7c, 0x9b, 0xe6, 0x9a,
0x70, 0x8f, 0x90, 0x20, 0xa2, 0xbb, 0xbe, 0xa4, 0xef, 0x46, 0xba, 0x87,
0x96, 0xfd, 0xfd, 0x93, 0xee, 0xf5, 0x9f, 0xc9, 0x89, 0x91, 0xaf, 0xf8,
0xa5, 0xd3, 0x00, 0xad, 0x27, 0xc3, 0x65, 0x0d, 0xe2, 0xc3, 0x62, 0x62,
0x9a, 0x31, 0x85, 0x5c, 0xa2, 0xcf, 0x18, 0x4d, 0xd9, 0x03, 0x65, 0xa3,
0x2e, 0x30, 0x2c, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16,
0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x15,
0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x16, 0x30, 0x0b,
0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x07, 0x80, 0x30,
0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03,
0x48, 0x00, 0x30, 0x45, 0x02, 0x20, 0x09, 0x48, 0xa1, 0x88, 0x7e, 0x11,
0xa4, 0x70, 0x95, 0x79, 0x4b, 0x61, 0x8f, 0x37, 0xd8, 0x21, 0xa4, 0xe0,
0x4c, 0x63, 0xe6, 0x5e, 0xc2, 0x7b, 0x90, 0x5e, 0xc0, 0x7f, 0xee, 0x72,
0x76, 0x1b, 0x02, 0x21, 0x00, 0xad, 0x2b, 0x74, 0x14, 0xc4, 0x57, 0xbc,
0xbe, 0x46, 0x6b, 0x7f, 0x25, 0x90, 0x79, 0xe0, 0x82, 0xbb, 0x69, 0x43,
0x0b, 0x99, 0xbd, 0x75, 0xd3, 0x4d, 0x8c, 0x8d, 0x2c, 0x9e, 0x50, 0x69,
0x9e
};
DecodedCert cert;
wc_InitDecodedCert(&cert, sshEkuCert, (word32)sizeof(sshEkuCert), NULL);
ExpectIntEQ(wc_ParseCert(&cert, CERT_TYPE, NO_VERIFY, NULL), 0);
ExpectIntEQ(cert.extExtKeyUsageSet, 1);
ExpectIntEQ(cert.extExtKeyUsage, 0);
ExpectIntEQ(cert.extExtKeyUsageSsh,
EXTKEYUSE_SSH_CLIENT_AUTH | EXTKEYUSE_SSH_SERVER_AUTH);
wc_FreeDecodedCert(&cert);
#endif /* TEST_EXTKEYUSAGE_SSH */
return EXPECT_RESULT();
}
int test_wc_SignCert_buffer_bounds(void)
{
EXPECT_DECLS;

2
tests/api/test_asn.h
View File

@ -48,6 +48,7 @@ int test_ToTraditional_ex_negative(void);
int test_ToTraditional_ex_mldsa_bad_params(void);
int test_wc_SignCert_buffer_bounds(void);
int test_wc_DecodeKeyUsage_decipherOnly(void);
int test_wc_DecodeExtKeyUsage_ssh(void);
int test_wc_AsnDecisionCoverage(void);
int test_wc_AsnFeatureCoverage(void);
@ -76,6 +77,7 @@ int test_wc_AsnFeatureCoverage(void);
TEST_DECL_GROUP("asn", test_ToTraditional_ex_mldsa_bad_params), \
TEST_DECL_GROUP("asn", test_wc_SignCert_buffer_bounds), \
TEST_DECL_GROUP("asn", test_wc_DecodeKeyUsage_decipherOnly), \
TEST_DECL_GROUP("asn", test_wc_DecodeExtKeyUsage_ssh), \
TEST_DECL_GROUP("asn", test_wc_AsnDecisionCoverage), \
TEST_DECL_GROUP("asn", test_wc_AsnFeatureCoverage)

20
wolfcrypt/src/asn.c
View File

@ -5700,6 +5700,8 @@ static const byte extExtKeyUsageOcspSignOid[] = {43, 6, 1, 5, 5, 7, 3, 9};
{43, 6, 1, 4, 1, 130, 55, 20, 2, 2};
static const byte extExtKeyUsageSshKpClientAuthOid[] =
{43, 6, 1, 5, 2, 3, 4};
static const byte extExtKeyUsageSshServerAuthOid[] =
EXT_KEY_USAGE_OID_BASE(22);
#endif /* WOLFSSL_WOLFSSH */
#ifdef WOLFSSL_SUBJ_DIR_ATTR
@ -7140,6 +7142,10 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz)
oid = extExtKeyUsageSshKpClientAuthOid;
*oidSz = sizeof(extExtKeyUsageSshKpClientAuthOid);
break;
case EKU_SSH_SERVER_AUTH_OID:
oid = extExtKeyUsageSshServerAuthOid;
*oidSz = sizeof(extExtKeyUsageSshServerAuthOid);
break;
#endif /* WOLFSSL_WOLFSSH */
default:
break;
@ -21598,6 +21604,20 @@ int DecodeExtKeyUsage(const byte* input, word32 sz,
case EKU_OCSP_SIGN_OID:
*extExtKeyUsage |= EXTKEYUSE_OCSP_SIGN;
break;
#ifdef WOLFSSL_WOLFSSH
case EKU_SSH_CLIENT_AUTH_OID:
*extExtKeyUsageSsh |= EXTKEYUSE_SSH_CLIENT_AUTH;
break;
case EKU_SSH_MSCL_OID:
*extExtKeyUsageSsh |= EXTKEYUSE_SSH_MSCL;
break;
case EKU_SSH_KP_CLIENT_AUTH_OID:
*extExtKeyUsageSsh |= EXTKEYUSE_SSH_KP_CLIENT_AUTH;
break;
case EKU_SSH_SERVER_AUTH_OID:
*extExtKeyUsageSsh |= EXTKEYUSE_SSH_SERVER_AUTH;
break;
#endif /* WOLFSSL_WOLFSSH */
}
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)

3
wolfcrypt/src/asn_orig.c
View File

@ -3986,6 +3986,9 @@ int DecodeExtKeyUsage(const byte* input, word32 sz,
case EKU_SSH_KP_CLIENT_AUTH_OID:
*extExtKeyUsageSsh |= EXTKEYUSE_SSH_KP_CLIENT_AUTH;
break;
case EKU_SSH_SERVER_AUTH_OID:
*extExtKeyUsageSsh |= EXTKEYUSE_SSH_SERVER_AUTH;
break;
#endif /* WOLFSSL_WOLFSSH */
default:
break;

1
wolfssl/wolfcrypt/asn.h
View File

@ -1506,6 +1506,7 @@ enum KeyIdType {
#define EXTKEYUSE_SSH_CLIENT_AUTH 0x01
#define EXTKEYUSE_SSH_MSCL 0x02
#define EXTKEYUSE_SSH_KP_CLIENT_AUTH 0x04
#define EXTKEYUSE_SSH_SERVER_AUTH 0x08
#endif /* WOLFSSL_WOLFSSH */
#define WC_NS_SSL_CLIENT 0x80

8
wolfssl/wolfcrypt/oid_sum.h
View File

@ -1327,7 +1327,9 @@ enum ExtKeyUsage_Sum {
/* 0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02 */
EKU_SSH_MSCL_OID = 264, /* 1.3.6.1.4.1.311.20.2.2 */
/* 0x2b,0x06,0x01,0x05,0x02,0x03,0x04 */
EKU_SSH_KP_CLIENT_AUTH_OID = 64 /* 1.3.6.1.5.2.3.4 */
EKU_SSH_KP_CLIENT_AUTH_OID = 64, /* 1.3.6.1.5.2.3.4 */
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x03,0x16 */
EKU_SSH_SERVER_AUTH_OID = 92 /* 1.3.6.1.5.5.7.3.22 */
#else
/* 0x55,0x1d,0x25,0x00 */
EKU_ANY_OID = 0x00da1daa, /* 2.5.29.37.0 */
@ -1348,7 +1350,9 @@ enum ExtKeyUsage_Sum {
/* 0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02 */
EKU_SSH_MSCL_OID = 0x103686d7, /* 1.3.6.1.4.1.311.20.2.2 */
/* 0x2b,0x06,0x01,0x05,0x02,0x03,0x04 */
EKU_SSH_KP_CLIENT_AUTH_OID = 0x7a050529 /* 1.3.6.1.5.2.3.4 */
EKU_SSH_KP_CLIENT_AUTH_OID = 0x7a050529, /* 1.3.6.1.5.2.3.4 */
/* 0x2b,0x06,0x01,0x05,0x05,0x07,0x03,0x16 */
EKU_SSH_SERVER_AUTH_OID = 0x1302012e /* 1.3.6.1.5.5.7.3.22 */
#endif
};