automatically generate the appendix with supported algorithms and ciphersuites.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index da61cdacadcabb70b39c70edc5d31b96b849d61e..90daff0819e823634a18c515657dd7a6cd1cf464 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -39,7 +39,7 @@ gnutls_TEXINFOS = gnutls.texi signatures.texi fdl.texi lgpl-2.1.texi  \
        examples/ex-serv-export.c examples/ex-serv-anon.c               \
        examples/ex-serv-pgp.c examples/ex-serv-srp.c                   \
        examples/ex-alert.c examples/ex-x509-info.c examples/ex-crq.c   \
-       examples/ex-pkcs12.c guile.texi $(guile_texi)
+       examples/ex-pkcs12.c guile.texi $(guile_texi) ../src/algorithms.texi
 
 # Images.  Make sure there are eps + png + pdf of each, plus the source dia.
 gnutls_TEXINFOS += gnutls-internals.dia gnutls-internals.eps           \
@@ -96,6 +96,9 @@ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
 ../lib/x509/x509-api.texi:
        cd ../lib/x509 && make x509-api.texi
 
+../src/algorithms.texi:
+       cd ../src/ && make algorithms.texi
+
 ../lib/openpgp/pgp-api.texi:
        cd ../lib/openpgp && make pgp-api.texi
 

diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index b2a8e43db4b698cbaaf7074c427b8bdee04e07e2..cb07ac19c4373471fac7e0f56170ce4b88b27b14 100644 (file)
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -3465,133 +3465,7 @@ expressions.
 @anchor{ciphersuites}
 @cindex Ciphersuites
 
-@multitable @columnfractions .45 .20 .35
-
-@item @code{TLS_RSA_NULL_MD5} 
-@tab 0x00 0x01
-@tab RFC 2246
-
-@item @code{TLS_ANON_DH_3DES_EDE_CBC_SHA} 
-@tab 0x00 0x1B
-@tab RFC 2246
-
-@item @code{TLS_ANON_DH_ARCFOUR_MD5}
-@tab 0x00 0x18
-@tab RFC 2246
-
-@item @code{TLS_ANON_DH_AES_128_CBC_SHA}
-@tab 0x00 0x34
-@tab RFC 2246
-
-@item @code{TLS_ANON_DH_AES_256_CBC_SHA}
-@tab 0x00 0x3A
-@tab RFC 2246
-
-@item @code{TLS_RSA_ARCFOUR_SHA}
-@tab 0x00 0x05
-@tab  RFC 2246
-
-@item @code{TLS_RSA_ARCFOUR_MD5}
-@tab 0x00 0x04
-@tab RFC 2246
-
-@item @code{TLS_RSA_3DES_EDE_CBC_SHA}
-@tab 0x00 0x0A
-@tab RFC 2246
-
-@item @code{TLS_RSA_EXPORT_ARCFOUR_40_MD5}
-@tab 0x00 0x03
-@tab RFC 2246
-
-@item @code{TLS_DHE_DSS_3DES_EDE_CBC_SHA}
-@tab 0x00 0x13
-@tab RFC 2246
-
-@item @code{TLS_DHE_RSA_3DES_EDE_CBC_SHA}
-@tab 0x00 0x16
-@tab RFC 2246
-
-@item @code{TLS_RSA_AES_128_CBC_SHA}
-@tab 0x00 0x2F
-@tab RFC 3268
-
-@item @code{TLS_RSA_AES_256_CBC_SHA}
-@tab 0x00 0x35
-@tab RFC 3268
-
-@item @code{TLS_DHE_DSS_AES_256_CBC_SHA}
-@tab 0x00 0x38
-@tab RFC 3268
-
-@item @code{TLS_DHE_DSS_AES_128_CBC_SHA}
-@tab 0x00 0x32
-@tab RFC 3268
-
-@item @code{TLS_DHE_RSA_AES_256_CBC_SHA}
-@tab 0x00 0x39
-@tab RFC 3268
-
-@item @code{TLS_DHE_RSA_AES_128_CBC_SHA}
-@tab 0x00 0x33
-@tab RFC 3268
-
-@item @code{TLS_SRP_SHA_3DES_EDE_CBC_SHA}
-@tab 0x00 0x50
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_AES_128_CBC_SHA}
-@tab 0x00 0x53
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_AES_256_CBC_SHA}
-@tab 0x00 0x56
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_RSA_3DES_EDE_CBC_SHA}
-@tab 0x00 0x51
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_DSS_3DES_EDE_CBC_SHA}
-@tab 0x00 0x52
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_RSA_AES_128_CBC_SHA}
-@tab 0x00 0x54
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_DSS_AES_128_CBC_SHA}
-@tab 0x00 0x55
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_RSA_AES_256_CBC_SHA}
-@tab 0x00 0x57
-@tab RFC 5054
-
-@item @code{TLS_SRP_SHA_DSS_AES_256_CBC_SHA}
-@tab 0x00 0x58
-@tab RFC 5054
-
-@item @code{TLS_DHE_DSS_ARCFOUR_SHA}
-@tab 0x00 0x66
-@tab draft-ietf-tls-56-bit-ciphersuites
-
-@item @code{TLS_PSK_ARCFOUR_SHA}
-@tab 0x00 0x8A
-@tab draft-ietf-tls-psk
-
-@item @code{TLS_PSK_3DES_EDE_CBC_SHA}
-@tab 0x00 0x8B
-@tab draft-ietf-tls-psk
-
-@item @code{TLS_PSK_AES_128_CBC_SHA}
-@tab 0x00 0x8C
-@tab draft-ietf-tls-psk
-
-@item @code{TLS_PSK_AES_256_CBC_SHA}
-@tab 0x00 0x8D
-@tab draft-ietf-tls-psk
-
-@end multitable
+@include ../src/algorithms.texi
 
 @c
 @c Guile Bindings