merge 5.7p1

1 files changed, 8 insertions, 1 deletions

diff --git a/jpake.c b/jpake.c
index cdf65f509..ac9a4bc34 100644
--- a/jpake.c
+++ b/jpake.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jpake.c,v 1.4 2010/07/13 23:13:16 djm Exp $ */
+/* $OpenBSD: jpake.c,v 1.6 2010/09/20 04:54:07 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -45,6 +45,7 @@
 #include "packet.h"
 #include "dispatch.h"
 #include "log.h"
+#include "misc.h"
 
 #include "jpake.h"
 #include "schnorr.h"
@@ -257,8 +258,12 @@ jpake_step2(struct modp_group *grp, BIGNUM *s,
         /* Validate peer's step 1 values */
         if (BN_cmp(theirpub1, BN_value_one()) <= 0)
                 fatal("%s: theirpub1 <= 1", __func__);
+        if (BN_cmp(theirpub1, grp->p) >= 0)
+                fatal("%s: theirpub1 >= p", __func__);
         if (BN_cmp(theirpub2, BN_value_one()) <= 0)
                 fatal("%s: theirpub2 <= 1", __func__);
+        if (BN_cmp(theirpub2, grp->p) >= 0)
+                fatal("%s: theirpub2 >= p", __func__);
 
         if (schnorr_verify_buf(grp->p, grp->q, grp->g, theirpub1,
             theirid, theirid_len, theirpub1_proof, theirpub1_proof_len) != 1)
@@ -363,6 +368,8 @@ jpake_key_confirm(struct modp_group *grp, BIGNUM *s, BIGNUM *step2_val,
         /* Validate step 2 values */
         if (BN_cmp(step2_val, BN_value_one()) <= 0)
                 fatal("%s: step2_val <= 1", __func__);
+        if (BN_cmp(step2_val, grp->p) >= 0)
+                fatal("%s: step2_val >= p", __func__);
 
         /*
          * theirpriv2_s_proof is calculated with a different generator: