diff options
| author | Bernhard Schmidt <berni@debian.org> | 2018-03-04 22:22:32 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2018-03-04 22:22:32 +0100 |
| commit | 70bdede29c1725428ff5d1edd12303ba5474d2a3 (patch) | |
| tree | 118c2b9adb156a129bd0a04d980f00ba01fc8264 /src/openvpn/crypto.h | |
| parent | bd24a09dcb08e98bba26e316fd46e1b5d0590afb (diff) | |
| parent | cf55ab99392458e723c7ebcc32c19bbd225b1f4b (diff) | |
Update upstream source from tag 'upstream/2.4.5'
Update to upstream version '2.4.5'
with Debian dir bfadc11012753514e3836a4dc88a94fd7d0f8314
Diffstat (limited to 'src/openvpn/crypto.h')
| -rw-r--r-- | src/openvpn/crypto.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h index 0cdd30f..e42f697 100644 --- a/src/openvpn/crypto.h +++ b/src/openvpn/crypto.h @@ -5,8 +5,8 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net> - * Copyright (C) 2010-2017 Fox Crypto B.V. <openvpn@fox-it.com> + * Copyright (C) 2002-2018 OpenVPN Inc <sales@openvpn.net> + * Copyright (C) 2010-2018 Fox Crypto B.V. <openvpn@fox-it.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -317,7 +317,7 @@ void init_key_type(struct key_type *kt, const char *ciphername, * Key context functions */ -void init_key_ctx(struct key_ctx *ctx, struct key *key, +void init_key_ctx(struct key_ctx *ctx, const struct key *key, const struct key_type *kt, int enc, const char *prefix); @@ -478,7 +478,7 @@ void must_have_n_keys(const char *filename, const char *option, const struct key int ascii2keydirection(int msglevel, const char *str); -const char *keydirection2ascii(int kd, bool remote); +const char *keydirection2ascii(int kd, bool remote, bool humanreadable); /* print keys */ void key2_print(const struct key2 *k, |