Commit b67ee816 authored by Niels Möller's avatar Niels Möller
Browse files

* src/atoms.in: Deleted serpent-cbc@lysator.liu.se.

* src/algorithms.c (all_symmetric_algorithms): Deleted
ATOM_SERPENT_CBC_LOCAL.
(all_crypto_algorithms): Likewise.

Rev: src/algorithms.c:1.39
Rev: src/atoms.in:1.40
parent a495b7da
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
struct alist * struct alist *
all_symmetric_algorithms() all_symmetric_algorithms()
{ {
return make_alist(11 return make_alist(10
#if WITH_ZLIB #if WITH_ZLIB
+1 +1
#endif #endif
...@@ -58,7 +58,6 @@ all_symmetric_algorithms() ...@@ -58,7 +58,6 @@ all_symmetric_algorithms()
ATOM_AES256_CBC, &crypto_aes256_cbc_algorithm, ATOM_AES256_CBC, &crypto_aes256_cbc_algorithm,
ATOM_AES256_CTR, &crypto_aes256_ctr_algorithm, ATOM_AES256_CTR, &crypto_aes256_ctr_algorithm,
ATOM_SERPENT256_CBC, &crypto_serpent256_cbc_algorithm, ATOM_SERPENT256_CBC, &crypto_serpent256_cbc_algorithm,
ATOM_SERPENT_CBC_LOCAL, &crypto_serpent256_cbc_algorithm,
ATOM_3DES_CBC, &crypto_des3_cbc_algorithm, ATOM_3DES_CBC, &crypto_des3_cbc_algorithm,
ATOM_CAST128_CBC, &crypto_cast128_cbc_algorithm, ATOM_CAST128_CBC, &crypto_cast128_cbc_algorithm,
ATOM_HMAC_SHA1, ATOM_HMAC_SHA1,
...@@ -104,14 +103,13 @@ default_crypto_algorithms(struct alist *algorithms) ...@@ -104,14 +103,13 @@ default_crypto_algorithms(struct alist *algorithms)
static struct int_list * static struct int_list *
all_crypto_algorithms(struct alist *algorithms) all_crypto_algorithms(struct alist *algorithms)
{ {
return filter_algorithms_l(algorithms, 9, return filter_algorithms_l(algorithms, 8,
ATOM_AES256_CBC, ATOM_AES256_CBC,
ATOM_AES256_CTR, ATOM_AES256_CTR,
ATOM_3DES_CBC, ATOM_3DES_CBC,
ATOM_TWOFISH_CBC, ATOM_TWOFISH_CBC,
ATOM_CAST128_CBC, ATOM_CAST128_CBC,
ATOM_SERPENT256_CBC, ATOM_SERPENT256_CBC,
ATOM_SERPENT_CBC_LOCAL,
ATOM_BLOWFISH_CBC, ATOM_BLOWFISH_CBC,
ATOM_ARCFOUR, -1); ATOM_ARCFOUR, -1);
} }
......
...@@ -36,9 +36,6 @@ cast128-cbc OPTIONAL CAST-128 in CBC mode ...@@ -36,9 +36,6 @@ cast128-cbc OPTIONAL CAST-128 in CBC mode
cast128-ctr OPTIONAL CAST-128 in SDCTR mode, cast128-ctr OPTIONAL CAST-128 in SDCTR mode,
# none OPTIONAL no encryption; NOT RECOMMENDED # none OPTIONAL no encryption; NOT RECOMMENDED
# Old lsh aliases
serpent-cbc@lysator.liu.se EXPERIMENTAL Serpent cipher in CBC mode
# MAC algorithms # MAC algorithms
hmac-sha1 REQUIRED HMAC-SHA1 (length = 20) hmac-sha1 REQUIRED HMAC-SHA1 (length = 20)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment