Merge commit 'origin/silc.1.1.branch'

[silc.git] / doc / silcalgs.conf

diff --git a/doc/silcalgs.conf b/doc/silcalgs.conf
index a0fb89bb1def2d98eafc1ef0046fece64ef0e4b5..b083bb8cbb9a3fa50e8b294bfd023f0780b452d4 100644 (file)
--- a/doc/silcalgs.conf
+++ b/doc/silcalgs.conf
@@ -7,78 +7,70 @@
 # You should not change the contents of this file unless you know what you
 # are doing.
 #
+# The first algorithm defined is always the default one to use.
+#
 
 #
 # Configured ciphers
 #
-# The "name" is unique name to the cipher. The "module" option can be either
-# absolute or relative to the "module_path", and it defines where the cipher
-# module is found.  If omitted the built-in cipher is used.  The "keylength"
-# defines the length of the key (bytes), and the "blocklength" defines the
-# block size of the cipher (bytes).
+# The "name" is unique name to the cipher.  The "keylength" defines the
+# length of the key (bytes), and the "blocklength" defines the block size
+# of the cipher (bytes).
 #
 cipher {
-       name = "aes-256-cbc";
-       module = "aes.sim.so";
+       name = "aes-256-ctr";
        keylength = 32;
        blocklength = 16;
 };
 cipher {
-       name = "aes-192-cbc";
-       module = "aes.sim.so";
-       keylength = 24;
+       name = "aes-256-cbc";
+       keylength = 32;
        blocklength = 16;
 };
 cipher {
-       name = "aes-128-cbc";
-       module = "aes.sim.so";
-       keylength = 16;
+       name = "aes-192-ctr";
+       keylength = 24;
        blocklength = 16;
 };
 cipher {
-       name = "twofish-256-cbc";
-       module = "twofish.sim.so";
-       keylength = 32;
+       name = "aes-192-cbc";
+       keylength = 24;
        blocklength = 16;
 };
 cipher {
-       name = "twofish-192-cbc";
-       module = "twofish.sim.so";
-       keylength = 24;
+       name = "aes-128-ctr";
+       keylength = 16;
        blocklength = 16;
 };
 cipher {
-       name = "twofish-128-cbc";
-       module = "twofish.sim.so";
+       name = "aes-128-cbc";
        keylength = 16;
        blocklength = 16;
 };
 cipher {
-       name = "mars-256-cbc";
-       module = "mars.sim.so";
+       name = "twofish-256-cbc";
        keylength = 32;
        blocklength = 16;
 };
 cipher {
-       name = "mars-192-cbc";
-       module = "mars.sim.so";
+       name = "twofish-192-cbc";
        keylength = 24;
        blocklength = 16;
 };
 cipher {
-       name = "mars-128-cbc";
-       module = "mars.sim.so";
+       name = "twofish-128-cbc";
        keylength = 16;
        blocklength = 16;
 };
-cipher {
-       name = "none";
-       module = "none.sim.so";
-};
 
 #
 # Configured hash functions
 #
+hash {
+       name = "sha256";
+       blocklength = 64;
+       digestlength = 32;
+};
 hash {
        name = "sha1";
        blocklength = 64;
@@ -94,6 +86,11 @@ hash {
 # Configured HMAC functions. The hash function used in the HMAC must
 # be configured in the hash section.
 #
+hmac {
+       name = "hmac-sha256-96";
+       hash = "sha256";
+       maclength = 12;
+};
 hmac {
        name = "hmac-sha1-96";
        hash = "sha1";
@@ -118,6 +115,6 @@ hmac {
 #
 # Configured PKCS
 #
-PKCS { 
-       name = "rsa"; 
+PKCS {
+       name = "rsa";
 };