summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-08 12:16:49 +1100
committerDamien Miller <djm@mindrot.org>2013-11-08 12:16:49 +1100
commit690d989008e18af3603a5e03f1276c9bad090370 (patch)
tree60dc95d5ad849ee6600da56ac4635b42740aad60 /cipher.h
parent08998c5fb9c7c1d248caa73b76e02ca0482e6d85 (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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cipher.h b/cipher.h
index b878d50f4..46502348b 100644
--- a/cipher.h
+++ b/cipher.h
@@ -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);
75int cipher_number(const char *); 75int cipher_number(const char *);
76char *cipher_name(int); 76char *cipher_name(int);
77int ciphers_valid(const char *); 77int ciphers_valid(const char *);
78char *cipher_alg_list(void); 78char *cipher_alg_list(char);
79void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int, 79void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int,
80 const u_char *, u_int, int); 80 const u_char *, u_int, int);
81void cipher_crypt(CipherContext *, u_char *, const u_char *, 81void cipher_crypt(CipherContext *, u_char *, const u_char *,