summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-05-29 18:23:26 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-05-29 18:23:26 +0000
commit5a0c2ef355818ffa3856643e0f2948d5110d4275 (patch)
tree5b942a6c50e4be127e96571a741dcd6bb3658e3f
parentffbf7282b34ca07ed51ce50828db1c26db325a4e (diff)
no space before label
-rw-r--r--lib/libssl/src/ssl/s3_clnt.c36
-rw-r--r--lib/libssl/src/ssl/ssl_lib.c18
2 files changed, 27 insertions, 27 deletions
diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c
index 7b4b3cce027..8dbea3869d1 100644
--- a/lib/libssl/src/ssl/s3_clnt.c
+++ b/lib/libssl/src/ssl/s3_clnt.c
@@ -654,7 +654,7 @@ ssl3_connect(SSL *s)
}
skip = 0;
}
- end:
+end:
s->in_handshake--;
if (buf != NULL)
BUF_MEM_free(buf);
@@ -825,7 +825,7 @@ ssl3_client_hello(SSL *s)
/* SSL3_ST_CW_CLNT_HELLO_B */
return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
- err:
+err:
return (-1);
}
@@ -1068,9 +1068,9 @@ ssl3_get_server_hello(SSL *s)
}
return (1);
- f_err:
+f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
- err:
+err:
return (-1);
}
@@ -1240,10 +1240,10 @@ ssl3_get_server_certificate(SSL *s)
ret = 1;
if (0) {
- f_err:
+f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
}
- err:
+err:
EVP_PKEY_free(pkey);
X509_free(x);
sk_X509_pop_free(sk, X509_free);
@@ -1706,9 +1706,9 @@ ssl3_get_key_exchange(SSL *s)
EVP_PKEY_free(pkey);
EVP_MD_CTX_cleanup(&md_ctx);
return (1);
- f_err:
+f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
- err:
+err:
EVP_PKEY_free(pkey);
if (rsa != NULL)
RSA_free(rsa);
@@ -1860,7 +1860,7 @@ ssl3_get_certificate_request(SSL *s)
}
if (0) {
- cont:
+cont:
ERR_clear_error();
}
@@ -1873,7 +1873,7 @@ ssl3_get_certificate_request(SSL *s)
ca_sk = NULL;
ret = 1;
- err:
+err:
if (ca_sk != NULL)
sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
return (ret);
@@ -1957,9 +1957,9 @@ ssl3_get_new_session_ticket(SSL *s)
&s->session->session_id_length, EVP_sha256(), NULL);
ret = 1;
return (ret);
- f_err:
+f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
- err:
+err:
return (-1);
}
@@ -2023,7 +2023,7 @@ ssl3_get_cert_status(SSL *s)
}
}
return (1);
- f_err:
+f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
return (-1);
}
@@ -2549,7 +2549,7 @@ ssl3_send_client_key_exchange(SSL *s)
memcpy(p, identity, n);
n += 2;
psk_err = 0;
- psk_err:
+psk_err:
OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN);
OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
if (psk_err != 0) {
@@ -2578,7 +2578,7 @@ ssl3_send_client_key_exchange(SSL *s)
/* SSL3_ST_CW_KEY_EXCH_B */
return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
- err:
+err:
BN_CTX_free(bn_ctx);
free(encodedPoint);
if (clnt_ecdh != NULL)
@@ -2717,7 +2717,7 @@ ssl3_send_client_verify(SSL *s)
EVP_MD_CTX_cleanup(&mctx);
EVP_PKEY_CTX_free(pctx);
return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
- err:
+err:
EVP_MD_CTX_cleanup(&mctx);
EVP_PKEY_CTX_free(pctx);
return (-1);
@@ -2901,9 +2901,9 @@ ssl3_check_cert_and_algorithm(SSL *s)
}
}
return (1);
- f_err:
+f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
- err:
+err:
return (0);
}
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c
index f29648d81e5..90a94817b68 100644
--- a/lib/libssl/src/ssl/ssl_lib.c
+++ b/lib/libssl/src/ssl/ssl_lib.c
@@ -371,7 +371,7 @@ SSL_new(SSL_CTX *ctx)
#endif
return (s);
- err:
+err:
if (s != NULL) {
if (s->cert != NULL)
ssl_cert_free(s->cert);
@@ -664,7 +664,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);
}
@@ -688,7 +688,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);
}
@@ -712,7 +712,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);
}
@@ -1497,7 +1497,7 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num,
if (skp != NULL)
*skp = sk;
return (sk);
- err:
+err:
if ((skp == NULL) || (*skp == NULL))
sk_SSL_CIPHER_free(sk);
return (NULL);
@@ -1596,7 +1596,7 @@ SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
result = client;
status = OPENSSL_NPN_NO_OVERLAP;
- found:
+found:
*out = (unsigned char *) result + 1;
*outlen = result[0];
return (status);
@@ -1874,10 +1874,10 @@ SSL_CTX_new(const SSL_METHOD *meth)
ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
return (ret);
- err:
+err:
SSLerr(SSL_F_SSL_CTX_NEW,
ERR_R_MALLOC_FAILURE);
- err2:
+err2:
if (ret != NULL)
SSL_CTX_free(ret);
return (NULL);
@@ -2700,7 +2700,7 @@ SSL_dup(SSL *s)
}
if (0) {
- err:
+err:
if (ret != NULL)
SSL_free(ret);
ret = NULL;