From 5640f8afc7965964f3a4209a4eada5a4719fa702 Mon Sep 17 00:00:00 2001
From: Steffen Jaeckel <s@jaeckel.eu>
Date: Tue, 4 Jul 2017 10:17:47 +0200
Subject: [PATCH] put dsa_set_pqg_dsaparam() in own c file

---
 src/pk/dsa/dsa_set.c              | 45 ----------------------
 src/pk/dsa/dsa_set_pqg_dsaparam.c | 63 +++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 45 deletions(-)
 create mode 100755 src/pk/dsa/dsa_set_pqg_dsaparam.c

diff --git a/src/pk/dsa/dsa_set.c b/src/pk/dsa/dsa_set.c
index 5c1e029..d25de01 100755
--- a/src/pk/dsa/dsa_set.c
+++ b/src/pk/dsa/dsa_set.c
@@ -57,51 +57,6 @@ LBL_ERR:
    return err;
 }
 
-/**
-  Import DSA's p, q & g from dsaparam
-
-      dsaparam data: openssl dsaparam -outform DER -out dsaparam.der 2048
-
-  @param dsaparam    The DSA param DER encoded data
-  @param dsaparamlen The length of dhparam data
-  @param key         [out] the destination for the imported key
-  @return CRYPT_OK if successful.
-*/
-int dsa_set_pqg_dsaparam(const unsigned char *dsaparam, unsigned long dsaparamlen,
-                         dsa_key *key)
-{
-   int err;
-
-   LTC_ARGCHK(dsaparam    != NULL);
-   LTC_ARGCHK(key         != NULL);
-   LTC_ARGCHK(ltc_mp.name != NULL);
-
-   /* init key */
-   err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL);
-   if (err != CRYPT_OK) return err;
-
-   if ((err = der_decode_sequence_multi(dsaparam, dsaparamlen,
-                                        LTC_ASN1_INTEGER, 1UL, key->p,
-                                        LTC_ASN1_INTEGER, 1UL, key->q,
-                                        LTC_ASN1_INTEGER, 1UL, key->g,
-                                        LTC_ASN1_EOL,     0UL, NULL)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   key->qord = mp_unsigned_bin_size(key->q);
-
-   if (key->qord >= LTC_MDSA_MAX_GROUP || key->qord <= 15 ||
-      (unsigned long)key->qord >= mp_unsigned_bin_size(key->p) || (mp_unsigned_bin_size(key->p) - key->qord) >= LTC_MDSA_DELTA) {
-      err = CRYPT_INVALID_PACKET;
-      goto LBL_ERR;
-   }
-   return CRYPT_OK;
-
-LBL_ERR:
-   dsa_free(key);
-   return err;
-}
-
 /**
   Import DSA public or private key from raw numbers
   @param pub     DSA's y (public key) in binary representation
diff --git a/src/pk/dsa/dsa_set_pqg_dsaparam.c b/src/pk/dsa/dsa_set_pqg_dsaparam.c
new file mode 100755
index 0000000..454a941
--- /dev/null
+++ b/src/pk/dsa/dsa_set_pqg_dsaparam.c
@@ -0,0 +1,63 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
+#include "tomcrypt.h"
+
+
+#ifdef LTC_MDSA
+
+/**
+  Import DSA's p, q & g from dsaparam
+
+      dsaparam data: openssl dsaparam -outform DER -out dsaparam.der 2048
+
+  @param dsaparam    The DSA param DER encoded data
+  @param dsaparamlen The length of dhparam data
+  @param key         [out] the destination for the imported key
+  @return CRYPT_OK if successful.
+*/
+int dsa_set_pqg_dsaparam(const unsigned char *dsaparam, unsigned long dsaparamlen,
+                         dsa_key *key)
+{
+   int err;
+
+   LTC_ARGCHK(dsaparam    != NULL);
+   LTC_ARGCHK(key         != NULL);
+   LTC_ARGCHK(ltc_mp.name != NULL);
+
+   /* init key */
+   err = mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL);
+   if (err != CRYPT_OK) return err;
+
+   if ((err = der_decode_sequence_multi(dsaparam, dsaparamlen,
+                                        LTC_ASN1_INTEGER, 1UL, key->p,
+                                        LTC_ASN1_INTEGER, 1UL, key->q,
+                                        LTC_ASN1_INTEGER, 1UL, key->g,
+                                        LTC_ASN1_EOL,     0UL, NULL)) != CRYPT_OK) {
+      goto LBL_ERR;
+   }
+
+   key->qord = mp_unsigned_bin_size(key->q);
+
+   if (key->qord >= LTC_MDSA_MAX_GROUP || key->qord <= 15 ||
+      (unsigned long)key->qord >= mp_unsigned_bin_size(key->p) || (mp_unsigned_bin_size(key->p) - key->qord) >= LTC_MDSA_DELTA) {
+      err = CRYPT_INVALID_PACKET;
+      goto LBL_ERR;
+   }
+   return CRYPT_OK;
+
+LBL_ERR:
+   dsa_free(key);
+   return err;
+}
+
+#endif
+
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */