diff options
| author | jca <> | 2018-03-15 12:27:01 +0000 |
|---|---|---|
| committer | jca <> | 2018-03-15 12:27:01 +0000 |
| commit | 31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204 (patch) | |
| tree | e59ff43ff5a8063f6f2c91ce72b8d8fd4f30e897 /src/regress/lib/libssl/unit/ssl_versions.c | |
| parent | 302371947c6242ab9f7f993a57b4b413756adb5c (diff) | |
| download | openbsd-31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204.tar.gz openbsd-31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204.tar.bz2 openbsd-31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204.zip | |
Provide SSL_CTX_get_min_proto_version and SSL_CTX_get_max_proto_version
We already provided the setters, so also provide the getters like
OpenSSL does. Addition prompted by the use of those functions in recent
openvpn releases.
manpage diff from schwarze@ (thanks!) with input from jsing@, ok tb@
jsing@
Diffstat (limited to 'src/regress/lib/libssl/unit/ssl_versions.c')
| -rw-r--r-- | src/regress/lib/libssl/unit/ssl_versions.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/regress/lib/libssl/unit/ssl_versions.c b/src/regress/lib/libssl/unit/ssl_versions.c index c12f115c19..d84a7106d5 100644 --- a/src/regress/lib/libssl/unit/ssl_versions.c +++ b/src/regress/lib/libssl/unit/ssl_versions.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_versions.c,v 1.4 2017/05/06 20:39:03 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.5 2018/03/15 12:27:01 jca Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -620,16 +620,16 @@ test_ssl_min_max_version(void) | |||
| 620 | goto next; | 620 | goto next; |
| 621 | } | 621 | } |
| 622 | 622 | ||
| 623 | if (ssl_ctx->internal->min_version != mmvt->want_minver) { | 623 | if (SSL_CTX_get_min_proto_version(ssl_ctx) != mmvt->want_minver) { |
| 624 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX min " | 624 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX min " |
| 625 | "version 0x%x, want 0x%x\n", i, | 625 | "version 0x%x, want 0x%x\n", i, |
| 626 | ssl_ctx->internal->min_version, mmvt->want_minver); | 626 | SSL_CTX_get_min_proto_version(ssl_ctx), mmvt->want_minver); |
| 627 | goto next; | 627 | goto next; |
| 628 | } | 628 | } |
| 629 | if (ssl_ctx->internal->max_version != mmvt->want_maxver) { | 629 | if (SSL_CTX_get_max_proto_version(ssl_ctx) != mmvt->want_maxver) { |
| 630 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX max " | 630 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX max " |
| 631 | "version 0x%x, want 0x%x\n", i, | 631 | "version 0x%x, want 0x%x\n", i, |
| 632 | ssl_ctx->internal->max_version, mmvt->want_maxver); | 632 | SSL_CTX_get_max_proto_version(ssl_ctx), mmvt->want_maxver); |
| 633 | goto next; | 633 | goto next; |
| 634 | } | 634 | } |
| 635 | 635 | ||
| @@ -638,16 +638,16 @@ test_ssl_min_max_version(void) | |||
| 638 | return 1; | 638 | return 1; |
| 639 | } | 639 | } |
| 640 | 640 | ||
| 641 | if (ssl->internal->min_version != mmvt->want_minver) { | 641 | if (SSL_get_min_proto_version(ssl) != mmvt->want_minver) { |
| 642 | fprintf(stderr, "FAIL: test %zu - initial SSL min " | 642 | fprintf(stderr, "FAIL: test %zu - initial SSL min " |
| 643 | "version 0x%x, want 0x%x\n", i, | 643 | "version 0x%x, want 0x%x\n", i, |
| 644 | ssl_ctx->internal->min_version, mmvt->want_minver); | 644 | SSL_get_min_proto_version(ssl), mmvt->want_minver); |
| 645 | goto next; | 645 | goto next; |
| 646 | } | 646 | } |
| 647 | if (ssl->internal->max_version != mmvt->want_maxver) { | 647 | if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) { |
| 648 | fprintf(stderr, "FAIL: test %zu - initial SSL max " | 648 | fprintf(stderr, "FAIL: test %zu - initial SSL max " |
| 649 | "version 0x%x, want 0x%x\n", i, | 649 | "version 0x%x, want 0x%x\n", i, |
| 650 | ssl_ctx->internal->max_version, mmvt->want_maxver); | 650 | SSL_get_max_proto_version(ssl), mmvt->want_maxver); |
| 651 | goto next; | 651 | goto next; |
| 652 | } | 652 | } |
| 653 | 653 | ||
| @@ -679,16 +679,16 @@ test_ssl_min_max_version(void) | |||
| 679 | goto next; | 679 | goto next; |
| 680 | } | 680 | } |
| 681 | 681 | ||
| 682 | if (ssl->internal->min_version != mmvt->want_minver) { | 682 | if (SSL_get_min_proto_version(ssl) != mmvt->want_minver) { |
| 683 | fprintf(stderr, "FAIL: test %zu - got SSL min " | 683 | fprintf(stderr, "FAIL: test %zu - got SSL min " |
| 684 | "version 0x%x, want 0x%x\n", i, | 684 | "version 0x%x, want 0x%x\n", i, |
| 685 | ssl_ctx->internal->min_version, mmvt->want_minver); | 685 | SSL_get_min_proto_version(ssl), mmvt->want_minver); |
| 686 | goto next; | 686 | goto next; |
| 687 | } | 687 | } |
| 688 | if (ssl->internal->max_version != mmvt->want_maxver) { | 688 | if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) { |
| 689 | fprintf(stderr, "FAIL: test %zu - got SSL max " | 689 | fprintf(stderr, "FAIL: test %zu - got SSL max " |
| 690 | "version 0x%x, want 0x%x\n", i, | 690 | "version 0x%x, want 0x%x\n", i, |
| 691 | ssl->internal->max_version, mmvt->want_maxver); | 691 | SSL_get_max_proto_version(ssl), mmvt->want_maxver); |
| 692 | goto next; | 692 | goto next; |
| 693 | } | 693 | } |
| 694 | 694 | ||
