grpc 1.60.0 → 1.62.0

data/third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c

@@ -81,8 +81,8 @@ ASN1_SEQUENCE(X509_REVOKED) = {
     ASN1_SEQUENCE_OF_OPT(X509_REVOKED, extensions, X509_EXTENSION),
 } ASN1_SEQUENCE_END(X509_REVOKED)
 
-static int crl_lookup(X509_CRL *crl, X509_REVOKED **ret, ASN1_INTEGER *serial,
-                      X509_NAME *issuer);
+static int crl_lookup(X509_CRL *crl, X509_REVOKED **ret,
+                      const ASN1_INTEGER *serial, X509_NAME *issuer);
 
 // The X509_CRL_INFO structure needs a bit of customisation. Since we cache
 // the original encoding the signature wont be affected by reordering of the
@@ -115,45 +115,15 @@ ASN1_SEQUENCE_enc(X509_CRL_INFO, enc, crl_inf_cb) = {
     ASN1_EXP_SEQUENCE_OF_OPT(X509_CRL_INFO, extensions, X509_EXTENSION, 0),
 } ASN1_SEQUENCE_END_enc(X509_CRL_INFO, X509_CRL_INFO)
 
-// Set CRL entry issuer according to CRL certificate issuer extension. Check
-// for unhandled critical CRL entry extensions.
-
-static int crl_set_issuers(X509_CRL *crl) {
-  size_t i, k;
-  int j;
-  GENERAL_NAMES *gens, *gtmp;
-  STACK_OF(X509_REVOKED) *revoked;
-
-  revoked = X509_CRL_get_REVOKED(crl);
-
-  gens = NULL;
-  for (i = 0; i < sk_X509_REVOKED_num(revoked); i++) {
+static int crl_parse_entry_extensions(X509_CRL *crl) {
+  STACK_OF(X509_REVOKED) *revoked = X509_CRL_get_REVOKED(crl);
+  for (size_t i = 0; i < sk_X509_REVOKED_num(revoked); i++) {
     X509_REVOKED *rev = sk_X509_REVOKED_value(revoked, i);
-    STACK_OF(X509_EXTENSION) *exts;
-    ASN1_ENUMERATED *reason;
-    X509_EXTENSION *ext;
-    gtmp = X509_REVOKED_get_ext_d2i(rev, NID_certificate_issuer, &j, NULL);
-    if (!gtmp && (j != -1)) {
-      crl->flags |= EXFLAG_INVALID;
-      return 1;
-    }
-
-    if (gtmp) {
-      gens = gtmp;
-      if (!crl->issuers) {
-        crl->issuers = sk_GENERAL_NAMES_new_null();
-        if (!crl->issuers) {
-          return 0;
-        }
-      }
-      if (!sk_GENERAL_NAMES_push(crl->issuers, gtmp)) {
-        return 0;
-      }
-    }
-    rev->issuer = gens;
 
-    reason = X509_REVOKED_get_ext_d2i(rev, NID_crl_reason, &j, NULL);
-    if (!reason && (j != -1)) {
+    int crit;
+    ASN1_ENUMERATED *reason =
+        X509_REVOKED_get_ext_d2i(rev, NID_crl_reason, &crit, NULL);
+    if (!reason && crit != -1) {
       crl->flags |= EXFLAG_INVALID;
       return 1;
     }
@@ -165,17 +135,11 @@ static int crl_set_issuers(X509_CRL *crl) {
       rev->reason = CRL_REASON_NONE;
     }
 
-    // Check for critical CRL entry extensions
-
-    exts = rev->extensions;
-
-    for (k = 0; k < sk_X509_EXTENSION_num(exts); k++) {
-      ext = sk_X509_EXTENSION_value(exts, k);
+    // We do not support any critical CRL entry extensions.
+    const STACK_OF(X509_EXTENSION) *exts = rev->extensions;
+    for (size_t j = 0; j < sk_X509_EXTENSION_num(exts); j++) {
+      const X509_EXTENSION *ext = sk_X509_EXTENSION_value(exts, j);
       if (X509_EXTENSION_get_critical(ext)) {
-        if (OBJ_obj2nid(X509_EXTENSION_get_object(ext)) ==
-            NID_certificate_issuer) {
-          continue;
-        }
         crl->flags |= EXFLAG_CRITICAL;
         break;
       }
@@ -190,9 +154,6 @@ static int crl_set_issuers(X509_CRL *crl) {
 static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
                   void *exarg) {
   X509_CRL *crl = (X509_CRL *)*pval;
-  STACK_OF(X509_EXTENSION) *exts;
-  X509_EXTENSION *ext;
-  size_t idx;
   int i;
 
   switch (operation) {
@@ -201,10 +162,6 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
       crl->akid = NULL;
       crl->flags = 0;
       crl->idp_flags = 0;
-      crl->idp_reasons = CRLDP_ALL_REASONS;
-      crl->issuers = NULL;
-      crl->crl_number = NULL;
-      crl->base_crl_number = NULL;
       break;
 
     case ASN1_OP_D2I_POST: {
@@ -247,39 +204,17 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         return 0;
       }
 
-      crl->crl_number = X509_CRL_get_ext_d2i(crl, NID_crl_number, &i, NULL);
-      if (crl->crl_number == NULL && i != -1) {
-        return 0;
-      }
-
-      crl->base_crl_number = X509_CRL_get_ext_d2i(crl, NID_delta_crl, &i, NULL);
-      if (crl->base_crl_number == NULL && i != -1) {
-        return 0;
-      }
-      // Delta CRLs must have CRL number
-      if (crl->base_crl_number && !crl->crl_number) {
-        OPENSSL_PUT_ERROR(X509, X509_R_DELTA_CRL_WITHOUT_CRL_NUMBER);
-        return 0;
-      }
-
       // See if we have any unhandled critical CRL extensions and indicate
       // this in a flag. We only currently handle IDP so anything else
       // critical sets the flag. This code accesses the X509_CRL structure
       // directly: applications shouldn't do this.
-
-      exts = crl->crl->extensions;
-
-      for (idx = 0; idx < sk_X509_EXTENSION_num(exts); idx++) {
-        int nid;
-        ext = sk_X509_EXTENSION_value(exts, idx);
-        nid = OBJ_obj2nid(X509_EXTENSION_get_object(ext));
-        if (nid == NID_freshest_crl) {
-          crl->flags |= EXFLAG_FRESHEST;
-        }
+      const STACK_OF(X509_EXTENSION) *exts = crl->crl->extensions;
+      for (size_t idx = 0; idx < sk_X509_EXTENSION_num(exts); idx++) {
+        const X509_EXTENSION *ext = sk_X509_EXTENSION_value(exts, idx);
+        int nid = OBJ_obj2nid(X509_EXTENSION_get_object(ext));
         if (X509_EXTENSION_get_critical(ext)) {
-          // We handle IDP and deltas
-          if ((nid == NID_issuing_distribution_point) ||
-              (nid == NID_authority_key_identifier) || (nid == NID_delta_crl)) {
+          if (nid == NID_issuing_distribution_point ||
+              nid == NID_authority_key_identifier) {
             continue;
           }
           crl->flags |= EXFLAG_CRITICAL;
@@ -287,7 +222,7 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         }
       }
 
-      if (!crl_set_issuers(crl)) {
+      if (!crl_parse_entry_extensions(crl)) {
         return 0;
       }
 
@@ -297,16 +232,15 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
     case ASN1_OP_FREE_POST:
       AUTHORITY_KEYID_free(crl->akid);
       ISSUING_DIST_POINT_free(crl->idp);
-      ASN1_INTEGER_free(crl->crl_number);
-      ASN1_INTEGER_free(crl->base_crl_number);
-      sk_GENERAL_NAMES_pop_free(crl->issuers, GENERAL_NAMES_free);
       break;
   }
   return 1;
 }
 
 // Convert IDP into a more convenient form
-
+//
+// TODO(davidben): Each of these flags are already booleans, so this is not
+// really more convenient. We can probably remove |idp_flags|.
 static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp) {
   int idp_only = 0;
   // Set various flags according to IDP
@@ -324,6 +258,11 @@ static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp) {
     crl->idp_flags |= IDP_ONLYATTR;
   }
 
+  // Per RFC 5280, section 5.2.5, at most one of onlyContainsUserCerts,
+  // onlyContainsCACerts, and onlyContainsAttributeCerts may be true.
+  //
+  // TODO(crbug.com/boringssl/443): Move this check to the |ISSUING_DIST_POINT|
+  // parser.
   if (idp_only > 1) {
     crl->idp_flags |= IDP_INVALID;
   }
@@ -334,15 +273,10 @@ static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp) {
 
   if (idp->onlysomereasons) {
     crl->idp_flags |= IDP_REASONS;
-    if (idp->onlysomereasons->length > 0) {
-      crl->idp_reasons = idp->onlysomereasons->data[0];
-    }
-    if (idp->onlysomereasons->length > 1) {
-      crl->idp_reasons |= (idp->onlysomereasons->data[1] << 8);
-    }
-    crl->idp_reasons &= CRLDP_ALL_REASONS;
   }
 
+  // TODO(davidben): The new verifier does not support nameRelativeToCRLIssuer.
+  // Remove this?
   return DIST_POINT_set_dpname(idp->distpoint, X509_CRL_get_issuer(crl));
 }
 
@@ -391,7 +325,7 @@ int X509_CRL_verify(X509_CRL *crl, EVP_PKEY *pkey) {
 }
 
 int X509_CRL_get0_by_serial(X509_CRL *crl, X509_REVOKED **ret,
-                            ASN1_INTEGER *serial) {
+                            const ASN1_INTEGER *serial) {
   return crl_lookup(crl, ret, serial, NULL);
 }
 
@@ -402,44 +336,19 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) {
 
 static int crl_revoked_issuer_match(X509_CRL *crl, X509_NAME *nm,
                                     X509_REVOKED *rev) {
-  size_t i;
-
-  if (!rev->issuer) {
-    if (!nm) {
-      return 1;
-    }
-    if (!X509_NAME_cmp(nm, X509_CRL_get_issuer(crl))) {
-      return 1;
-    }
-    return 0;
-  }
-
-  if (!nm) {
-    nm = X509_CRL_get_issuer(crl);
-  }
-
-  for (i = 0; i < sk_GENERAL_NAME_num(rev->issuer); i++) {
-    GENERAL_NAME *gen = sk_GENERAL_NAME_value(rev->issuer, i);
-    if (gen->type != GEN_DIRNAME) {
-      continue;
-    }
-    if (!X509_NAME_cmp(nm, gen->d.directoryName)) {
-      return 1;
-    }
-  }
-  return 0;
+  return nm == NULL || X509_NAME_cmp(nm, X509_CRL_get_issuer(crl)) == 0;
 }
 
 static CRYPTO_MUTEX g_crl_sort_lock = CRYPTO_MUTEX_INIT;
 
-static int crl_lookup(X509_CRL *crl, X509_REVOKED **ret, ASN1_INTEGER *serial,
-                      X509_NAME *issuer) {
+static int crl_lookup(X509_CRL *crl, X509_REVOKED **ret,
+                      const ASN1_INTEGER *serial, X509_NAME *issuer) {
   // Use an assert, rather than a runtime error, because returning nothing for a
   // CRL is arguably failing open, rather than closed.
   assert(serial->type == V_ASN1_INTEGER || serial->type == V_ASN1_NEG_INTEGER);
   X509_REVOKED rtmp, *rev;
   size_t idx;
-  rtmp.serialNumber = serial;
+  rtmp.serialNumber = (ASN1_INTEGER *)serial;
   // Sort revoked into serial number order if not already sorted. Do this
   // under a lock to avoid race condition.
 
@@ -468,9 +377,6 @@ static int crl_lookup(X509_CRL *crl, X509_REVOKED **ret, ASN1_INTEGER *serial,
       if (ret) {
         *ret = rev;
       }
-      if (rev->reason == CRL_REASON_REMOVE_FROM_CRL) {
-        return 2;
-      }
       return 1;
     }
   }

data/third_party/boringssl-with-bazel/src/crypto/x509/x_name.c

@@ -99,7 +99,7 @@ ASN1_SEQUENCE(X509_NAME_ENTRY) = {
     ASN1_SIMPLE(X509_NAME_ENTRY, value, ASN1_PRINTABLE),
 } ASN1_SEQUENCE_END(X509_NAME_ENTRY)
 
-IMPLEMENT_ASN1_FUNCTIONS_const(X509_NAME_ENTRY)
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X509_NAME_ENTRY)
 IMPLEMENT_ASN1_DUP_FUNCTION_const(X509_NAME_ENTRY)
 
 // For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY } so
@@ -122,7 +122,6 @@ ASN1_ITEM_TEMPLATE_END(X509_NAME_INTERNAL)
 static const ASN1_EXTERN_FUNCS x509_name_ff = {
     x509_name_ex_new,
     x509_name_ex_free,
-    0,  // Default clear behaviour is OK
     x509_name_ex_d2i,
     x509_name_ex_i2d,
 };
@@ -512,17 +511,17 @@ int X509_NAME_set(X509_NAME **xn, X509_NAME *name) {
 
 int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) { return ne->set; }
 
-int X509_NAME_get0_der(X509_NAME *nm, const unsigned char **pder,
-                       size_t *pderlen) {
+int X509_NAME_get0_der(X509_NAME *nm, const unsigned char **out_der,
+                       size_t *out_der_len) {
   // Make sure encoding is valid
   if (i2d_X509_NAME(nm, NULL) <= 0) {
     return 0;
   }
-  if (pder != NULL) {
-    *pder = (unsigned char *)nm->bytes->data;
+  if (out_der != NULL) {
+    *out_der = (unsigned char *)nm->bytes->data;
   }
-  if (pderlen != NULL) {
-    *pderlen = nm->bytes->length;
+  if (out_der_len != NULL) {
+    *out_der_len = nm->bytes->length;
   }
   return 1;
 }

data/third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c

@@ -65,17 +65,46 @@
 #include <openssl/evp.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/thread.h>
 
 #include "../internal.h"
 #include "internal.h"
 
-// Minor tweak to operation: free up EVP_PKEY
+
+static void x509_pubkey_changed(X509_PUBKEY *pub) {
+  EVP_PKEY_free(pub->pkey);
+  pub->pkey = NULL;
+
+  // Re-encode the |X509_PUBKEY| to DER and parse it with EVP's APIs.
+  uint8_t *spki = NULL;
+  int spki_len = i2d_X509_PUBKEY(pub, &spki);
+  if (spki_len < 0) {
+    goto err;
+  }
+
+  CBS cbs;
+  CBS_init(&cbs, spki, (size_t)spki_len);
+  EVP_PKEY *pkey = EVP_parse_public_key(&cbs);
+  if (pkey == NULL || CBS_len(&cbs) != 0) {
+    EVP_PKEY_free(pkey);
+    goto err;
+  }
+
+  pub->pkey = pkey;
+
+err:
+  OPENSSL_free(spki);
+  // If the operation failed, clear errors. An |X509_PUBKEY| whose key we cannot
+  // parse is still a valid SPKI. It just cannot be converted to an |EVP_PKEY|.
+  ERR_clear_error();
+}
+
 static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
                      void *exarg) {
+  X509_PUBKEY *pubkey = (X509_PUBKEY *)*pval;
   if (operation == ASN1_OP_FREE_POST) {
-    X509_PUBKEY *pubkey = (X509_PUBKEY *)*pval;
     EVP_PKEY_free(pubkey->pkey);
+  } else if (operation == ASN1_OP_D2I_POST) {
+    x509_pubkey_changed(pubkey);
   }
   return 1;
 }
@@ -124,60 +153,25 @@ error:
   return 0;
 }
 
-// g_pubkey_lock is used to protect the initialisation of the |pkey| member of
-// |X509_PUBKEY| objects. Really |X509_PUBKEY| should have a |CRYPTO_once_t|
-// inside it for this, but |CRYPTO_once_t| is private and |X509_PUBKEY| is
-// not.
-static CRYPTO_MUTEX g_pubkey_lock = CRYPTO_MUTEX_INIT;
-
-EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) {
-  EVP_PKEY *ret = NULL;
-  uint8_t *spki = NULL;
-
+EVP_PKEY *X509_PUBKEY_get0(const X509_PUBKEY *key) {
   if (key == NULL) {
-    goto error;
-  }
-
-  CRYPTO_MUTEX_lock_read(&g_pubkey_lock);
-  if (key->pkey != NULL) {
-    CRYPTO_MUTEX_unlock_read(&g_pubkey_lock);
-    EVP_PKEY_up_ref(key->pkey);
-    return key->pkey;
+    return NULL;
   }
-  CRYPTO_MUTEX_unlock_read(&g_pubkey_lock);
 
-  // Re-encode the |X509_PUBKEY| to DER and parse it.
-  int spki_len = i2d_X509_PUBKEY(key, &spki);
-  if (spki_len < 0) {
-    goto error;
-  }
-  CBS cbs;
-  CBS_init(&cbs, spki, (size_t)spki_len);
-  ret = EVP_parse_public_key(&cbs);
-  if (ret == NULL || CBS_len(&cbs) != 0) {
+  if (key->pkey == NULL) {
     OPENSSL_PUT_ERROR(X509, X509_R_PUBLIC_KEY_DECODE_ERROR);
-    goto error;
+    return NULL;
   }
 
-  // Check to see if another thread set key->pkey first
-  CRYPTO_MUTEX_lock_write(&g_pubkey_lock);
-  if (key->pkey) {
-    CRYPTO_MUTEX_unlock_write(&g_pubkey_lock);
-    EVP_PKEY_free(ret);
-    ret = key->pkey;
-  } else {
-    key->pkey = ret;
-    CRYPTO_MUTEX_unlock_write(&g_pubkey_lock);
-  }
-
-  OPENSSL_free(spki);
-  EVP_PKEY_up_ref(ret);
-  return ret;
+  return key->pkey;
+}
 
-error:
-  OPENSSL_free(spki);
-  EVP_PKEY_free(ret);
-  return NULL;
+EVP_PKEY *X509_PUBKEY_get(const X509_PUBKEY *key) {
+  EVP_PKEY *pkey = X509_PUBKEY_get0(key);
+  if (pkey != NULL) {
+    EVP_PKEY_up_ref(pkey);
+  }
+  return pkey;
 }
 
 int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *obj, int param_type,
@@ -190,6 +184,8 @@ int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *obj, int param_type,
   // Set the number of unused bits to zero.
   pub->public_key->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
   pub->public_key->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+
+  x509_pubkey_changed(pub);
   return 1;
 }
 

data/third_party/boringssl-with-bazel/src/crypto/x509/x_spki.c

@@ -60,6 +60,8 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 
+#include "internal.h"
+
 
 ASN1_SEQUENCE(NETSCAPE_SPKAC) = {
     ASN1_SIMPLE(NETSCAPE_SPKAC, pubkey, X509_PUBKEY),

data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c

@@ -65,7 +65,6 @@
 #include <openssl/pool.h>
 #include <openssl/thread.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../asn1/internal.h"
 #include "../bytestring/internal.h"
@@ -92,11 +91,10 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CINF)
 // x509_new_null returns a new |X509| object where the |cert_info|, |sig_alg|,
 // and |signature| fields are not yet filled in.
 static X509 *x509_new_null(void) {
-  X509 *ret = OPENSSL_malloc(sizeof(X509));
+  X509 *ret = OPENSSL_zalloc(sizeof(X509));
   if (ret == NULL) {
     return NULL;
   }
-  OPENSSL_memset(ret, 0, sizeof(X509));
 
   ret->references = 1;
   ret->ex_pathlen = -1;
@@ -343,7 +341,6 @@ static int x509_i2d_cb(ASN1_VALUE **pval, unsigned char **out,
 static const ASN1_EXTERN_FUNCS x509_extern_funcs = {
     x509_new_cb,
     x509_free_cb,
-    /*asn1_ex_clear=*/NULL,
     x509_d2i_cb,
     x509_i2d_cb,
 };

data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c

@@ -90,7 +90,7 @@ static X509_CERT_AUX *aux_get(X509 *x) {
   return x->aux;
 }
 
-int X509_alias_set1(X509 *x, const unsigned char *name, ossl_ssize_t len) {
+int X509_alias_set1(X509 *x, const uint8_t *name, ossl_ssize_t len) {
   X509_CERT_AUX *aux;
   // TODO(davidben): Empty aliases are not meaningful in PKCS#12, and the
   // getters cannot quite represent them. Also erase the object if |len| is
@@ -112,7 +112,7 @@ int X509_alias_set1(X509 *x, const unsigned char *name, ossl_ssize_t len) {
   return ASN1_STRING_set(aux->alias, name, len);
 }
 
-int X509_keyid_set1(X509 *x, const unsigned char *id, ossl_ssize_t len) {
+int X509_keyid_set1(X509 *x, const uint8_t *id, ossl_ssize_t len) {
   X509_CERT_AUX *aux;
   // TODO(davidben): Empty key IDs are not meaningful in PKCS#12, and the
   // getters cannot quite represent them. Also erase the object if |len| is
@@ -134,7 +134,7 @@ int X509_keyid_set1(X509 *x, const unsigned char *id, ossl_ssize_t len) {
   return ASN1_STRING_set(aux->keyid, id, len);
 }
 
-unsigned char *X509_alias_get0(X509 *x, int *out_len) {
+const uint8_t *X509_alias_get0(const X509 *x, int *out_len) {
   const ASN1_UTF8STRING *alias = x->aux != NULL ? x->aux->alias : NULL;
   if (out_len != NULL) {
     *out_len = alias != NULL ? alias->length : 0;
@@ -142,7 +142,7 @@ unsigned char *X509_alias_get0(X509 *x, int *out_len) {
   return alias != NULL ? alias->data : NULL;
 }
 
-unsigned char *X509_keyid_get0(X509 *x, int *out_len) {
+const uint8_t *X509_keyid_get0(const X509 *x, int *out_len) {
   const ASN1_OCTET_STRING *keyid = x->aux != NULL ? x->aux->keyid : NULL;
   if (out_len != NULL) {
     *out_len = keyid != NULL ? keyid->length : 0;
@@ -150,7 +150,7 @@ unsigned char *X509_keyid_get0(X509 *x, int *out_len) {
   return keyid != NULL ? keyid->data : NULL;
 }
 
-int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj) {
+int X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj) {
   ASN1_OBJECT *objtmp = OBJ_dup(obj);
   if (objtmp == NULL) {
     goto err;
@@ -172,7 +172,7 @@ err:
   return 0;
 }
 
-int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj) {
+int X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj) {
   ASN1_OBJECT *objtmp = OBJ_dup(obj);
   if (objtmp == NULL) {
     goto err;

data/third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h

@@ -79,27 +79,6 @@
 // ARMV8_SHA512 indicates support for hardware SHA-512 instructions.
 #define ARMV8_SHA512 (1 << 6)
 
-#if defined(__ASSEMBLER__)
-
-// We require the ARM assembler provide |__ARM_ARCH| from Arm C Language
-// Extensions (ACLE). This is supported in GCC 4.8+ and Clang 3.2+. MSVC does
-// not implement ACLE, but we require Clang's assembler on Windows.
-#if !defined(__ARM_ARCH)
-#error "ARM assembler must define __ARM_ARCH"
-#endif
-
-// __ARM_ARCH__ is used by OpenSSL assembly to determine the minimum target ARM
-// version.
-//
-// TODO(davidben): Switch the assembly to use |__ARM_ARCH| directly.
-#define __ARM_ARCH__ __ARM_ARCH
-
-// Even when building for 32-bit ARM, support for aarch64 crypto instructions
-// will be included.
-#define __ARM_MAX_ARCH__ 8
-
-#endif  // __ASSEMBLER__
-
 #endif  // ARM || AARCH64
 
 #endif  // OPENSSL_HEADER_ARM_ARCH_H

data/third_party/boringssl-with-bazel/src/include/openssl/asm_base.h

@@ -75,14 +75,13 @@
 #error "ARM assembler must define __ARM_ARCH"
 #endif
 
-// __ARM_ARCH__ is used by OpenSSL assembly to determine the minimum target ARM
-// version.
-//
-// TODO(davidben): Switch the assembly to use |__ARM_ARCH| directly.
-#define __ARM_ARCH__ __ARM_ARCH
-
 // Even when building for 32-bit ARM, support for aarch64 crypto instructions
 // will be included.
+//
+// TODO(davidben): Remove this and the corresponding ifdefs? This is only
+// defined because some OpenSSL assembly files would allow disabling the NEON
+// code entirely. I think we'd prefer to do that by lifting the dispatch to C
+// anyway.
 #define __ARM_MAX_ARCH__ 8
 
 // Support macros for

data/third_party/boringssl-with-bazel/src/include/openssl/base.h

@@ -109,7 +109,7 @@ extern "C" {
 // A consumer may use this symbol in the preprocessor to temporarily build
 // against multiple revisions of BoringSSL at the same time. It is not
 // recommended to do so for longer than is necessary.
-#define BORINGSSL_API_VERSION 26
+#define BORINGSSL_API_VERSION 29
 
 #if defined(BORINGSSL_SHARED_LIBRARY)
 
@@ -286,6 +286,7 @@ typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;
 typedef struct BASIC_CONSTRAINTS_st BASIC_CONSTRAINTS;
 typedef struct DIST_POINT_st DIST_POINT;
 typedef struct DSA_SIG_st DSA_SIG;
+typedef struct GENERAL_NAME_st GENERAL_NAME;
 typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
 typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
 typedef struct Netscape_spkac_st NETSCAPE_SPKAC;
@@ -372,6 +373,7 @@ typedef struct trust_token_client_st TRUST_TOKEN_CLIENT;
 typedef struct trust_token_issuer_st TRUST_TOKEN_ISSUER;
 typedef struct trust_token_method_st TRUST_TOKEN_METHOD;
 typedef struct v3_ext_ctx X509V3_CTX;
+typedef struct v3_ext_method X509V3_EXT_METHOD;
 typedef struct x509_attributes_st X509_ATTRIBUTE;
 typedef struct x509_lookup_st X509_LOOKUP;
 typedef struct x509_lookup_method_st X509_LOOKUP_METHOD;

data/third_party/boringssl-with-bazel/src/include/openssl/bio.h

@@ -703,9 +703,17 @@ OPENSSL_EXPORT int BIO_meth_set_ctrl(BIO_METHOD *method,
 
 // BIO_set_data sets custom data on |bio|. It may be retried with
 // |BIO_get_data|.
+//
+// This function should only be called by the implementation of a custom |BIO|.
+// In particular, the data pointer of a built-in |BIO| is private to the
+// library. For other uses, see |BIO_set_ex_data| and |BIO_set_app_data|.
 OPENSSL_EXPORT void BIO_set_data(BIO *bio, void *ptr);
 
 // BIO_get_data returns custom data on |bio| set by |BIO_get_data|.
+//
+// This function should only be called by the implementation of a custom |BIO|.
+// In particular, the data pointer of a built-in |BIO| is private to the
+// library. For other uses, see |BIO_get_ex_data| and |BIO_get_app_data|.
 OPENSSL_EXPORT void *BIO_get_data(BIO *bio);
 
 // BIO_set_init sets whether |bio| has been fully initialized. Until fully
@@ -761,6 +769,21 @@ OPENSSL_EXPORT int BIO_get_init(BIO *bio);
 #define BIO_CTRL_SET_FILENAME 30
 
 
+// ex_data functions.
+//
+// See |ex_data.h| for details.
+
+OPENSSL_EXPORT int BIO_get_ex_new_index(long argl, void *argp,
+                                        CRYPTO_EX_unused *unused,
+                                        CRYPTO_EX_dup *dup_unused,
+                                        CRYPTO_EX_free *free_func);
+OPENSSL_EXPORT int BIO_set_ex_data(BIO *bio, int idx, void *arg);
+OPENSSL_EXPORT void *BIO_get_ex_data(const BIO *bio, int idx);
+
+#define BIO_set_app_data(bio, arg) (BIO_set_ex_data(bio, 0, (char *)(arg)))
+#define BIO_get_app_data(bio) (BIO_get_ex_data(bio, 0))
+
+
 // Deprecated functions.
 
 // BIO_f_base64 returns a filter |BIO| that base64-encodes data written into
@@ -852,6 +875,7 @@ struct bio_method_st {
 
 struct bio_st {
   const BIO_METHOD *method;
+  CRYPTO_EX_DATA ex_data;
 
   // init is non-zero if this |BIO| has been initialised.
   int init;