Added self check functions to self-test.h.

diff --git a/lib/includes/Makefile.am b/lib/includes/Makefile.am
index 31449cb1c0d603daf6d5e9e488a2c035da868228..eae85db5178ea527ed3f86e4ac59786c7c885e46 100644 (file)
--- a/lib/includes/Makefile.am
+++ b/lib/includes/Makefile.am
@@ -21,7 +21,7 @@
 nobase_include_HEADERS = gnutls/x509.h gnutls/pkcs12.h gnutls/compat.h \
        gnutls/openpgp.h gnutls/crypto.h gnutls/pkcs11.h                \
        gnutls/abstract.h gnutls/dtls.h gnutls/ocsp.h gnutls/tpm.h      \
-       gnutls/x509-ext.h
+       gnutls/x509-ext.h gnutls/self-test.h
 
 if ENABLE_CXX
 nobase_include_HEADERS += gnutls/gnutlsxx.h

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 67419e9e6466bf71aead5fd97fc2b4ac3ffac4cf..a860a1fc0b2439ac1caea5e3972c788e6414a70f 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -2124,12 +2124,6 @@ void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
                                         gnutls_pin_callback_t fn,
                                         void *userdata);
 
- /* Self checking functions */
-int gnutls_cipher_self_test(unsigned all, gnutls_cipher_algorithm_t cipher);
-int gnutls_mac_self_test(unsigned all, gnutls_mac_algorithm_t mac);
-int gnutls_digest_self_test(unsigned all, gnutls_digest_algorithm_t digest);
-int gnutls_pk_self_test(unsigned all, gnutls_pk_algorithm_t pk);
-
 /* FIPS140-2 related functions */
 int gnutls_fips140_mode_enabled(void);
 

diff --git a/lib/includes/gnutls/self-test.h b/lib/includes/gnutls/self-test.h
new file mode 100644 (file)
index 0000000..b77ddde
--- /dev/null
+++ b/lib/includes/gnutls/self-test.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 Free Software Foundation, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * The GnuTLS 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 program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef __GNUTLS_SELF_H
+#define __GNUTLS_SELF_H
+
+#include <gnutls/gnutls.h>
+
+ /* Self checking functions */
+ 
+ /* The functions are not part of the main API, and are conditionally
+  * enabled. */
+
+int gnutls_cipher_self_test(unsigned all, gnutls_cipher_algorithm_t cipher);
+int gnutls_mac_self_test(unsigned all, gnutls_mac_algorithm_t mac);
+int gnutls_digest_self_test(unsigned all, gnutls_digest_algorithm_t digest);
+int gnutls_pk_self_test(unsigned all, gnutls_pk_algorithm_t pk);
+
+#endif