Skip to content

CP-307865 accept SHA512 for custom server certs #6467

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

Merged
merged 3 commits into from
May 15, 2025
Merged

CP-307865 accept SHA512 for custom server certs #6467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ad042e
CP-307865 accept SHA512 for custom server certs
May 14, 2025
ce0d919
CP-307865 adjust error meesage to mention supported SHA algorithms
May 14, 2025
44031b5
CP-307865 add unit tests for SHA512
May 15, 2025
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
6 changes: 3 additions & 3 deletions ocaml/gencert/lib.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ let validate_pem_chain ~pem_leaf ~pem_chain now private_key =
| _ ->
Error (`Msg (server_certificate_key_mismatch, []))
in
let ensure_sha256_signature_algorithm certificate =
let ensure_signature_algorithm certificate =
match X509.Certificate.signature_algorithm certificate with
| Some (_, `SHA256) ->
| Some (_, (`SHA256 | `SHA512)) ->
Ok certificate
| _ ->
Error (`Msg (server_certificate_signature_not_supported, []))
Expand All @@ -116,7 +116,7 @@ let validate_pem_chain ~pem_leaf ~pem_chain now private_key =
~error_not_yet:server_certificate_not_valid_yet
~error_expired:server_certificate_expired
>>= ensure_keys_match private_key
>>= ensure_sha256_signature_algorithm
>>= ensure_signature_algorithm
>>= fun cert ->
match Option.map validate_chain pem_chain with
| None ->
Expand Down
13 changes: 13 additions & 0 deletions ocaml/gencert/test_lib.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ let valid_leaf_certificates =
, "2020-02-01T00:00:00Z"
, `SHA256
)
; ( "Valid, SHA512, matches key"
, "pkey_rsa_2048"
, "2020-02-01T00:00:00Z"
, `SHA512
)
]

(* ( description, leaf_private_key, expected_private_key, time_of_validation,
Expand Down Expand Up @@ -80,6 +85,14 @@ let invalid_leaf_certificates =
, server_certificate_key_mismatch
, []
)
; ( "Valid, SHA512, keys do not match"
, "pkey_rsa_2048"
, "pkey_rsa_4096"
, "2020-02-01T00:00:00Z"
, `SHA512
, server_certificate_key_mismatch
, []
)
; ( "Valid, SHA1, matching keys"
, "pkey_rsa_2048"
, "pkey_rsa_2048"
Expand Down
4 changes: 2 additions & 2 deletions ocaml/idl/datamodel_errors.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,8 +1708,8 @@ let _ =
~doc:"The provided certificate has expired." () ;
error Api_errors.server_certificate_signature_not_supported []
~doc:
"The provided certificate is not using the SHA256 (SHA2) signature \
algorithm."
"The provided certificate is not using one of the following SHA2 \
signature algorithms: SHA256, SHA512."
() ;

error Api_errors.server_certificate_chain_invalid []
Expand Down
Loading