some other bugfixes ported from the development branch.

2 files changed, 126 insertions, 0 deletions

diff --git a/lib/x509/dsa.c b/lib/x509/dsa.c
new file mode 100644
index 0000000000..6d2f25b72f
--- /dev/null
+++ b/lib/x509/dsa.c
@@ -0,0 +1,125 @@
+/*
+ *  Copyright (C) 2003 Nikos Mavroyanopoulos
+ *  Copyright (C) 2004 Free Software Foundation
+ *
+ *  This file is part of GNUTLS.
+ *
+ *  The GNUTLS 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.
+ *
+ *  This 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 this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ */
+
+/* This file contains code for DSA keys.
+ */
+ 
+#include <gnutls_int.h>
+#include <gnutls_errors.h>
+#include <gnutls_datum.h>
+#include <debug.h>
+
+/* resarr will contain: p(0), q(1), g(2), y(3), x(4).
+ */
+int _gnutls_dsa_generate_params(GNUTLS_MPI* resarr, int* resarr_len, int bits)
+{
+
+	int ret;
+	gcry_sexp_t parms, key, list;
+
+	if (bits > 1024) {
+		gnutls_assert();
+		return GNUTLS_E_INVALID_REQUEST;
+	}
+
+	ret = gcry_sexp_build( &parms, NULL, "(genkey(dsa(nbits %d)))", bits);
+	if (ret != 0) {
+		gnutls_assert();
+		return GNUTLS_E_INTERNAL_ERROR;
+	}
+
+	/* generate the DSA key 
+	 */
+	ret = gcry_pk_genkey( &key, parms);
+	gcry_sexp_release( parms);
+
+	if (ret != 0) {
+		gnutls_assert();
+		return GNUTLS_E_INTERNAL_ERROR;
+	}
+
+       	list = gcry_sexp_find_token( key, "p", 0);
+	if (list == NULL) {
+        	gnutls_assert();
+        	gcry_sexp_release( key);
+                return GNUTLS_E_INTERNAL_ERROR;
+	}
+
+	resarr[0] = gcry_sexp_nth_mpi(list, 1, 0);
+	gcry_sexp_release(list);
+
+       	list = gcry_sexp_find_token( key, "q", 0);
+	if (list == NULL) {
+        	gnutls_assert();
+        	gcry_sexp_release( key);
+                return GNUTLS_E_INTERNAL_ERROR;
+	}
+
+	resarr[1] = gcry_sexp_nth_mpi(list, 1, 0);
+	gcry_sexp_release(list);
+
+       	list = gcry_sexp_find_token( key, "g", 0);
+	if (list == NULL) {
+        	gnutls_assert();
+        	gcry_sexp_release( key);
+                return GNUTLS_E_INTERNAL_ERROR;
+	}
+
+	resarr[2] = gcry_sexp_nth_mpi(list, 1, 0);
+	gcry_sexp_release(list);
+
+       	list = gcry_sexp_find_token( key, "y", 0);
+	if (list == NULL) {
+        	gnutls_assert();
+        	gcry_sexp_release( key);
+                return GNUTLS_E_INTERNAL_ERROR;
+	}
+
+	resarr[3] = gcry_sexp_nth_mpi(list, 1, 0);
+	gcry_sexp_release(list);
+
+
+       	list = gcry_sexp_find_token( key, "x", 0);
+	if (list == NULL) {
+        	gnutls_assert();
+        	gcry_sexp_release( key);
+                return GNUTLS_E_INTERNAL_ERROR;
+	}
+
+	resarr[4] = gcry_sexp_nth_mpi(list, 1, 0);
+	gcry_sexp_release(list);
+
+
+	gcry_sexp_release(key);
+
+	_gnutls_dump_mpi( "p: ", resarr[0]);
+	_gnutls_dump_mpi( "q: ", resarr[1]);
+	_gnutls_dump_mpi( "g: ", resarr[2]);
+	_gnutls_dump_mpi( "y: ", resarr[3]);
+	_gnutls_dump_mpi( "x: ", resarr[4]);
+
+	*resarr_len = 5;
+
+	return 0;
+
+}
+
diff --git a/lib/x509/dsa.h b/lib/x509/dsa.h
new file mode 100644
index 0000000000..4f9d7562b9
--- /dev/null
+++ b/lib/x509/dsa.h
@@ -0,0 +1 @@
+int _gnutls_dsa_generate_params(GNUTLS_MPI* resarr, int* resarr_len, int bits);