diff options
| author |   hshoexer <hshoexer@openbsd.org> | 2004-01-23 17:06:03 +0000 |
|---|---|---|
| committer | hshoexer <hshoexer@openbsd.org> | 2004-01-23 17:06:03 +0000 |
| commit | 3652c0d8567b50d6dfb92d96122c655f5bfd742c (patch) | |
| tree | 60eb89656ad21a8a86726b75e28761d114247e36 /usr.bin/ssh/cipher.c | |
| parent | enable acss. (diff) | |
| download | wireguard-openbsd-3652c0d8567b50d6dfb92d96122c655f5bfd742c.tar.xz wireguard-openbsd-3652c0d8567b50d6dfb92d96122c655f5bfd742c.zip | |
enable acss for ssh
ok deraadt@ markus@
Diffstat (limited to 'usr.bin/ssh/cipher.c')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index 0bc20775df8..20b22ce99f2 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/cipher.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.66 2003/11/10 16:23:41 jakob Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.67 2004/01/23 17:06:03 hshoexer Exp $"); #include "xmalloc.h" #include "log.h" @@ -85,6 +85,7 @@ struct Cipher { { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr }, { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr }, { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, + { "acss@openbsd.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss }, { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } }; @@ -373,7 +374,7 @@ cipher_get_keycontext(const CipherContext *cc, u_char *dat) Cipher *c = cc->cipher; int plen = 0; - if (c->evptype == EVP_rc4) { + if (c->evptype == EVP_rc4 || c->evptype == EVP_acss) { plen = EVP_X_STATE_LEN(cc->evp); if (dat == NULL) return (plen); @@ -388,7 +389,7 @@ cipher_set_keycontext(CipherContext *cc, u_char *dat) Cipher *c = cc->cipher; int plen; - if (c->evptype == EVP_rc4) { + if (c->evptype == EVP_rc4 || c->evptype == EVP_acss) { plen = EVP_X_STATE_LEN(cc->evp); memcpy(EVP_X_STATE(cc->evp), dat, plen); } |