summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-01-29 10:44:36 +0100
committerWerner Koch <wk@gnupg.org>2014-01-29 10:47:20 +0100
commitaea96a64fbc58a0b6f9f435e97e93294c6eb1052 (patch)
tree8d2cb39d0e5408109b7619e2d4cbed1076ed5288
parent121a90d8931944974054f7d94f63b7f89df87fa5 (diff)
downloadlibgcrypt-aea96a64fbc58a0b6f9f435e97e93294c6eb1052.tar.gz
Reserve control code for FIPS extensions.
* src/gcrypt.h.in (GCRYCTL_INACTIVATE_FIPS_FLAG): New. (GCRYCTL_REACTIVATE_FIPS_FLAG): New. * src/global.c (_gcry_vcontrol): Add them but return not_implemented.
-rw-r--r--src/gcrypt.h.in4
-rw-r--r--src/global.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index b06f2592..c84a3f70 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -327,7 +327,9 @@ enum gcry_ctl_cmds
GCRYCTL_DISABLE_LOCKED_SECMEM = 67,
GCRYCTL_DISABLE_PRIV_DROP = 68,
GCRYCTL_SET_CCM_LENGTHS = 69,
- GCRYCTL_CLOSE_RANDOM_DEVICE = 70
+ GCRYCTL_CLOSE_RANDOM_DEVICE = 70,
+ GCRYCTL_INACTIVATE_FIPS_FLAG = 71,
+ GCRYCTL_REACTIVATE_FIPS_FLAG = 72
};
/* Perform various operations defined by CMD. */
diff --git a/src/global.c b/src/global.c
index ec0cc3fa..4e8df86d 100644
--- a/src/global.c
+++ b/src/global.c
@@ -666,6 +666,11 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr)
| GCRY_SECMEM_FLAG_NO_PRIV_DROP));
break;
+ case GCRYCTL_INACTIVATE_FIPS_FLAG:
+ case GCRYCTL_REACTIVATE_FIPS_FLAG:
+ rc = GPG_ERR_NOT_IMPLEMENTED;
+ break;
+
default:
_gcry_set_preferred_rng_type (0);
rc = GPG_ERR_INV_OP;