From: lteo Date: Fri, 25 Apr 2014 03:38:59 +0000 (+0000) Subject: KNF fixes X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=47f9dd97ffe2f548d1954b3123f7552ee1c6d622;p=openbsd KNF fixes --- diff --git a/lib/libssl/src/ssl/ssl_txt.c b/lib/libssl/src/ssl/ssl_txt.c index 5538c57562a..c6bfd68de66 100644 --- a/lib/libssl/src/ssl/ssl_txt.c +++ b/lib/libssl/src/ssl/ssl_txt.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -112,24 +112,24 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) if (x == NULL) goto err; - if (BIO_puts(bp, "SSL-Session:\n") - <= 0) goto err; + if (BIO_puts(bp, "SSL-Session:\n") <= 0) + goto err; if (x->ssl_version == SSL3_VERSION) - s="SSLv3"; + s = "SSLv3"; else if (x->ssl_version == TLS1_2_VERSION) - s="TLSv1.2"; + s = "TLSv1.2"; else if (x->ssl_version == TLS1_1_VERSION) - s="TLSv1.1"; + s = "TLSv1.1"; else if (x->ssl_version == TLS1_VERSION) - s="TLSv1"; + s = "TLSv1"; else if (x->ssl_version == DTLS1_VERSION) - s="DTLSv1"; + s = "DTLSv1"; else if (x->ssl_version == DTLS1_BAD_VER) - s="DTLSv1-bad"; + s = "DTLSv1-bad"; else - s="unknown"; - if (BIO_printf(bp, " Protocol : %s\n", s) - <= 0) goto err; + s = "unknown"; + if (BIO_printf(bp, " Protocol : %s\n", s) <= 0) + goto err; if (x->cipher == NULL) { if (((x->cipher_id) & 0xff000000) == 0x02000000) { @@ -143,62 +143,63 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) if (BIO_printf(bp, " Cipher : %s\n",((x->cipher == NULL)?"unknown":x->cipher->name)) <= 0) goto err; } - if (BIO_puts(bp, " Session-ID: ") - <= 0) goto err; + if (BIO_puts(bp, " Session-ID: ") <= 0) + goto err; for (i = 0; i < x->session_id_length; i++) { - if (BIO_printf(bp, "%02X", x->session_id[i]) - <= 0) goto err; + if (BIO_printf(bp, "%02X", x->session_id[i]) <= 0) + goto err; } - if (BIO_puts(bp, "\n Session-ID-ctx: ") - <= 0) goto err; + if (BIO_puts(bp, "\n Session-ID-ctx: ") <= 0) + goto err; for (i = 0; i < x->sid_ctx_length; i++) { if (BIO_printf(bp, "%02X", x->sid_ctx[i]) <= 0) goto err; } - if (BIO_puts(bp, "\n Master-Key: ") - <= 0) goto err; + if (BIO_puts(bp, "\n Master-Key: ") <= 0) + goto err; for (i = 0; i < (unsigned int)x->master_key_length; i++) { - if (BIO_printf(bp, "%02X", x->master_key[i]) - <= 0) goto err; + if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0) + goto err; } #ifndef OPENSSL_NO_KRB5 - if (BIO_puts(bp, "\n Krb5 Principal: ") - <= 0) goto err; + if (BIO_puts(bp, "\n Krb5 Principal: ") <= 0) + goto err; if (x->krb5_client_princ_len == 0) { - if (BIO_puts(bp, "None") - <= 0) goto err; - } else + if (BIO_puts(bp, "None") <= 0) + goto err; + } else { for (i = 0; i < x->krb5_client_princ_len; i++) { - if (BIO_printf(bp, "%02X", x->krb5_client_princ[i]) - <= 0) goto err; + if (BIO_printf(bp, "%02X", x->krb5_client_princ[i]) <= 0) + goto err; + } } #endif /* OPENSSL_NO_KRB5 */ #ifndef OPENSSL_NO_PSK - if (BIO_puts(bp, "\n PSK identity: ") - <= 0) goto err; - if (BIO_printf(bp, "%s", x->psk_identity ? x->psk_identity : "None") - <= 0) goto err; - if (BIO_puts(bp, "\n PSK identity hint: ") - <= 0) goto err; - if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") - <= 0) goto err; + if (BIO_puts(bp, "\n PSK identity: ") <= 0) + goto err; + if (BIO_printf(bp, "%s", x->psk_identity ? x->psk_identity : "None") <= 0) + goto err; + if (BIO_puts(bp, "\n PSK identity hint: ") <= 0) + goto err; + if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) + goto err; #endif #ifndef OPENSSL_NO_SRP - if (BIO_puts(bp, "\n SRP username: ") - <= 0) goto err; - if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") - <= 0) goto err; + if (BIO_puts(bp, "\n SRP username: ") <= 0) + goto err; + if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") <= 0) + goto err; #endif #ifndef OPENSSL_NO_TLSEXT if (x->tlsext_tick_lifetime_hint) { if (BIO_printf(bp, - "\n TLS session ticket lifetime hint: %ld (seconds)", - x->tlsext_tick_lifetime_hint) <=0) - goto err; + "\n TLS session ticket lifetime hint: %ld (seconds)", + x->tlsext_tick_lifetime_hint) <= 0) + goto err; } if (x->tlsext_tick) { - if (BIO_puts(bp, "\n TLS session ticket:\n") - <= 0) goto err; + if (BIO_puts(bp, "\n TLS session ticket:\n") <= 0) + goto err; if (BIO_dump_indent(bp, (char *)x->tlsext_tick, x->tlsext_ticklen, 4) <= 0) goto err; } @@ -210,27 +211,31 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) ssl_cipher_get_evp(x, NULL, NULL, NULL, NULL, &comp); if (comp == NULL) { - if (BIO_printf(bp, "\n Compression: %d", x->compress_meth) - <= 0) goto err; + if (BIO_printf(bp, "\n Compression: %d", x->compress_meth) <= 0) + goto err; } else { - if (BIO_printf(bp, "\n Compression: %d (%s)", comp->id, comp->method->name) <= 0) goto err; - } + if (BIO_printf(bp, "\n Compression: %d (%s)", comp->id, comp->method->name) <= 0) + goto err; + } } #endif if (x->time != 0) { - if (BIO_printf(bp, "\n Start Time: %lld", (long long)x->time) - <= 0) goto err; + if (BIO_printf(bp, "\n Start Time: %lld", (long long)x->time) <= 0) + goto err; } if (x->timeout != 0L) { - if (BIO_printf(bp, "\n Timeout : %ld (sec)", x->timeout) <= 0) goto err; - } - if (BIO_puts(bp, "\n") - <= 0) goto err; + if (BIO_printf(bp, "\n Timeout : %ld (sec)", x->timeout) <= 0) + goto err; + } + if (BIO_puts(bp, "\n") <= 0) + goto err; + + if (BIO_puts(bp, " Verify return code: ") <= 0) + goto err; - if (BIO_puts(bp, " Verify return code: ") - <= 0) goto err; if (BIO_printf(bp, "%ld (%s)\n", x->verify_result, - X509_verify_cert_error_string(x->verify_result)) <= 0) goto err; + X509_verify_cert_error_string(x->verify_result)) <= 0) + goto err; return (1); err: diff --git a/lib/libssl/ssl_txt.c b/lib/libssl/ssl_txt.c index 5538c57562a..c6bfd68de66 100644 --- a/lib/libssl/ssl_txt.c +++ b/lib/libssl/ssl_txt.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -112,24 +112,24 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) if (x == NULL) goto err; - if (BIO_puts(bp, "SSL-Session:\n") - <= 0) goto err; + if (BIO_puts(bp, "SSL-Session:\n") <= 0) + goto err; if (x->ssl_version == SSL3_VERSION) - s="SSLv3"; + s = "SSLv3"; else if (x->ssl_version == TLS1_2_VERSION) - s="TLSv1.2"; + s = "TLSv1.2"; else if (x->ssl_version == TLS1_1_VERSION) - s="TLSv1.1"; + s = "TLSv1.1"; else if (x->ssl_version == TLS1_VERSION) - s="TLSv1"; + s = "TLSv1"; else if (x->ssl_version == DTLS1_VERSION) - s="DTLSv1"; + s = "DTLSv1"; else if (x->ssl_version == DTLS1_BAD_VER) - s="DTLSv1-bad"; + s = "DTLSv1-bad"; else - s="unknown"; - if (BIO_printf(bp, " Protocol : %s\n", s) - <= 0) goto err; + s = "unknown"; + if (BIO_printf(bp, " Protocol : %s\n", s) <= 0) + goto err; if (x->cipher == NULL) { if (((x->cipher_id) & 0xff000000) == 0x02000000) { @@ -143,62 +143,63 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) if (BIO_printf(bp, " Cipher : %s\n",((x->cipher == NULL)?"unknown":x->cipher->name)) <= 0) goto err; } - if (BIO_puts(bp, " Session-ID: ") - <= 0) goto err; + if (BIO_puts(bp, " Session-ID: ") <= 0) + goto err; for (i = 0; i < x->session_id_length; i++) { - if (BIO_printf(bp, "%02X", x->session_id[i]) - <= 0) goto err; + if (BIO_printf(bp, "%02X", x->session_id[i]) <= 0) + goto err; } - if (BIO_puts(bp, "\n Session-ID-ctx: ") - <= 0) goto err; + if (BIO_puts(bp, "\n Session-ID-ctx: ") <= 0) + goto err; for (i = 0; i < x->sid_ctx_length; i++) { if (BIO_printf(bp, "%02X", x->sid_ctx[i]) <= 0) goto err; } - if (BIO_puts(bp, "\n Master-Key: ") - <= 0) goto err; + if (BIO_puts(bp, "\n Master-Key: ") <= 0) + goto err; for (i = 0; i < (unsigned int)x->master_key_length; i++) { - if (BIO_printf(bp, "%02X", x->master_key[i]) - <= 0) goto err; + if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0) + goto err; } #ifndef OPENSSL_NO_KRB5 - if (BIO_puts(bp, "\n Krb5 Principal: ") - <= 0) goto err; + if (BIO_puts(bp, "\n Krb5 Principal: ") <= 0) + goto err; if (x->krb5_client_princ_len == 0) { - if (BIO_puts(bp, "None") - <= 0) goto err; - } else + if (BIO_puts(bp, "None") <= 0) + goto err; + } else { for (i = 0; i < x->krb5_client_princ_len; i++) { - if (BIO_printf(bp, "%02X", x->krb5_client_princ[i]) - <= 0) goto err; + if (BIO_printf(bp, "%02X", x->krb5_client_princ[i]) <= 0) + goto err; + } } #endif /* OPENSSL_NO_KRB5 */ #ifndef OPENSSL_NO_PSK - if (BIO_puts(bp, "\n PSK identity: ") - <= 0) goto err; - if (BIO_printf(bp, "%s", x->psk_identity ? x->psk_identity : "None") - <= 0) goto err; - if (BIO_puts(bp, "\n PSK identity hint: ") - <= 0) goto err; - if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") - <= 0) goto err; + if (BIO_puts(bp, "\n PSK identity: ") <= 0) + goto err; + if (BIO_printf(bp, "%s", x->psk_identity ? x->psk_identity : "None") <= 0) + goto err; + if (BIO_puts(bp, "\n PSK identity hint: ") <= 0) + goto err; + if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) + goto err; #endif #ifndef OPENSSL_NO_SRP - if (BIO_puts(bp, "\n SRP username: ") - <= 0) goto err; - if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") - <= 0) goto err; + if (BIO_puts(bp, "\n SRP username: ") <= 0) + goto err; + if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") <= 0) + goto err; #endif #ifndef OPENSSL_NO_TLSEXT if (x->tlsext_tick_lifetime_hint) { if (BIO_printf(bp, - "\n TLS session ticket lifetime hint: %ld (seconds)", - x->tlsext_tick_lifetime_hint) <=0) - goto err; + "\n TLS session ticket lifetime hint: %ld (seconds)", + x->tlsext_tick_lifetime_hint) <= 0) + goto err; } if (x->tlsext_tick) { - if (BIO_puts(bp, "\n TLS session ticket:\n") - <= 0) goto err; + if (BIO_puts(bp, "\n TLS session ticket:\n") <= 0) + goto err; if (BIO_dump_indent(bp, (char *)x->tlsext_tick, x->tlsext_ticklen, 4) <= 0) goto err; } @@ -210,27 +211,31 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) ssl_cipher_get_evp(x, NULL, NULL, NULL, NULL, &comp); if (comp == NULL) { - if (BIO_printf(bp, "\n Compression: %d", x->compress_meth) - <= 0) goto err; + if (BIO_printf(bp, "\n Compression: %d", x->compress_meth) <= 0) + goto err; } else { - if (BIO_printf(bp, "\n Compression: %d (%s)", comp->id, comp->method->name) <= 0) goto err; - } + if (BIO_printf(bp, "\n Compression: %d (%s)", comp->id, comp->method->name) <= 0) + goto err; + } } #endif if (x->time != 0) { - if (BIO_printf(bp, "\n Start Time: %lld", (long long)x->time) - <= 0) goto err; + if (BIO_printf(bp, "\n Start Time: %lld", (long long)x->time) <= 0) + goto err; } if (x->timeout != 0L) { - if (BIO_printf(bp, "\n Timeout : %ld (sec)", x->timeout) <= 0) goto err; - } - if (BIO_puts(bp, "\n") - <= 0) goto err; + if (BIO_printf(bp, "\n Timeout : %ld (sec)", x->timeout) <= 0) + goto err; + } + if (BIO_puts(bp, "\n") <= 0) + goto err; + + if (BIO_puts(bp, " Verify return code: ") <= 0) + goto err; - if (BIO_puts(bp, " Verify return code: ") - <= 0) goto err; if (BIO_printf(bp, "%ld (%s)\n", x->verify_result, - X509_verify_cert_error_string(x->verify_result)) <= 0) goto err; + X509_verify_cert_error_string(x->verify_result)) <= 0) + goto err; return (1); err: