X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=blobdiff_plain;f=doc%2Fgnu-oids.texi;h=eb26576db69116c0e9bb0a709648160422bd2435;hp=ecbd59b4f548a1f928271466d450f4174f63da35;hb=765ff4cb2bd24b860e29e0b712bb40b7a2ae9b5b;hpb=fdfe96fe43746d63364f823ab3032c8301d53d1f

diff --git a/doc/gnu-oids.texi b/doc/gnu-oids.texi
index ecbd59b4f..eb26576db 100644
--- a/doc/gnu-oids.texi
+++ b/doc/gnu-oids.texi
@@ -1,6 +1,6 @@
 @c This table of OID's is included in the GNU Coding Standards.
 @c
-@c Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+@c Copyright 2008, 2009, 2010, 2013 Free Software Foundation, Inc.
 @c
 @c Copying and distribution of this file, with or without modification,
 @c are permitted in any medium without royalty provided the copyright
@@ -37,19 +37,25 @@
 
 1.3.6.1.4.1.11591.12 digestAlgorithm
   1.3.6.1.4.1.11591.12.2 TIGER/192
-  1.3.6.1.4.1.11591.13 encryptionAlgorithm
-    1.3.6.1.4.1.11591.13.2 Serpent
-      1.3.6.1.4.1.11591.13.2.1 Serpent-128-ECB
-      1.3.6.1.4.1.11591.13.2.2 Serpent-128-CBC
-      1.3.6.1.4.1.11591.13.2.3 Serpent-128-OFB
-      1.3.6.1.4.1.11591.13.2.4 Serpent-128-CFB
-      1.3.6.1.4.1.11591.13.2.21 Serpent-192-ECB
-      1.3.6.1.4.1.11591.13.2.22 Serpent-192-CBC
-      1.3.6.1.4.1.11591.13.2.23 Serpent-192-OFB
-      1.3.6.1.4.1.11591.13.2.24 Serpent-192-CFB
-      1.3.6.1.4.1.11591.13.2.41 Serpent-256-ECB
-      1.3.6.1.4.1.11591.13.2.42 Serpent-256-CBC
-      1.3.6.1.4.1.11591.13.2.43 Serpent-256-OFB
-      1.3.6.1.4.1.11591.13.2.44 Serpent-256-CFB
-  1.3.6.1.4.1.11591.14 CRC algorithms
-    1.3.6.1.4.1.11591.14.1 CRC 32
+
+1.3.6.1.4.1.11591.13 encryptionAlgorithm
+  1.3.6.1.4.1.11591.13.2 Serpent
+    1.3.6.1.4.1.11591.13.2.1 Serpent-128-ECB
+    1.3.6.1.4.1.11591.13.2.2 Serpent-128-CBC
+    1.3.6.1.4.1.11591.13.2.3 Serpent-128-OFB
+    1.3.6.1.4.1.11591.13.2.4 Serpent-128-CFB
+    1.3.6.1.4.1.11591.13.2.21 Serpent-192-ECB
+    1.3.6.1.4.1.11591.13.2.22 Serpent-192-CBC
+    1.3.6.1.4.1.11591.13.2.23 Serpent-192-OFB
+    1.3.6.1.4.1.11591.13.2.24 Serpent-192-CFB
+    1.3.6.1.4.1.11591.13.2.41 Serpent-256-ECB
+    1.3.6.1.4.1.11591.13.2.42 Serpent-256-CBC
+    1.3.6.1.4.1.11591.13.2.43 Serpent-256-OFB
+    1.3.6.1.4.1.11591.13.2.44 Serpent-256-CFB
+
+1.3.6.1.4.1.11591.14 CRC algorithms
+  1.3.6.1.4.1.11591.14.1 CRC 32
+
+@c Added 2013-12-05 on request from Werner Koch <wk@gnupg.org>
+1.3.6.1.4.1.11591.15 ellipticCurve
+  1.3.6.1.4.1.11591.15.1 Ed25519