From 20082be063b985d6a00401dbb3508f3a49ac2049 Mon Sep 17 00:00:00 2001
From: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
Date: Tue, 3 Jan 2023 09:45:13 +0100
Subject: [PATCH] Fix Subject Key Identifier, Authority Key Identifier entries
 in oid_x509_ext

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
---
 library/oid.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/library/oid.c b/library/oid.c
index 77c4ab9048..1ec3197593 100644
--- a/library/oid.c
+++ b/library/oid.c
@@ -320,17 +320,19 @@ static const oid_x509_ext_t oid_x509_ext[] =
         MBEDTLS_OID_X509_EXT_CERTIFICATE_POLICIES,
     },
     {
-        { ADD_LEN(MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER), "id-ce-subjectKeyIdentifier",
-          "Subject Key Identifier" },
+        OID_DESCRIPTOR(MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER,
+                       "id-ce-subjectKeyIdentifier",
+                       "Subject Key Identifier"),
         MBEDTLS_OID_X509_EXT_SUBJECT_KEY_IDENTIFIER,
     },
     {
-        { ADD_LEN(MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER), "id-ce-authorityKeyIdentifier",
-          "Authority Key Identifier" },
+        OID_DESCRIPTOR(MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER,
+                       "id-ce-authorityKeyIdentifier",
+                       "Authority Key Identifier"),
         MBEDTLS_OID_X509_EXT_AUTHORITY_KEY_IDENTIFIER,
     },
     {
-        { NULL, 0, NULL, NULL },
+        NULL_OID_DESCRIPTOR,
         0,
     },
 };