11 files changed, 44 insertions, 44 deletions

diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index 93cfa0d2a4..460b09fd87 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_ssl.c,v 1.29 2018/08/24 20:30:21 tb Exp $ */
+/* $OpenBSD: bio_ssl.c,v 1.30 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -509,7 +509,7 @@ BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
                 goto err;
         return (ret);
 
-err:
+ err:
         BIO_free(buf);
         BIO_free(ssl);
         return (NULL);
@@ -528,7 +528,7 @@ BIO_new_ssl_connect(SSL_CTX *ctx)
                 goto err;
         return (ret);
 
-err:
+ err:
         BIO_free(con);
         BIO_free(ssl);
         return (NULL);
@@ -553,7 +553,7 @@ BIO_new_ssl(SSL_CTX *ctx, int client)
         BIO_set_ssl(ret, ssl, BIO_CLOSE);
         return (ret);
 
-err:
+ err:
         BIO_free(ret);
         return (NULL);
 }
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index 9b06d37947..ad7c03b518 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_both.c,v 1.72 2021/05/16 14:10:43 jsing Exp $ */
+/* $OpenBSD: d1_both.c,v 1.73 2021/06/11 11:13:53 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -396,7 +396,7 @@ dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
         msg_hdr = &D1I(s)->r_msg_hdr;
         memset(msg_hdr, 0, sizeof(struct hm_header_st));
 
-again:
+ again:
         i = dtls1_get_message_fragment(s, st1, stn, max, ok);
         if (i == DTLS1_HM_BAD_FRAGMENT ||
             i == DTLS1_HM_FRAGMENT_RETRY)  /* bad fragment received */
@@ -644,7 +644,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 
         return DTLS1_HM_FRAGMENT_RETRY;
 
-err:
+ err:
         if (item == NULL && frag != NULL)
                 dtls1_hm_fragment_free(frag);
         *ok = 0;
@@ -731,7 +731,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 
         return DTLS1_HM_FRAGMENT_RETRY;
 
-err:
+ err:
         if (item == NULL && frag != NULL)
                 dtls1_hm_fragment_free(frag);
         *ok = 0;
@@ -747,7 +747,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
         int i, al;
         struct hm_header_st msg_hdr;
 
-again:
+ again:
         /* see if we have the required fragment already */
         if ((frag_len = dtls1_retrieve_buffered_fragment(s, max, ok)) || *ok) {
                 if (*ok)
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index 3b3fd95f6f..504044d8af 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.96 2021/05/16 13:56:30 jsing Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.97 2021/06/11 11:13:53 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -244,10 +244,10 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority)
 
         return (1);
 
-err:
+ err:
         ssl3_release_buffer(&rdata->rbuf);
 
-init_err:
+ init_err:
         SSLerror(s, ERR_R_INTERNAL_ERROR);
         free(rdata);
         pitem_free(item);
@@ -377,7 +377,7 @@ dtls1_get_record(SSL *s)
 
         /* get something from the wire */
         if (0) {
-again:
+ again:
                 /* dump this record on all retries */
                 rr->length = 0;
                 s->internal->packet_length = 0;
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c
index 40dddd0805..d3d4883b35 100644
--- a/src/lib/libssl/ssl_both.c
+++ b/src/lib/libssl/ssl_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_both.c,v 1.31 2021/05/16 13:56:30 jsing Exp $ */
+/* $OpenBSD: ssl_both.c,v 1.32 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -556,7 +556,7 @@ ssl_cert_type(X509 *x, EVP_PKEY *pkey)
                 ret = SSL_PKEY_GOST01;
         }
 
-err:
+ err:
         if (!pkey)
                 EVP_PKEY_free(pk);
         return (ret);
@@ -638,7 +638,7 @@ ssl3_setup_init_buffer(SSL *s)
         s->internal->init_buf = buf;
         return (1);
 
-err:
+ err:
         BUF_MEM_free(buf);
         return (0);
 }
@@ -678,7 +678,7 @@ ssl3_setup_read_buffer(SSL *s)
         s->internal->packet = S3I(s)->rbuf.buf;
         return 1;
 
-err:
+ err:
         SSLerror(s, ERR_R_MALLOC_FAILURE);
         return 0;
 }
@@ -711,7 +711,7 @@ ssl3_setup_write_buffer(SSL *s)
 
         return 1;
 
-err:
+ err:
         SSLerror(s, ERR_R_MALLOC_FAILURE);
         return 0;
 }
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index d122c80f2c..a13ee598ce 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_cert.c,v 1.82 2021/04/21 19:27:56 jsing Exp $ */
+/* $OpenBSD: ssl_cert.c,v 1.83 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -610,7 +610,7 @@ SSL_load_client_CA_file(const char *file)
         }
 
         if (0) {
-err:
+ err:
                 sk_X509_NAME_pop_free(ret, X509_NAME_free);
                 ret = NULL;
         }
@@ -671,7 +671,7 @@ SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
         ERR_clear_error();
 
         if (0) {
-err:
+ err:
                 ret = 0;
         }
         BIO_free(in);
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 4fa011ebc5..8aa774a241 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.259 2021/05/16 14:10:43 jsing Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.260 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -667,7 +667,7 @@ SSL_set_fd(SSL *s, int fd)
         BIO_set_fd(bio, fd, BIO_NOCLOSE);
         SSL_set_bio(s, bio, bio);
         ret = 1;
-err:
+ err:
         return (ret);
 }
 
@@ -690,7 +690,7 @@ SSL_set_wfd(SSL *s, int fd)
         } else
                 SSL_set_bio(s, SSL_get_rbio(s), SSL_get_rbio(s));
         ret = 1;
-err:
+ err:
         return (ret);
 }
 
@@ -713,7 +713,7 @@ SSL_set_rfd(SSL *s, int fd)
         } else
                 SSL_set_bio(s, SSL_get_wbio(s), SSL_get_wbio(s));
         ret = 1;
-err:
+ err:
         return (ret);
 }
 
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c
index bada2482f8..e3a1e5dc4b 100644
--- a/src/lib/libssl/ssl_rsa.c
+++ b/src/lib/libssl/ssl_rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_rsa.c,v 1.33 2021/05/16 14:10:43 jsing Exp $ */
+/* $OpenBSD: ssl_rsa.c,v 1.34 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -120,7 +120,7 @@ SSL_use_certificate_file(SSL *ssl, const char *file, int type)
         }
 
         ret = SSL_use_certificate(ssl, x);
-end:
+ end:
         X509_free(x);
         BIO_free(in);
         return (ret);
@@ -243,7 +243,7 @@ SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
         }
         ret = SSL_use_RSAPrivateKey(ssl, rsa);
         RSA_free(rsa);
-end:
+ end:
         BIO_free(in);
         return (ret);
 }
@@ -312,7 +312,7 @@ SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
         }
         ret = SSL_use_PrivateKey(ssl, pkey);
         EVP_PKEY_free(pkey);
-end:
+ end:
         BIO_free(in);
         return (ret);
 }
@@ -436,7 +436,7 @@ SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
         }
 
         ret = SSL_CTX_use_certificate(ctx, x);
-end:
+ end:
         X509_free(x);
         BIO_free(in);
         return (ret);
@@ -517,7 +517,7 @@ SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
         }
         ret = SSL_CTX_use_RSAPrivateKey(ctx, rsa);
         RSA_free(rsa);
-end:
+ end:
         BIO_free(in);
         return (ret);
 }
@@ -583,7 +583,7 @@ SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
         }
         ret = SSL_CTX_use_PrivateKey(ctx, pkey);
         EVP_PKEY_free(pkey);
-end:
+ end:
         BIO_free(in);
         return (ret);
 }
@@ -674,7 +674,7 @@ use_certificate_chain_file(const char *file, CERT *cert,
 
         ret = use_certificate_chain_bio(in, cert, passwd_cb, passwd_arg);
 
-end:
+ end:
         BIO_free(in);
         return (ret);
 }
@@ -711,7 +711,7 @@ SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, void *buf, int len)
             ctx->default_passwd_callback,
             ctx->default_passwd_callback_userdata);
 
-end:
+ end:
         BIO_free(in);
         return (ret);
 }
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index 81ac493e6c..4281cd279d 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_txt.c,v 1.28 2017/02/07 02:08:38 beck Exp $ */
+/* $OpenBSD: ssl_txt.c,v 1.29 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -181,7 +181,7 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
                 goto err;
 
         return (1);
-err:
+ err:
         return (0);
 }
 
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 16ed5fa65f..2f555f37d0 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.147 2021/05/16 14:10:43 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.148 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -482,14 +482,14 @@ tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
             val, vallen, NULL, 0, NULL, 0, NULL, 0, NULL, 0, out, olen);
 
         goto ret;
-err1:
+ err1:
         SSLerror(s, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL);
         rv = 0;
         goto ret;
-err2:
+ err2:
         SSLerror(s, ERR_R_MALLOC_FAILURE);
         rv = 0;
-ret:
+ ret:
         free(val);
 
         return (rv);
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 78ac1f5acc..72958b7c56 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.180 2021/05/16 14:10:43 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.181 2021/06/11 11:13:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -668,7 +668,7 @@ ssl_check_clienthello_tlsext_late(SSL *s)
         } else
                 s->internal->tlsext_status_expected = 0;
 
-err:
+ err:
         switch (ret) {
         case SSL_TLSEXT_ERR_ALERT_FATAL:
                 ssl3_send_alert(s, SSL3_AL_FATAL, al);
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index 19ad0af487..aab988d532 100644
--- a/src/lib/libssl/tls13_server.c
+++ b/src/lib/libssl/tls13_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_server.c,v 1.77 2021/06/08 17:41:52 tb Exp $ */
+/* $OpenBSD: tls13_server.c,v 1.78 2021/06/11 11:13:53 jsing Exp $ */
 /*
  * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -343,7 +343,7 @@ tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb, int hrr)
                 goto err;
 
         return 1;
-err:
+ err:
         return 0;
 }