aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/license.rst1
-rw-r--r--doc/relnotes/1_11_12.rst4
-rw-r--r--doc/website/algos.rst1
3 files changed, 5 insertions, 1 deletions
diff --git a/doc/license.rst b/doc/license.rst
index 0bf7226fc..bd33743f2 100644
--- a/doc/license.rst
+++ b/doc/license.rst
@@ -30,6 +30,7 @@ Botan (http://botan.randombit.net/) is distributed under these terms::
2012-2014 Markus Wanner
2013 Joel Low
2014 cryptosource GmbH
+ 2014 Andrew Moon
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/doc/relnotes/1_11_12.rst b/doc/relnotes/1_11_12.rst
index 516f41e81..88ece0477 100644
--- a/doc/relnotes/1_11_12.rst
+++ b/doc/relnotes/1_11_12.rst
@@ -6,8 +6,10 @@ Version 1.11.12, Not Yet Released
encrypting Curve25519 keys under PKCS #8 and including them in
certificates and CRLs have been defined.
+* Add Poly1305, based on the implementation poly1305-donna by
+ Andrew Moon.
+
* When encrypted as PKCS #8 structures, Curve25519 and McEliece
private keys default to using AES-256/GCM instead of AES-256/CBC
* Define OIDs for OCB mode with AES, Serpent and Twofish.
-
diff --git a/doc/website/algos.rst b/doc/website/algos.rst
index 698342af4..d2afbd2ba 100644
--- a/doc/website/algos.rst
+++ b/doc/website/algos.rst
@@ -62,6 +62,7 @@ Authentication Codes
* HMAC
* CMAC (aka OMAC1)
+ * Poly1305
* Obsolete designs CBC-MAC, ANSI X9.19 DES-MAC, and the
protocol-specific SSLv3 authentication code