diff options
author | jsg <> | 2025-06-02 12:18:22 +0000 |
---|---|---|
committer | jsg <> | 2025-06-02 12:18:22 +0000 |
commit | 48953da575c7603ca385d0f700de7b83798b8498 (patch) | |
tree | ce9d0de641519c3a435112363e783cc094829596 /src | |
parent | 97f49394bbc1f9adcd4006ec4e97de63c1740e85 (diff) | |
download | openbsd-48953da575c7603ca385d0f700de7b83798b8498.tar.gz openbsd-48953da575c7603ca385d0f700de7b83798b8498.tar.bz2 openbsd-48953da575c7603ca385d0f700de7b83798b8498.zip |
correct indentation, no functional change
found with smatch, ok tb@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/asn1/asn_mime.c | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_acpt.c | 11 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_conf.c | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_prn.c | 7 | ||||
-rw-r--r-- | src/lib/libssl/bio_ssl.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 7 |
8 files changed, 28 insertions, 25 deletions
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c index 932bfcf0b4..d42dd8663e 100644 --- a/src/lib/libcrypto/asn1/asn_mime.c +++ b/src/lib/libcrypto/asn1/asn_mime.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn_mime.c,v 1.36 2025/05/10 05:54:38 tb Exp $ */ | 1 | /* $OpenBSD: asn_mime.c,v 1.37 2025/06/02 12:18:21 jsg Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -507,8 +507,9 @@ SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it) | |||
507 | *bcont = sk_BIO_value(parts, 0); | 507 | *bcont = sk_BIO_value(parts, 0); |
508 | BIO_free(asnin); | 508 | BIO_free(asnin); |
509 | sk_BIO_free(parts); | 509 | sk_BIO_free(parts); |
510 | } else sk_BIO_pop_free(parts, BIO_vfree); | 510 | } else |
511 | return val; | 511 | sk_BIO_pop_free(parts, BIO_vfree); |
512 | return val; | ||
512 | } | 513 | } |
513 | 514 | ||
514 | /* OK, if not multipart/signed try opaque signature */ | 515 | /* OK, if not multipart/signed try opaque signature */ |
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index 73d147f4c1..60e61100b1 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_acpt.c,v 1.32 2025/05/10 05:54:38 tb Exp $ */ | 1 | /* $OpenBSD: bss_acpt.c,v 1.33 2025/06/02 12:18:21 jsg Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -261,11 +261,12 @@ again: | |||
261 | if (c->bio_chain != NULL) { | 261 | if (c->bio_chain != NULL) { |
262 | if ((dbio = BIO_dup_chain(c->bio_chain)) == NULL) | 262 | if ((dbio = BIO_dup_chain(c->bio_chain)) == NULL) |
263 | goto err; | 263 | goto err; |
264 | if (!BIO_push(dbio, bio)) goto err; | 264 | if (!BIO_push(dbio, bio)) |
265 | bio = dbio; | 265 | goto err; |
266 | bio = dbio; | ||
266 | } | 267 | } |
267 | if (BIO_push(b, bio) | 268 | if (BIO_push(b, bio) == NULL) |
268 | == NULL) goto err; | 269 | goto err; |
269 | 270 | ||
270 | c->state = ACPT_S_OK; | 271 | c->state = ACPT_S_OK; |
271 | return (1); | 272 | return (1); |
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 24dad82f5f..14f410f59d 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_conn.c,v 1.42 2025/05/10 05:54:38 tb Exp $ */ | 1 | /* $OpenBSD: bss_conn.c,v 1.43 2025/06/02 12:18:21 jsg Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -141,7 +141,7 @@ conn_state(BIO *b, BIO_CONNECT *c) | |||
141 | } | 141 | } |
142 | for (; *p != '\0'; p++) { | 142 | for (; *p != '\0'; p++) { |
143 | if ((*p == ':') || (*p == '/')) | 143 | if ((*p == ':') || (*p == '/')) |
144 | break; | 144 | break; |
145 | } | 145 | } |
146 | 146 | ||
147 | i= *p; | 147 | i= *p; |
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index f03a4431e7..d8c0472857 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: err.c,v 1.76 2025/05/20 09:25:40 tb Exp $ */ | 1 | /* $OpenBSD: err.c,v 1.77 2025/06/02 12:18:21 jsg Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -824,7 +824,7 @@ err_clear_last_constant_time(int clear) | |||
824 | 824 | ||
825 | es = ERR_get_state(); | 825 | es = ERR_get_state(); |
826 | if (es == NULL) | 826 | if (es == NULL) |
827 | return; | 827 | return; |
828 | 828 | ||
829 | top = es->top; | 829 | top = es->top; |
830 | 830 | ||
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c index 19f771c466..2089f72bc7 100644 --- a/src/lib/libcrypto/x509/x509_conf.c +++ b/src/lib/libcrypto/x509/x509_conf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_conf.c,v 1.30 2025/05/10 05:54:39 tb Exp $ */ | 1 | /* $OpenBSD: x509_conf.c,v 1.31 2025/06/02 12:18:21 jsg Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -242,8 +242,9 @@ v3_check_critical(const char **value) | |||
242 | if ((strlen(p) < 9) || strncmp(p, "critical,", 9)) | 242 | if ((strlen(p) < 9) || strncmp(p, "critical,", 9)) |
243 | return 0; | 243 | return 0; |
244 | p += 9; | 244 | p += 9; |
245 | while (isspace((unsigned char)*p)) p++; | 245 | while (isspace((unsigned char)*p)) |
246 | *value = p; | 246 | p++; |
247 | *value = p; | ||
247 | return 1; | 248 | return 1; |
248 | } | 249 | } |
249 | 250 | ||
diff --git a/src/lib/libcrypto/x509/x509_prn.c b/src/lib/libcrypto/x509/x509_prn.c index 3bf7c803e5..23c649a7b9 100644 --- a/src/lib/libcrypto/x509/x509_prn.c +++ b/src/lib/libcrypto/x509/x509_prn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_prn.c,v 1.6 2023/05/08 05:30:38 tb Exp $ */ | 1 | /* $OpenBSD: x509_prn.c,v 1.7 2025/06/02 12:18:22 jsg Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -87,8 +87,9 @@ X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml) | |||
87 | for (i = 0; i < sk_CONF_VALUE_num(val); i++) { | 87 | for (i = 0; i < sk_CONF_VALUE_num(val); i++) { |
88 | if (ml) | 88 | if (ml) |
89 | BIO_printf(out, "%*s", indent, ""); | 89 | BIO_printf(out, "%*s", indent, ""); |
90 | else if (i > 0) BIO_printf(out, ", "); | 90 | else if (i > 0) |
91 | nval = sk_CONF_VALUE_value(val, i); | 91 | BIO_printf(out, ", "); |
92 | nval = sk_CONF_VALUE_value(val, i); | ||
92 | if (!nval->name) | 93 | if (!nval->name) |
93 | BIO_puts(out, nval->value); | 94 | BIO_puts(out, nval->value); |
94 | else if (!nval->value) | 95 | else if (!nval->value) |
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c index 6dd1699606..13e4f30539 100644 --- a/src/lib/libssl/bio_ssl.c +++ b/src/lib/libssl/bio_ssl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bio_ssl.c,v 1.40 2023/07/19 13:34:33 tb Exp $ */ | 1 | /* $OpenBSD: bio_ssl.c,v 1.41 2025/06/02 12:18:22 jsg Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -229,9 +229,7 @@ ssl_write(BIO *b, const char *out, int outl) | |||
229 | 229 | ||
230 | BIO_clear_retry_flags(b); | 230 | BIO_clear_retry_flags(b); |
231 | 231 | ||
232 | /* ret=SSL_do_handshake(ssl); | 232 | ret = SSL_write(ssl, out, outl); |
233 | if (ret > 0) */ | ||
234 | ret = SSL_write(ssl, out, outl); | ||
235 | 233 | ||
236 | switch (SSL_get_error(ssl, ret)) { | 234 | switch (SSL_get_error(ssl, ret)) { |
237 | case SSL_ERROR_NONE: | 235 | case SSL_ERROR_NONE: |
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index ce68981493..be6ad1bf9a 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.331 2025/03/12 14:03:55 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.332 2025/06/02 12:18:22 jsg Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -3008,8 +3008,9 @@ SSL_dup(SSL *s) | |||
3008 | 3008 | ||
3009 | /* Dup the client_CA list */ | 3009 | /* Dup the client_CA list */ |
3010 | if (s->client_CA != NULL) { | 3010 | if (s->client_CA != NULL) { |
3011 | if ((sk = sk_X509_NAME_dup(s->client_CA)) == NULL) goto err; | 3011 | if ((sk = sk_X509_NAME_dup(s->client_CA)) == NULL) |
3012 | ret->client_CA = sk; | 3012 | goto err; |
3013 | ret->client_CA = sk; | ||
3013 | for (i = 0; i < sk_X509_NAME_num(sk); i++) { | 3014 | for (i = 0; i < sk_X509_NAME_num(sk); i++) { |
3014 | xn = sk_X509_NAME_value(sk, i); | 3015 | xn = sk_X509_NAME_value(sk, i); |
3015 | if (sk_X509_NAME_set(sk, i, | 3016 | if (sk_X509_NAME_set(sk, i, |