Skip to content

crypto-policies: add MinProtocol, Ciphersuites, and key=value config format #10535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dom-omg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

crypto-policies: add MinProtocol, Ciphersuites, and key=value config format #10535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion examples/crypto_policies/default/wolfssl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
@SECLEVEL=2:EECDH:kRSA:EDH:PSK:DHEPSK:ECDHEPSK:RSAPSK:!RC4:!eNULL:!aNULL
[system_default_sect]
MinProtocol = TLSv1.2
CipherString = @SECLEVEL=2:EECDH:kRSA:EDH:PSK:DHEPSK:ECDHEPSK:RSAPSK:!RC4:!eNULL:!aNULL
Ciphersuites = TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256
5 changes: 4 additions & 1 deletion examples/crypto_policies/future/wolfssl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
@SECLEVEL=3:EECDH:EDH:PSK:DHEPSK:ECDHEPSK:!RSAPSK:!kRSA:!AES128:!RC4:!eNULL:!aNULL:!SHA1
[system_default_sect]
MinProtocol = TLSv1.3
CipherString = @SECLEVEL=3:EECDH:EDH:PSK:DHEPSK:ECDHEPSK:!RSAPSK:!kRSA:!AES128:!RC4:!eNULL:!aNULL:!SHA1
Ciphersuites = TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256
5 changes: 4 additions & 1 deletion examples/crypto_policies/legacy/wolfssl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
@SECLEVEL=1:EECDH:kRSA:EDH:PSK:DHEPSK:ECDHEPSK:RSAPSK:!eNULL:!aNULL
[system_default_sect]
MinProtocol = TLSv1.0
CipherString = @SECLEVEL=1:EECDH:kRSA:EDH:PSK:DHEPSK:ECDHEPSK:RSAPSK:!eNULL:!aNULL
Ciphersuites = TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256
15 changes: 15 additions & 0 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2564,6 +2564,21 @@ int wolfSSL_crypto_policy_init_ctx(WOLFSSL_CTX * ctx,
}
#endif /* HAVE_ECC */

/* Override SECLEVEL-derived minimum version with explicit MinProtocol
* if it was set in the config file. */
{
byte explicit_min = 0;
#ifdef WOLFSSL_DTLS
if (dtls)
explicit_min = wolfSSL_crypto_policy_get_min_dtls_downgrade();
else
#endif /* WOLFSSL_DTLS */
explicit_min = wolfSSL_crypto_policy_get_min_downgrade();

if (explicit_min != 0)
minDowngrade = explicit_min;
}

/* Finally set the ctx values. */
ctx->minDowngrade = minDowngrade;
ctx->secLevel = level;
Expand Down
Loading