diff options
| author | jsg <> | 2025-06-02 12:18:22 +0000 |
|---|---|---|
| committer | jsg <> | 2025-06-02 12:18:22 +0000 |
| commit | 0a9ae15841c7f994ec48b5317b89dbfe586ddcc7 (patch) | |
| tree | ce9d0de641519c3a435112363e783cc094829596 /src/lib/libssl | |
| parent | 660732fe44b595572e8605f5855d894ff2fa2a04 (diff) | |
| download | openbsd-0a9ae15841c7f994ec48b5317b89dbfe586ddcc7.tar.gz openbsd-0a9ae15841c7f994ec48b5317b89dbfe586ddcc7.tar.bz2 openbsd-0a9ae15841c7f994ec48b5317b89dbfe586ddcc7.zip | |
correct indentation, no functional change
found with smatch, ok tb@
Diffstat (limited to 'src/lib/libssl')
| -rw-r--r-- | src/lib/libssl/bio_ssl.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 7 |
2 files changed, 6 insertions, 7 deletions
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, |
