diff options
| author | des <des@FreeBSD.org> | 2016-01-19 18:28:23 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 18:28:23 +0000 |
| commit | 7a7bc643b5dd94f6333f2a1d91923165ad77176f (patch) | |
| tree | 9d2b367395b2d3c9a63b4aecd1eb28b17b838703 /crypto/openssh/cipher.h | |
| parent | 834fb5aff44e0a606772591d869016a1d8d9aa95 (diff) | |
| parent | 928d872bfcc9d49be194dc51d80555f1bbdbff6b (diff) | |
| download | FreeBSD-src-7a7bc643b5dd94f6333f2a1d91923165ad77176f.zip FreeBSD-src-7a7bc643b5dd94f6333f2a1d91923165ad77176f.tar.gz | |
Upgrade to OpenSSH 6.8p1.
Diffstat (limited to 'crypto/openssh/cipher.h')
| -rw-r--r-- | crypto/openssh/cipher.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/cipher.h b/crypto/openssh/cipher.h index de74c1e..62a88b4 100644 --- a/crypto/openssh/cipher.h +++ b/crypto/openssh/cipher.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.h,v 1.46 2014/06/24 01:13:21 djm Exp $ */ +/* $OpenBSD: cipher.h,v 1.47 2015/01/14 10:24:42 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -72,19 +72,19 @@ struct sshcipher_ctx { const struct sshcipher *cipher; }; -typedef struct sshcipher Cipher ; -typedef struct sshcipher_ctx CipherContext ; +typedef struct sshcipher Cipher; +typedef struct sshcipher_ctx CipherContext; u_int cipher_mask_ssh1(int); const struct sshcipher *cipher_by_name(const char *); const struct sshcipher *cipher_by_number(int); int cipher_number(const char *); 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 *, const u_char *, u_int, const u_char *, u_int, int); -const char* cipher_warning_message(const struct sshcipher_ctx *); 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, |
