Update snapshot(2017-12-20)

[platform/upstream/iotivity.git] / resource / csdk / security / src / pkix_interface.c

diff --git a/resource/csdk/security/src/pkix_interface.c b/resource/csdk/security/src/pkix_interface.c
index 5b1dc61..8de7e4c 100644 (file)
--- a/resource/csdk/security/src/pkix_interface.c
+++ b/resource/csdk/security/src/pkix_interface.c
@@ -24,9 +24,11 @@
 #include "srmresourcestrings.h"
 #include "casecurityinterface.h"
 #include "logger.h"
-#ifdef __TIZENRT__
+#include "base64.h"
 #include "oic_malloc.h"
-#endif
+
+#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----"
+#define PEM_END_CRT "-----END CERTIFICATE-----"
 
 #define TAG "OIC_SRM_PKIX_INTERFACE"
 
@@ -111,11 +113,81 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen)
     OIC_LOG_BUFFER(INFO, TAG, crtBuf, *crtBufLen);
 
     mbedtls_x509_crt deviceCert;
+    mbedtls_x509_crt_init(&deviceCert);
     int ret = 0;
 
+    uint8_t *derCrtBuf = NULL;
+    size_t *derCrtBufLen = NULL;
+
+    uint8_t *derCrtBufTmp = NULL;
+    size_t derCrtBufLenTmp = 0;
+
     // check only first(i.e., device) certificate
     if (crtBuf[0] == 0x30 && crtBuf[1] == 0x82)
     {
+        derCrtBuf = crtBuf;
+        derCrtBufLen = crtBufLen;
+    }
+    else
+    {
+        uint8_t * begin = (uint8_t *)memmem(crtBuf, *crtBufLen,
+                                            PEM_BEGIN_CRT, sizeof(PEM_BEGIN_CRT) - 1);
+        if (NULL != begin)
+        {
+            uint8_t * end = (uint8_t *)memmem(crtBuf, *crtBufLen,
+                                              PEM_END_CRT, sizeof(PEM_END_CRT) - 1);
+            if (NULL != end)
+            {
+                uint32_t idx = 0;
+                uint32_t count = 0;
+                uint32_t decodedLen = 0;
+                begin += sizeof(PEM_BEGIN_CRT) - 1;
+                size_t certLen = (size_t)(end - begin);
+                size_t outBufSize = B64DECODE_OUT_SAFESIZE(certLen + 1);
+
+                uint8_t * certCopy = (uint8_t *)OICCalloc(certLen, 1);
+                if(NULL == certCopy)
+                {
+                    OIC_LOG (ERROR, TAG, "Failed to allocate memory.");
+                    goto exit;
+                }
+                for (idx = 0; idx < certLen; idx++)
+                {
+                    if (begin[idx] != '\r' && begin[idx] != '\n')
+                    {
+                        certCopy[count] = begin[idx];
+                        count++;
+                    }
+                }
+                certLen = count;
+
+                derCrtBufTmp = (uint8_t *)OICCalloc(outBufSize, 1);
+                if(NULL == derCrtBufTmp)
+                {
+                    OIC_LOG (ERROR, TAG, "Failed to allocate memory.");
+                    goto exit;
+                }
+
+                if (B64_OK != b64Decode((char *)certCopy, certLen, derCrtBufTmp, outBufSize, &decodedLen))
+                {
+                    OICFree(certCopy);
+                    goto exit;
+                }
+                OICFree(certCopy);
+
+                derCrtBuf = derCrtBufTmp;
+                derCrtBufLenTmp = decodedLen;
+                derCrtBufLen = &derCrtBufLenTmp;
+            }
+        }
+        else
+        {
+            goto exit;
+        }
+    }
+
+    if (NULL != derCrtBuf && NULL != derCrtBufLen && 0 != *derCrtBufLen)
+    {
         uint8_t *sign_ptr = NULL;
         /**
         * structure of r_buf & s_buf
@@ -132,18 +204,16 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen)
         uint32_t removed_total = 0;
         size_t org_len = 0;
 
-        mbedtls_x509_crt_init(&deviceCert);
-
-        unsigned char * tmp = (unsigned char *)crtBuf + 1;
-        if ( 0 != mbedtls_asn1_get_len(&tmp, crtBuf + *crtBufLen, &org_len))
+        unsigned char * tmp = (unsigned char *)derCrtBuf + 1;
+        if ( 0 != mbedtls_asn1_get_len(&tmp, derCrtBuf + *derCrtBufLen, &org_len))
         {
             OIC_LOG(ERROR, TAG, "Invalid parsed length");
             goto exit;
         }
 
-        if (org_len < *crtBufLen)
+        if (org_len < *derCrtBufLen)
         {
-            ret = mbedtls_x509_crt_parse_der(&deviceCert, crtBuf, org_len + 4);
+            ret = mbedtls_x509_crt_parse_der(&deviceCert, derCrtBuf, org_len + 4);
             if (0 != ret)
             {
                 OIC_LOG_V(ERROR, TAG, "mbedtls_x509_crt_parse_der returned -0x%04x", -(ret));
@@ -198,7 +268,7 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen)
             if (removed_total > 0)
             {
                 // if length of signature is incorrect.
-                OIC_LOG_V(INFO, TAG, "Cert Length (Before) : %lu", *crtBufLen);
+                OIC_LOG_V(INFO, TAG, "Cert Length (Before) : %lu", *derCrtBufLen);
                 OIC_LOG(INFO, TAG, "Invalid length of signature is dectected.");
                 OIC_LOG(INFO, TAG, "Update signature...");
 
@@ -244,10 +314,10 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen)
                     }
 
                     org_len += 4; // include header and length field
-                    size_t remained_len = (*crtBufLen - org_len);
-                    memcpy(crtBuf, deviceCert.raw.p, crt_len);
-                    memcpy(crtBuf + crt_len, crtBuf + org_len, remained_len);
-                    *crtBufLen = (size_t)crt_len + remained_len;
+                    size_t remained_len = (*derCrtBufLen - org_len);
+                    memcpy(derCrtBuf, deviceCert.raw.p, crt_len);
+                    memcpy(derCrtBuf + crt_len, derCrtBuf + org_len, remained_len);
+                    *derCrtBufLen = (size_t)crt_len + remained_len;
 
                     mbedtls_x509_crt_free(&crt_cpy);
                     OIC_LOG_V(INFO, TAG, "Dev cert : %lu -> %lu", org_len, crt_len);
@@ -270,6 +340,7 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen)
 
 exit:
     mbedtls_x509_crt_free(&deviceCert);
+    OICFree(derCrtBufTmp);
     OIC_LOG_V(DEBUG, TAG, "Cert chain length = %d", *crtBufLen);
     OIC_LOG_V(DEBUG, TAG, "Out %s", __func__);
 }