summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/cipher.h
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2013-11-07 11:58:27 +0000
committerdtucker <dtucker@openbsd.org>2013-11-07 11:58:27 +0000
commitceeba42d56c0e4577deabe3c9c739b5800e10ef8 (patch)
tree191d84526a59478725b32c7d412fdd5bdeb41da8 /usr.bin/ssh/cipher.h
parentReplace sc_dying in favour of usbd_is_dying() and usbd_deactivate(). (diff)
downloadwireguard-openbsd-ceeba42d56c0e4577deabe3c9c739b5800e10ef8.tar.xz
wireguard-openbsd-ceeba42d56c0e4577deabe3c9c739b5800e10ef8.zip
Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@
Diffstat (limited to 'usr.bin/ssh/cipher.h')
-rw-r--r--usr.bin/ssh/cipher.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/cipher.h b/usr.bin/ssh/cipher.h
index b878d50f4fc..46502348b79 100644
--- a/usr.bin/ssh/cipher.h
+++ b/usr.bin/ssh/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.40 2013/04/19 01:06:50 djm Exp $ */
+/* $OpenBSD: cipher.h,v 1.41 2013/11/07 11:58:27 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -75,7 +75,7 @@ const Cipher *cipher_by_number(int);
int cipher_number(const char *);
char *cipher_name(int);
int ciphers_valid(const char *);
-char *cipher_alg_list(void);
+char *cipher_alg_list(char);
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 *,