Move verify.h stuff to x509_int.h.

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 86da59f1eb1754ac0f8e9a8e16b948c7b688c982..2c90ac77352b5ce8cefeb5bd86269e3b04a9313a 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 rfc2818.h verify.h compat.h                      \
+       common.h mpi.h rfc2818.h compat.h                               \
        extensions.h privkey.h                                          \
                                                                        \
        gnutls_extra.h openssl_compat.h                                 \

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 9e8b123c5ea0719cdd661e78da3bd2cea5f8f67c..14525893a8d48cb80344e27fdda67f25e55e9c17 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/verify.h"
 #include "x509/mpi.h"
 #include "x509/privkey.h"
 #include "read-file.h"

diff --git a/lib/openpgp/pgpverify.c b/lib/openpgp/pgpverify.c
index d6c117924165a83b299f347b1408aff297e6557c..0fb9904922daadbad2c3008edf464187ed7ae1c5 100644 (file)
--- a/lib/openpgp/pgpverify.c
+++ b/lib/openpgp/pgpverify.c
@@ -27,7 +27,6 @@
 #include <gnutls_errors.h>
 #include <gnutls_openpgp.h>
 #include <gnutls_num.h>
-#include <x509/verify.h>       /* lib/x509/verify.h */
 
 
 /**

diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 9ea8851420668729aad78751e64368d46eca71c9..c993726ac7696a0ea02e65f55050aeb4e7f02311 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -32,8 +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      \
-       extensions.h verify.h mpi.h privkey.h pkcs12.h rfc2818.h        \
-       output.c
+       extensions.h mpi.h privkey.h pkcs12.h rfc2818.h output.c
 
 EXTRA_DIST = x509-api.texi
 

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 9f839a4c17240a06f8886c36eb528ebf89ce90ec..9f8331a1736735bf36ed77f72a2a6f4d1ee470b3 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -34,7 +34,6 @@
 #include <x509_int.h>
 #include <mpi.h>
 #include <extensions.h>
-#include <verify.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/sign.c b/lib/x509/sign.c
index 36a0f03ac29a279cb56cfa8ba07eb5ff7f311ec5..e807614c33f6e70245dd2dc4973d89ff1935da28 100644 (file)
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -41,7 +41,6 @@
 #include <x509_int.h>
 #include <mpi.h>
 #include <common.h>
-#include <verify.h>
 
 /* Writes the digest information and the digest in a DER encoded
  * structure. The digest info is allocated and stored into the info structure.

diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 052b9a4dbc139020160338c24ae072b7b6fd5e02..6ae4cf716598bed2a92a7b51a33e04da51ed8bdf 100644 (file)
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -38,7 +38,6 @@
 #include <x509_int.h>
 #include <mpi.h>
 #include <common.h>
-#include <verify.h>
 
 static int _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
                                        const gnutls_x509_crt_t * trusted_cas,

diff --git a/lib/x509/verify.h b/lib/x509/verify.h
deleted file mode 100644 (file)
index 5bd9aa9..0000000
--- a/lib/x509/verify.h
+++ /dev/null
@@ -1,34 +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 "x509_int.h"
-
-int gnutls_x509_crt_is_issuer (gnutls_x509_crt_t cert,
-                              gnutls_x509_crt_t issuer);
-int _gnutls_x509_verify_signature (const gnutls_datum_t * tbs,
-                                  const gnutls_datum_t * signature,
-                                  gnutls_x509_crt_t issuer);
-int _gnutls_x509_privkey_verify_signature (const gnutls_datum_t * tbs,
-                                          const gnutls_datum_t * signature,
-                                          gnutls_x509_privkey_t issuer);

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index e591b00c88d7b7abec81c3e079151fa0ecd506f0..b11ebb8e0d8f18b6ff7f2187dde9877ee5c6c2d3 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -36,7 +36,6 @@
 #include <libtasn1.h>
 #include <mpi.h>
 #include <privkey.h>
-#include <verify.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 2e40c68c4a002d73db67522424c65a103bd6840d..3e9d568042e5d5edc7ccf92606f369c8e1d17287 100644 (file)
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -163,4 +163,15 @@ int _gnutls_x509_get_dn_oid (ASN1_TYPE asn1_struct,
 /* dsa.c */
 int _gnutls_dsa_generate_params (mpi_t * resarr, int *resarr_len, int bits);
 
+
+/* verify.c */
+int gnutls_x509_crt_is_issuer (gnutls_x509_crt_t cert,
+                              gnutls_x509_crt_t issuer);
+int _gnutls_x509_verify_signature (const gnutls_datum_t * tbs,
+                                  const gnutls_datum_t * signature,
+                                  gnutls_x509_crt_t issuer);
+int _gnutls_x509_privkey_verify_signature (const gnutls_datum_t * tbs,
+                                          const gnutls_datum_t * signature,
+                                          gnutls_x509_privkey_t issuer);
+
 #endif