grpc 1.84.0 → 1.85.0.pre1

data/third_party/boringssl-with-bazel/include/openssl/ssl3.h

@@ -23,78 +23,23 @@ extern "C" {
 #endif
 
 
-// These are kept to support clients that negotiates higher protocol versions
+// These are kept to support clients that negotiate higher protocol versions
 // using SSLv2 client hello records.
 #define SSL2_MT_CLIENT_HELLO 1
 #define SSL2_VERSION 0x0002
 
-// Signalling cipher suite value from RFC 5746.
+// The following constants are equal to TLS cipher suite values, OR-d with
+// 0x03000000. This is part of OpenSSL's SSL 2.0 legacy. SSL 2.0 has long since
+// been removed from BoringSSL.
+// TODO(davidben): Define these in terms of `SSL_CIPHER_*` constants. The
+// challenge is that existing code expects them to be defined in ssl3.h, so we
+// must first merge ssl3.h into ssl.h.
+#define SSL3_CK_RSA_DES_192_CBC3_SHA 0x0300000A
 #define SSL3_CK_SCSV 0x030000FF
-// Fallback signalling cipher suite value from RFC 7507.
 #define SSL3_CK_FALLBACK_SCSV 0x03005600
 
-#define SSL3_CK_RSA_NULL_MD5 0x03000001
-#define SSL3_CK_RSA_NULL_SHA 0x03000002
-#define SSL3_CK_RSA_RC4_40_MD5 0x03000003
-#define SSL3_CK_RSA_RC4_128_MD5 0x03000004
-#define SSL3_CK_RSA_RC4_128_SHA 0x03000005
-#define SSL3_CK_RSA_RC2_40_MD5 0x03000006
-#define SSL3_CK_RSA_IDEA_128_SHA 0x03000007
-#define SSL3_CK_RSA_DES_40_CBC_SHA 0x03000008
-#define SSL3_CK_RSA_DES_64_CBC_SHA 0x03000009
-#define SSL3_CK_RSA_DES_192_CBC3_SHA 0x0300000A
-
-#define SSL3_CK_DH_DSS_DES_40_CBC_SHA 0x0300000B
-#define SSL3_CK_DH_DSS_DES_64_CBC_SHA 0x0300000C
-#define SSL3_CK_DH_DSS_DES_192_CBC3_SHA 0x0300000D
-#define SSL3_CK_DH_RSA_DES_40_CBC_SHA 0x0300000E
-#define SSL3_CK_DH_RSA_DES_64_CBC_SHA 0x0300000F
-#define SSL3_CK_DH_RSA_DES_192_CBC3_SHA 0x03000010
-
-#define SSL3_CK_EDH_DSS_DES_40_CBC_SHA 0x03000011
-#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA 0x03000012
-#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA 0x03000013
-#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA 0x03000014
-#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA 0x03000015
-#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA 0x03000016
-
-#define SSL3_CK_ADH_RC4_40_MD5 0x03000017
-#define SSL3_CK_ADH_RC4_128_MD5 0x03000018
-#define SSL3_CK_ADH_DES_40_CBC_SHA 0x03000019
-#define SSL3_CK_ADH_DES_64_CBC_SHA 0x0300001A
-#define SSL3_CK_ADH_DES_192_CBC_SHA 0x0300001B
-
-#define SSL3_TXT_RSA_NULL_MD5 "NULL-MD5"
-#define SSL3_TXT_RSA_NULL_SHA "NULL-SHA"
-#define SSL3_TXT_RSA_RC4_40_MD5 "EXP-RC4-MD5"
-#define SSL3_TXT_RSA_RC4_128_MD5 "RC4-MD5"
-#define SSL3_TXT_RSA_RC4_128_SHA "RC4-SHA"
-#define SSL3_TXT_RSA_RC2_40_MD5 "EXP-RC2-CBC-MD5"
-#define SSL3_TXT_RSA_IDEA_128_SHA "IDEA-CBC-SHA"
-#define SSL3_TXT_RSA_DES_40_CBC_SHA "EXP-DES-CBC-SHA"
-#define SSL3_TXT_RSA_DES_64_CBC_SHA "DES-CBC-SHA"
 #define SSL3_TXT_RSA_DES_192_CBC3_SHA "DES-CBC3-SHA"
 
-#define SSL3_TXT_DH_DSS_DES_40_CBC_SHA "EXP-DH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_DH_DSS_DES_64_CBC_SHA "DH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA "DH-DSS-DES-CBC3-SHA"
-#define SSL3_TXT_DH_RSA_DES_40_CBC_SHA "EXP-DH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_DH_RSA_DES_64_CBC_SHA "DH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA "DH-RSA-DES-CBC3-SHA"
-
-#define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA "EXP-EDH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA "EDH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA "EDH-DSS-DES-CBC3-SHA"
-#define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA "EXP-EDH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA "EDH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA "EDH-RSA-DES-CBC3-SHA"
-
-#define SSL3_TXT_ADH_RC4_40_MD5 "EXP-ADH-RC4-MD5"
-#define SSL3_TXT_ADH_RC4_128_MD5 "ADH-RC4-MD5"
-#define SSL3_TXT_ADH_DES_40_CBC_SHA "EXP-ADH-DES-CBC-SHA"
-#define SSL3_TXT_ADH_DES_64_CBC_SHA "ADH-DES-CBC-SHA"
-#define SSL3_TXT_ADH_DES_192_CBC_SHA "ADH-DES-CBC3-SHA"
-
 #define SSL3_SSL_SESSION_ID_LENGTH 32
 #define SSL3_MAX_SSL_SESSION_ID_LENGTH 32
 
@@ -139,7 +84,7 @@ extern "C" {
 // bytes (256) plus the mac size.
 //
 // TODO(davidben): This derivation doesn't take AEADs into account, or TLS 1.1
-// explicit nonces. It happens to work because |SSL3_RT_MAX_MD_SIZE| is larger
+// explicit nonces. It happens to work because `SSL3_RT_MAX_MD_SIZE` is larger
 // than necessary and no true AEAD has variable overhead in TLS 1.2.
 #define SSL3_RT_MAX_ENCRYPTED_OVERHEAD (256 + SSL3_RT_MAX_MD_SIZE)
 
@@ -150,7 +95,7 @@ extern "C" {
     (EVP_AEAD_MAX_OVERHEAD + EVP_AEAD_MAX_NONCE_LENGTH)
 
 // SSL3_RT_MAX_COMPRESSED_LENGTH is an alias for
-// |SSL3_RT_MAX_PLAIN_LENGTH|. Compression is gone, so don't include the
+// `SSL3_RT_MAX_PLAIN_LENGTH`. Compression is gone, so don't include the
 // compression overhead.
 #define SSL3_RT_MAX_COMPRESSED_LENGTH SSL3_RT_MAX_PLAIN_LENGTH
 
@@ -159,9 +104,6 @@ extern "C" {
 #define SSL3_RT_MAX_PACKET_SIZE \
   (SSL3_RT_MAX_ENCRYPTED_LENGTH + SSL3_RT_HEADER_LENGTH)
 
-#define SSL3_MD_CLIENT_FINISHED_CONST "\x43\x4C\x4E\x54"
-#define SSL3_MD_SERVER_FINISHED_CONST "\x53\x52\x56\x52"
-
 #define SSL3_RT_CHANGE_CIPHER_SPEC 20
 #define SSL3_RT_ALERT 21
 #define SSL3_RT_HANDSHAKE 22
@@ -214,7 +156,7 @@ extern "C" {
 #define DTLS1_MT_HELLO_VERIFY_REQUEST 3
 
 // The following are legacy aliases for consumers which use
-// |SSL_CTX_set_msg_callback|.
+// `SSL_CTX_set_msg_callback`.
 #define SSL3_MT_SERVER_DONE SSL3_MT_SERVER_HELLO_DONE
 #define SSL3_MT_NEWSESSION_TICKET SSL3_MT_NEW_SESSION_TICKET
 

data/third_party/boringssl-with-bazel/include/openssl/stack.h

@@ -26,49 +26,67 @@ extern "C" {
 // used collection object.
 //
 // This file defines macros for type-safe use of the stack functions. A stack
-// type is named like |STACK_OF(FOO)| and is accessed with functions named
-// like |sk_FOO_*|. Note the stack will typically contain /pointers/ to |FOO|.
+// type is named like `STACK_OF(FOO)` and is accessed with functions named
+// like `sk_FOO_*`. Note the stack will typically contain /pointers/ to `FOO`.
 //
-// The |DECLARE_STACK_OF| macro makes |STACK_OF(FOO)| available, and
-// |DEFINE_STACK_OF| makes the corresponding functions available.
+// The `DECLARE_STACK_OF` macro makes `STACK_OF(FOO)` available, and
+// `DEFINE_STACK_OF` makes the corresponding functions available.
 
 
 // Defining stacks.
 
-// STACK_OF expands to the stack type for |type|.
+// STACK_OF expands to the stack type for `type`.
 #define STACK_OF(type) struct stack_st_##type
 
-// DECLARE_STACK_OF declares the |STACK_OF(type)| type. It does not make the
-// corresponding |sk_type_*| functions available. This macro should be used in
+// DECLARE_STACK_OF declares the `STACK_OF(type)` type. It does not make the
+// corresponding `sk_type_*` functions available. This macro should be used in
 // files which only need the type.
 #define DECLARE_STACK_OF(type) STACK_OF(type);
 
-// DEFINE_NAMED_STACK_OF defines |STACK_OF(name)| to be a stack whose elements
-// are |type| *. This macro makes the |sk_name_*| functions available.
+// DEFINE_NAMED_STACK_OF defines `STACK_OF(name)` to be a stack whose elements
+// are `type` *. This macro makes the `sk_name_*` functions available.
 //
-// It is not necessary to use |DECLARE_STACK_OF| in files which use this macro.
+// It is not necessary to use `DECLARE_STACK_OF` in files which use this macro.
+//
+// Must be used from the global namespace.
 #define DEFINE_NAMED_STACK_OF(name, type)                    \
   BORINGSSL_DEFINE_STACK_OF_IMPL(name, type *, const type *) \
   BORINGSSL_DEFINE_STACK_TRAITS(name, type, false)
 
-// DEFINE_STACK_OF defines |STACK_OF(type)| to be a stack whose elements are
-// |type| *. This macro makes the |sk_type_*| functions available.
+// DEFINE_STACK_OF defines `STACK_OF(type)` to be a stack whose elements are
+// `type` *. This macro makes the `sk_type_*` functions available.
+//
+// It is not necessary to use `DECLARE_STACK_OF` in files which use this macro.
 //
-// It is not necessary to use |DECLARE_STACK_OF| in files which use this macro.
+// Must be used from the global namespace.
 #define DEFINE_STACK_OF(type) DEFINE_NAMED_STACK_OF(type, type)
 
-// DEFINE_CONST_STACK_OF defines |STACK_OF(type)| to be a stack whose elements
-// are const |type| *. This macro makes the |sk_type_*| functions available.
+// DEFINE_CONST_STACK_OF defines `STACK_OF(type)` to be a stack whose elements
+// are const `type` *. This macro makes the `sk_type_*` functions available.
+//
+// It is not necessary to use `DECLARE_STACK_OF` in files which use this macro.
 //
-// It is not necessary to use |DECLARE_STACK_OF| in files which use this macro.
+// Must be used from the global namespace.
 #define DEFINE_CONST_STACK_OF(type)                                \
   BORINGSSL_DEFINE_STACK_OF_IMPL(type, const type *, const type *) \
   BORINGSSL_DEFINE_STACK_TRAITS(type, const type, true)
 
+// DEFINE_NAMESPACED_STACK_OF is same as `DEFINE_STACK_OF` but to be used for
+// internal stacks from within the bssl namespace.
+//
+// Such stacks then can only be accessed using `STACK_OF` if in the `bssl`
+// namespace or if the `bssl` namespace has been imported with a
+// using-directive.
+#define DEFINE_NAMESPACED_STACK_OF(type)                     \
+  BORINGSSL_DEFINE_STACK_OF_IMPL(type, type *, const type *) \
+  BSSL_NAMESPACE_END                                         \
+  BORINGSSL_DEFINE_STACK_TRAITS(type, type, false)           \
+  BSSL_NAMESPACE_BEGIN
+
 
 // Using stacks.
 //
-// After the |DEFINE_STACK_OF| macro is used, the following functions are
+// After the `DEFINE_STACK_OF` macro is used, the following functions are
 // available.
 
 #if 0  // Sample
@@ -80,11 +98,11 @@ typedef void (*sk_SAMPLE_free_func)(SAMPLE *);
 // return the copy or NULL on error.
 typedef SAMPLE *(*sk_SAMPLE_copy_func)(const SAMPLE *);
 
-// sk_SAMPLE_cmp_func is a callback to compare |*a| to |*b|. It should return a
-// value < 0, 0, or > 0 if |*a| is less than, equal to, or greater than |*b|,
+// sk_SAMPLE_cmp_func is a callback to compare `*a` to `*b`. It should return a
+// value < 0, 0, or > 0 if `*a` is less than, equal to, or greater than `*b`,
 // respectively.  Note the extra indirection - the function is given a pointer
-// to a pointer to the element. This is the |qsort|/|bsearch| comparison
-// function applied to an array of |SAMPLE*|.
+// to a pointer to the element. This is the `qsort`/`bsearch` comparison
+// function applied to an array of `SAMPLE*`.
 typedef int (*sk_SAMPLE_cmp_func)(const SAMPLE *const *a,
                                   const SAMPLE *const *b);
 
@@ -96,107 +114,113 @@ STACK_OF(SAMPLE) *sk_SAMPLE_new(sk_SAMPLE_cmp_func comp);
 // NULL on allocation failure.
 STACK_OF(SAMPLE) *sk_SAMPLE_new_null(void);
 
-// sk_SAMPLE_num returns the number of elements in |sk|. It is safe to cast this
-// value to |int|. |sk| is guaranteed to have at most |INT_MAX| elements. If
-// |sk| is NULL, it is treated as the empty list and this function returns zero.
+// sk_SAMPLE_num returns the number of elements in `sk`. It is safe to cast this
+// value to `int`. `sk` is guaranteed to have at most `INT_MAX` elements. If
+// `sk` is NULL, it is treated as the empty list and this function returns zero.
 size_t sk_SAMPLE_num(const STACK_OF(SAMPLE) *sk);
 
-// sk_SAMPLE_zero resets |sk| to the empty state but does nothing to free the
+// sk_SAMPLE_zero resets `sk` to the empty state but does nothing to free the
 // individual elements themselves.
 void sk_SAMPLE_zero(STACK_OF(SAMPLE) *sk);
 
-// sk_SAMPLE_value returns the |i|th pointer in |sk|, or NULL if |i| is out of
-// range. If |sk| is NULL, it is treated as an empty list and the function
+// sk_SAMPLE_value returns the `i`th pointer in `sk`, or NULL if `i` is out of
+// range. If `sk` is NULL, it is treated as an empty list and the function
 // returns NULL.
 SAMPLE *sk_SAMPLE_value(const STACK_OF(SAMPLE) *sk, size_t i);
 
-// sk_SAMPLE_set sets the |i|th pointer in |sk| to |p| and returns |p|. If |i|
+// sk_SAMPLE_set sets the `i`th pointer in `sk` to `p` and returns `p`. If `i`
 // is out of range, it returns NULL.
 SAMPLE *sk_SAMPLE_set(STACK_OF(SAMPLE) *sk, size_t i, SAMPLE *p);
 
-// sk_SAMPLE_free frees |sk|, but does nothing to free the individual elements.
-// Use |sk_SAMPLE_pop_free| to also free the elements.
+// sk_SAMPLE_free frees `sk`, but does nothing to free the individual elements.
+// Use `sk_SAMPLE_pop_free` to also free the elements.
 void sk_SAMPLE_free(STACK_OF(SAMPLE) *sk);
 
-// sk_SAMPLE_pop_free calls |free_func| on each element in |sk| and then
+// sk_SAMPLE_pop_free calls `free_func` on each element in `sk` and then
 // frees the stack itself.
 void sk_SAMPLE_pop_free(STACK_OF(SAMPLE) *sk, sk_SAMPLE_free_func free_func);
 
-// sk_SAMPLE_insert inserts |p| into the stack at index |where|, moving existing
+// sk_SAMPLE_insert inserts `p` into the stack at index `where`, moving existing
 // elements if needed. It returns the length of the new stack, or zero on
 // error.
 size_t sk_SAMPLE_insert(STACK_OF(SAMPLE) *sk, SAMPLE *p, size_t where);
 
-// sk_SAMPLE_delete removes the pointer at index |where|, moving other elements
-// down if needed. It returns the removed pointer, or NULL if |where| is out of
+// sk_SAMPLE_delete removes the pointer at index `where`, moving other elements
+// down if needed. It returns the removed pointer, or NULL if `where` is out of
 // range.
 SAMPLE *sk_SAMPLE_delete(STACK_OF(SAMPLE) *sk, size_t where);
 
-// sk_SAMPLE_delete_ptr removes, at most, one instance of |p| from |sk| based on
-// pointer equality. If an instance of |p| is found then |p| is returned,
+// sk_SAMPLE_delete_ptr removes, at most, one instance of `p` from `sk` based on
+// pointer equality. If an instance of `p` is found then `p` is returned,
 // otherwise it returns NULL.
 SAMPLE *sk_SAMPLE_delete_ptr(STACK_OF(SAMPLE) *sk, const SAMPLE *p);
 
-// sk_SAMPLE_delete_if_func is the callback function for |sk_SAMPLE_delete_if|.
-// It should return one to remove |p| and zero to keep it.
+// sk_SAMPLE_delete_if_func is the callback function for `sk_SAMPLE_delete_if`.
+// It should return one to remove `p` and zero to keep it.
 typedef int (*sk_SAMPLE_delete_if_func)(SAMPLE *p, void *data);
 
-// sk_SAMPLE_delete_if calls |func| with each element of |sk| and removes the
-// entries where |func| returned one. This function does not free or return
-// removed pointers so, if |sk| owns its contents, |func| should release the
+// sk_SAMPLE_delete_if calls `func` with each element of `sk` and removes the
+// entries where `func` returned one. This function does not free or return
+// removed pointers so, if `sk` owns its contents, `func` should release the
 // pointers prior to returning one.
 void sk_SAMPLE_delete_if(STACK_OF(SAMPLE) *sk, sk_SAMPLE_delete_if_func func,
                          void *data);
 
-// sk_SAMPLE_find find the first value in |sk| equal to |p|. |sk|'s comparison
-// function determines equality, or pointer equality if |sk| has no comparison
+// sk_SAMPLE_find find the first value in `sk` equal to `p`. `sk`'s comparison
+// function determines equality, or pointer equality if `sk` has no comparison
 // function.
 //
-// If the stack is sorted (see |sk_SAMPLE_sort|), this function uses a binary
+// If the stack is sorted (see `sk_SAMPLE_sort`), this function uses a binary
 // search. Otherwise it performs a linear search. If it finds a matching
-// element, it writes the index to |*out_index| (if |out_index| is not NULL) and
-// returns one. Otherwise, it returns zero. If |sk| is NULL, it is treated as
+// element, it writes the index to `*out_index` (if `out_index` is not NULL) and
+// returns one. Otherwise, it returns zero. If `sk` is NULL, it is treated as
 // the empty list and the function returns zero.
 //
 // Note this differs from OpenSSL. The type signature is slightly different, and
-// OpenSSL's version will implicitly sort |sk| if it has a comparison function
+// OpenSSL's version will implicitly sort `sk` if it has a comparison function
 // defined.
 int sk_SAMPLE_find(const STACK_OF(SAMPLE) *sk, size_t *out_index,
                    const SAMPLE *p);
 
-// sk_SAMPLE_shift removes and returns the first element in |sk|, or NULL if
-// |sk| is empty.
+// sk_SAMPLE_shift removes and returns the first element in `sk`, or NULL if
+// `sk` is empty.
 SAMPLE *sk_SAMPLE_shift(STACK_OF(SAMPLE) *sk);
 
-// sk_SAMPLE_push appends |p| to |sk| and returns the length of the new stack,
+// sk_SAMPLE_push appends `p` to `sk` and returns the length of the new stack,
 // or 0 on allocation failure.
 size_t sk_SAMPLE_push(STACK_OF(SAMPLE) *sk, SAMPLE *p);
 
-// sk_SAMPLE_pop removes and returns the last element of |sk|, or NULL if |sk|
+// sk_SAMPLE_pop removes and returns the last element of `sk`, or NULL if `sk`
 // is empty.
 SAMPLE *sk_SAMPLE_pop(STACK_OF(SAMPLE) *sk);
 
 // sk_SAMPLE_dup performs a shallow copy of a stack and returns the new stack,
-// or NULL on error. Use |sk_SAMPLE_deep_copy| to also copy the elements.
+// or NULL on error. Use `sk_SAMPLE_deep_copy` to also copy the elements.
 STACK_OF(SAMPLE) *sk_SAMPLE_dup(const STACK_OF(SAMPLE) *sk);
 
-// sk_SAMPLE_sort sorts the elements of |sk| into ascending order based on the
+// sk_SAMPLE_sort sorts the elements of `sk` into ascending order based on the
 // comparison function. The stack maintains a "sorted" flag and sorting an
 // already sorted stack is a no-op.
 void sk_SAMPLE_sort(STACK_OF(SAMPLE) *sk);
 
-// sk_SAMPLE_is_sorted returns one if |sk| is known to be sorted and zero
+// sk_SAMPLE_sort_and_dedup sorts the elements of `sk` based on the comparison
+// function and removes duplicates. If `free_func` is not NULL, it is called on
+// every removed element.
+void sk_SAMPLE_sort_and_dedup(STACK_OF(SAMPLE) *sk,
+                              sk_SAMPLE_free_func free_func);
+
+// sk_SAMPLE_is_sorted returns one if `sk` is known to be sorted and zero
 // otherwise.
 int sk_SAMPLE_is_sorted(const STACK_OF(SAMPLE) *sk);
 
-// sk_SAMPLE_set_cmp_func sets the comparison function to be used by |sk| and
+// sk_SAMPLE_set_cmp_func sets the comparison function to be used by `sk` and
 // returns the previous one.
 sk_SAMPLE_cmp_func sk_SAMPLE_set_cmp_func(STACK_OF(SAMPLE) *sk,
                                           sk_SAMPLE_cmp_func comp);
 
-// sk_SAMPLE_deep_copy performs a copy of |sk| and of each of the non-NULL
-// elements in |sk| by using |copy_func|. If an error occurs, it calls
-// |free_func| to free any copies already made and returns NULL.
+// sk_SAMPLE_deep_copy performs a copy of `sk` and of each of the non-NULL
+// elements in `sk` by using `copy_func`. If an error occurs, it calls
+// `free_func` to free any copies already made and returns NULL.
 STACK_OF(SAMPLE) *sk_SAMPLE_deep_copy(const STACK_OF(SAMPLE) *sk,
                                       sk_SAMPLE_copy_func copy_func,
                                       sk_SAMPLE_free_func free_func);
@@ -206,34 +230,34 @@ STACK_OF(SAMPLE) *sk_SAMPLE_deep_copy(const STACK_OF(SAMPLE) *sk,
 
 // Private functions.
 //
-// The |sk_*| functions generated above are implemented internally using the
+// The `sk_*` functions generated above are implemented internally using the
 // type-erased functions below. Callers should use the typed wrappers instead.
 // When using the type-erased functions, callers are responsible for ensuring
 // the underlying types are correct. Casting pointers to the wrong types will
 // result in memory errors.
 
 // OPENSSL_sk_free_func is a function that frees an element in a stack. Note its
-// actual type is void (*)(T *) for some T. Low-level |sk_*| functions will be
+// actual type is void (*)(T *) for some T. Low-level `sk_*` functions will be
 // passed a type-specific wrapper to call it correctly.
 typedef void (*OPENSSL_sk_free_func)(void *ptr);
 
 // OPENSSL_sk_copy_func is a function that copies an element in a stack. Note
-// its actual type is T *(*)(const T *) for some T. Low-level |sk_*| functions
+// its actual type is T *(*)(const T *) for some T. Low-level `sk_*` functions
 // will be passed a type-specific wrapper to call it correctly.
 typedef void *(*OPENSSL_sk_copy_func)(const void *ptr);
 
 // OPENSSL_sk_cmp_func is a comparison function that returns a value < 0, 0 or >
-// 0 if |*a| is less than, equal to or greater than |*b|, respectively.  Note
+// 0 if `*a` is less than, equal to or greater than `*b`, respectively.  Note
 // the extra indirection - the function is given a pointer to a pointer to the
 // element. This differs from the usual qsort/bsearch comparison function.
 //
-// Note its actual type is |int (*)(const T *const *a, const T *const *b)|.
-// Low-level |sk_*| functions will be passed a type-specific wrapper to call it
+// Note its actual type is `int (*)(const T *const *a, const T *const *b)`.
+// Low-level `sk_*` functions will be passed a type-specific wrapper to call it
 // correctly.
 typedef int (*OPENSSL_sk_cmp_func)(const void *const *a, const void *const *b);
 
 // OPENSSL_sk_delete_if_func is the generic version of
-// |sk_SAMPLE_delete_if_func|.
+// `sk_SAMPLE_delete_if_func`.
 typedef int (*OPENSSL_sk_delete_if_func)(void *obj, void *data);
 
 // The following function types call the above type-erased signatures with the
@@ -250,7 +274,7 @@ typedef int (*OPENSSL_sk_call_delete_if_func)(OPENSSL_sk_delete_if_func, void *,
 typedef struct stack_st OPENSSL_STACK;
 
 // The following are raw stack functions. They implement the corresponding typed
-// |sk_SAMPLE_*| functions generated by |DEFINE_STACK_OF|. Callers shouldn't be
+// `sk_SAMPLE_*` functions generated by `DEFINE_STACK_OF`. Callers shouldn't be
 // using them. Rather, callers should use the typed functions.
 OPENSSL_EXPORT OPENSSL_STACK *OPENSSL_sk_new(OPENSSL_sk_cmp_func comp);
 OPENSSL_EXPORT OPENSSL_STACK *OPENSSL_sk_new_null(void);
@@ -278,6 +302,9 @@ OPENSSL_EXPORT void *OPENSSL_sk_pop(OPENSSL_STACK *sk);
 OPENSSL_EXPORT OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *sk);
 OPENSSL_EXPORT void OPENSSL_sk_sort(OPENSSL_STACK *sk,
                                     OPENSSL_sk_call_cmp_func call_cmp_func);
+OPENSSL_EXPORT void OPENSSL_sk_sort_and_dedup(
+    OPENSSL_STACK *sk, OPENSSL_sk_call_cmp_func call_cmp_func,
+    OPENSSL_sk_call_free_func call_free_func, OPENSSL_sk_free_func free_func);
 OPENSSL_EXPORT int OPENSSL_sk_is_sorted(const OPENSSL_STACK *sk);
 OPENSSL_EXPORT OPENSSL_sk_cmp_func
 OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk, OPENSSL_sk_cmp_func comp);
@@ -297,7 +324,7 @@ OPENSSL_EXPORT OPENSSL_STACK *OPENSSL_sk_deep_copy(
 
 typedef OPENSSL_STACK _STACK;
 
-// The following functions call the corresponding |OPENSSL_sk_*| function.
+// The following functions call the corresponding `OPENSSL_sk_*` function.
 OPENSSL_EXPORT OPENSSL_DEPRECATED OPENSSL_STACK *sk_new_null(void);
 OPENSSL_EXPORT OPENSSL_DEPRECATED size_t sk_num(const OPENSSL_STACK *sk);
 OPENSSL_EXPORT OPENSSL_DEPRECATED void *sk_value(const OPENSSL_STACK *sk,
@@ -306,16 +333,16 @@ OPENSSL_EXPORT OPENSSL_DEPRECATED void sk_free(OPENSSL_STACK *sk);
 OPENSSL_EXPORT OPENSSL_DEPRECATED size_t sk_push(OPENSSL_STACK *sk, void *p);
 OPENSSL_EXPORT OPENSSL_DEPRECATED void *sk_pop(OPENSSL_STACK *sk);
 
-// sk_pop_free_ex calls |OPENSSL_sk_pop_free_ex|.
+// sk_pop_free_ex calls `OPENSSL_sk_pop_free_ex`.
 //
 // TODO(b/291994116): Remove this.
 OPENSSL_EXPORT OPENSSL_DEPRECATED void sk_pop_free_ex(
     OPENSSL_STACK *sk, OPENSSL_sk_call_free_func call_free_func,
     OPENSSL_sk_free_func free_func);
 
-// sk_pop_free behaves like |OPENSSL_sk_pop_free_ex| but performs an invalid
+// sk_pop_free behaves like `OPENSSL_sk_pop_free_ex` but performs an invalid
 // function pointer cast. It exists because some existing callers called
-// |sk_pop_free| directly.
+// `sk_pop_free` directly.
 //
 // TODO(davidben): Migrate callers to bssl::UniquePtr and remove this.
 OPENSSL_EXPORT OPENSSL_DEPRECATED void sk_pop_free(
@@ -354,15 +381,21 @@ BSSL_NAMESPACE_END
   /* We disable MSVC C4191 in this macro, which warns when pointers are cast   \
    * to the wrong type. While the cast itself is valid, it is often a bug      \
    * because calling it through the cast is UB. However, we never actually     \
-   * call functions as |OPENSSL_sk_cmp_func|. The type is just a type-erased   \
+   * call functions as `OPENSSL_sk_cmp_func`. The type is just a type-erased   \
    * function pointer. (C does not guarantee function pointers fit in          \
-   * |void*|, and GCC will warn on this.) Thus we just disable the false       \
+   * `void*`, and GCC will warn on this.) Thus we just disable the false       \
    * positive warning. */                                                      \
   OPENSSL_MSVC_PRAGMA(warning(push))                                           \
   OPENSSL_MSVC_PRAGMA(warning(disable : 4191))                                 \
-  OPENSSL_CLANG_PRAGMA("clang diagnostic push")                                \
-  OPENSSL_CLANG_PRAGMA("clang diagnostic ignored \"-Wunknown-warning-option\"") \
-  OPENSSL_CLANG_PRAGMA("clang diagnostic ignored \"-Wcast-function-type-strict\"") \
+  OPENSSL_GNUC_CLANG_PRAGMA("GCC diagnostic push")                             \
+  OPENSSL_CLANG_PRAGMA(                                                        \
+      "clang diagnostic ignored \"-Wunknown-warning-option\"")                 \
+  OPENSSL_CLANG_PRAGMA(                                                        \
+      "clang diagnostic ignored \"-Wcast-function-type-strict\"")              \
+  /* We also disable -Wcast-qual. As part of this C-based type erasure setup,  \
+   * the wrapper macros need to cast away const in places. In C++, const_cast  \
+   * suppresses the warning, but it seemingly cannot be suppressed in C. */    \
+  OPENSSL_GNUC_CLANG_PRAGMA("GCC diagnostic ignored \"-Wcast-qual\"")          \
                                                                                \
   DECLARE_STACK_OF(name)                                                       \
                                                                                \
@@ -386,7 +419,7 @@ BSSL_NAMESPACE_END
                                                const void *a, const void *b) { \
     constptrtype a_ptr = (constptrtype)a;                                      \
     constptrtype b_ptr = (constptrtype)b;                                      \
-    /* |cmp_func| expects an extra layer of pointers to match qsort. */        \
+    /* `cmp_func` expects an extra layer of pointers to match qsort. */        \
     return ((sk_##name##_cmp_func)cmp_func)(&a_ptr, &b_ptr);                   \
   }                                                                            \
                                                                                \
@@ -479,6 +512,13 @@ BSSL_NAMESPACE_END
     OPENSSL_sk_sort((OPENSSL_STACK *)sk, sk_##name##_call_cmp_func);           \
   }                                                                            \
                                                                                \
+  OPENSSL_INLINE void sk_##name##_sort_and_dedup(                              \
+      STACK_OF(name) *sk, sk_##name##_free_func free_func) {                   \
+    OPENSSL_sk_sort_and_dedup((OPENSSL_STACK *)sk, sk_##name##_call_cmp_func,  \
+                              sk_##name##_call_free_func,                      \
+                              (OPENSSL_sk_free_func)free_func);                \
+  }                                                                            \
+                                                                               \
   OPENSSL_INLINE int sk_##name##_is_sorted(const STACK_OF(name) *sk) {         \
     return OPENSSL_sk_is_sorted((const OPENSSL_STACK *)sk);                    \
   }                                                                            \
@@ -498,7 +538,7 @@ BSSL_NAMESPACE_END
         (OPENSSL_sk_free_func)free_func);                                      \
   }                                                                            \
                                                                                \
-  OPENSSL_CLANG_PRAGMA("clang diagnostic pop")                                 \
+  OPENSSL_GNUC_CLANG_PRAGMA("GCC diagnostic pop")                              \
   OPENSSL_MSVC_PRAGMA(warning(pop))
 
 
@@ -515,6 +555,7 @@ DEFINE_NAMED_STACK_OF(OPENSSL_STRING, char)
 #endif
 
 #if !defined(BORINGSSL_NO_CXX)
+// Work around consumers including our headers under extern "C".
 extern "C++" {
 
 #include <type_traits>
@@ -523,7 +564,7 @@ BSSL_NAMESPACE_BEGIN
 
 namespace internal {
 
-// Stacks defined with |DEFINE_CONST_STACK_OF| are freed with |sk_free|.
+// Stacks defined with `DEFINE_CONST_STACK_OF` are freed with `sk_free`.
 template <typename Stack>
 struct DeleterImpl<Stack, std::enable_if_t<StackTraits<Stack>::kIsConst>> {
   static void Free(Stack *sk) {
@@ -531,7 +572,7 @@ struct DeleterImpl<Stack, std::enable_if_t<StackTraits<Stack>::kIsConst>> {
   }
 };
 
-// Stacks defined with |DEFINE_STACK_OF| are freed with |sk_pop_free| and the
+// Stacks defined with `DEFINE_STACK_OF` are freed with `sk_pop_free` and the
 // corresponding type's deleter.
 template <typename Stack>
 struct DeleterImpl<Stack, std::enable_if_t<!StackTraits<Stack>::kIsConst>> {
@@ -590,7 +631,7 @@ using StackIterator =
 
 }  // namespace internal
 
-// PushToStack pushes |elem| to |sk|. It returns true on success and false on
+// PushToStack pushes `elem` to `sk`. It returns true on success and false on
 // allocation failure.
 template <typename Stack>
 inline std::enable_if_t<!internal::StackTraits<Stack>::kIsConst, bool>
@@ -604,6 +645,20 @@ PushToStack(Stack *sk,
   return true;
 }
 
+// Define begin() and end() for stack types so C++ range for loops work.
+// This pair of functions is for DEFINE_NAMESPACED_STACK_OF stacks, unlike
+// the other pair, which is for DEFINE_STACK_OF ones.
+template <typename Stack>
+inline bssl::internal::StackIterator<Stack> begin(const Stack *sk) {
+  return bssl::internal::StackIterator<Stack>(sk, 0);
+}
+
+template <typename Stack>
+inline bssl::internal::StackIterator<Stack> end(const Stack *sk) {
+  return bssl::internal::StackIterator<Stack>(
+      sk, OPENSSL_sk_num(reinterpret_cast<const OPENSSL_STACK *>(sk)));
+}
+
 BSSL_NAMESPACE_END
 
 // Define begin() and end() for stack types so C++ range for loops work.

data/third_party/boringssl-with-bazel/include/openssl/target.h

@@ -48,8 +48,10 @@
 #elif defined(__pnacl__)
 #define OPENSSL_32_BIT
 #define OPENSSL_PNACL
-#elif defined(__wasm__)
+#elif defined(__wasm32__)
 #define OPENSSL_32_BIT
+#elif defined(__wasm64__)
+#define OPENSSL_64_BIT
 #elif defined(__asmjs__)
 #define OPENSSL_32_BIT
 #elif defined(__myriad2__)
@@ -103,6 +105,11 @@
 #define OPENSSL_FUCHSIA
 #endif
 
+// See go/boringssl-on-pythia.
+#if defined(__pythia__)
+#define OPENSSL_PYTHIA
+#endif
+
 // Trusty is Android's TEE target. See
 // https://source.android.com/docs/security/features/trusty
 //
@@ -163,6 +170,11 @@
 #define OPENSSL_NO_SOCK
 #endif
 
+#if defined(OPENSSL_PYTHIA)
+#define OPENSSL_NO_POSIX_IO
+#define OPENSSL_NO_SOCK
+#endif
+
 #if defined(__ANDROID_API__)
 #define OPENSSL_ANDROID
 #endif

data/third_party/boringssl-with-bazel/include/openssl/thread.h

@@ -24,16 +24,6 @@ extern "C" {
 #endif
 
 
-// CRYPTO_refcount_t is the type of a reference count.
-//
-// Since some platforms use C11 atomics to access this, it should have the
-// _Atomic qualifier. However, this header is included by C++ programs as well
-// as C code that might not set -std=c11. So, in practice, it's not possible to
-// do that. Instead we statically assert that the size and native alignment of
-// a plain uint32_t and an _Atomic uint32_t are equal in refcount.c.
-typedef uint32_t CRYPTO_refcount_t;
-
-
 // Deprecated functions.
 //
 // Historically, OpenSSL required callers to provide locking callbacks.