cfb8: Fix decrypt path

[gd/nettle] / sexp2dsa.c

diff --git a/sexp2dsa.c b/sexp2dsa.c
index a4208854e8e946922d6c442662cee93e31db13bc..948859935156d9eb7f82ae1ab873b66411cfb9a5 100644 (file)
--- a/sexp2dsa.c
+++ b/sexp2dsa.c
@@ -1,26 +1,33 @@
 /* sexp2dsa.c
- *
- */
 
-/* nettle, low-level cryptographics library
- *
- * Copyright (C) 2002 Niels Möller
- *  
- * The nettle library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version.
- * 
- * The nettle library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02111-1301, USA.
- */
+   Copyright (C) 2002 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
 
 #if HAVE_CONFIG_H
 # include "config.h"
@@ -47,59 +54,76 @@ do {                                                \
  */
 
 int
-dsa_keypair_from_sexp_alist(struct dsa_public_key *pub,
-                           struct dsa_private_key *priv,
+dsa_keypair_from_sexp_alist(struct dsa_params *params,
+                           mpz_t pub,
+                           mpz_t priv,
                            unsigned p_max_bits,
                            unsigned q_bits,
                            struct sexp_iterator *i)
 {
-  static const uint8_t * const names[5]
+  static const char * const names[5]
     = { "p", "q", "g", "y", "x" };
   struct sexp_iterator values[5];
   unsigned nvalues = priv ? 5 : 4;
-  
+  unsigned p_bits;
+
   if (!sexp_iterator_assoc(i, nvalues, names, values))
     return 0;
 
-  if (priv)
-    GET(priv->x, q_bits, &values[4]);
-  
-  GET(pub->p, p_max_bits, &values[0]);
-  GET(pub->q, q_bits, &values[1]);
-  if (mpz_sizeinbase(pub->q, 2) != q_bits)
+  GET(params->p, p_max_bits, &values[0]);
+  p_bits = mpz_sizeinbase (params->p, 2);
+  GET(params->q, q_bits ? q_bits : p_bits, &values[1]);
+  if (q_bits > 0 && mpz_sizeinbase(params->q, 2) != q_bits)
+    return 0;
+  if (mpz_cmp (params->q, params->p) >= 0)
     return 0;
-  GET(pub->g, p_max_bits, &values[2]);
-  GET(pub->y, p_max_bits, &values[3]);
-  
+  GET(params->g, p_bits, &values[2]);
+  if (mpz_cmp (params->g, params->p) >= 0)
+    return 0;
+  GET(pub, p_bits, &values[3]);
+  if (mpz_cmp (pub, params->p) >= 0)
+    return 0;
+
+  if (priv)
+    {
+      GET(priv, mpz_sizeinbase (params->q, 2), &values[4]);
+      if (mpz_cmp (priv, params->q) >= 0)
+       return 0;
+    }
+
   return 1;
 }
 
 int
-dsa_sha1_keypair_from_sexp(struct dsa_public_key *pub,
-                          struct dsa_private_key *priv,
+dsa_sha1_keypair_from_sexp(struct dsa_params *params,
+                          mpz_t pub,
+                          mpz_t priv,
                           unsigned p_max_bits, 
-                          unsigned length, const uint8_t *expr)
+                          size_t length, const uint8_t *expr)
 {
   struct sexp_iterator i;
 
   return sexp_iterator_first(&i, length, expr)
     && sexp_iterator_check_type(&i, priv ? "private-key" : "public-key")
     && sexp_iterator_check_type(&i, "dsa")
-    && dsa_keypair_from_sexp_alist(pub, priv, p_max_bits, DSA_SHA1_Q_BITS, &i);
+    && dsa_keypair_from_sexp_alist(params, pub, priv,
+                                  p_max_bits, DSA_SHA1_Q_BITS, &i);
 }
 
 int
-dsa_sha256_keypair_from_sexp(struct dsa_public_key *pub,
-                            struct dsa_private_key *priv,
+dsa_sha256_keypair_from_sexp(struct dsa_params *params,
+                            mpz_t pub,
+                            mpz_t priv,
                             unsigned p_max_bits, 
-                            unsigned length, const uint8_t *expr)
+                            size_t length, const uint8_t *expr)
 {
   struct sexp_iterator i;
 
   return sexp_iterator_first(&i, length, expr)
     && sexp_iterator_check_type(&i, priv ? "private-key" : "public-key")
     && sexp_iterator_check_type(&i, "dsa-sha256")
-    && dsa_keypair_from_sexp_alist(pub, priv, p_max_bits, DSA_SHA256_Q_BITS, &i);
+    && dsa_keypair_from_sexp_alist(params, pub, priv,
+                                  p_max_bits, DSA_SHA256_Q_BITS, &i);
 }
 
 int
@@ -107,7 +131,7 @@ dsa_signature_from_sexp(struct dsa_signature *rs,
                        struct sexp_iterator *i,
                        unsigned q_bits)
 {
-  static const uint8_t * const names[2] = { "r", "s" };
+  static const char * const names[2] = { "r", "s" };
   struct sexp_iterator values[2];
 
   if (!sexp_iterator_assoc(i, 2, names, values))