diff options
author | tb <> | 2021-06-19 18:28:51 +0000 |
---|---|---|
committer | tb <> | 2021-06-19 18:28:51 +0000 |
commit | f3231da7e89a3a1b6fbe00fb2afa52f76f4c9745 (patch) | |
tree | 3f68aea6f3b693a7fe452ee609fe12afa2925e3b /src | |
parent | 6afe60e39f7d03240c1f094e1f341b84a8de3f4e (diff) | |
download | openbsd-f3231da7e89a3a1b6fbe00fb2afa52f76f4c9745.tar.gz openbsd-f3231da7e89a3a1b6fbe00fb2afa52f76f4c9745.tar.bz2 openbsd-f3231da7e89a3a1b6fbe00fb2afa52f76f4c9745.zip |
zap trailing whitespace
Diffstat (limited to 'src')
-rw-r--r-- | src/regress/lib/libssl/dtls/dtlstest.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/regress/lib/libssl/dtls/dtlstest.c b/src/regress/lib/libssl/dtls/dtlstest.c index 30d8525971..08424c1a4b 100644 --- a/src/regress/lib/libssl/dtls/dtlstest.c +++ b/src/regress/lib/libssl/dtls/dtlstest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dtlstest.c,v 1.13 2021/06/19 17:11:34 jsing Exp $ */ | 1 | /* $OpenBSD: dtlstest.c,v 1.14 2021/06/19 18:28:51 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2020, 2021 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2020, 2021 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -218,7 +218,7 @@ bio_packet_monkey_write(BIO *bio, const char *in, int in_len) | |||
218 | free(ctx->delayed_msg); | 218 | free(ctx->delayed_msg); |
219 | ctx->delayed_msg = NULL; | 219 | ctx->delayed_msg = NULL; |
220 | } | 220 | } |
221 | 221 | ||
222 | if (ctx->delay_mask > 0) { | 222 | if (ctx->delay_mask > 0) { |
223 | delay = ctx->delay_mask & 1; | 223 | delay = ctx->delay_mask & 1; |
224 | ctx->delay_mask >>= 1; | 224 | ctx->delay_mask >>= 1; |
@@ -458,8 +458,7 @@ dtls_server(int sock, long options, long mtu) | |||
458 | SSL_CTX_set_dh_auto(ssl_ctx, 2); | 458 | SSL_CTX_set_dh_auto(ssl_ctx, 2); |
459 | SSL_CTX_set_options(ssl_ctx, options); | 459 | SSL_CTX_set_options(ssl_ctx, options); |
460 | 460 | ||
461 | if (SSL_CTX_use_certificate_file(ssl_ctx, server_cert_file, | 461 | if (SSL_CTX_use_certificate_chain_file(ssl_ctx, server_cert_file) != 1) { |
462 | SSL_FILETYPE_PEM) != 1) { | ||
463 | fprintf(stderr, "FAIL: Failed to load server certificate"); | 462 | fprintf(stderr, "FAIL: Failed to load server certificate"); |
464 | goto failure; | 463 | goto failure; |
465 | } | 464 | } |
@@ -472,6 +471,10 @@ dtls_server(int sock, long options, long mtu) | |||
472 | if ((ssl = SSL_new(ssl_ctx)) == NULL) | 471 | if ((ssl = SSL_new(ssl_ctx)) == NULL) |
473 | errx(1, "server ssl"); | 472 | errx(1, "server ssl"); |
474 | 473 | ||
474 | if (SSL_use_certificate_chain_file(ssl, server_cert_file) != 1) { | ||
475 | fprintf(stderr, "FAIL: Failed to load server certificate"); | ||
476 | goto failure; | ||
477 | } | ||
475 | SSL_set_bio(ssl, bio, bio); | 478 | SSL_set_bio(ssl, bio, bio); |
476 | bio = NULL; | 479 | bio = NULL; |
477 | 480 | ||