openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-23 21:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor*.c: make JPAKE compile

Browse Source
This commit is contained in:
Markus Friedl
2012-09-20 12:27:34 +02:00
parent 253e997d49
commit 45b1a33a8e
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ssh/monitor.c
View File

@@ -1788,7 +1788,8 @@ mm_answer_jpake_step2(int sock, struct sshbuf *m)
{
struct jpake_ctx *pctx = authctxt->jpake_ctx;
u_char *x1_proof, *x2_proof, *x4_s_proof;
u_int x1_proof_len, x2_proof_len, x4_s_proof_len;
u_int x4_s_proof_len;
size_t x1_proof_len, x2_proof_len, len;
int r;
if (pctx == NULL)
@@ -1799,11 +1800,11 @@ mm_answer_jpake_step2(int sock, struct sshbuf *m)
fatal("%s: BN_new", __func__);
if ((r = sshbuf_get_bignum2(m, pctx->g_x1)) != 0 ||
(r = sshbuf_get_bignum2(m, pctx->g_x2)) != 0 ||
(r = sshbuf_get_string(m, &pctx->client_id,
&pctx->client_id_len)) != 0 ||
(r = sshbuf_get_string(m, &pctx->client_id, &len)) != 0 ||
(r = sshbuf_get_string(m, &x1_proof, &x1_proof_len)) != 0 ||
(r = sshbuf_get_string(m, &x2_proof, &x2_proof_len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));
pctx->client_id_len = len;
jpake_step2(pctx->grp, pctx->s, pctx->g_x3,
pctx->g_x1, pctx->g_x2, pctx->x4,
@@ -1843,7 +1844,7 @@ mm_answer_jpake_key_confirm(int sock, struct sshbuf *m)
{
struct jpake_ctx *pctx = authctxt->jpake_ctx;
u_char *x2_s_proof;
u_int x2_s_proof_len;
size_t x2_s_proof_len;
int r;
if (pctx == NULL)
@@ -1887,13 +1888,13 @@ mm_answer_jpake_check_confirm(int sock, struct sshbuf *m)
{
int r, authenticated = 0;
u_char *peer_confirm_hash;
u_int peer_confirm_hash_len;
size_t peer_confirm_hash_len;
struct jpake_ctx *pctx = authctxt->jpake_ctx;
if (pctx == NULL)
fatal("%s: pctx == NULL", __func__);
if ((r = sshbuf_get_string(m, peer_confirm_hash,
if ((r = sshbuf_get_string(m, &peer_confirm_hash,
&peer_confirm_hash_len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));

25
ssh/monitor_wrap.c
View File

@@ -955,6 +955,7 @@ mm_auth2_jpake_get_pwdata(Authctxt *authctxt, BIGNUM **s,
char **hash_scheme, char **salt)
{
struct sshbuf *m;
int r;
debug3("%s entering", __func__);
@@ -982,6 +983,8 @@ mm_jpake_step1(struct modp_group *grp,
u_char **priv2_proof, u_int *priv2_proof_len)
{
struct sshbuf *m;
size_t len, len1, len2;
int r;
debug3("%s entering", __func__);
@@ -1000,13 +1003,16 @@ mm_jpake_step1(struct modp_group *grp,
(*g_priv2 = BN_new()) == NULL)
fatal("%s: BN_new", __func__);
if ((r = sshbuf_get_string(m, id, id_len)) != 0 ||
if ((r = sshbuf_get_string(m, id, &len)) != 0 ||
/* priv1 and priv2 are, well, private */
(r = sshbuf_get_bignum2(m, *g_priv1)) != 0 ||
(r = sshbuf_get_bignum2(m, *g_priv2)) != 0 ||
(r = sshbuf_get_string(m, priv1_proof, priv1_proof_len)) != 0 ||
(r = sshbuf_get_string(m, priv2_proof, priv2_proof_len)) != 0)
(r = sshbuf_get_string(m, priv1_proof, &len1)) != 0 ||
(r = sshbuf_get_string(m, priv2_proof, &len2)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));
*id_len = len;
*priv1_proof_len = len1;
*priv2_proof_len = len2;
sshbuf_free(m);
}
@@ -1022,6 +1028,8 @@ mm_jpake_step2(struct modp_group *grp, BIGNUM *s,
u_char **newpub_exponent_proof, u_int *newpub_exponent_proof_len)
{
struct sshbuf *m;
size_t len;
int r;
debug3("%s entering", __func__);
@@ -1048,9 +1056,9 @@ mm_jpake_step2(struct modp_group *grp, BIGNUM *s,
fatal("%s: BN_new", __func__);
if ((r = sshbuf_get_bignum2(m, *newpub)) != 0 ||
(r = sshbuf_get_string(m, newpub_exponent_proof,
newpub_exponent_proof_len)) != 0)
(r = sshbuf_get_string(m, newpub_exponent_proof, &len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));
*newpub_exponent_proof_len = len;
sshbuf_free(m);
}
@@ -1067,6 +1075,8 @@ mm_jpake_key_confirm(struct modp_group *grp, BIGNUM *s, BIGNUM *step2_val,
u_char **confirm_hash, u_int *confirm_hash_len)
{
struct sshbuf *m;
size_t len;
int r;
debug3("%s entering", __func__);
@@ -1087,8 +1097,9 @@ mm_jpake_key_confirm(struct modp_group *grp, BIGNUM *s, BIGNUM *step2_val,
MONITOR_ANS_JPAKE_KEY_CONFIRM, m);
/* 'k' is sensitive and stays in the monitor */
if ((r = sshbuf_get_string(m, confirm_hash, confirm_hash_len)) != 0)
if ((r = sshbuf_get_string(m, confirm_hash, &len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));
*confirm_hash_len = len;
sshbuf_free(m);
}
@@ -1100,7 +1111,7 @@ mm_jpake_check_confirm(const BIGNUM *k,
const u_char *peer_confirm_hash, u_int peer_confirm_hash_len)
{
struct sshbuf *m;
int success = 0;
int r, success = 0;
debug3("%s entering", __func__);