- djm@cvs.openbsd.org 2009/02/18 04:31:21

     [schnorr.c]
     signature should hash over the entire group, not just the generator
     (this is still disabled code)

diff --git a/ChangeLog b/ChangeLog
index a659a62a36fac5c7c456457fe7de1dd4cf900f99..3bad0fc034e7ca63582962be955304ee633ed9b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    - djm@cvs.openbsd.org 2009/02/17 01:28:32
      [ssh_config]
      sync with revised default ciphers; pointed out by dkrause@
+   - djm@cvs.openbsd.org 2009/02/18 04:31:21
+     [schnorr.c]
+     signature should hash over the entire group, not just the generator
+     (this is still disabled code)
 
 20090216
  - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]
@@ -5177,5 +5181,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5198 2009/02/21 01:45:02 djm Exp $
+$Id: ChangeLog,v 1.5199 2009/02/21 01:45:18 djm Exp $
 

diff --git a/schnorr.c b/schnorr.c
index e3abe570276c65c66e59c41256db7a7dac703213..546975072221a5e2b37644b56980231290c82115 100644 (file)
--- a/schnorr.c
+++ b/schnorr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: schnorr.c,v 1.1 2008/11/04 08:22:13 djm Exp $ */
+/* $OpenBSD: schnorr.c,v 1.2 2009/02/18 04:31:21 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -81,8 +81,10 @@ schnorr_hash(const BIGNUM *p, const BIGNUM *q, const BIGNUM *g,
        buffer_init(&b);
        EVP_MD_CTX_init(&evp_md_ctx);
 
-       /* h = H(g || g^v || g^x || id) */
+       /* h = H(g || p || q || g^v || g^x || id) */
        buffer_put_bignum2(&b, g);
+       buffer_put_bignum2(&b, p);
+       buffer_put_bignum2(&b, q);
        buffer_put_bignum2(&b, g_v);
        buffer_put_bignum2(&b, g_x);
        buffer_put_string(&b, id, idlen);