forked from pool/libgcrypt
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
Index: libgcrypt-1.11.1/src/gcrypt.h.in
|
||
|
===================================================================
|
||
|
--- libgcrypt-1.11.1.orig/src/gcrypt.h.in
|
||
|
+++ libgcrypt-1.11.1/src/gcrypt.h.in
|
||
|
@@ -335,12 +335,9 @@ enum gcry_ctl_cmds
|
||
|
GCRYCTL_FIPS_SERVICE_INDICATOR_MAC = 85,
|
||
|
GCRYCTL_FIPS_SERVICE_INDICATOR_MD = 86,
|
||
|
GCRYCTL_FIPS_SERVICE_INDICATOR_PK_FLAGS = 87,
|
||
|
- GCRYCTL_MD_CUSTOMIZE = 88
|
||
|
-#ifdef _GCRYPT_IN_LIBGCRYPT /* This is not yet part of the public API. */
|
||
|
- ,
|
||
|
+ GCRYCTL_MD_CUSTOMIZE = 88,
|
||
|
GCRYCTL_FIPS_SERVICE_INDICATOR = 89,
|
||
|
GCRYCTL_FIPS_REJECT_NON_FIPS = 90
|
||
|
-#endif /*_GCRYPT_IN_LIBGCRYPT*/
|
||
|
};
|
||
|
|
||
|
/* Perform various operations defined by CMD. */
|
||
|
@@ -1977,8 +1974,6 @@ void gcry_log_debugsxp (const char *text
|
||
|
char *gcry_get_config (int mode, const char *what);
|
||
|
|
||
|
/* Convinience macro to access the FIPS service indicator. */
|
||
|
-#ifdef _GCRYPT_IN_LIBGCRYPT /* This is not yet part of the public API. */
|
||
|
-
|
||
|
#define gcry_get_fips_service_indicator() \
|
||
|
gcry_control (GCRYCTL_FIPS_SERVICE_INDICATOR)
|
||
|
|
||
|
@@ -2012,9 +2007,6 @@ char *gcry_get_config (int mode, const c
|
||
|
#define GCRY_FIPS_FLAG_REJECT_DEFAULT \
|
||
|
GCRY_FIPS_FLAG_REJECT_COMPAT110
|
||
|
|
||
|
-#endif /*_GCRYPT_IN_LIBGCRYPT*/
|
||
|
-
|
||
|
-
|
||
|
/* Log levels used by the internal logging facility. */
|
||
|
enum gcry_log_levels
|
||
|
{
|