diff options
| author | Damien Miller <djm@mindrot.org> | 2013-02-12 11:00:34 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-02-12 11:00:34 +1100 |
| commit | f0a8ded824a0149940a8c95755da05a9ce5d7f35 (patch) | |
| tree | 2d0110f9ce614c2cd6a489659c0433187825869b /cipher.c | |
| parent | 60565bcb5c26f38b9f1c0261c0608751979571d4 (diff) | |
| download | openssh-git-f0a8ded824a0149940a8c95755da05a9ce5d7f35.tar.gz | |
- djm@cvs.openbsd.org 2013/01/26 06:11:05
[Makefile.in acss.c acss.h cipher-acss.c cipher.c]
[openbsd-compat/openssl-compat.h]
remove ACSS, now that it is gone from libcrypto too
Diffstat (limited to 'cipher.c')
| -rw-r--r-- | cipher.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.c,v 1.86 2013/01/12 11:22:04 djm Exp $ */ +/* $OpenBSD: cipher.c,v 1.87 2013/01/26 06:11:05 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -93,10 +93,6 @@ struct Cipher { { "aes256-gcm@openssh.com", SSH_CIPHER_SSH2, 16, 32, 12, 16, 0, 0, EVP_aes_256_gcm }, #endif -#ifdef USE_CIPHER_ACSS - { "acss@openssh.org", - SSH_CIPHER_SSH2, 16, 5, 0, 0, 0, 0, EVP_acss }, -#endif { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL } }; @@ -478,7 +474,7 @@ cipher_get_keycontext(const CipherContext *cc, u_char *dat) Cipher *c = cc->cipher; int plen = 0; - if (c->evptype == EVP_rc4 || c->evptype == EVP_acss) { + if (c->evptype == EVP_rc4) { plen = EVP_X_STATE_LEN(cc->evp); if (dat == NULL) return (plen); @@ -493,7 +489,7 @@ cipher_set_keycontext(CipherContext *cc, u_char *dat) Cipher *c = cc->cipher; int plen; - if (c->evptype == EVP_rc4 || c->evptype == EVP_acss) { + if (c->evptype == EVP_rc4) { plen = EVP_X_STATE_LEN(cc->evp); memcpy(EVP_X_STATE(cc->evp), dat, plen); } |