diff options
| author | mischief <mischief@offblast.org> | 2014-02-25 17:37:59 -0800 |
|---|---|---|
| committer | mischief <mischief@offblast.org> | 2014-02-25 17:37:59 -0800 |
| commit | 99f9a601781d6ff26d09fbedb47a0043fff08323 (patch) | |
| tree | ee066ee9b5c73635e7b109cf7f624634373e35c3 | |
| parent | 774ccb19e4a29850f675c339e4ba7f5a8dbb48d8 (diff) | |
| download | plan9front-99f9a601781d6ff26d09fbedb47a0043fff08323.tar.xz | |
libsec: add aes_128_cbc and aes_256_cbc ciphers
| -rw-r--r-- | sys/man/3/tls | 6 | ||||
| -rw-r--r-- | sys/src/libsec/port/tlshand.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/man/3/tls b/sys/man/3/tls index 99f470d90..8f5a30ec2 100644 --- a/sys/man/3/tls +++ b/sys/man/3/tls @@ -258,9 +258,11 @@ This will always include .BR clear , meaning no encryption or digesting. Currently implemented encryption algorithms are -.B 'rc4_128' +.B 'rc4_128', +.BR '3des_ede_cbc', +.BR 'aes_128_cbc', and -.BR '3des_ede_cbc' . +.BR 'aes_256_cbc'. Currently implemented hashing algorithms are .B 'md5' and diff --git a/sys/src/libsec/port/tlshand.c b/sys/src/libsec/port/tlshand.c index 60debc88b..1dc282751 100644 --- a/sys/src/libsec/port/tlshand.c +++ b/sys/src/libsec/port/tlshand.c @@ -17,7 +17,7 @@ enum { TLSFinishedLen = 12, SSL3FinishedLen = MD5dlen+SHA1dlen, - MaxKeyData = 104, // amount of secret we may need + MaxKeyData = 136, // amount of secret we may need MaxChunk = 1<<14, RandomSize = 32, SidSize = 32, @@ -248,7 +248,9 @@ enum { static Algs cipherAlgs[] = { {"rc4_128", "md5", 2 * (16 + MD5dlen), TLS_RSA_WITH_RC4_128_MD5}, {"rc4_128", "sha1", 2 * (16 + SHA1dlen), TLS_RSA_WITH_RC4_128_SHA}, - {"3des_ede_cbc","sha1",2*(4*8+SHA1dlen), TLS_RSA_WITH_3DES_EDE_CBC_SHA}, + {"3des_ede_cbc","sha1", 2*(4*8+SHA1dlen), TLS_RSA_WITH_3DES_EDE_CBC_SHA}, + {"aes_128_cbc", "sha1", 2*(16+16+SHA1dlen), TLS_RSA_WITH_AES_128_CBC_SHA}, + {"aes_256_cbc", "sha1", 2*(32+16+SHA1dlen), TLS_RSA_WITH_AES_256_CBC_SHA}, }; static uchar compressors[] = { |