summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-01-23 10:24:29 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-01-23 21:53:54 +1100
commit7f8e66fea8c4e2a910df9067cb7638999b7764d5 (patch)
tree88c1a4a73a03cfa993fee0c1f23b6327ef1351a1 /cipher.h
parent69ac4e33023b379e9a8e9b4b6aeeffa6d1fcf6fa (diff)
upstream: 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@ OpenBSD-Commit-ID: 44c6e1133a90fd15a3aa865bdedc53bab28b7910
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cipher.h b/cipher.h
index 5843aab49..1a591cd7f 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher.h,v 1.54 2019/09/06 05:23:55 djm Exp $ */ 1/* $OpenBSD: cipher.h,v 1.55 2020/01/23 10:24:29 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -54,6 +54,7 @@ const struct sshcipher *cipher_by_name(const char *);
54const char *cipher_warning_message(const struct sshcipher_ctx *); 54const char *cipher_warning_message(const struct sshcipher_ctx *);
55int ciphers_valid(const char *); 55int ciphers_valid(const char *);
56char *cipher_alg_list(char, int); 56char *cipher_alg_list(char, int);
57const char *compression_alg_list(int);
57int cipher_init(struct sshcipher_ctx **, const struct sshcipher *, 58int cipher_init(struct sshcipher_ctx **, const struct sshcipher *,
58 const u_char *, u_int, const u_char *, u_int, int); 59 const u_char *, u_int, const u_char *, u_int, int);
59int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *, 60int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *,