Move mpi.h stuff to x509_int.h.

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 903ddff98efbb3ede8da63be219ed262ef75cd0d..1385dd642900ecd295a637be89e2380f16fd0891 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -68,7 +68,7 @@ IGNORE_HFILES=debug.h gnutls_compress.h defines.h gnutls_cipher.h     \
        der.h errors.h gstr.h parser_aux.h element.h                    \
        errors_int.h int.h mem.h structure.h                            \
                                                                        \
-       common.h mpi.h compat.h                                         \
+       common.h compat.h                                               \
                                                                        \
        gnutls_extra.h openssl_compat.h                                 \
                                                                        \

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 1f24ae100e7d307c13c1082401fbce87530ea9da..989719fc38ec3aa44001cb3a870d60b6a28acc45 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -41,7 +41,6 @@
 #include <gnutls_auth_int.h>
 #include <gnutls_x509.h>
 #include "x509/x509_int.h"
-#include "x509/mpi.h"
 #ifdef ENABLE_OPENPGP
 # include "openpgp/gnutls_openpgp.h"
 #endif

diff --git a/lib/gnutls_dh_primes.c b/lib/gnutls_dh_primes.c
index 7a40db3d79daace544242bbc7c420e63afd5ea6f..1e68195cbcbdf1e9532951ff7ca3943ff0fc7f7b 100644 (file)
--- a/lib/gnutls_dh_primes.c
+++ b/lib/gnutls_dh_primes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -28,7 +28,7 @@
 #include <x509_b64.h>          /* for PKCS3 PEM decoding */
 #include <gnutls_global.h>
 #include <gnutls_dh.h>
-#include <x509/mpi.h>
+#include "x509/x509_int.h"
 #include "debug.h"
 
 

diff --git a/lib/gnutls_pk.c b/lib/gnutls_pk.c
index 389f40fcf1ef2479fe9ffd9d8aa55eec9368ff6f..3427083beb3dbaf52b021311673a4d1b43631c0b 100644 (file)
--- a/lib/gnutls_pk.c
+++ b/lib/gnutls_pk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -34,7 +34,7 @@
 #include <gnutls_global.h>
 #include <gnutls_num.h>
 #include "debug.h"
-#include <x509/mpi.h>
+#include <x509/x509_int.h>
 #include <x509/common.h>
 #include <gc.h>
 

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index ef6c15eeb61842d50e9ed227b49d6020d11cf34d..e6adbde4d093920597f980792c5f52891554ad41 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -44,7 +44,6 @@
 #include <gnutls_x509.h>
 #include "x509/common.h"
 #include "x509/x509_int.h"
