aboutsummaryrefslogtreecommitdiffstats
path: root/sys/linux/socket_alg.txt
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-11-27 09:09:01 +0100
committerDmitry Vyukov <dvyukov@google.com>2017-11-27 09:09:01 +0100
commit473d90487bd18f55b035887093e17b4a0ccc3b52 (patch)
treeba143da8d5574184b8ffa76ea2b1313ced5b836f /sys/linux/socket_alg.txt
parentd695195a6be9ceaf6e5ecafa2566bf1a378b8613 (diff)
sys/linux: improve hash generation for KEYCTL_DH_COMPUTE
KEYCTL_DH_COMPUTE used the old fixed list of algorithm names. Use the new code for algorithm generation. + it needs only SHASH algs, but we passed in all alg names. Pass only SHASH algs.
Diffstat (limited to 'sys/linux/socket_alg.txt')
-rw-r--r--sys/linux/socket_alg.txt8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/linux/socket_alg.txt b/sys/linux/socket_alg.txt
index b07a2b5ca..2dc4b648a 100644
--- a/sys/linux/socket_alg.txt
+++ b/sys/linux/socket_alg.txt
@@ -22,10 +22,10 @@ sendmmsg$alg(fd sock_algconn, mmsg ptr[in, array[msghdr_alg]], vlen len[mmsg], f
# Special struct generated by Go code.
sockaddr_alg {
family const[AF_ALG, int16]
- type string[salg_type, 14]
+ type string["filled later", 14]
feat flags[af_alg_type, int32]
mask flags[af_alg_type, int32]
- name string[salg_name, 64]
+ name string["filled later", 64]
}
msghdr_alg {
@@ -70,9 +70,5 @@ af_alg_type = CRYPTO_ALG_TYPE_MASK, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_COMP
alg_op_op = ALG_OP_DECRYPT, ALG_OP_ENCRYPT
-salg_type = "aead", "hash", "rng", "skcipher"
-
-salg_name = "cmac(aes)", "ecb(aes)", "cbc(aes)", "hmac(sha1)", "pcbc(fcrypt)", "ghash", "jitterentropy_rng", "stdrng", "stdrng", "stdrng", "stdrng", "hmac(sha256)", "stdrng", "stdrng", "stdrng", "stdrng", "stdrng", "842", "lz4hc", "lz4", "lzo", "crct10dif", "crc32", "crc32c", "michael_mic", "zlib", "deflate", "poly1305", "chacha20", "salsa20", "seed", "anubis", "khazad", "xeta", "xtea", "tea", "ecb(arc4)", "arc4", "cast6", "cast5", "camellia", "aes", "tnepres", "serpent", "twofish", "blowfish", "fcrypt", "des3_ede", "des", "tgr128", "tgr160", "tgr192", "wp256", "wp384", "wp512", "sha384", "sha512", "sha224", "sha256", "sha1", "rmd320", "rmd256", "rmd160", "rmd128", "md5", "md4", "digest_null", "compress_null", "ecb(cipher_null)", "cipher_null", "rsa", "poly1305", "xts(serpent)", "lrw(serpent)", "ctr(serpent)", "cbc(serpent)", "__ecb-serpent-sse2", "ecb(serpent)", "__xts-serpent-sse2", "__lrw-serpent-sse2", "__ctr-serpent-sse2", "__cbc-serpent-sse2", "__ecb-serpent-sse2", "salsa20", "xts(twofish)", "lrw(twofish)", "ctr(twofish)", "cbc(twofish)", "ecb(twofish)", "twofish", "ctr(blowfish)", "cbc(blowfish)", "ecb(blowfish)", "blowfish", "xts(camellia)", "lrw(camellia)", "ctr(camellia)", "cbc(camellia)", "ecb(camellia)", "camellia", "ctr(des3_ede)", "cbc(des3_ede)", "ecb(des3_ede)", "des3_ede", "aes"
-
# Removed in next-20160210 (commit 11049218)
define CRYPTO_ALG_TYPE_PCOMPRESS 0x0000000f