Skip to content

scep: keep the caps-driven signing hash within the wolfSSL build #34

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
yosuke-wolfssl wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −0
Open

scep: keep the caps-driven signing hash within the wolfSSL build #34

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
4 changes: 4 additions & 0 deletions src/scep/scep_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,14 @@ static int pick_hash_oid(const WolfCertScepCaps* caps)
{
if (caps == NULL)
return SHA256h;
#ifdef WOLFSSL_SHA512
if (caps->sha512)
return SHA512h;
#endif
#ifdef WOLFSSL_SHA384
if (caps->sha384)
return SHA384h;
#endif

return SHA256h;
}
Expand Down
18 changes: 18 additions & 0 deletions tests/integration/test_scep_roundtrip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,24 @@ int main(void)
fprintf(stderr, "SCEP rsa:4096 rc=%d (%s)\n", rc, wolfcert_strerror(rc));
REQUIRE(rc == WOLFCERT_OK);

/* ---- Caps-driven signing hash. A CA that advertises SHA-512 or SHA-384
* must not push the client past the digests wolfSSL was built with. */
WolfCertScepCaps caps_hash = caps;
WolfCertBuffer issued_hash = { 0 };

caps_hash.sha512 = 1;
REQUIRE(wolfcert_scep_pkcs_req(&cli, &caps_hash, ca_der->buffer,
Comment thread
yosuke-wolfssl marked this conversation as resolved.
ca_der->length, dk, csr.data, csr.len,
&issued_hash) == WOLFCERT_OK);
wolfcert_buffer_free(&issued_hash);

caps_hash.sha512 = 0;
caps_hash.sha384 = 1;
REQUIRE(wolfcert_scep_pkcs_req(&cli, &caps_hash, ca_der->buffer,
ca_der->length, dk, csr.data, csr.len,
&issued_hash) == WOLFCERT_OK);
wolfcert_buffer_free(&issued_hash);

/* ---- Content-cipher override: explicit AES-256 and AES-128 both enroll.
* Each half needs the cipher wolfSSL was actually built with; scep_prepare
* returns WOLFCERT_ERR_UNSUPPORTED for one the library cannot do. */
Expand Down
Loading