openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-22 04:36:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow NULL arguments to get_(bignum[12]|ecpoint) functions to allow skipping

Browse Source
This commit is contained in:
Damien Miller
2012-09-21 04:40:57 +10:00
parent 9ee9bf1541
commit 32c4e89225
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ssh/sshbuf-getput-crypto.c
View File

@@ -41,7 +41,7 @@ sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM *v)
return SSH_ERR_BIGNUM_IS_NEGATIVE;
if (len > SSHBUF_MAX_BIGNUM)
return SSH_ERR_BIGNUM_TOO_LARGE;
if (BN_bin2bn(d, len, v) == NULL)
if (v != NULL && BN_bin2bn(d, len, v) == NULL)
return SSH_ERR_ALLOC_FAIL;
/* Consume the string */
if (sshbuf_get_string_direct(buf, NULL, NULL) != 0) {
@@ -69,7 +69,7 @@ sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *v)
return SSH_ERR_BIGNUM_TOO_LARGE;
if (sshbuf_len(buf) < 2 + len_bytes)
return SSH_ERR_MESSAGE_INCOMPLETE;
if (BN_bin2bn(d + 2, len_bytes, v) == NULL)
if (v != NULL && BN_bin2bn(d + 2, len_bytes, v) == NULL)
return SSH_ERR_ALLOC_FAIL;
if (sshbuf_consume(buf, 2 + len_bytes) != 0) {
SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR"));
@@ -92,9 +92,10 @@ sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g)
if (len == 0 || len > SSHBUF_MAX_ECPOINT)
return SSH_ERR_ECPOINT_TOO_LARGE;
/* Only handle uncompressed points */
if (*d != POINT_CONVERSION_UNCOMPRESSED ||
EC_POINT_oct2point(g, v, d, len, NULL) != 1)
if (*d != POINT_CONVERSION_UNCOMPRESSED)
return SSH_ERR_INVALID_FORMAT;
if (v != NULL && EC_POINT_oct2point(g, v, d, len, NULL) != 1)
return SSH_ERR_INVALID_FORMAT; /* XXX assumption */
/* Skip string */
if (sshbuf_get_string_direct(buf, NULL, NULL) != 0) {
/* Shouldn't happen */