diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-27 18:25:47 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-27 18:25:47 +0100 |
| commit | 79f3537f69e125f19f59c36aa090120a63186a54 (patch) | |
| tree | 2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /src/openvpn/ssl_openssl.h | |
| parent | f2137fedb30cb87448eb03b2f288920df6187571 (diff) | |
| parent | 3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff) | |
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'src/openvpn/ssl_openssl.h')
| -rw-r--r-- | src/openvpn/ssl_openssl.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/openvpn/ssl_openssl.h b/src/openvpn/ssl_openssl.h index 115ac43..c64c65f 100644 --- a/src/openvpn/ssl_openssl.h +++ b/src/openvpn/ssl_openssl.h @@ -5,8 +5,8 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net> - * Copyright (C) 2010 Fox Crypto B.V. <openvpn@fox-it.com> + * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net> + * Copyright (C) 2010-2017 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 @@ -40,7 +40,7 @@ * resumption (and the accompanying SSL_OP_NO_TICKET flag). */ #ifndef SSL_OP_NO_TICKET -# define SSL_OP_NO_TICKET 0 +#define SSL_OP_NO_TICKET 0 #endif /** @@ -54,10 +54,10 @@ struct tls_root_ctx { }; struct key_state_ssl { - SSL *ssl; /* SSL object -- new obj created for each new key */ - BIO *ssl_bio; /* read/write plaintext from here */ - BIO *ct_in; /* write ciphertext to here */ - BIO *ct_out; /* read ciphertext from here */ + SSL *ssl; /* SSL object -- new obj created for each new key */ + BIO *ssl_bio; /* read/write plaintext from here */ + BIO *ct_in; /* write ciphertext to here */ + BIO *ct_out; /* read ciphertext from here */ }; /** @@ -66,6 +66,6 @@ struct key_state_ssl { */ extern int mydata_index; /* GLOBAL */ -void openssl_set_mydata_index (void); +void openssl_set_mydata_index(void); #endif /* SSL_OPENSSL_H_ */ |