[Draft] Using EVP_PKEY in OpenSSH #445
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bob-beck
reviewed
Oct 13, 2023
| @@ -283,6 +288,103 @@ dh_pub_is_valid(const DH *dh, const BIGNUM *dh_pub) | |||
| int | |||
| dh_gen_key(DH *dh, int need) | |||
| { | |||
| #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) | |||
There was a problem hiding this comment.
If you are just going to switch over to EVP_PKEY, this should be possible without wholesale code duplication for OpenSSL 3.0 - The EVP_pkey interface isn't significantly different between 1.1.1 and 3.0.
There was a problem hiding this comment.
I think as a first step you should separate out all the OpenSSL 3.0 stuff from this, and make a PR that ONLY converts to the EVP_PKEY API with the LibreSSL (1.1.1) api.
| @@ -200,4 +302,48 @@ kex_dh_dec(struct kex *kex, const struct sshbuf *dh_blob, | |||
| sshbuf_free(buf); | |||
| return r; | |||
| } | |||
| #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) | |||
There was a problem hiding this comment.
Again, this is bringing in OpenSSL 3.0 stuff, not just converting to EVP_PKEY. I think a first step here is to convert to PKEY without including anything for 3.0, and to just have a minimal change that converts to the EVP_PKEY api with the 1.1.1. interface.
beldmit
added a commit
to beldmit/openssh-portable
that referenced
this pull request
Oct 18, 2023
A truncated part of openssh#445
Open
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An attempt to use EVP_PKEY instead of RSA/DSA/EC structures