diff options
author | tedu <> | 2014-05-29 18:23:25 +0000 |
---|---|---|
committer | tedu <> | 2014-05-29 18:23:25 +0000 |
commit | 86117447269c03ab8082b4466ebc2e667c09e5e8 (patch) | |
tree | 898363e0117316f506d2c70ce1832a55ea6b12b5 /src/lib/libssl/ssl_lib.c | |
parent | cb5b529a7d74486f62dc2c023a0f56a37ea84287 (diff) | |
download | openbsd-86117447269c03ab8082b4466ebc2e667c09e5e8.tar.gz openbsd-86117447269c03ab8082b4466ebc2e667c09e5e8.tar.bz2 openbsd-86117447269c03ab8082b4466ebc2e667c09e5e8.zip |
no space before label
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index f29648d81e..90a94817b6 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -371,7 +371,7 @@ SSL_new(SSL_CTX *ctx) | |||
371 | #endif | 371 | #endif |
372 | 372 | ||
373 | return (s); | 373 | return (s); |
374 | err: | 374 | err: |
375 | if (s != NULL) { | 375 | if (s != NULL) { |
376 | if (s->cert != NULL) | 376 | if (s->cert != NULL) |
377 | ssl_cert_free(s->cert); | 377 | ssl_cert_free(s->cert); |
@@ -664,7 +664,7 @@ SSL_set_fd(SSL *s, int fd) | |||
664 | BIO_set_fd(bio, fd, BIO_NOCLOSE); | 664 | BIO_set_fd(bio, fd, BIO_NOCLOSE); |
665 | SSL_set_bio(s, bio, bio); | 665 | SSL_set_bio(s, bio, bio); |
666 | ret = 1; | 666 | ret = 1; |
667 | err: | 667 | err: |
668 | return (ret); | 668 | return (ret); |
669 | } | 669 | } |
670 | 670 | ||
@@ -688,7 +688,7 @@ SSL_set_wfd(SSL *s, int fd) | |||
688 | } else | 688 | } else |
689 | SSL_set_bio(s, SSL_get_rbio(s), SSL_get_rbio(s)); | 689 | SSL_set_bio(s, SSL_get_rbio(s), SSL_get_rbio(s)); |
690 | ret = 1; | 690 | ret = 1; |
691 | err: | 691 | err: |
692 | return (ret); | 692 | return (ret); |
693 | } | 693 | } |
694 | 694 | ||
@@ -712,7 +712,7 @@ SSL_set_rfd(SSL *s, int fd) | |||
712 | } else | 712 | } else |
713 | SSL_set_bio(s, SSL_get_wbio(s), SSL_get_wbio(s)); | 713 | SSL_set_bio(s, SSL_get_wbio(s), SSL_get_wbio(s)); |
714 | ret = 1; | 714 | ret = 1; |
715 | err: | 715 | err: |
716 | return (ret); | 716 | return (ret); |
717 | } | 717 | } |
718 | 718 | ||
@@ -1497,7 +1497,7 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, | |||
1497 | if (skp != NULL) | 1497 | if (skp != NULL) |
1498 | *skp = sk; | 1498 | *skp = sk; |
1499 | return (sk); | 1499 | return (sk); |
1500 | err: | 1500 | err: |
1501 | if ((skp == NULL) || (*skp == NULL)) | 1501 | if ((skp == NULL) || (*skp == NULL)) |
1502 | sk_SSL_CIPHER_free(sk); | 1502 | sk_SSL_CIPHER_free(sk); |
1503 | return (NULL); | 1503 | return (NULL); |
@@ -1596,7 +1596,7 @@ SSL_select_next_proto(unsigned char **out, unsigned char *outlen, | |||
1596 | result = client; | 1596 | result = client; |
1597 | status = OPENSSL_NPN_NO_OVERLAP; | 1597 | status = OPENSSL_NPN_NO_OVERLAP; |
1598 | 1598 | ||
1599 | found: | 1599 | found: |
1600 | *out = (unsigned char *) result + 1; | 1600 | *out = (unsigned char *) result + 1; |
1601 | *outlen = result[0]; | 1601 | *outlen = result[0]; |
1602 | return (status); | 1602 | return (status); |
@@ -1874,10 +1874,10 @@ SSL_CTX_new(const SSL_METHOD *meth) | |||
1874 | ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; | 1874 | ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; |
1875 | 1875 | ||
1876 | return (ret); | 1876 | return (ret); |
1877 | err: | 1877 | err: |
1878 | SSLerr(SSL_F_SSL_CTX_NEW, | 1878 | SSLerr(SSL_F_SSL_CTX_NEW, |
1879 | ERR_R_MALLOC_FAILURE); | 1879 | ERR_R_MALLOC_FAILURE); |
1880 | err2: | 1880 | err2: |
1881 | if (ret != NULL) | 1881 | if (ret != NULL) |
1882 | SSL_CTX_free(ret); | 1882 | SSL_CTX_free(ret); |
1883 | return (NULL); | 1883 | return (NULL); |
@@ -2700,7 +2700,7 @@ SSL_dup(SSL *s) | |||
2700 | } | 2700 | } |
2701 | 2701 | ||
2702 | if (0) { | 2702 | if (0) { |
2703 | err: | 2703 | err: |
2704 | if (ret != NULL) | 2704 | if (ret != NULL) |
2705 | SSL_free(ret); | 2705 | SSL_free(ret); |
2706 | ret = NULL; | 2706 | ret = NULL; |