privkey.h -> abstract.h

diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index 2b7169886ceaf82a43b20eb5a803968e11e41bbf..14344b08e67c447dde501a49923b822ffe5a3471 100644 (file)
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -45,7 +45,7 @@
 #include <gnutls_state.h>
 #include <gnutls_pk.h>
 #include <gnutls_x509.h>
-#include <gnutls/privkey.h>
+#include <gnutls/abstract.h>
 #include "debug.h"
 
 #ifdef ENABLE_OPENPGP

diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index dc902fe7dd29a0beac6996f38afbd267804c8639..1c1336d02564a7d8b287b0b7640f049eb233bba5 100644 (file)
--- a/lib/auth_cert.h
+++ b/lib/auth_cert.h
@@ -30,7 +30,7 @@
 # include "auth_dh_common.h"
 # include "x509/x509_int.h"
 # include "openpgp/openpgp_int.h"
-# include <gnutls/privkey.h>
+# include <gnutls/abstract.h>
 # include <gnutls/compat.h>
 
 /* This structure may be complex, but it's the only way to

diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index b8b4a9b8fd31f2311dbf556ad70a6e08f8e4df45..07c54e5dc0377e641b7ab3051d1bf3bc64ce1434 100644 (file)
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -29,7 +29,7 @@
 #include <gnutls_errors.h>
 #include <gnutls_datum.h>
 #include <pkcs11_int.h>
-#include <gnutls/privkey.h>
+#include <gnutls/abstract.h>
 #include <sign.h>
 #include <gnutls_pk.h>
 #include <x509_int.h>

diff --git a/lib/gnutls_sig.h b/lib/gnutls_sig.h
index ca8324ae2904153ed2c2d6907bb61ebbd02eddf3..b99210e05d55953038c25e7b84b5357d5f41f53b 100644 (file)
--- a/lib/gnutls_sig.h
+++ b/lib/gnutls_sig.h
@@ -26,7 +26,7 @@
 #ifndef GNUTLS_SIG_H
 # define GNUTLS_SIG_H
 
-#include <gnutls/privkey.h>
+#include <gnutls/abstract.h>
 
 int _gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
                                      gnutls_cert * cert,

diff --git a/lib/gnutls_x509.h b/lib/gnutls_x509.h
index bdc6a369a2909e09e9c6428f214cfa963c338f81..d1ba1cbcbaa8699da05fcaa57a8b66335be5bca8 100644 (file)
--- a/lib/gnutls_x509.h
+++ b/lib/gnutls_x509.h
@@ -24,7 +24,7 @@
  */
 
 #include <libtasn1.h>
-#include <gnutls/privkey.h>
+#include <gnutls/abstract.h>
 
 int _gnutls_x509_cert_verify_peers (gnutls_session_t session,
                                    unsigned int *status);

diff --git a/lib/includes/gnutls/privkey.h b/lib/includes/gnutls/abstract.h
similarity index 100%
rename from lib/includes/gnutls/privkey.h
rename to lib/includes/gnutls/abstract.h

diff --git a/lib/openpgp/gnutls_openpgp.h b/lib/openpgp/gnutls_openpgp.h
index 411c5aa1d5edc5b07f89b3aca82c7924774d2dbf..b5f67d40fe32806c370f230f609584729a5e2e67 100644 (file)
--- a/lib/openpgp/gnutls_openpgp.h
+++ b/lib/openpgp/gnutls_openpgp.h
@@ -7,7 +7,7 @@
 
 #include <auth_cert.h>
 #include <opencdk.h>
-#include <gnutls/privkey.h>
+#include <gnutls/abstract.h>
 
 /* OpenCDK compatible */
 typedef enum