diff options
author | Damien Miller <djm@mindrot.org> | 2013-01-09 16:12:19 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-01-09 16:12:19 +1100 |
commit | 1d75abfe23cadf8cdba0bd2cfd54f3bc1ca80dc5 (patch) | |
tree | b717aa08dcc3c018d6fdae575017b3cb5fd92767 /cipher.h | |
parent | aa7ad3039c671c157bb99217d60674dad8154a22 (diff) |
- markus@cvs.openbsd.org 2013/01/08 18:49:04
[PROTOCOL authfile.c cipher.c cipher.h kex.c kex.h monitor_wrap.c]
[myproposal.h packet.c ssh_config.5 sshd_config.5]
support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
ok and feedback djm@
Diffstat (limited to 'cipher.h')
-rw-r--r-- | cipher.h | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.h,v 1.38 2012/12/11 22:31:18 markus Exp $ */ | 1 | /* $OpenBSD: cipher.h,v 1.39 2013/01/08 18:49:04 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -64,6 +64,7 @@ typedef struct CipherContext CipherContext; | |||
64 | struct Cipher; | 64 | struct Cipher; |
65 | struct CipherContext { | 65 | struct CipherContext { |
66 | int plaintext; | 66 | int plaintext; |
67 | int encrypt; | ||
67 | EVP_CIPHER_CTX evp; | 68 | EVP_CIPHER_CTX evp; |
68 | Cipher *cipher; | 69 | Cipher *cipher; |
69 | }; | 70 | }; |
@@ -76,11 +77,14 @@ char *cipher_name(int); | |||
76 | int ciphers_valid(const char *); | 77 | int ciphers_valid(const char *); |
77 | void cipher_init(CipherContext *, Cipher *, const u_char *, u_int, | 78 | void cipher_init(CipherContext *, Cipher *, const u_char *, u_int, |
78 | const u_char *, u_int, int); | 79 | const u_char *, u_int, int); |
79 | void cipher_crypt(CipherContext *, u_char *, const u_char *, u_int, u_int); | 80 | void cipher_crypt(CipherContext *, u_char *, const u_char *, |
81 | u_int, u_int, u_int); | ||
80 | void cipher_cleanup(CipherContext *); | 82 | void cipher_cleanup(CipherContext *); |
81 | void cipher_set_key_string(CipherContext *, Cipher *, const char *, int); | 83 | void cipher_set_key_string(CipherContext *, Cipher *, const char *, int); |
82 | u_int cipher_blocksize(const Cipher *); | 84 | u_int cipher_blocksize(const Cipher *); |
83 | u_int cipher_keylen(const Cipher *); | 85 | u_int cipher_keylen(const Cipher *); |
86 | u_int cipher_authlen(const Cipher *); | ||
87 | u_int cipher_ivlen(const Cipher *); | ||
84 | u_int cipher_is_cbc(const Cipher *); | 88 | u_int cipher_is_cbc(const Cipher *); |
85 | 89 | ||
86 | u_int cipher_get_number(const Cipher *); | 90 | u_int cipher_get_number(const Cipher *); |