diff options
| author | des <des@FreeBSD.org> | 2013-09-21 21:36:09 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-09-21 21:36:09 +0000 |
| commit | cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a (patch) | |
| tree | a72d0647ecce54e017341118e11204ee4ba0de68 /crypto/openssh/cipher.h | |
| parent | 3e16db31d109ec87db0aa5d7fcd63e93398259d4 (diff) | |
| parent | ff2597d3eebc3da3f7cf2a638607274cad9b199e (diff) | |
| download | FreeBSD-src-cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a.zip FreeBSD-src-cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a.tar.gz | |
Upgrade to 6.3p1.
Approved by: re (gjb)
Diffstat (limited to 'crypto/openssh/cipher.h')
| -rw-r--r-- | crypto/openssh/cipher.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crypto/openssh/cipher.h b/crypto/openssh/cipher.h index 8cb57c3..b878d50 100644 --- a/crypto/openssh/cipher.h +++ b/crypto/openssh/cipher.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.h,v 1.39 2013/01/08 18:49:04 markus Exp $ */ +/* $OpenBSD: cipher.h,v 1.40 2013/04/19 01:06:50 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -66,21 +66,22 @@ struct CipherContext { int plaintext; int encrypt; EVP_CIPHER_CTX evp; - Cipher *cipher; + const Cipher *cipher; }; u_int cipher_mask_ssh1(int); -Cipher *cipher_by_name(const char *); -Cipher *cipher_by_number(int); +const Cipher *cipher_by_name(const char *); +const Cipher *cipher_by_number(int); int cipher_number(const char *); char *cipher_name(int); int ciphers_valid(const char *); -void cipher_init(CipherContext *, Cipher *, const u_char *, u_int, +char *cipher_alg_list(void); +void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int, const u_char *, u_int, int); void cipher_crypt(CipherContext *, u_char *, const u_char *, u_int, u_int, u_int); void cipher_cleanup(CipherContext *); -void cipher_set_key_string(CipherContext *, Cipher *, const char *, int); +void cipher_set_key_string(CipherContext *, const Cipher *, const char *, int); u_int cipher_blocksize(const Cipher *); u_int cipher_keylen(const Cipher *); u_int cipher_authlen(const Cipher *); |
