summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/cipher.h
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2020-01-23 10:24:29 +0000
committerdtucker <dtucker@openbsd.org>2020-01-23 10:24:29 +0000
commitd2d1ddc01e164583fc6451048058886077f35159 (patch)
treee7dd7c5daadcdfd351e6c754d60427b9f3b3239d /usr.bin/ssh/cipher.h
parentWhen checking for unsafe directories, ignore non-directories (ie symlinks, (diff)
downloadwireguard-openbsd-d2d1ddc01e164583fc6451048058886077f35159.tar.xz
wireguard-openbsd-d2d1ddc01e164583fc6451048058886077f35159.zip
Make zlib optional. This adds a "ZLIB" build time option that allows
building without zlib compression and associated options. With feedback from markus@, ok djm@
Diffstat (limited to 'usr.bin/ssh/cipher.h')
-rw-r--r--usr.bin/ssh/cipher.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/cipher.h b/usr.bin/ssh/cipher.h
index 5843aab4931..1a591cd7fd4 100644
--- a/usr.bin/ssh/cipher.h
+++ b/usr.bin/ssh/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.54 2019/09/06 05:23:55 djm Exp $ */
+/* $OpenBSD: cipher.h,v 1.55 2020/01/23 10:24:29 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -54,6 +54,7 @@ const struct sshcipher *cipher_by_name(const char *);
const char *cipher_warning_message(const struct sshcipher_ctx *);
int ciphers_valid(const char *);
char *cipher_alg_list(char, int);
+const char *compression_alg_list(int);
int cipher_init(struct sshcipher_ctx **, const struct sshcipher *,
const u_char *, u_int, const u_char *, u_int, int);
int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *,