Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Register Name Constraints extension and BPv7 OIDs #147

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
+20 −1
Open

Register Name Constraints extension and BPv7 OIDs #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog.d/register-name-constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Features
* Register Name Constraints extension.
* Add OIDs for BPv7 from RFC 9174.
2 changes: 2 additions & 0 deletions drivers/builtin/include/mbedtls/oid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
#define MBEDTLS_OID_EMAIL_PROTECTION MBEDTLS_OID_KP "\x04" /**< id-kp-emailProtection OBJECT IDENTIFIER ::= { id-kp 4 } */
#define MBEDTLS_OID_TIME_STAMPING MBEDTLS_OID_KP "\x08" /**< id-kp-timeStamping OBJECT IDENTIFIER ::= { id-kp 8 } */
#define MBEDTLS_OID_OCSP_SIGNING MBEDTLS_OID_KP "\x09" /**< id-kp-OCSPSigning OBJECT IDENTIFIER ::= { id-kp 9 } */
#define MBEDTLS_OID_BUNDLE_SECURITY MBEDTLS_OID_KP "\x23" /**< id-kp-bundleSecurity OBJECT IDENTIFIER ::= { id-kp 35 } */

/**
* Wi-SUN Alliance Field Area Network
Expand All @@ -212,6 +213,7 @@

#define MBEDTLS_OID_ON MBEDTLS_OID_PKIX "\x08" /**< id-on OBJECT IDENTIFIER ::= { id-pkix 8 } */
#define MBEDTLS_OID_ON_HW_MODULE_NAME MBEDTLS_OID_ON "\x04" /**< id-on-hardwareModuleName OBJECT IDENTIFIER ::= { id-on 4 } */
#define MBEDTLS_OID_ON_BUNDLE_EID MBEDTLS_OID_ON "\x0b" /**< id-on-bundleEID OBJECT IDENTIFIER ::= { id-on 11 } */

/*
* PKCS definition OIDs
Expand Down
13 changes: 12 additions & 1 deletion drivers/builtin/src/oid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,15 @@ static const oid_x509_ext_t oid_x509_ext[] =
MBEDTLS_OID_X509_EXT_BASIC_CONSTRAINTS,
},
{
OID_DESCRIPTOR(MBEDTLS_OID_KEY_USAGE, "id-ce-keyUsage", "Key Usage"),
OID_DESCRIPTOR(MBEDTLS_OID_NAME_CONSTRAINTS,
"id-ce-nameConstraints",
"Name Constraints"),
MBEDTLS_OID_X509_EXT_NAME_CONSTRAINTS,
},
{
OID_DESCRIPTOR(MBEDTLS_OID_KEY_USAGE,
"id-ce-keyUsage",
"Key Usage"),
MBEDTLS_OID_X509_EXT_KEY_USAGE,
},
{
Expand Down Expand Up @@ -343,6 +351,9 @@ static const mbedtls_oid_descriptor_t oid_ext_key_usage[] =
OID_DESCRIPTOR(MBEDTLS_OID_WISUN_FAN,
"id-kp-wisun-fan-device",
"Wi-SUN Alliance Field Area Network (FAN)"),
OID_DESCRIPTOR(MBEDTLS_OID_BUNDLE_SECURITY,
"id-kp-bundleSecurity",
"Bundle Protocol Security"),
NULL_OID_DESCRIPTOR,
};

Expand Down
3 changes: 3 additions & 0 deletions tests/suites/test_suite_oid.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ oid_get_extended_key_usage:"2B06010505070309":"OCSP Signing"
OID get Ext Key Usage - id-kp-wisun-fan-device
oid_get_extended_key_usage:"2B0601040182E42501":"Wi-SUN Alliance Field Area Network (FAN)"

OID get Ext Key Usage - id-kp-bundleSecurity
oid_get_extended_key_usage:"2B06010505070323":"Bundle Protocol Security"

OID get Ext Key Usage invalid oid
oid_get_extended_key_usage:"5533445566":""

Expand Down