summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--schnorr.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a659a62a3..3bad0fc03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 - djm@cvs.openbsd.org 2009/02/17 01:28:32 3 - djm@cvs.openbsd.org 2009/02/17 01:28:32
4 [ssh_config] 4 [ssh_config]
5 sync with revised default ciphers; pointed out by dkrause@ 5 sync with revised default ciphers; pointed out by dkrause@
6 - djm@cvs.openbsd.org 2009/02/18 04:31:21
7 [schnorr.c]
8 signature should hash over the entire group, not just the generator
9 (this is still disabled code)
6 10
720090216 1120090216
8 - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh] 12 - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]
@@ -5177,5 +5181,5 @@
5177 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5181 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5178 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5182 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5179 5183
5180$Id: ChangeLog,v 1.5198 2009/02/21 01:45:02 djm Exp $ 5184$Id: ChangeLog,v 1.5199 2009/02/21 01:45:18 djm Exp $
5181 5185
diff --git a/schnorr.c b/schnorr.c
index e3abe5702..546975072 100644
--- a/schnorr.c
+++ b/schnorr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: schnorr.c,v 1.1 2008/11/04 08:22:13 djm Exp $ */ 1/* $OpenBSD: schnorr.c,v 1.2 2009/02/18 04:31:21 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2008 Damien Miller. All rights reserved. 3 * Copyright (c) 2008 Damien Miller. All rights reserved.
4 * 4 *
@@ -81,8 +81,10 @@ schnorr_hash(const BIGNUM *p, const BIGNUM *q, const BIGNUM *g,
81 buffer_init(&b); 81 buffer_init(&b);
82 EVP_MD_CTX_init(&evp_md_ctx); 82 EVP_MD_CTX_init(&evp_md_ctx);
83 83
84 /* h = H(g || g^v || g^x || id) */ 84 /* h = H(g || p || q || g^v || g^x || id) */
85 buffer_put_bignum2(&b, g); 85 buffer_put_bignum2(&b, g);
86 buffer_put_bignum2(&b, p);
87 buffer_put_bignum2(&b, q);
86 buffer_put_bignum2(&b, g_v); 88 buffer_put_bignum2(&b, g_v);
87 buffer_put_bignum2(&b, g_x); 89 buffer_put_bignum2(&b, g_x);
88 buffer_put_string(&b, id, idlen); 90 buffer_put_string(&b, id, idlen);