grpc 1.10.0 → 1.11.0.pre2

data/include/grpc/byte_buffer.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_BYTE_BUFFER_H
 #define GRPC_BYTE_BUFFER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/byte_buffer.h>
 #include <grpc/slice_buffer.h>
 

data/include/grpc/byte_buffer_reader.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_BYTE_BUFFER_READER_H
 #define GRPC_BYTE_BUFFER_READER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/byte_buffer_reader.h>
 
 #endif /* GRPC_BYTE_BUFFER_READER_H */

data/include/grpc/census.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_CENSUS_H
 #define GRPC_CENSUS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/grpc.h>
 
 #ifdef __cplusplus

data/include/grpc/fork.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_FORK_H
 #define GRPC_FORK_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/fork.h>
 
 #endif /* GRPC_FORK_H */

data/include/grpc/grpc.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_H
 #define GRPC_GRPC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/status.h>
 
 #include <grpc/byte_buffer.h>
@@ -284,6 +286,14 @@ GRPCAPI grpc_channel* grpc_lame_client_channel_create(
 /** Close and destroy a grpc channel */
 GRPCAPI void grpc_channel_destroy(grpc_channel* channel);
 
+/** Returns the JSON formatted channel trace for this channel. The caller
+    owns the returned string and is responsible for freeing it. */
+GRPCAPI char* grpc_channel_get_trace(grpc_channel* channel);
+
+/** Returns the channel uuid, which can be used to look up its trace at a
+    later time. */
+GRPCAPI intptr_t grpc_channel_get_uuid(grpc_channel* channel);
+
 /** Error handling for grpc_call
    Most grpc_call functions return a grpc_error. If the error is not GRPC_OK
    then the operation failed due to some unsatisfied precondition.

data/include/grpc/grpc_cronet.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_CRONET_H
 #define GRPC_GRPC_CRONET_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/grpc.h>
 
 #ifdef __cplusplus

data/include/grpc/grpc_posix.h

@@ -19,9 +19,10 @@
 #ifndef GRPC_GRPC_POSIX_H
 #define GRPC_GRPC_POSIX_H
 
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include <grpc/impl/codegen/grpc_types.h>
+
 #include <stddef.h>
 
 #ifdef __cplusplus

data/include/grpc/grpc_security.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_SECURITY_H
 #define GRPC_GRPC_SECURITY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
@@ -98,6 +100,25 @@ GRPCAPI void grpc_auth_context_add_cstring_property(grpc_auth_context* ctx,
 GRPCAPI int grpc_auth_context_set_peer_identity_property_name(
     grpc_auth_context* ctx, const char* name);
 
+/** --- SSL Session Cache. ---
+
+    A SSL session cache object represents a way to cache client sessions
+    between connections. Only ticket-based resumption is supported. */
+
+typedef struct grpc_ssl_session_cache grpc_ssl_session_cache;
+
+/** Create LRU cache for client-side SSL sessions with the given capacity.
+    If capacity is < 1, a default capacity is used instead. */
+GRPCAPI grpc_ssl_session_cache* grpc_ssl_session_cache_create_lru(
+    size_t capacity);
+
+/** Destroy SSL session cache. */
+GRPCAPI void grpc_ssl_session_cache_destroy(grpc_ssl_session_cache* cache);
+
+/** Create a channel arg with the given cache object. */
+GRPCAPI grpc_arg
+grpc_ssl_session_cache_create_channel_arg(grpc_ssl_session_cache* cache);
+
 /** --- grpc_channel_credentials object. ---
 
    A channel credentials object represents a way to authenticate a client on a

data/include/grpc/grpc_security_constants.h

@@ -29,6 +29,7 @@ extern "C" {
 #define GRPC_X509_CN_PROPERTY_NAME "x509_common_name"
 #define GRPC_X509_SAN_PROPERTY_NAME "x509_subject_alternative_name"
 #define GRPC_X509_PEM_CERT_PROPERTY_NAME "x509_pem_cert"
+#define GRPC_SSL_SESSION_REUSED_PROPERTY "ssl_session_reused"
 
 /** Environment variable that points to the default SSL roots file. This file
    must be a PEM encoded file with all the roots such as the one that can be

data/include/grpc/impl/codegen/byte_buffer.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_BYTE_BUFFER_H
 #define GRPC_IMPL_CODEGEN_BYTE_BUFFER_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/grpc_types.h>
 
 #ifdef __cplusplus

data/include/grpc/impl/codegen/grpc_types.h

@@ -258,6 +258,10 @@ typedef struct {
     secure channel is an SSL channel). If this parameter is specified and the
     underlying is not an SSL channel, it will just be ignored. */
 #define GRPC_SSL_TARGET_NAME_OVERRIDE_ARG "grpc.ssl_target_name_override"
+/** If non-zero, a pointer to a session cache (a pointer of type
+    grpc_ssl_session_cache*). (use grpc_ssl_session_cache_arg_vtable() to fetch
+    an appropriate pointer arg vtable) */
+#define GRPC_SSL_SESSION_CACHE_ARG "grpc.ssl_session_cache"
 /** Maximum metadata size, in bytes. Note this limit applies to the max sum of
     all metadata key-value entries in a batch of headers. */
 #define GRPC_ARG_MAX_METADATA_SIZE "grpc.max_metadata_size"
@@ -281,6 +285,10 @@ typedef struct {
 #define GRPC_ARG_SOCKET_MUTATOR "grpc.socket_mutator"
 /** The grpc_socket_factory instance to create and bind sockets. A pointer. */
 #define GRPC_ARG_SOCKET_FACTORY "grpc.socket_factory"
+/** The maximum number of trace events to keep in the tracer for each channel or
+ * subchannel. The default is 10. If set to 0, channel tracing is disabled. */
+#define GRPC_ARG_MAX_CHANNEL_TRACE_EVENTS_PER_NODE \
+  "grpc.max_channel_trace_events_per_node"
 /** If non-zero, Cronet transport will coalesce packets to fewer frames
  * when possible. */
 #define GRPC_ARG_USE_CRONET_PACKET_COALESCING \
@@ -314,6 +322,20 @@ typedef struct {
     Defaults to "blend". In the current implementation "blend" is equivalent to
     "latency". */
 #define GRPC_ARG_OPTIMIZATION_TARGET "grpc.optimization_target"
+/** If set to zero, disables retry behavior. Otherwise, transparent retries
+    are enabled for all RPCs, and configurable retries are enabled when they
+    are configured via the service config. For details, see:
+      https://github.com/grpc/proposal/blob/master/A6-client-retries.md
+ */
+#define GRPC_ARG_ENABLE_RETRIES "grpc.enable_retries"
+/** Per-RPC retry buffer size, in bytes. Default is 256 KiB. */
+#define GRPC_ARG_PER_RPC_RETRY_BUFFER_SIZE "grpc.per_rpc_retry_buffer_size"
+/** Channel arg that carries the bridged objective c object for custom metrics
+ * logging filter. */
+#define GRPC_ARG_MOBILE_LOG_CONFIG "grpc.mobile_log_config"
+/** If non-zero, client authority filter is disabled for the channel */
+#define GRPC_ARG_DISABLE_CLIENT_AUTHORITY_FILTER \
+  "grpc.disable_client_authority_filter"
 /** \} */
 
 /** Result of a grpc call. If the caller satisfies the prerequisites of a
@@ -551,6 +573,8 @@ typedef struct grpc_op {
     } recv_initial_metadata;
     /** ownership of the byte buffer is moved to the caller; the caller must
         call grpc_byte_buffer_destroy on this value, or reuse it in a future op.
+        The returned byte buffer will be NULL if trailing metadata was
+        received instead of a message.
        */
     struct grpc_op_recv_message {
       struct grpc_byte_buffer** recv_message;

data/include/grpc/impl/codegen/slice.h

@@ -95,7 +95,7 @@ struct grpc_slice {
 
 /** Represents an expandable array of slices, to be interpreted as a
    single item. */
-typedef struct {
+typedef struct grpc_slice_buffer {
   /** This is for internal use only. External users (i.e any code outside grpc
    * core) MUST NOT use this field */
   grpc_slice* base_slices;

data/include/grpc/impl/codegen/sync.h

@@ -43,6 +43,7 @@ extern "C" {
 
 /* Platform-specific type declarations of gpr_mu and gpr_cv.   */
 #include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 #if defined(GPR_POSIX_SYNC)

data/include/grpc/impl/codegen/sync_custom.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H
 #define GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 /* Users defining GPR_CUSTOM_SYNC need to define the following macros. */

data/include/grpc/impl/codegen/sync_generic.h

@@ -20,6 +20,8 @@
 #define GRPC_IMPL_CODEGEN_SYNC_GENERIC_H
 /* Generic type defintions for gpr_sync. */
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/atm.h>
 
 /* gpr_event */

data/include/grpc/impl/codegen/sync_posix.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_POSIX_H
 #define GRPC_IMPL_CODEGEN_SYNC_POSIX_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 #include <pthread.h>

data/include/grpc/impl/codegen/sync_windows.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
 #define GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
 
+#include <grpc/impl/codegen/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 typedef struct {

data/include/grpc/slice.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SLICE_H
 #define GRPC_SLICE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/slice.h>
 #include <grpc/support/sync.h>
 

data/include/grpc/slice_buffer.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SLICE_BUFFER_H
 #define GRPC_SLICE_BUFFER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/slice.h>
 
 #ifdef __cplusplus

data/include/grpc/status.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_STATUS_H
 #define GRPC_STATUS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/status.h>
 
 #endif /* GRPC_STATUS_H */

data/include/grpc/support/alloc.h

@@ -19,9 +19,9 @@
 #ifndef GRPC_SUPPORT_ALLOC_H
 #define GRPC_SUPPORT_ALLOC_H
 
-#include <stddef.h>
+#include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/support/atm.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_H
 #define GRPC_SUPPORT_ATM_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm.h>
 
 #endif /* GRPC_SUPPORT_ATM_H */

data/include/grpc/support/atm_gcc_atomic.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_GCC_ATOMIC_H
 #define GRPC_SUPPORT_ATM_GCC_ATOMIC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm_gcc_atomic.h>
 
 #endif /* GRPC_SUPPORT_ATM_GCC_ATOMIC_H */

data/include/grpc/support/atm_gcc_sync.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_GCC_SYNC_H
 #define GRPC_SUPPORT_ATM_GCC_SYNC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm_gcc_sync.h>
 
 #endif /* GRPC_SUPPORT_ATM_GCC_SYNC_H */

data/include/grpc/support/atm_windows.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_WINDOWS_H
 #define GRPC_SUPPORT_ATM_WINDOWS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/atm_windows.h>
 
 #endif /* GRPC_SUPPORT_ATM_WINDOWS_H */

data/include/grpc/support/log.h

@@ -20,7 +20,7 @@
 #define GRPC_SUPPORT_LOG_H
 
 #include <grpc/impl/codegen/port_platform.h>
-#include <inttypes.h>
+
 #include <stdarg.h>
 #include <stdlib.h> /* for abort() */
 

data/include/grpc/support/sync.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_H
 #define GRPC_SUPPORT_SYNC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/gpr_types.h> /* for gpr_timespec */
 #include <grpc/impl/codegen/sync.h>
 

data/include/grpc/support/sync_custom.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_CUSTOM_H
 #define GRPC_SUPPORT_SYNC_CUSTOM_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/sync_custom.h>
 
 #endif /* GRPC_SUPPORT_SYNC_CUSTOM_H */

data/include/grpc/support/sync_generic.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_GENERIC_H
 #define GRPC_SUPPORT_SYNC_GENERIC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/sync_generic.h>
 
 #endif /* GRPC_SUPPORT_SYNC_GENERIC_H */

data/include/grpc/support/sync_posix.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_POSIX_H
 #define GRPC_SUPPORT_SYNC_POSIX_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/sync_posix.h>
 
 #endif /* GRPC_SUPPORT_SYNC_POSIX_H */

data/include/grpc/support/sync_windows.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_WINDOWS_H
 #define GRPC_SUPPORT_SYNC_WINDOWS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/sync_windows.h>
 
 #endif /* GRPC_SUPPORT_SYNC_WINDOWS_H */

data/include/grpc/support/time.h

@@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_TIME_H
 #define GRPC_SUPPORT_TIME_H
 
+#include <grpc/support/port_platform.h>
+
 #include <grpc/impl/codegen/gpr_types.h>
 
 #include <stddef.h>

data/src/boringssl/err_data.c

@@ -75,52 +75,52 @@ const uint32_t kOpenSSLReasonValues[] = {
     0xc3b00ea,
     0xc3b88d4,
     0x10320845,
-    0x10329513,
-    0x1033151f,
-    0x10339538,
-    0x1034154b,
-    0x10348eed,
+    0x10329535,
+    0x10331541,
+    0x1033955a,
+    0x1034156d,
+    0x10348efc,
     0x10350c5e,
-    0x1035955e,
-    0x10361573,
-    0x10369586,
-    0x103715a5,
-    0x103795be,
-    0x103815d3,
-    0x103895f1,
-    0x10391600,
-    0x1039961c,
-    0x103a1637,
-    0x103a9646,
-    0x103b1662,
-    0x103b967d,
-    0x103c1694,
+    0x10359580,
+    0x10361595,
+    0x103695a8,
+    0x103715c7,
+    0x103795e0,
+    0x103815f5,
+    0x10389613,
+    0x10391622,
+    0x1039963e,
+    0x103a1659,
+    0x103a9668,
+    0x103b1684,
+    0x103b969f,
+    0x103c16b6,
     0x103c80ea,
-    0x103d16a5,
-    0x103d96b9,
-    0x103e16d8,
-    0x103e96e7,
-    0x103f16fe,
-    0x103f9711,
+    0x103d16c7,
+    0x103d96db,
+    0x103e16fa,
+    0x103e9709,
+    0x103f1720,
+    0x103f9733,
     0x10400c22,
-    0x10409724,
-    0x10411742,
-    0x10419755,
-    0x1042176f,
-    0x1042977f,
-    0x10431793,
-    0x104397a9,
-    0x104417c1,
-    0x104497d6,
-    0x104517ea,
-    0x104597fc,
+    0x10409746,
+    0x10411764,
+    0x10419777,
+    0x10421791,
+    0x104297a1,
+    0x104317b5,
+    0x104397cb,
+    0x104417e3,
+    0x104497f8,
+    0x1045180c,
+    0x1045981e,
     0x104605fb,
     0x1046894d,
-    0x10471811,
-    0x10479828,
-    0x1048183d,
-    0x1048984b,
-    0x10490e4f,
+    0x10471833,
+    0x1047984a,
+    0x1048185f,
+    0x1048986d,
+    0x10490e5e,
     0x14320c05,
     0x14328c13,
     0x14330c22,
@@ -128,55 +128,56 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x143400ac,
     0x143480ea,
     0x18320083,
-    0x18328f43,
+    0x18328f52,
     0x183300ac,
-    0x18338f59,
-    0x18340f6d,
+    0x18338f68,
+    0x18340f7c,
     0x183480ea,
-    0x18350f82,
-    0x18358f9a,
-    0x18360faf,
-    0x18368fc3,
-    0x18370fe7,
-    0x18378ffd,
-    0x18381011,
-    0x18389021,
+    0x18350f91,
+    0x18358fa9,
+    0x18360fbe,
+    0x18368fd2,
+    0x18370ff6,
+    0x1837900c,
+    0x18381020,
+    0x18389030,
     0x18390a73,
-    0x18399031,
-    0x183a1059,
-    0x183a907f,
+    0x18399040,
+    0x183a1068,
+    0x183a908e,
     0x183b0c6a,
-    0x183b90b4,
-    0x183c10c6,
-    0x183c90d1,
-    0x183d10e1,
-    0x183d90f2,
-    0x183e1103,
-    0x183e9115,
-    0x183f113e,
-    0x183f9157,
-    0x1840116f,
+    0x183b90c3,
+    0x183c10d5,
+    0x183c90e0,
+    0x183d10f0,
+    0x183d9101,
+    0x183e1112,
+    0x183e9124,
+    0x183f114d,
+    0x183f9166,
+    0x1840117e,
     0x184086d3,
-    0x184110a2,
-    0x1841906d,
-    0x1842108c,
-    0x18429046,
-    0x20321196,
-    0x243211a2,
+    0x184110b1,
+    0x1841907c,
+    0x1842109b,
+    0x18429055,
+    0x203211b8,
+    0x203291a5,
+    0x243211c4,
     0x24328993,
-    0x243311b4,
-    0x243391c1,
-    0x243411ce,
-    0x243491e0,
-    0x243511ef,
-    0x2435920c,
-    0x24361219,
-    0x24369227,
-    0x24371235,
-    0x24379243,
-    0x2438124c,
-    0x24389259,
-    0x2439126c,
+    0x243311d6,
+    0x243391e3,
+    0x243411f0,
+    0x24349202,
+    0x24351211,
+    0x2435922e,
+    0x2436123b,
+    0x24369249,
+    0x24371257,
+    0x24379265,
+    0x2438126e,
+    0x2438927b,
+    0x2439128e,
     0x28320c52,
     0x28328c6a,
     0x28330c22,
@@ -184,43 +185,43 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x28340c5e,
     0x283480ac,
     0x283500ea,
-    0x2c322c30,
-    0x2c329283,
-    0x2c332c3e,
-    0x2c33ac50,
-    0x2c342c64,
-    0x2c34ac76,
-    0x2c352c91,
-    0x2c35aca3,
-    0x2c362cb6,
+    0x2c322c6c,
+    0x2c3292a5,
+    0x2c332c7a,
+    0x2c33ac8c,
+    0x2c342ca0,
+    0x2c34acb2,
+    0x2c352ccd,
+    0x2c35acdf,
+    0x2c362cf2,
     0x2c36832d,
-    0x2c372cc3,
-    0x2c37acd5,
-    0x2c382cfa,
-    0x2c38ad11,
-    0x2c392d1f,
-    0x2c39ad2f,
-    0x2c3a2d41,
-    0x2c3aad55,
-    0x2c3b2d66,
-    0x2c3bad85,
-    0x2c3c1295,
-    0x2c3c92ab,
-    0x2c3d2d99,
-    0x2c3d92c4,
-    0x2c3e2db6,
-    0x2c3eadc4,
-    0x2c3f2ddc,
-    0x2c3fadf4,
-    0x2c402e01,
-    0x2c409196,
-    0x2c412e12,
-    0x2c41ae25,
-    0x2c42116f,
-    0x2c42ae36,
+    0x2c372cff,
+    0x2c37ad11,
+    0x2c382d36,
+    0x2c38ad4d,
+    0x2c392d5b,
+    0x2c39ad6b,
+    0x2c3a2d7d,
+    0x2c3aad91,
+    0x2c3b2da2,
+    0x2c3badc1,
+    0x2c3c12b7,
+    0x2c3c92cd,
+    0x2c3d2dd5,
+    0x2c3d92e6,
+    0x2c3e2df2,
+    0x2c3eae00,
+    0x2c3f2e18,
+    0x2c3fae30,
+    0x2c402e3d,
+    0x2c4091b8,
+    0x2c412e4e,
+    0x2c41ae61,
+    0x2c42117e,
+    0x2c42ae72,
     0x2c430720,
-    0x2c43ad77,
-    0x2c442ce8,
+    0x2c43adb3,
+    0x2c442d24,
     0x30320000,
     0x30328015,
     0x3033001f,
@@ -335,238 +336,240 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x3c380dc0,
     0x3c388dd4,
     0x3c390c6a,
-    0x3c398de8,
-    0x3c3a0dfc,
+    0x3c398df7,
+    0x3c3a0e0b,
     0x3c3a890d,
-    0x3c3b0e0c,
-    0x3c3b8e27,
-    0x3c3c0e39,
-    0x3c3c8e6c,
-    0x3c3d0e76,
-    0x3c3d8e8a,
-    0x3c3e0e98,
-    0x3c3e8ebd,
+    0x3c3b0e1b,
+    0x3c3b8e36,
+    0x3c3c0e48,
+    0x3c3c8e7b,
+    0x3c3d0e85,
+    0x3c3d8e99,
+    0x3c3e0ea7,
+    0x3c3e8ecc,
     0x3c3f0c93,
-    0x3c3f8ea6,
+    0x3c3f8eb5,
     0x3c4000ac,
     0x3c4080ea,
     0x3c410d13,
     0x3c418d52,
-    0x3c420e4f,
-    0x403218a4,
-    0x403298ba,
-    0x403318e8,
-    0x403398f2,
-    0x40341909,
-    0x40349927,
-    0x40351937,
-    0x40359949,
-    0x40361956,
-    0x40369962,
-    0x40371977,
-    0x40379989,
-    0x40381994,
-    0x403899a6,
-    0x40390eed,
-    0x403999b6,
-    0x403a19c9,
-    0x403a99ea,
-    0x403b19fb,
-    0x403b9a0b,
+    0x3c420e5e,
+    0x3c428de8,
+    0x403218c6,
+    0x403298dc,
+    0x4033190a,
+    0x40339914,
+    0x4034192b,
+    0x40349949,
+    0x40351959,
+    0x4035996b,
+    0x40361978,
+    0x40369984,
+    0x40371999,
+    0x403799ab,
+    0x403819b6,
+    0x403899c8,
+    0x40390efc,
+    0x403999d8,
+    0x403a19eb,
+    0x403a9a0c,
+    0x403b1a1d,
+    0x403b9a2d,
     0x403c0064,
     0x403c8083,
-    0x403d1a8f,
-    0x403d9aa5,
-    0x403e1ab4,
-    0x403e9aec,
-    0x403f1b06,
-    0x403f9b14,
-    0x40401b29,
-    0x40409b3d,
-    0x40411b5a,
-    0x40419b75,
-    0x40421b8e,
-    0x40429ba1,
-    0x40431bb5,
-    0x40439bcd,
-    0x40441be4,
+    0x403d1ab1,
+    0x403d9ac7,
+    0x403e1ad6,
+    0x403e9b0e,
+    0x403f1b28,
+    0x403f9b36,
+    0x40401b4b,
+    0x40409b5f,
+    0x40411b7c,
+    0x40419b97,
+    0x40421bb0,
+    0x40429bc3,
+    0x40431bd7,
+    0x40439bef,
+    0x40441c06,
     0x404480ac,
-    0x40451bf9,
-    0x40459c0b,
-    0x40461c2f,
-    0x40469c4f,
-    0x40471c5d,
-    0x40479c84,
-    0x40481cc1,
-    0x40489cda,
-    0x40491cf1,
-    0x40499d0b,
-    0x404a1d22,
-    0x404a9d40,
-    0x404b1d58,
-    0x404b9d6f,
-    0x404c1d85,
-    0x404c9d97,
-    0x404d1db8,
-    0x404d9dda,
-    0x404e1dee,
-    0x404e9dfb,
-    0x404f1e28,
-    0x404f9e51,
-    0x40501e8c,
-    0x40509ea0,
-    0x40511ebb,
-    0x40521ecb,
-    0x40529eef,
-    0x40531f07,
-    0x40539f1a,
-    0x40541f2f,
-    0x40549f52,
-    0x40551f60,
-    0x40559f7d,
-    0x40561f8a,
-    0x40569fa3,
-    0x40571fbb,
-    0x40579fce,
-    0x40581fe3,
-    0x4058a00a,
-    0x40592039,
-    0x4059a066,
-    0x405a207a,
-    0x405aa08a,
-    0x405b20a2,
-    0x405ba0b3,
-    0x405c20c6,
-    0x405ca105,
-    0x405d2112,
-    0x405da129,
-    0x405e2167,
+    0x40451c1b,
+    0x40459c2d,
+    0x40461c51,
+    0x40469c71,
+    0x40471c7f,
+    0x40479ca6,
+    0x40481ce3,
+    0x40489d16,
+    0x40491d2d,
+    0x40499d47,
+    0x404a1d5e,
+    0x404a9d7c,
+    0x404b1d94,
+    0x404b9dab,
+    0x404c1dc1,
+    0x404c9dd3,
+    0x404d1df4,
+    0x404d9e16,
+    0x404e1e2a,
+    0x404e9e37,
+    0x404f1e64,
+    0x404f9e8d,
+    0x40501ec8,
+    0x40509edc,
+    0x40511ef7,
+    0x40521f07,
+    0x40529f2b,
+    0x40531f43,
+    0x40539f56,
+    0x40541f6b,
+    0x40549f8e,
+    0x40551f9c,
+    0x40559fb9,
+    0x40561fc6,
+    0x40569fdf,
+    0x40571ff7,
+    0x4057a00a,
+    0x4058201f,
+    0x4058a046,
+    0x40592075,
+    0x4059a0a2,
+    0x405a20b6,
+    0x405aa0c6,
+    0x405b20de,
+    0x405ba0ef,
+    0x405c2102,
+    0x405ca141,
+    0x405d214e,
+    0x405da165,
+    0x405e21a3,
     0x405e8ab1,
-    0x405f2188,
-    0x405fa195,
-    0x406021a3,
-    0x4060a1c5,
-    0x40612209,
-    0x4061a241,
-    0x40622258,
-    0x4062a269,
-    0x4063227a,
-    0x4063a28f,
-    0x406422a6,
-    0x4064a2d2,
-    0x406522ed,
-    0x4065a304,
-    0x4066231c,
-    0x4066a346,
-    0x40672371,
-    0x4067a392,
-    0x406823b9,
-    0x4068a3da,
-    0x4069240c,
-    0x4069a43a,
-    0x406a245b,
-    0x406aa47b,
-    0x406b2603,
-    0x406ba626,
-    0x406c263c,
-    0x406ca8b7,
-    0x406d28e6,
-    0x406da90e,
-    0x406e293c,
-    0x406ea989,
-    0x406f29a8,
-    0x406fa9e0,
-    0x407029f3,
-    0x4070aa10,
+    0x405f21c4,
+    0x405fa1d1,
+    0x406021df,
+    0x4060a201,
+    0x40612245,
+    0x4061a27d,
+    0x40622294,
+    0x4062a2a5,
+    0x406322b6,
+    0x4063a2cb,
+    0x406422e2,
+    0x4064a30e,
+    0x40652329,
+    0x4065a340,
+    0x40662358,
+    0x4066a382,
+    0x406723ad,
+    0x4067a3ce,
+    0x406823f5,
+    0x4068a416,
+    0x40692448,
+    0x4069a476,
+    0x406a2497,
+    0x406aa4b7,
+    0x406b263f,
+    0x406ba662,
+    0x406c2678,
+    0x406ca8f3,
+    0x406d2922,
+    0x406da94a,
+    0x406e2978,
+    0x406ea9c5,
+    0x406f29e4,
+    0x406faa1c,
+    0x40702a2f,
+    0x4070aa4c,
     0x40710800,
-    0x4071aa22,
-    0x40722a35,
-    0x4072aa4e,
-    0x40732a66,
-    0x40739482,
-    0x40742a7a,
-    0x4074aa94,
-    0x40752aa5,
-    0x4075aab9,
-    0x40762ac7,
-    0x40769259,
-    0x40772aec,
-    0x4077ab0e,
-    0x40782b29,
-    0x4078ab62,
-    0x40792b79,
-    0x4079ab8f,
-    0x407a2b9b,
-    0x407aabae,
-    0x407b2bc3,
-    0x407babd5,
-    0x407c2c06,
-    0x407cac0f,
-    0x407d23f5,
-    0x407d9e61,
-    0x407e2b3e,
-    0x407ea01a,
-    0x407f1c71,
-    0x407f9a31,
-    0x40801e38,
-    0x40809c99,
-    0x40811edd,
-    0x40819e12,
-    0x40822927,
-    0x40829a17,
-    0x40831ff5,
-    0x4083a2b7,
-    0x40841cad,
-    0x4084a052,
-    0x408520d7,
-    0x4085a1ed,
-    0x40862149,
-    0x40869e7b,
-    0x4087296d,
-    0x4087a21e,
-    0x40881a78,
-    0x4088a3a5,
-    0x40891ac7,
-    0x40899a54,
-    0x408a265c,
-    0x408a9862,
-    0x408b2bea,
-    0x408ba9bd,
-    0x408c20e7,
-    0x408c987e,
-    0x41f4252e,
-    0x41f925c0,
-    0x41fe24b3,
-    0x41fea6a8,
-    0x41ff2799,
-    0x42032547,
-    0x42082569,
-    0x4208a5a5,
-    0x42092497,
-    0x4209a5df,
-    0x420a24ee,
-    0x420aa4ce,
-    0x420b250e,
-    0x420ba587,
-    0x420c27b5,
-    0x420ca675,
-    0x420d268f,
-    0x420da6c6,
-    0x421226e0,
-    0x4217277c,
-    0x4217a722,
-    0x421c2744,
-    0x421f26ff,
-    0x422127cc,
-    0x4226275f,
-    0x422b289b,
-    0x422ba849,
-    0x422c2883,
-    0x422ca808,
-    0x422d27e7,
-    0x422da868,
-    0x422e282e,
-    0x422ea954,
+    0x4071aa5e,
+    0x40722a71,
+    0x4072aa8a,
+    0x40732aa2,
+    0x407394a4,
+    0x40742ab6,
+    0x4074aad0,
+    0x40752ae1,
+    0x4075aaf5,
+    0x40762b03,
+    0x4076927b,
+    0x40772b28,
+    0x4077ab4a,
+    0x40782b65,
+    0x4078ab9e,
+    0x40792bb5,
+    0x4079abcb,
+    0x407a2bd7,
+    0x407aabea,
+    0x407b2bff,
+    0x407bac11,
+    0x407c2c42,
+    0x407cac4b,
+    0x407d2431,
+    0x407d9e9d,
+    0x407e2b7a,
+    0x407ea056,
+    0x407f1c93,
+    0x407f9a53,
+    0x40801e74,
+    0x40809cbb,
+    0x40811f19,
+    0x40819e4e,
+    0x40822963,
+    0x40829a39,
+    0x40832031,
+    0x4083a2f3,
+    0x40841ccf,
+    0x4084a08e,
+    0x40852113,
+    0x4085a229,
+    0x40862185,
+    0x40869eb7,
+    0x408729a9,
+    0x4087a25a,
+    0x40881a9a,
+    0x4088a3e1,
+    0x40891ae9,
+    0x40899a76,
+    0x408a2698,
+    0x408a9884,
+    0x408b2c26,
+    0x408ba9f9,
+    0x408c2123,
+    0x408c98a0,
+    0x408d1cfc,
+    0x41f4256a,
+    0x41f925fc,
+    0x41fe24ef,
+    0x41fea6e4,
+    0x41ff27d5,
+    0x42032583,
+    0x420825a5,
+    0x4208a5e1,
+    0x420924d3,
+    0x4209a61b,
+    0x420a252a,
+    0x420aa50a,
+    0x420b254a,
+    0x420ba5c3,
+    0x420c27f1,
+    0x420ca6b1,
+    0x420d26cb,
+    0x420da702,
+    0x4212271c,
+    0x421727b8,
+    0x4217a75e,
+    0x421c2780,
+    0x421f273b,
+    0x42212808,
+    0x4226279b,
+    0x422b28d7,
+    0x422ba885,
+    0x422c28bf,
+    0x422ca844,
+    0x422d2823,
+    0x422da8a4,
+    0x422e286a,
+    0x422ea990,
     0x4432072b,
     0x4432873a,
     0x44330746,
@@ -584,114 +587,114 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x44390800,
     0x4439880e,
     0x443a0821,
-    0x48321283,
-    0x48329295,
-    0x483312ab,
-    0x483392c4,
-    0x4c3212e9,
-    0x4c3292f9,
-    0x4c33130c,
-    0x4c33932c,
+    0x483212a5,
+    0x483292b7,
+    0x483312cd,
+    0x483392e6,
+    0x4c32130b,
+    0x4c32931b,
+    0x4c33132e,
+    0x4c33934e,
     0x4c3400ac,
     0x4c3480ea,
-    0x4c351338,
-    0x4c359346,
-    0x4c361362,
-    0x4c369375,
-    0x4c371384,
-    0x4c379392,
-    0x4c3813a7,
-    0x4c3893b3,
-    0x4c3913d3,
-    0x4c3993fd,
-    0x4c3a1416,
-    0x4c3a942f,
+    0x4c35135a,
+    0x4c359368,
+    0x4c361384,
+    0x4c369397,
+    0x4c3713a6,
+    0x4c3793b4,
+    0x4c3813c9,
+    0x4c3893d5,
+    0x4c3913f5,
+    0x4c39941f,
+    0x4c3a1438,
+    0x4c3a9451,
     0x4c3b05fb,
-    0x4c3b9448,
-    0x4c3c145a,
-    0x4c3c9469,
-    0x4c3d1482,
+    0x4c3b946a,
+    0x4c3c147c,
+    0x4c3c948b,
+    0x4c3d14a4,
     0x4c3d8c45,
-    0x4c3e14db,
-    0x4c3e9491,
-    0x4c3f14fd,
-    0x4c3f9259,
-    0x4c4014a7,
-    0x4c4092d5,
-    0x4c4114cb,
-    0x50322e48,
-    0x5032ae57,
-    0x50332e62,
-    0x5033ae72,
-    0x50342e8b,
-    0x5034aea5,
-    0x50352eb3,
-    0x5035aec9,
-    0x50362edb,
-    0x5036aef1,
-    0x50372f0a,
-    0x5037af1d,
-    0x50382f35,
-    0x5038af46,
-    0x50392f5b,
-    0x5039af6f,
-    0x503a2f8f,
-    0x503aafa5,
-    0x503b2fbd,
-    0x503bafcf,
-    0x503c2feb,
-    0x503cb002,
-    0x503d301b,
-    0x503db031,
-    0x503e303e,
-    0x503eb054,
-    0x503f3066,
+    0x4c3e14fd,
+    0x4c3e94b3,
+    0x4c3f151f,
+    0x4c3f927b,
+    0x4c4014c9,
+    0x4c4092f7,
+    0x4c4114ed,
+    0x50322e84,
+    0x5032ae93,
+    0x50332e9e,
+    0x5033aeae,
+    0x50342ec7,
+    0x5034aee1,
+    0x50352eef,
+    0x5035af05,
+    0x50362f17,
+    0x5036af2d,
+    0x50372f46,
+    0x5037af59,
+    0x50382f71,
+    0x5038af82,
+    0x50392f97,
+    0x5039afab,
+    0x503a2fcb,
+    0x503aafe1,
+    0x503b2ff9,
+    0x503bb00b,
+    0x503c3027,
+    0x503cb03e,
+    0x503d3057,
+    0x503db06d,
+    0x503e307a,
+    0x503eb090,
+    0x503f30a2,
     0x503f8382,
-    0x50403079,
-    0x5040b089,
-    0x504130a3,
-    0x5041b0b2,
-    0x504230cc,
-    0x5042b0e9,
-    0x504330f9,
-    0x5043b109,
-    0x50443118,
+    0x504030b5,
+    0x5040b0c5,
+    0x504130df,
+    0x5041b0ee,
+    0x50423108,
+    0x5042b125,
+    0x50433135,
+    0x5043b145,
+    0x50443154,
     0x5044843f,
-    0x5045312c,
-    0x5045b14a,
-    0x5046315d,
-    0x5046b173,
-    0x50473185,
-    0x5047b19a,
-    0x504831c0,
-    0x5048b1ce,
-    0x504931e1,
-    0x5049b1f6,
-    0x504a320c,
-    0x504ab21c,
-    0x504b323c,
-    0x504bb24f,
-    0x504c3272,
-    0x504cb2a0,
-    0x504d32b2,
-    0x504db2cf,
-    0x504e32ea,
-    0x504eb306,
-    0x504f3318,
-    0x504fb32f,
-    0x5050333e,
+    0x50453168,
+    0x5045b186,
+    0x50463199,
+    0x5046b1af,
+    0x504731c1,
+    0x5047b1d6,
+    0x504831fc,
+    0x5048b20a,
+    0x5049321d,
+    0x5049b232,
+    0x504a3248,
+    0x504ab258,
+    0x504b3278,
+    0x504bb28b,
+    0x504c32ae,
+    0x504cb2dc,
+    0x504d32ee,
+    0x504db30b,
+    0x504e3326,
+    0x504eb342,
+    0x504f3354,
+    0x504fb36b,
+    0x5050337a,
     0x505086ef,
-    0x50513351,
-    0x58320f2b,
-    0x68320eed,
+    0x5051338d,
+    0x58320f3a,
+    0x68320efc,
     0x68328c6a,
     0x68330c7d,
-    0x68338efb,
-    0x68340f0b,
+    0x68338f0a,
+    0x68340f1a,
     0x683480ea,
-    0x6c320ec9,
+    0x6c320ed8,
     0x6c328c34,
-    0x6c330ed4,
+    0x6c330ee3,
     0x74320a19,
     0x743280ac,
     0x74330c45,
@@ -721,7 +724,7 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x783d8b4a,
     0x783e0aa0,
     0x783e8a52,
-    0x7c321185,
+    0x7c321194,
 };
 
 const size_t kOpenSSLReasonValuesLen = sizeof(kOpenSSLReasonValues) / sizeof(kOpenSSLReasonValues[0]);
@@ -912,6 +915,7 @@ const char kOpenSSLReasonStringData[] =
     "INVALID_FORM\0"
     "INVALID_GROUP_ORDER\0"
     "INVALID_PRIVATE_KEY\0"
+    "INVALID_SCALAR\0"
     "MISSING_PRIVATE_KEY\0"
     "NON_NAMED_CURVE\0"
     "PKPARAMETERS2GROUP_FAILURE\0"
@@ -959,6 +963,7 @@ const char kOpenSSLReasonStringData[] =
     "UNKNOWN_PUBLIC_KEY_TYPE\0"
     "UNSUPPORTED_ALGORITHM\0"
     "OUTPUT_TOO_LARGE\0"
+    "INVALID_OID_STRING\0"
     "UNKNOWN_NID\0"
     "BAD_BASE64_DECODE\0"
     "BAD_END_LINE\0"
@@ -1094,6 +1099,7 @@ const char kOpenSSLReasonStringData[] =
     "DUPLICATE_EXTENSION\0"
     "DUPLICATE_KEY_SHARE\0"
     "ECC_CERT_NOT_FOR_SIGNING\0"
+    "EMPTY_HELLO_RETRY_REQUEST\0"
     "EMS_STATE_INCONSISTENT\0"
     "ENCRYPTED_LENGTH_TOO_LONG\0"
     "ERROR_ADDING_EXTENSION\0"