diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-08-03 05:41:57 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-08-09 09:06:52 +1000 |
| commit | 4706c1d8c15cd5565b59512853c2da9bd4ca26c9 (patch) | |
| tree | 81ff9de3bdf3627b382bb4b808cf0e0612f4424f /cipher.h | |
| parent | e600348a7afd6325cc5cd783cb424065cbc20434 (diff) | |
| download | openssh-git-4706c1d8c15cd5565b59512853c2da9bd4ca26c9.tar.gz | |
upstream commit
small refactor of cipher.c: make ciphercontext opaque to
callers feedback and ok markus@
Upstream-ID: 094849f8be68c3bdad2c0f3dee551ecf7be87f6f
Diffstat (limited to 'cipher.h')
| -rw-r--r-- | cipher.h | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.h,v 1.48 2015/07/08 19:09:25 markus Exp $ */ +/* $OpenBSD: cipher.h,v 1.49 2016/08/03 05:41:57 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -63,14 +63,7 @@ #define CIPHER_DECRYPT 0 struct sshcipher; -struct sshcipher_ctx { - int plaintext; - int encrypt; - EVP_CIPHER_CTX evp; - struct chachapoly_ctx cp_ctx; /* XXX union with evp? */ - struct aesctr_ctx ac_ctx; /* XXX union with evp? */ - const struct sshcipher *cipher; -}; +struct sshcipher_ctx; u_int cipher_mask_ssh1(int); const struct sshcipher *cipher_by_name(const char *); @@ -80,15 +73,15 @@ char *cipher_name(int); const char *cipher_warning_message(const struct sshcipher_ctx *); int ciphers_valid(const char *); char *cipher_alg_list(char, int); -int cipher_init(struct sshcipher_ctx *, const struct sshcipher *, +int cipher_init(struct sshcipher_ctx **, const struct sshcipher *, const u_char *, u_int, const u_char *, u_int, int); int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *, u_int, u_int, u_int); int cipher_get_length(struct sshcipher_ctx *, u_int *, u_int, const u_char *, u_int); -int cipher_cleanup(struct sshcipher_ctx *); -int cipher_set_key_string(struct sshcipher_ctx *, const struct sshcipher *, - const char *, int); +void cipher_free(struct sshcipher_ctx *); +int cipher_set_key_string(struct sshcipher_ctx **, + const struct sshcipher *, const char *, int); u_int cipher_blocksize(const struct sshcipher *); u_int cipher_keylen(const struct sshcipher *); u_int cipher_seclen(const struct sshcipher *); @@ -96,10 +89,14 @@ u_int cipher_authlen(const struct sshcipher *); u_int cipher_ivlen(const struct sshcipher *); u_int cipher_is_cbc(const struct sshcipher *); +u_int cipher_ctx_is_plaintext(struct sshcipher_ctx *); +u_int cipher_ctx_get_number(struct sshcipher_ctx *); + u_int cipher_get_number(const struct sshcipher *); int cipher_get_keyiv(struct sshcipher_ctx *, u_char *, u_int); int cipher_set_keyiv(struct sshcipher_ctx *, const u_char *); int cipher_get_keyiv_len(const struct sshcipher_ctx *); int cipher_get_keycontext(const struct sshcipher_ctx *, u_char *); void cipher_set_keycontext(struct sshcipher_ctx *, const u_char *); + #endif /* CIPHER_H */ |