diff options
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.c,v 1.86 2013/01/12 11:22:04 djm Exp $ */ | 1 | /* $OpenBSD: cipher.c,v 1.87 2013/01/26 06:11:05 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -93,10 +93,6 @@ struct Cipher { | |||
93 | { "aes256-gcm@openssh.com", | 93 | { "aes256-gcm@openssh.com", |
94 | SSH_CIPHER_SSH2, 16, 32, 12, 16, 0, 0, EVP_aes_256_gcm }, | 94 | SSH_CIPHER_SSH2, 16, 32, 12, 16, 0, 0, EVP_aes_256_gcm }, |
95 | #endif | 95 | #endif |
96 | #ifdef USE_CIPHER_ACSS | ||
97 | { "acss@openssh.org", | ||
98 | SSH_CIPHER_SSH2, 16, 5, 0, 0, 0, 0, EVP_acss }, | ||
99 | #endif | ||
100 | { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL } | 96 | { NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL } |
101 | }; | 97 | }; |
102 | 98 | ||
@@ -478,7 +474,7 @@ cipher_get_keycontext(const CipherContext *cc, u_char *dat) | |||
478 | Cipher *c = cc->cipher; | 474 | Cipher *c = cc->cipher; |
479 | int plen = 0; | 475 | int plen = 0; |
480 | 476 | ||
481 | if (c->evptype == EVP_rc4 || c->evptype == EVP_acss) { | 477 | if (c->evptype == EVP_rc4) { |
482 | plen = EVP_X_STATE_LEN(cc->evp); | 478 | plen = EVP_X_STATE_LEN(cc->evp); |
483 | if (dat == NULL) | 479 | if (dat == NULL) |
484 | return (plen); | 480 | return (plen); |
@@ -493,7 +489,7 @@ cipher_set_keycontext(CipherContext *cc, u_char *dat) | |||
493 | Cipher *c = cc->cipher; | 489 | Cipher *c = cc->cipher; |
494 | int plen; | 490 | int plen; |
495 | 491 | ||
496 | if (c->evptype == EVP_rc4 || c->evptype == EVP_acss) { | 492 | if (c->evptype == EVP_rc4) { |
497 | plen = EVP_X_STATE_LEN(cc->evp); | 493 | plen = EVP_X_STATE_LEN(cc->evp); |
498 | memcpy(EVP_X_STATE(cc->evp), dat, plen); | 494 | memcpy(EVP_X_STATE(cc->evp), dat, plen); |
499 | } | 495 | } |