Update BoringSSL to 1f51cfc7d7f54d2bee30bb5793470ef9c36a5083 (#121)

Author: Lukasa

Package.swift

@@ -20,7 +20,7 @@
 // Sources/CCryptoBoringSSL directory. The source repository is at
 // https://boringssl.googlesource.com/boringssl.
 //
-// BoringSSL Commit: f961de5c47ed265c3e758ec70dd15ece20809962
+// BoringSSL Commit: 1f51cfc7d7f54d2bee30bb5793470ef9c36a5083
 
 import PackageDescription
 

Sources/CCryptoBoringSSL/CMakeLists.txt

@@ -65,7 +65,6 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/chacha/chacha.c"
   "crypto/cipher_extra/cipher_extra.c"
   "crypto/cipher_extra/derive_key.c"
-  "crypto/cipher_extra/e_aesccm.c"
   "crypto/cipher_extra/e_aesctrhmac.c"
   "crypto/cipher_extra/e_aesgcmsiv.c"
   "crypto/cipher_extra/e_chacha20poly1305.c"
@@ -75,7 +74,6 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/cipher_extra/e_rc4.c"
   "crypto/cipher_extra/e_tls.c"
   "crypto/cipher_extra/tls_cbc.c"
-  "crypto/cmac/cmac.c"
   "crypto/conf/conf.c"
   "crypto/cpu_aarch64_apple.c"
   "crypto/cpu_aarch64_fuchsia.c"
@@ -102,7 +100,6 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/engine/engine.c"
   "crypto/err/err.c"
   "crypto/err/err_data.c"
-  "crypto/evp/digestsign.c"
   "crypto/evp/evp.c"
   "crypto/evp/evp_asn1.c"
   "crypto/evp/evp_ctx.c"
@@ -111,6 +108,7 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/evp/p_ec_asn1.c"
   "crypto/evp/p_ed25519.c"
   "crypto/evp/p_ed25519_asn1.c"
+  "crypto/evp/p_hkdf.c"
   "crypto/evp/p_rsa.c"
   "crypto/evp/p_rsa_asn1.c"
   "crypto/evp/p_x25519.c"
@@ -148,10 +146,13 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/fipsmodule/cipher/aead.c"
   "crypto/fipsmodule/cipher/cipher.c"
   "crypto/fipsmodule/cipher/e_aes.c"
+  "crypto/fipsmodule/cipher/e_aesccm.c"
+  "crypto/fipsmodule/cmac/cmac.c"
   "crypto/fipsmodule/dh/check.c"
   "crypto/fipsmodule/dh/dh.c"
   "crypto/fipsmodule/digest/digest.c"
   "crypto/fipsmodule/digest/digests.c"
+  "crypto/fipsmodule/digestsign/digestsign.c"
   "crypto/fipsmodule/ec/ec.c"
   "crypto/fipsmodule/ec/ec_key.c"
   "crypto/fipsmodule/ec/ec_montgomery.c"
@@ -188,6 +189,7 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/fipsmodule/rsa/rsa_impl.c"
   "crypto/fipsmodule/self_check/fips.c"
   "crypto/fipsmodule/self_check/self_check.c"
+  "crypto/fipsmodule/service_indicator/service_indicator.c"
   "crypto/fipsmodule/sha/sha1-altivec.c"
   "crypto/fipsmodule/sha/sha1.c"
   "crypto/fipsmodule/sha/sha256.c"
@@ -360,6 +362,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|Android" AND CMAKE_SYSTEM_PROCESSOR MATC
 elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64")
   target_sources(CCryptoBoringSSL PRIVATE
     crypto/chacha/chacha-armv8.ios.aarch64.S
+    crypto/cipher_extra/chacha20_poly1305_armv8.ios.aarch64.S
     crypto/fipsmodule/aesv8-armx64.ios.aarch64.S
     crypto/fipsmodule/armv8-mont.ios.aarch64.S
     crypto/fipsmodule/ghash-neon-armv8.ios.aarch64.S
@@ -373,6 +376,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|Android" AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64")
   target_sources(CCryptoBoringSSL PRIVATE
     crypto/chacha/chacha-armv8.linux.aarch64.S
+    crypto/cipher_extra/chacha20_poly1305_armv8.linux.aarch64.S
     crypto/fipsmodule/aesv8-armx64.linux.aarch64.S
     crypto/fipsmodule/armv8-mont.linux.aarch64.S
     crypto/fipsmodule/ghash-neon-armv8.linux.aarch64.S

Sources/CCryptoBoringSSL/crypto/asn1/a_gentm.c

@@ -55,130 +55,26 @@
  * [including the GNU Public Licence.] */
 
 #include <CCryptoBoringSSL_asn1.h>
+#include <CCryptoBoringSSL_bytestring.h>
+#include <CCryptoBoringSSL_err.h>
+#include <CCryptoBoringSSL_mem.h>
 
 #include <string.h>
 #include <time.h>
 
-#include <CCryptoBoringSSL_err.h>
-#include <CCryptoBoringSSL_mem.h>
-
 #include "internal.h"
 
 int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d)
 {
-    static const int min[9] = { 0, 0, 1, 1, 0, 0, 0, 0, 0 };
-    static const int max[9] = { 99, 99, 12, 31, 23, 59, 59, 12, 59 };
-    char *a;
-    int n, i, l, o;
-
-    if (d->type != V_ASN1_GENERALIZEDTIME)
-        return (0);
-    l = d->length;
-    a = (char *)d->data;
-    o = 0;
-    /*
-     * GENERALIZEDTIME is similar to UTCTIME except the year is represented
-     * as YYYY. This stuff treats everything as a two digit field so make
-     * first two fields 00 to 99
-     */
-    if (l < 13)
-        goto err;
-    for (i = 0; i < 7; i++) {
-        if ((i == 6) && ((a[o] == 'Z') || (a[o] == '+') || (a[o] == '-'))) {
-            i++;
-            if (tm)
-                tm->tm_sec = 0;
-            break;
-        }
-        if ((a[o] < '0') || (a[o] > '9'))
-            goto err;
-        n = a[o] - '0';
-        if (++o > l)
-            goto err;
-
-        if ((a[o] < '0') || (a[o] > '9'))
-            goto err;
-        n = (n * 10) + a[o] - '0';
-        if (++o > l)
-            goto err;
-
-        if ((n < min[i]) || (n > max[i]))
-            goto err;
-        if (tm) {
-            switch (i) {
-            case 0:
-                tm->tm_year = n * 100 - 1900;
-                break;
-            case 1:
-                tm->tm_year += n;
-                break;
-            case 2:
-                tm->tm_mon = n - 1;
-                break;
-            case 3:
-                tm->tm_mday = n;
-                break;
-            case 4:
-                tm->tm_hour = n;
-                break;
-            case 5:
-                tm->tm_min = n;
-                break;
-            case 6:
-                tm->tm_sec = n;
-                break;
-            }
-        }
-    }
-    /*
-     * Optional fractional seconds: decimal point followed by one or more
-     * digits.
-     */
-    if (a[o] == '.') {
-        if (++o > l)
-            goto err;
-        i = o;
-        while ((a[o] >= '0') && (a[o] <= '9') && (o <= l))
-            o++;
-        /* Must have at least one digit after decimal point */
-        if (i == o)
-            goto err;
+    if (d->type != V_ASN1_GENERALIZEDTIME) {
+        return 0;
     }
-
-    if (a[o] == 'Z')
-        o++;
-    else if ((a[o] == '+') || (a[o] == '-')) {
-        int offsign = a[o] == '-' ? 1 : -1, offset = 0;
-        o++;
-        if (o + 4 > l)
-            goto err;
-        for (i = 7; i < 9; i++) {
-            if ((a[o] < '0') || (a[o] > '9'))
-                goto err;
-            n = a[o] - '0';
-            o++;
-            if ((a[o] < '0') || (a[o] > '9'))
-                goto err;
-            n = (n * 10) + a[o] - '0';
-            if ((n < min[i]) || (n > max[i]))
-                goto err;
-            if (tm) {
-                if (i == 7)
-                    offset = n * 3600;
-                else if (i == 8)
-                    offset += n * 60;
-            }
-            o++;
-        }
-        if (offset && !OPENSSL_gmtime_adj(tm, 0, offset * offsign))
-            return 0;
-    } else if (a[o]) {
-        /* Missing time zone information. */
-        goto err;
+    CBS cbs;
+    CBS_init(&cbs, d->data, (size_t)d->length);
+    if (!CBS_parse_generalized_time(&cbs, tm, /*allow_timezone_offset=*/0)) {
+        return 0;
     }
-    return (o == l);
- err:
-    return (0);
+    return 1;
 }
 
 int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *d)