[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-54-gaea96a6

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".

The branch, master has been updated
       via  aea96a64fbc58a0b6f9f435e97e93294c6eb1052 (commit)
      from  121a90d8931944974054f7d94f63b7f89df87fa5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aea96a64fbc58a0b6f9f435e97e93294c6eb1052
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 29 10:44:36 2014 +0100

    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.

diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index b06f259..c84a3f7 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 ec0cc3f..4e8df86 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;

-----------------------------------------------------------------------

Summary of changes:
 src/gcrypt.h.in |    4 +++-
 src/global.c    |    5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits