summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_clnt.c
diff options
context:
space:
mode:
authortedu <>2014-05-29 18:23:25 +0000
committertedu <>2014-05-29 18:23:25 +0000
commit86117447269c03ab8082b4466ebc2e667c09e5e8 (patch)
tree898363e0117316f506d2c70ce1832a55ea6b12b5 /src/lib/libssl/s3_clnt.c
parentcb5b529a7d74486f62dc2c023a0f56a37ea84287 (diff)
downloadopenbsd-86117447269c03ab8082b4466ebc2e667c09e5e8.tar.gz
openbsd-86117447269c03ab8082b4466ebc2e667c09e5e8.tar.bz2
openbsd-86117447269c03ab8082b4466ebc2e667c09e5e8.zip
no space before label
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r--src/lib/libssl/s3_clnt.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 7b4b3cce02..8dbea3869d 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -654,7 +654,7 @@ ssl3_connect(SSL *s)
654 } 654 }
655 skip = 0; 655 skip = 0;
656 } 656 }
657 end: 657end:
658 s->in_handshake--; 658 s->in_handshake--;
659 if (buf != NULL) 659 if (buf != NULL)
660 BUF_MEM_free(buf); 660 BUF_MEM_free(buf);
@@ -825,7 +825,7 @@ ssl3_client_hello(SSL *s)
825 825
826 /* SSL3_ST_CW_CLNT_HELLO_B */ 826 /* SSL3_ST_CW_CLNT_HELLO_B */
827 return (ssl3_do_write(s, SSL3_RT_HANDSHAKE)); 827 return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
828 err: 828err:
829 return (-1); 829 return (-1);
830} 830}
831 831
@@ -1068,9 +1068,9 @@ ssl3_get_server_hello(SSL *s)
1068 } 1068 }
1069 1069
1070 return (1); 1070 return (1);
1071 f_err: 1071f_err:
1072 ssl3_send_alert(s, SSL3_AL_FATAL, al); 1072 ssl3_send_alert(s, SSL3_AL_FATAL, al);
1073 err: 1073err:
1074 return (-1); 1074 return (-1);
1075} 1075}
1076 1076
@@ -1240,10 +1240,10 @@ ssl3_get_server_certificate(SSL *s)
1240 ret = 1; 1240 ret = 1;
1241 1241
1242 if (0) { 1242 if (0) {
1243 f_err: 1243f_err:
1244 ssl3_send_alert(s, SSL3_AL_FATAL, al); 1244 ssl3_send_alert(s, SSL3_AL_FATAL, al);
1245 } 1245 }
1246 err: 1246err:
1247 EVP_PKEY_free(pkey); 1247 EVP_PKEY_free(pkey);
1248 X509_free(x); 1248 X509_free(x);
1249 sk_X509_pop_free(sk, X509_free); 1249 sk_X509_pop_free(sk, X509_free);
@@ -1706,9 +1706,9 @@ ssl3_get_key_exchange(SSL *s)
1706 EVP_PKEY_free(pkey); 1706 EVP_PKEY_free(pkey);
1707 EVP_MD_CTX_cleanup(&md_ctx); 1707 EVP_MD_CTX_cleanup(&md_ctx);
1708 return (1); 1708 return (1);
1709 f_err: 1709f_err:
1710 ssl3_send_alert(s, SSL3_AL_FATAL, al); 1710 ssl3_send_alert(s, SSL3_AL_FATAL, al);
1711 err: 1711err:
1712 EVP_PKEY_free(pkey); 1712 EVP_PKEY_free(pkey);
1713 if (rsa != NULL) 1713 if (rsa != NULL)
1714 RSA_free(rsa); 1714 RSA_free(rsa);
@@ -1860,7 +1860,7 @@ ssl3_get_certificate_request(SSL *s)
1860 } 1860 }
1861 1861
1862 if (0) { 1862 if (0) {
1863 cont: 1863cont:
1864 ERR_clear_error(); 1864 ERR_clear_error();
1865 } 1865 }
1866 1866
@@ -1873,7 +1873,7 @@ ssl3_get_certificate_request(SSL *s)
1873 ca_sk = NULL; 1873 ca_sk = NULL;
1874 1874
1875 ret = 1; 1875 ret = 1;
1876 err: 1876err:
1877 if (ca_sk != NULL) 1877 if (ca_sk != NULL)
1878 sk_X509_NAME_pop_free(ca_sk, X509_NAME_free); 1878 sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
1879 return (ret); 1879 return (ret);
@@ -1957,9 +1957,9 @@ ssl3_get_new_session_ticket(SSL *s)
1957 &s->session->session_id_length, EVP_sha256(), NULL); 1957 &s->session->session_id_length, EVP_sha256(), NULL);
1958 ret = 1; 1958 ret = 1;
1959 return (ret); 1959 return (ret);
1960 f_err: 1960f_err:
1961 ssl3_send_alert(s, SSL3_AL_FATAL, al); 1961 ssl3_send_alert(s, SSL3_AL_FATAL, al);
1962 err: 1962err:
1963 return (-1); 1963 return (-1);
1964} 1964}
1965 1965
@@ -2023,7 +2023,7 @@ ssl3_get_cert_status(SSL *s)
2023 } 2023 }
2024 } 2024 }
2025 return (1); 2025 return (1);
2026 f_err: 2026f_err:
2027 ssl3_send_alert(s, SSL3_AL_FATAL, al); 2027 ssl3_send_alert(s, SSL3_AL_FATAL, al);
2028 return (-1); 2028 return (-1);
2029} 2029}
@@ -2549,7 +2549,7 @@ ssl3_send_client_key_exchange(SSL *s)
2549 memcpy(p, identity, n); 2549 memcpy(p, identity, n);
2550 n += 2; 2550 n += 2;
2551 psk_err = 0; 2551 psk_err = 0;
2552 psk_err: 2552psk_err:
2553 OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN); 2553 OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN);
2554 OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms)); 2554 OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
2555 if (psk_err != 0) { 2555 if (psk_err != 0) {
@@ -2578,7 +2578,7 @@ ssl3_send_client_key_exchange(SSL *s)
2578 2578
2579 /* SSL3_ST_CW_KEY_EXCH_B */ 2579 /* SSL3_ST_CW_KEY_EXCH_B */
2580 return (ssl3_do_write(s, SSL3_RT_HANDSHAKE)); 2580 return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
2581 err: 2581err:
2582 BN_CTX_free(bn_ctx); 2582 BN_CTX_free(bn_ctx);
2583 free(encodedPoint); 2583 free(encodedPoint);
2584 if (clnt_ecdh != NULL) 2584 if (clnt_ecdh != NULL)
@@ -2717,7 +2717,7 @@ ssl3_send_client_verify(SSL *s)
2717 EVP_MD_CTX_cleanup(&mctx); 2717 EVP_MD_CTX_cleanup(&mctx);
2718 EVP_PKEY_CTX_free(pctx); 2718 EVP_PKEY_CTX_free(pctx);
2719 return (ssl3_do_write(s, SSL3_RT_HANDSHAKE)); 2719 return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
2720 err: 2720err:
2721 EVP_MD_CTX_cleanup(&mctx); 2721 EVP_MD_CTX_cleanup(&mctx);
2722 EVP_PKEY_CTX_free(pctx); 2722 EVP_PKEY_CTX_free(pctx);
2723 return (-1); 2723 return (-1);
@@ -2901,9 +2901,9 @@ ssl3_check_cert_and_algorithm(SSL *s)
2901 } 2901 }
2902 } 2902 }
2903 return (1); 2903 return (1);
2904 f_err: 2904f_err:
2905 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE); 2905 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
2906 err: 2906err:
2907 return (0); 2907 return (0);
2908} 2908}
2909 2909