Refactor sshkey #10
Closed
Refactor sshkey #10
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
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
mfriedl
reviewed
Feb 11, 2022
|
sorry for the useless commit names, but they should address all your comments @mfriedl :) |
djmdjm
force-pushed
the
refactor-sshkey
branch
from
98c5649
to
82842ed
Compare
Move keytypes data and some of the type-specific code (allocation, cleanup, etc) out into each key type's implementation.
also share some cleanup code for SK
djmdjm
force-pushed
the
refactor-sshkey
branch
from
82842ed
to
829426b
Compare
mfriedl
reviewed
Oct 26, 2022
| static int | ||
| ssh_dss_equal(const struct sshkey *a, const struct sshkey *b) | ||
| { | ||
| const BIGNUM *dsa_p_a, *dsa_q_a, *dsa_g_a, *dsa_pub_key_a; |
There was a problem hiding this comment.
ok to me, but my brain works different and I would have written dsa_a_p and dsa_b_p, etc
mfriedl
reviewed
Oct 26, 2022
| u_int32_t left; | ||
| size_t pklen; | ||
|
|
||
| if ((r = sshkey_xmss_init(n, from->xmss_name)) != 0) |
mfriedl
reviewed
Oct 26, 2022
| if (from->xmss_pk == NULL) | ||
| return 0; /* XXX SSH_ERR_INTERNAL_ERROR ? */ | ||
|
|
||
| if ((pklen = sshkey_xmss_pklen(k)) == 0 || |
mfriedl
reviewed
Oct 26, 2022
| return 0; /* XXX SSH_ERR_INTERNAL_ERROR ? */ | ||
|
|
||
| if ((pklen = sshkey_xmss_pklen(k)) == 0 || | ||
| sshkey_xmss_pklen(n) != pklen) |
mfriedl
reviewed
Oct 26, 2022
| return SSH_ERR_ALLOC_FAIL; /* caller will free to->xmss_pk */ | ||
| memcpy(to->xmss_pk, from->xmss_pk, pklen); | ||
| /* simulate number of signatures left on pubkey */ | ||
| left = sshkey_xmss_signatures_left(k); |
mfriedl
reviewed
Oct 26, 2022
| /* simulate number of signatures left on pubkey */ | ||
| left = sshkey_xmss_signatures_left(k); | ||
| if (left) | ||
| sshkey_xmss_enable_maxsign(n, left); |
mfriedl
reviewed
Oct 26, 2022
| sshkey_xmss_pklen(n) != pklen) | ||
| return SSH_ERR_INTERNAL_ERROR; | ||
| if ((to->xmss_pk = malloc(pklen)) == NULL) | ||
| return SSH_ERR_ALLOC_FAIL; /* caller will free to->xmss_pk */ |
There was a problem hiding this comment.
no need to free since malloc failed
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.
This factors most of the algorithm-specific code from sshkey.c to the algorithm-specific files (e.g. ssh-rsa.c). There's probably more to do, like cleaning up the various ECDSA NID helpers, etc.