moved gnutls_fips140_mode_enabled to gnutls.h

3 files changed, 2 insertions, 59 deletions

diff --git a/lib/includes/Makefile.am b/lib/includes/Makefile.am
index 2fe1ce2ef0..2fb86094c6 100644
--- a/lib/includes/Makefile.am
+++ b/lib/includes/Makefile.am
@@ -23,10 +23,6 @@ nobase_include_HEADERS = gnutls/x509.h gnutls/pkcs12.h gnutls/compat.h	\
 	gnutls/abstract.h gnutls/dtls.h gnutls/ocsp.h gnutls/tpm.h	\
 	gnutls/xssl.h
 
-if ENABLE_FIPS140
-nobase_include_HEADERS += gnutls/fips140.h
-endif
-
 if ENABLE_CXX
 nobase_include_HEADERS += gnutls/gnutlsxx.h
 endif
diff --git a/lib/includes/gnutls/fips140.h b/lib/includes/gnutls/fips140.h
deleted file mode 100644
index f60c8141c3..0000000000
--- a/lib/includes/gnutls/fips140.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c -*-
- * Copyright (C) 2000-2012 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/>
- *
- */
-
-/* This file contains the types and prototypes for all the
- * high level functionality of the gnutls main library.
- *
- * If the optional C++ binding was built, it is available in
- * gnutls/gnutlsxx.h.
- *
- * The openssl compatibility layer (which is under the GNU GPL
- * license) is in gnutls/openssl.h.
- *
- * The low level cipher functionality is in gnutls/crypto.h.
- */
-
-
-#ifndef GNUTLS_FIPS140_H
-#define GNUTLS_FIPS140_H
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* *INDENT-ON* */
-
-
-int gnutls_fips140_mode_enabled(void);
-
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-}
-#endif
-/* *INDENT-ON* */
-
-#endif
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index eb23afe45f..a8e392c769 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -2101,6 +2101,8 @@ 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);
 
   /* Gnutls error codes. The mapping to a TLS alert is also shown in
    * comments.