commit 92635406f931ed32d69bc24ada8d50421d8c35c7
author Kazuho Oku <kazuhooku@gmail.com> Wed Jul 13 17:05:39 2022 +0900
committer GitHub <noreply@github.com> Wed Jul 13 17:05:39 2022 +0900
tree 67f29dc075662d5410850168ad7220c5f1e5fcc6
parent 74feba44643ed905317be7a64a689f0d49120860
parent 34a5a3e1848e7901a3b244df6854e17156df2ee3

Merge pull request #403 from h2o/kazuho/cosmetic

fix cosmetic issues

lib/openssl.c

diff --git a/lib/openssl.c b/lib/openssl.c
index efdfd7d..b83dc36 100644
--- a/lib/openssl.c
+++ b/lib/openssl.c
@@ -566,7 +566,8 @@
     /* set public key */
     if ((ctx->super.pubkey.len = EVP_PKEY_get1_tls_encodedpoint(ctx->privkey, &ctx->super.pubkey.base)) == 0) {
         ctx->super.pubkey.base = NULL;
-        return PTLS_ERROR_NO_MEMORY;
+        ret = PTLS_ERROR_NO_MEMORY;
+        goto Exit;
     }
 
     *_ctx = &ctx->super;

lib/picotls.c

diff --git a/lib/picotls.c b/lib/picotls.c
index 0c6a676..7dd75ba 100644
--- a/lib/picotls.c
+++ b/lib/picotls.c
@@ -1461,6 +1461,8 @@
     assert(tls->ctx->ticket_lifetime != 0);
     assert(tls->ctx->encrypt_ticket != NULL);
 
+    ptls_buffer_init(&session_id, session_id_smallbuf, sizeof(session_id_smallbuf));
+
     { /* calculate verify-data that will be sent by the client */
         size_t orig_off = emitter->buf->off;
         if (tls->pending_handshake_secret != NULL && !tls->ctx->omit_end_of_early_data) {
@@ -1483,7 +1485,6 @@
     tls->ctx->random_bytes(&ticket_age_add, sizeof(ticket_age_add));
 
     /* build the raw nsk */
-    ptls_buffer_init(&session_id, session_id_smallbuf, sizeof(session_id_smallbuf));
     ret = encode_session_identifier(tls->ctx, &session_id, ticket_age_add, ptls_iovec_init(NULL, 0), tls->key_schedule,
                                     tls->server_name, tls->key_share->id, tls->cipher_suite->id, tls->negotiated_protocol);
     if (ret != 0)
@@ -4129,7 +4130,6 @@
     });
 
     if (mode == HANDSHAKE_MODE_FULL) {
-        /* send certificate request if client authentication is activated */
         if (tls->ctx->require_client_authentication) {
             ptls_push_message(emitter, tls->key_schedule, PTLS_HANDSHAKE_TYPE_CERTIFICATE_REQUEST, {
                 /* certificate_request_context, this field SHALL be zero length, unless the certificate
@@ -4145,19 +4145,11 @@
                     });
                 });
             });
-
-            if (ret != 0) {
-                goto Exit;
-            }
         }
-
-        ret = send_certificate_and_certificate_verify(tls, emitter, &ch->signature_algorithms, ptls_iovec_init(NULL, 0),
-                                                      PTLS_SERVER_CERTIFICATE_VERIFY_CONTEXT_STRING, ch->status_request,
-                                                      ch->cert_compression_algos.list, ch->cert_compression_algos.count);
-
-        if (ret != 0) {
+        if ((ret = send_certificate_and_certificate_verify(tls, emitter, &ch->signature_algorithms, ptls_iovec_init(NULL, 0),
+                                                           PTLS_SERVER_CERTIFICATE_VERIFY_CONTEXT_STRING, ch->status_request,
+                                                           ch->cert_compression_algos.list, ch->cert_compression_algos.count)) != 0)
             goto Exit;
-        }
     }
 
     if ((ret = send_finished(tls, emitter)) != 0)