diff options
Diffstat (limited to 'cipher.h')
-rw-r--r-- | cipher.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.h,v 1.44 2014/01/25 10:12:50 dtucker Exp $ */ | 1 | /* $OpenBSD: cipher.h,v 1.45 2014/04/29 18:01:49 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -39,6 +39,7 @@ | |||
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | #include "cipher-chachapoly.h" | 41 | #include "cipher-chachapoly.h" |
42 | #include "cipher-aesctr.h" | ||
42 | 43 | ||
43 | /* | 44 | /* |
44 | * Cipher types for SSH-1. New types can be added, but old types should not | 45 | * Cipher types for SSH-1. New types can be added, but old types should not |
@@ -69,6 +70,7 @@ struct CipherContext { | |||
69 | int encrypt; | 70 | int encrypt; |
70 | EVP_CIPHER_CTX evp; | 71 | EVP_CIPHER_CTX evp; |
71 | struct chachapoly_ctx cp_ctx; /* XXX union with evp? */ | 72 | struct chachapoly_ctx cp_ctx; /* XXX union with evp? */ |
73 | struct aesctr_ctx ac_ctx; /* XXX union with evp? */ | ||
72 | const Cipher *cipher; | 74 | const Cipher *cipher; |
73 | }; | 75 | }; |
74 | 76 | ||