diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-08 12:16:49 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-08 12:16:49 +1100 |
commit | 690d989008e18af3603a5e03f1276c9bad090370 (patch) | |
tree | 60dc95d5ad849ee6600da56ac4635b42740aad60 /cipher.h | |
parent | 08998c5fb9c7c1d248caa73b76e02ca0482e6d85 (diff) |
- dtucker@cvs.openbsd.org 2013/11/07 11:58:27
[cipher.c cipher.h kex.c kex.h mac.c mac.h servconf.c ssh.c]
Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@
Diffstat (limited to 'cipher.h')
-rw-r--r-- | cipher.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.h,v 1.40 2013/04/19 01:06:50 djm Exp $ */ | 1 | /* $OpenBSD: cipher.h,v 1.41 2013/11/07 11:58:27 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -75,7 +75,7 @@ const Cipher *cipher_by_number(int); | |||
75 | int cipher_number(const char *); | 75 | int cipher_number(const char *); |
76 | char *cipher_name(int); | 76 | char *cipher_name(int); |
77 | int ciphers_valid(const char *); | 77 | int ciphers_valid(const char *); |
78 | char *cipher_alg_list(void); | 78 | char *cipher_alg_list(char); |
79 | void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int, | 79 | void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int, |
80 | const u_char *, u_int, int); | 80 | const u_char *, u_int, int); |
81 | void cipher_crypt(CipherContext *, u_char *, const u_char *, | 81 | void cipher_crypt(CipherContext *, u_char *, const u_char *, |