-#include "x509/mpi.h"
 #include "read-file.h"
 
 /*

diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index b8ee0080b6d0f13e477127f9177faa452298a966..28fbee5748d7253fceb800612cb65520605d4b15 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -32,7 +32,7 @@ libgnutls_x509_la_SOURCES = crl.c dn.c common.c x509.c extensions.c   \
        dsa.c rfc2818_hostname.c verify.c mpi.c privkey.c pkcs7.c       \
        crq.c sign.c privkey_pkcs8.c pkcs12.c pkcs12_bag.c              \
        pkcs12_encr.c x509_write.c crl_write.c common.h x509_int.h      \
-       mpi.h pkcs12.h output.c
+       pkcs12.h output.c
 
 EXTRA_DIST = x509-api.texi
 

diff --git a/lib/x509/common.c b/lib/x509/common.c
index 0eeb0348cb6d62503bdee1a90b08af9d62003a19..d7cf9eb6415f433412de73f2514c1cc290e5877e 100644 (file)
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -31,8 +31,8 @@
 #include <gnutls_x509.h>
 #include <gnutls_num.h>
 #include <x509_b64.h>
+#include "x509_int.h"
 #include <common.h>
-#include <mpi.h>
 #include <time.h>
 
 typedef struct _oid2string

diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index b4f7050c3625dbac61937e8b98e727f1d5abae05..6834fc858cc61a0030b35ff05832168a3c7ebe18 100644 (file)
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -36,7 +36,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <mpi.h>
 #include <libtasn1.h>
 
 static void disable_optional_stuff (gnutls_x509_crl_t crl);

diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 5636c4479faa02cf66eb0cec4c58282f6567a9e2..b06489959f334a126fe8f091d74b89bab9829eb9 100644 (file)
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -35,8 +35,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <x509_int.h>
-#include <mpi.h>
+#include "x509_int.h"
 #include <libtasn1.h>
 
 /**

diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
index dcc82798df79fc45610c6a040a13bd564703cede..af3b0fc5f81f097edaca6b42a81a182c00bea9fe 100644 (file)
--- a/lib/x509/extensions.c
+++ b/lib/x509/extensions.c
@@ -28,7 +28,6 @@
 #include <gnutls_int.h>
 #include <gnutls_errors.h>
 #include <gnutls_global.h>
-#include <mpi.h>
 #include <libtasn1.h>
 #include <common.h>
 #include <x509_int.h>

diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index d0fc52e32dfe8f5492acdffebaac012820b48562..74334aa1e8d06ba9c56083d29148005b386b1ad1 100644 (file)
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -30,7 +30,6 @@
 #include "common.h"
 #include "x509_int.h"
 #include <gnutls_num.h>
-#include "mpi.h"
 
 /*
  * some x509 certificate parsing functions that relate to MPI parameter

diff --git a/lib/x509/mpi.h b/lib/x509/mpi.h
deleted file mode 100644 (file)
index c8bd72a..0000000
--- a/lib/x509/mpi.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA
- *
- */
-
-#include <gnutls_int.h>
-#include "x509_int.h"
-
-int _gnutls_x509_crt_get_mpis (gnutls_x509_crt_t cert,
-                              mpi_t * params, int *params_size);
-int _gnutls_x509_read_rsa_params (opaque * der, int dersize, mpi_t * params);
-int _gnutls_x509_read_dsa_pubkey (opaque * der, int dersize, mpi_t * params);
-int _gnutls_x509_read_dsa_params (opaque * der, int dersize, mpi_t * params);
-
-int _gnutls_x509_write_rsa_params (mpi_t * params, int params_size,
-                                  gnutls_datum_t * der);
-int _gnutls_x509_write_dsa_params (mpi_t * params, int params_size,
-                                  gnutls_datum_t * der);
-int _gnutls_x509_write_dsa_public_key (mpi_t * params, int params_size,
-                                      gnutls_datum_t * der);
-
-int _gnutls_x509_read_uint (ASN1_TYPE node, const char *value,
-                           unsigned int *ret);
-
-int  
-_gnutls_x509_read_der_int  (opaque * der, int dersize, mpi_t* out);
-
-int _gnutls_x509_read_int (ASN1_TYPE node, const char *value,
-                          mpi_t * ret_mpi);
-int _gnutls_x509_write_int (ASN1_TYPE node, const char *value, mpi_t mpi,
-                           int lz);
-int _gnutls_x509_write_uint32 (ASN1_TYPE node, const char *value,
-                              uint32_t num);
-
-int _gnutls_x509_write_sig_params (ASN1_TYPE dst, const char *dst_name,
-                                  gnutls_pk_algorithm_t pk_algorithm,
-                                  gnutls_digest_algorithm_t, mpi_t * params,
-                                  int params_size);

diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index b258373108be933b59aaa509c0794f36d9682296..4601b285b2c47f0c0c97eb0311bc1e059917c889 100644 (file)
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -36,8 +36,8 @@
 #include <gnutls_num.h>
 #include <common.h>
 #include <x509_b64.h>
+#include "x509_int.h"
 #include <pkcs12.h>
-#include <mpi.h>
 #include <gc.h>
 
 

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index a83ec0e91a2924ac4cfe63115eb6658d2a109676..a52b7c7b84f03f78e352b9588eb0660ab1a219e5 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -32,7 +32,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <mpi.h>
 
 static int _gnutls_asn1_encode_rsa (ASN1_TYPE * c2, mpi_t * params);
 int _gnutls_asn1_encode_dsa (ASN1_TYPE * c2, mpi_t * params);

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 17aca8b42d1061ef0bd54ae7c98705d0cb3bcd0f..04946bac8fabe00ae2548288caf6095fbbbd1217 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -33,9 +33,8 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <x509_int.h>
+#include "x509_int.h"
 #include <pkcs12.h>
-#include <mpi.h>
 #include <gnutls_algorithms.h>
 #include <gnutls_num.h>
 #include <gc.h>

diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index e807614c33f6e70245dd2dc4973d89ff1935da28..47fd6ed31ab8d1c0d27c15748a5271be4846e4a2 100644 (file)
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -39,7 +39,6 @@
 #include <gnutls_str.h>
 #include <gnutls_datum.h>
 #include <x509_int.h>
-#include <mpi.h>
 #include <common.h>
 
 /* Writes the digest information and the digest in a DER encoded

diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 6ae4cf716598bed2a92a7b51a33e04da51ed8bdf..26abb56d2514a0fe8a40d4232f6425af223d7784 100644 (file)
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -35,8 +35,7 @@
 #include <gnutls_sig.h>
 #include <gnutls_str.h>
 #include <gnutls_datum.h>
-#include <x509_int.h>
-#include <mpi.h>
+#include "x509_int.h"
 #include <common.h>
 
 static int _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 2277253d3b576928ed52ac36f3e528c9b2f83f40..d9b17b7e54e7e03e56d9f138a2baabb7cddc0dd9 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -33,7 +33,6 @@
 #include <x509_b64.h>
 #include <x509_int.h>
 #include <libtasn1.h>
-#include <mpi.h>
 
 /**
   * gnutls_x509_crt_init - This function initializes a gnutls_x509_crt_t structure

diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index 0015ac35e49bb224cff80cd5fd1964be1897cd42..550ec12b9ca28bff8f7d3d9fa41079fd861482a7 100644 (file)
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -223,4 +223,36 @@ int _gnutls_x509_ext_gen_proxyCertInfo (int pathLenConstraint,
                                        size_t sizeof_policy,
                                        gnutls_datum_t * der_ext);
 
+/* mpi.c */
+
+int _gnutls_x509_crt_get_mpis (gnutls_x509_crt_t cert,
+                              mpi_t * params, int *params_size);
+int _gnutls_x509_read_rsa_params (opaque * der, int dersize, mpi_t * params);
+int _gnutls_x509_read_dsa_pubkey (opaque * der, int dersize, mpi_t * params);
+int _gnutls_x509_read_dsa_params (opaque * der, int dersize, mpi_t * params);
+
+int _gnutls_x509_write_rsa_params (mpi_t * params, int params_size,
+                                  gnutls_datum_t * der);
+int _gnutls_x509_write_dsa_params (mpi_t * params, int params_size,
+                                  gnutls_datum_t * der);
+int _gnutls_x509_write_dsa_public_key (mpi_t * params, int params_size,
+                                      gnutls_datum_t * der);
+
+int _gnutls_x509_read_uint (ASN1_TYPE node, const char *value,
+                           unsigned int *ret);
+
+int _gnutls_x509_read_der_int  (opaque * der, int dersize, mpi_t* out);
+
+int _gnutls_x509_read_int (ASN1_TYPE node, const char *value,
+                          mpi_t * ret_mpi);
+int _gnutls_x509_write_int (ASN1_TYPE node, const char *value, mpi_t mpi,
+                           int lz);
+int _gnutls_x509_write_uint32 (ASN1_TYPE node, const char *value,
+                              uint32_t num);
+
+int _gnutls_x509_write_sig_params (ASN1_TYPE dst, const char *dst_name,
+                                  gnutls_pk_algorithm_t pk_algorithm,
+                                  gnutls_digest_algorithm_t, mpi_t * params,
+                                  int params_size);
+
 #endif

diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 0bd7e2447b2c8f36e20eb3915a2791272aff2dca..b583e873cdf5fd8b92d45c2684f39db9b4ea4314 100644 (file)
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -35,8 +35,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <x509_int.h>
-#include <mpi.h>
+#include "x509_int.h"
 #include <libtasn1.h>
 
 static void disable_optional_stuff (gnutls_x509_crt_t cert);