[git] GCRYPT - branch, wk-ocb-mode, created. libgcrypt-1.5.0-6-g2a6b6e2
by Werner Koch
cvs at cvs.gnupg.org
Fri Sep 16 10:55:17 CEST 2011
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, wk-ocb-mode has been created
at 2a6b6e2488af88729fd2cb70a8b5db022b463e57 (commit)
- Log -----------------------------------------------------------------
commit 2a6b6e2488af88729fd2cb70a8b5db022b463e57
Author: Werner Koch <wk at gnupg.org>
Date: Thu Sep 8 10:08:27 2011 +0200
Preparing for OCB mode
diff --git a/NEWS b/NEWS
index 0a01c32..2239911 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Noteworthy changes in version 1.6.0 (unreleased)
* Interface changes relative to the 1.5.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ GCRYCTL_ENABLE_GPL_CODE NEW.
Noteworthy changes in version 1.5.0 (2011-06-29)
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 992c63b..9b66ced 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (AM_MAKEINFOFLAGS): New.
+ * texi.css: New.
+
2009-10-28 Werner Koch <wk at g10code.com>
* gcrypt.texi (Multi-Threading): Add examples.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fc12745..f4d3c7c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,8 @@
EXTRA_DIST = README.apichanges HACKING \
libgcrypt-modules.eps fips-fsm.eps \
libgcrypt-modules.png fips-fsm.png \
- libgcrypt-modules.pdf fips-fsm.pdf
+ libgcrypt-modules.pdf fips-fsm.pdf \
+ texi.css
DISTCLEANFILES = gcrypt.cps
@@ -31,6 +32,8 @@ BUILT_SOURCES = libgcrypt-modules.eps fips-fsm.eps \
info_TEXINFOS = gcrypt.texi
gcrypt_TEXINFOS = lgpl.texi gpl.texi libgcrypt-modules.fig fips-fsm.fig
+AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css
+
.fig.png:
fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
@@ -48,23 +51,22 @@ gcrypt_TEXINFOS = lgpl.texi gpl.texi libgcrypt-modules.fig fips-fsm.fig
# Make sure that gcrypt.texi is touched if any other source file has
# been modified. This is required so that the version.texi magic
# updates the release date.
-gnupg.texi : $(gcrypt_TEXINFOS)
+gcrypt.texi : $(gcrypt_TEXINFOS)
touch $(srcdir)/gcrypt.texi
-online: gcrypt.html gcrypt.pdf gcrypt.info
+online: gcrypt.html gcrypt.pdf
set -e; \
echo "Uploading current manuals to www.gnupg.org ..."; \
cp libgcrypt-modules.png gcrypt.html/; \
cp fips-fsm.png gcrypt.html/; \
user=werner ; dashdevel="" ; \
- if echo "@PACKAGE_VERSION@" | grep -- "-svn" >/dev/null; then \
+ if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \
dashdevel="-devel" ; \
cp gcrypt.pdf gcrypt.html/; \
- cp gcrypt.info gcrypt.html/; \
else \
- rsync -v gcrypt.pdf gcrypt.info \
+ rsync -v gcrypt.pdf \
$${user}@trithemius.gnupg.org:webspace/manuals/ ; \
fi ; \
cd gcrypt.html ; \
- rsync -vr --exclude='.svn' . \
+ rsync -vr --exclude='.svn' . \
$${user}@trithemius.gnupg.org:webspace/manuals/gcrypt$${dashdevel}/
diff --git a/doc/texi.css b/doc/texi.css
new file mode 100644
index 0000000..ce24697
--- /dev/null
+++ b/doc/texi.css
@@ -0,0 +1,19 @@
+/* The gnupg.org standard stylesheet. */
+ @import url(/share/site.css);
+
+/* The gnupg site sets body margins to zero. Because we don't have
+ the table layout here we have to set our own margins for the body. */
+body {
+ margin-left: 1em;
+ margin-right: 1em;
+}
+
+/* Make the top header larger. */
+h1 {
+ text-align: center;
+ font-size: 200%;
+}
+
+h1:first-letter {
+ font-size: 120%;
+}
diff --git a/src/ChangeLog b/src/ChangeLog
index 8506532..9ad86b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-08 Werner Koch <wk at g10code.com>
+
+ * gcrypt.h.in (GCRYCTL_ENABLE_GPL_CODE): New.
+
2011-06-10 Werner Koch <wk at g10code.com>
* sexp.c (vsexp_sscan): Add new format specifiers 'M' and 'u'.
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index 63f71c0..802f7b9 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -415,7 +415,11 @@ enum gcry_ctl_cmds
GCRYCTL_FORCE_FIPS_MODE = 56,
GCRYCTL_SELFTEST = 57,
/* Note: 58 .. 62 are used internally. */
- GCRYCTL_DISABLE_HWF = 63
+ GCRYCTL_DISABLE_HWF = 63,
+ GCRYCTL_ENABLE_GPL_CODE = 64,
+ GCRYCTL_AEAD_DATA = 65,
+ GCRYCTL_AEAD_AD = 66,
+ GCRYCTL_AEAD_FINALIZE = 67
};
/* Perform various operations defined by CMD. */
@@ -855,7 +859,8 @@ enum gcry_cipher_modes
GCRY_CIPHER_MODE_STREAM = 4, /* Used with stream ciphers. */
GCRY_CIPHER_MODE_OFB = 5, /* Outer feedback. */
GCRY_CIPHER_MODE_CTR = 6, /* Counter. */
- GCRY_CIPHER_MODE_AESWRAP= 7 /* AES-WRAP algorithm. */
+ GCRY_CIPHER_MODE_AESWRAP= 7, /* AES-WRAP algorithm. */
+ GCRY_CIPHER_MODE_OCB = 8 /* Offet Codebook. */
};
/* Flags used with the open function. */
diff --git a/src/global.c b/src/global.c
index d65b068..9999925 100644
--- a/src/global.c
+++ b/src/global.c
@@ -596,6 +596,10 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr)
}
break;
+ case GCRYCTL_ENABLE_GPL_CODE:
+ /* FIXME */
+ break;
+
default:
/* A call to make sure that the dummy code is linked in. */
_gcry_compat_identification ();
-----------------------------------------------------------------------
hooks/post-receive
--
The GNU crypto library
http://git.gnupg.org
More information about the Gnupg-commits
mailing list