Update BoringSSL to 059585c8dadc7c8170c788f8c89843ee1c5b8f11 (#495)

Author: Lukasa

Benchmarks/Thresholds/5.10/NIOSSHBenchmarks.SimpleHandshake.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 644865
+  "mallocCountTotal" : 637000
 }

Benchmarks/Thresholds/5.9/NIOSSHBenchmarks.SimpleHandshake.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 644868
+  "mallocCountTotal" : 637000
 }

Benchmarks/Thresholds/6.0/NIOSSHBenchmarks.SimpleHandshake.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 643873
+  "mallocCountTotal" : 636000
 }

Benchmarks/Thresholds/nightly-6.0/NIOSSHBenchmarks.SimpleHandshake.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 643873
+  "mallocCountTotal" : 636000
 }

Benchmarks/Thresholds/nightly-main/NIOSSHBenchmarks.SimpleHandshake.p90.json

@@ -1,3 +1,3 @@
 {
-  "mallocCountTotal" : 643873
+  "mallocCountTotal" : 636000
 }

Package.swift

@@ -26,7 +26,7 @@ import class Foundation.ProcessInfo
 // Sources/CNIOBoringSSL directory. The source repository is at
 // https://boringssl.googlesource.com/boringssl.
 //
-// BoringSSL Commit: d0a175601b9e180ce58cb1e33649057f5c484146
+// BoringSSL Commit: 059585c8dadc7c8170c788f8c89843ee1c5b8f11
 
 /// This function generates the dependencies we want to express.
 ///

Sources/CNIOBoringSSL/crypto/asn1/a_bitstr.c renamed to Sources/CNIOBoringSSL/crypto/asn1/a_bitstr.cc

@@ -142,6 +142,7 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
   const unsigned char *p;
   unsigned char *s;
   int padding;
+  uint8_t padding_mask;
 
   if (len < 1) {
     OPENSSL_PUT_ERROR(ASN1, ASN1_R_STRING_TOO_SHORT);
@@ -170,7 +171,7 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
   }
 
   // Unused bits in a BIT STRING must be zero.
-  uint8_t padding_mask = (1 << padding) - 1;
+  padding_mask = (1 << padding) - 1;
   if (padding != 0 && (len < 1 || (p[len - 1] & padding_mask) != 0)) {
     OPENSSL_PUT_ERROR(ASN1, ASN1_R_INVALID_BIT_STRING_PADDING);
     goto err;
@@ -182,7 +183,7 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
   ret->flags |= (ASN1_STRING_FLAG_BITS_LEFT | padding);  // set
 
   if (len > 0) {
-    s = OPENSSL_memdup(p, len);
+    s = reinterpret_cast<uint8_t *>(OPENSSL_memdup(p, len));
     if (s == NULL) {
       goto err;
     }

Sources/CNIOBoringSSL/crypto/asn1/a_bool.c renamed to Sources/CNIOBoringSSL/crypto/asn1/a_bool.cc

@@ -72,7 +72,7 @@ void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x) {
     return NULL;
   }
   const uint8_t *ptr = data;
-  void *ret = ASN1_item_d2i(x, &ptr, len, it);
+  void *ret = ASN1_item_d2i(reinterpret_cast<ASN1_VALUE **>(x), &ptr, len, it);
   OPENSSL_free(data);
   return ret;
 }

Sources/CNIOBoringSSL/crypto/asn1/a_d2i_fp.c renamed to Sources/CNIOBoringSSL/crypto/asn1/a_d2i_fp.cc

@@ -73,7 +73,7 @@ void *ASN1_item_dup(const ASN1_ITEM *it, void *x) {
     return NULL;
   }
 
-  i = ASN1_item_i2d(x, &b, it);
+  i = ASN1_item_i2d(reinterpret_cast<ASN1_VALUE *>(x), &b, it);
   if (b == NULL) {
     return NULL;
   }