Fix loading inline tls-crypt-v2 keys with mbed TLS
PATCH 1/6 Fix loading inline tls-crypt-v2 keys with mbed TLS
From: Arne Schwabe <[email protected]...>
Using a tls-crypt-v2 key with mbed TLS inline results in
PEM decode error: source buffer not null-terminated
This is because the mbed TLS decode PEM function excepts the last byte in the buffer to be 0x00. When constructing the buffer we only made as big as strlen, which does not include the 0x00 byte of a string. Add an extra byte to ensure also the null byte is included in the buffer.
--- src/openvpn/tls_crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/tls_crypt.c +1 -1
@@ -298,7 +298,7 @@ tls_crypt_v2_read_keyfile(struct buffer *key, const char *pem_name, }else { -buf_set_read (&key_pem, (const void *)key_inline,strlen (key_inline)); +buf_set_read (&key_pem, (const void *)key_inline,strlen (key_inline) +1 ); }if (!crypto_pem_decode (pem_name, key, &key_pem))
Signature · 1 line
2.19.2
PATCH 2/6 Refactor tls_crypt_v2_write_server_key_file into crypto.c
From: Arne Schwabe <[email protected]...>
This allows the method to be resued for generating other types of keys that should also not be reused as tls-crypt/tls-auth keys.
--- src/openvpn/crypto.c | 34 ++++++++++++++++++++++++++++++++++ src/openvpn/crypto.h | 10 ++++++++++ src/openvpn/tls_crypt.c | 30 +----------------------------- 3 files changed, 45 insertions(+), 29 deletions(-)
src/openvpn/crypto.c +34 -0
@@ -1848,3 +1848,37 @@ translate_cipher_name_to_openvpn(const char *cipher_name)return pair->openvpn_name; } + +void +write_pem_key_file (const char *filename,const char *pem_name) +{ +struct gc_arena gc =gc_new (); +struct key server_key = {0 }; +struct buffer server_key_buf =clear_buf (); +struct buffer server_key_pem =clear_buf (); + +if (!rand_bytes ((void *)&server_key,sizeof (server_key))) + { +msg (M_NONFATAL ,"ERROR: could not generate random key" ); + goto cleanup; + } +buf_set_read (&server_key_buf, (void *)&server_key,sizeof (server_key)); +if (!crypto_pem_encode (pem_name, &server_key_pem, + &server_key_buf, &gc)) + { +msg (M_WARN ,"ERROR: could not PEM-encode key" ); + goto cleanup; + } + +if (!buffer_write_file (filename, &server_key_pem)) + { +msg (M_ERR ,"ERROR: could not write key file" ); + goto cleanup; + } + +cleanup: +secure_memzero (&server_key,sizeof (server_key)); +buf_clear (&server_key_pem); +gc_free (&gc); +return ; +}
src/openvpn/crypto.h +10 -0
@@ -420,6 +420,16 @@ void crypto_adjust_frame_parameters(struct frame *frame,/** Return the worst-case OpenVPN crypto overhead (in bytes) */ unsigned int crypto_max_overhead (void ); +/** +* Generate a server key with enough randomness to fill a key struct +* and write to file. +* +* @param filename Filename of the server key file to create. +* @param pem_name The name to use in the PEM header/footer. +*/ +void +write_pem_key_file (const char *filename,const char *pem_name); +/* Minimum length of the nonce used by the PRNG */ #define NONCE_SECRET_LEN_MIN 16
src/openvpn/tls_crypt.c +1 -29
@@ -670,35 +670,7 @@ tls_crypt_v2_extract_client_key(struct buffer *buf,void tls_crypt_v2_write_server_key_file (const char *filename) { -struct gc_arena gc =gc_new (); -struct key server_key = {0 }; -struct buffer server_key_buf =clear_buf (); -struct buffer server_key_pem =clear_buf (); - -if (!rand_bytes ((void *)&server_key,sizeof (server_key))) - { -msg (M_NONFATAL ,"ERROR: could not generate random key" ); - goto cleanup; - } -buf_set_read (&server_key_buf, (void *)&server_key,sizeof (server_key)); -if (!crypto_pem_encode (tls_crypt_v2_srv_pem_name, &server_key_pem, - &server_key_buf, &gc)) - { -msg (M_WARN ,"ERROR: could not PEM-encode server key" ); - goto cleanup; - } - -if (!buffer_write_file (filename, &server_key_pem)) - { -msg (M_ERR ,"ERROR: could not write server key file" ); - goto cleanup; - } - -cleanup: -secure_memzero (&server_key,sizeof (server_key)); -buf_clear (&server_key_pem); -gc_free (&gc); -return ; +write_pem_key_file (filename, tls_crypt_v2_srv_pem_name); }void
Signature · 1 line
2.19.2
[Openvpn-devel] [PATCH applied] Re: Refactor tls_crypt_v2_write_server_key_file into crypto.c
Your patch has been applied to the master branch.
commit 801be382702f943c42784d26eb07605be8ba0a18
Author: Arne Schwabe Date: Mon Jan 14 16:48:15 2019 +0100
Refactor tls_crypt_v2_write_server_key_file into crypto.c
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg18090.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
PATCH 3/6 Add send_control_channel_string_dowork variant
In reply to Arne SchwabeFrom: Arne Schwabe <[email protected]...>
The send_control_channel_string_dowork variant does not schedule the sending of the actual and can be used where struct context is not available.
--- src/openvpn/forward.c | 43 +++++++++++++++++++++++-------------------- src/openvpn/forward.h | 31 ++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 21 deletions(-)
src/openvpn/forward.c +23 -20
@@ -464,42 +464,45 @@ check_connection_established_dowork(struct context *c) } } -/* -* Send a string to remote over the TLS control channel. -* Used for push/pull messages, passing username/password, -* etc. -*/ +bool +send_control_channel_string_dowork (struct tls_multi *multi, +const char *str,int msglevel) +{ +struct gc_arena gc =gc_new (); +bool stat; + +/* buffered cleartext write onto TLS control channel */ + stat =tls_send_payload (multi, (uint8_t *) str,strlen (str) +1 ); + +msg (msglevel,"SENT CONTROL [%s]: '%s' (status=%d)" , +tls_common_name (multi, false), +sanitize_control_message (str, &gc), + (int ) stat); + +gc_free (&gc); +return stat; +} +bool send_control_channel_string (struct context *c,const char *str,int msglevel) {if (c->c2.tls_multi) { -struct gc_arena gc =gc_new (); -bool stat; - -/* buffered cleartext write onto TLS control channel */ - stat =tls_send_payload (c->c2.tls_multi, (uint8_t *) str,strlen (str) +1 ); - +bool ret =send_control_channel_string_dowork (c->c2.tls_multi, + str, msglevel);/* * Reschedule tls_multi_process. * NOTE: in multi-client mode, usually the below two statements are * insufficient to reschedule the client instance object unless * multi_schedule_context_wakeup(m, mi) is also called. */ +interval_action (&c->c2.tmp_int);context_immediate_reschedule (c);/* ZERO-TIMEOUT */ - -msg (msglevel,"SENT CONTROL [%s]: '%s' (status=%d)" , -tls_common_name (c->c2.tls_multi, false), -sanitize_control_message (str, &gc), - (int ) stat); - -gc_free (&gc); -return stat; +return ret; }return true; } -/* * Add routes. */
src/openvpn/forward.h +30 -1
@@ -286,7 +286,36 @@ void process_outgoing_tun(struct context *c);/**************************************************************************/ -bool send_control_channel_string (struct context *c,const char *str,int msglevel); +/* +* Send a string to remote over the TLS control channel. +* Used for push/pull messages, passing username/password, +* etc. +* @param c - The context structure of the VPN tunnel associated with +* the packet. +* @param str - The message to be sent +* @param msglevel - Message level to use for logging +*/ +bool +send_control_channel_string (struct context *c,const char *str,int msglevel); + +/* +* Send a string to remote over the TLS control channel. +* Used for push/pull messages, passing username/password, +* etc. +* +* This variant does not schedule the actual sending of the message +* The caller needs to ensure that it is scheduled or call +* send_control_channel_string +* +* @param multi - The tls_multi structure of the VPN tunnel associated +* with the packet. +* @param str - The message to be sent +* @param msglevel - Message level to use for logging +*/ + +bool +send_control_channel_string_dowork (struct tls_multi *multi, +const char *str,int msglevel);#define PIPV4_PASSTOS (1<<0)#define PIP_MSSFIX (1<<1)/* v4 and v6 */
Signature · 1 line
2.19.2
[Openvpn-devel] [PATCH applied] Re: Add send_control_channel_string_dowork variant
"Just moving of code" (though the change c2->c2.multi -> multi makes this harder for git to show). Tested with t_client testset plus a profile that uses user+pass auth so these still go out.
Your patch has been applied to the master branch.
commit 1000d5e1191d0a372e9e82f76dd1d1f101fe308e
Author: Arne Schwabe Date: Mon Jan 14 16:48:16 2019 +0100
Add send_control_channel_string_dowork variant
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg18092.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
PATCH 4/6 Rewrite auth-token-gen to be based on HMAC based tokens
In reply to Arne SchwabeThe previous auth-token implementation had a serious problem, especially when paired with an unpatched OpenVPN client that keeps trying the auth-token (commit e61b401a).
The auth-token-gen implementation forgot the auth-token on reconnect, this lead to reconnect with auth-token never working.
This new implementation implements the auth-token in a stateles variant. By using HMAC to sign the auth-token the server can verify if a token has been authenticated and by checking the embedded timestamp in the token it can also verify that the auth-token is still valid.
--- src/openvpn/Makefile.am | 1 + src/openvpn/auth_token.c | 333 +++++++++++++++++++++++++++++++++++++++ src/openvpn/auth_token.h | 101 ++++++++++++ src/openvpn/init.c | 34 +++- src/openvpn/openvpn.h | 1 + src/openvpn/options.c | 24 ++- src/openvpn/options.h | 4 + src/openvpn/push.c | 70 ++++++-- src/openvpn/push.h | 8 + src/openvpn/ssl.c | 7 +- src/openvpn/ssl_common.h | 30 ++-- src/openvpn/ssl_verify.c | 74 ++------- 12 files changed, 594 insertions(+), 93 deletions(-) create mode 100644 src/openvpn/auth_token.c create mode 100644 src/openvpn/auth_token.h
src/openvpn/Makefile.am +1 -0
@@ -39,6 +39,7 @@ sbin_PROGRAMS = openvpn openvpn_SOURCES = \ argv.c argv.h \ + auth_token.c auth_token.h \ base64.c base64.h \ basic.h \ buffer.c buffer.h \
src/openvpn/auth_token.c new file +333 -0
333 lines not on this page · raw message
src/openvpn/auth_token.h new file +101 -0
101 lines not on this page · raw message
src/openvpn/init.c +33 -1
@@ -51,6 +51,7 @@#include "ssl_verify.h" #include "tls_crypt.h" #include "forward.h" +#include "auth_token.h" #include "memdbg.h"
@@ -1098,6 +1099,17 @@ do_genkey(const struct options *options)msg (M_USAGE ,"--tls-crypt-v2-genkey type should be \"client\" or \"server\"" ); } + +if (options->auth_token_gen_secret_file) + { +if (!options->auth_token_secret_file) + { +msg (M_USAGE ,"--auth-gen-token-secret-genkey requires a server key " +"to be set via --auth-gen-token-secret to create a shared secret" ); + } +auth_token_write_server_key_file (options->auth_token_secret_file); +return true; + }return false; }
@@ -2490,7 +2502,6 @@ init_crypto_pre(struct context *c, const unsigned int flags) rand_ctx_enable_prediction_resistance(); }#endif - }/*
@@ -2614,6 +2625,20 @@ do_init_tls_wrap_key(struct context *c) } +/* +* Initialise the auth-token key context +*/ +static void +do_init_auth_token_key (struct context *c) +{ +if (!c->options.auth_token_generate) +return ; + +auth_token_init_secret (&c->c1.ks.auth_token_key, + c->options.auth_token_secret_file, + c->options.auth_token_secret_file_inline); +} +/* * Initialize the persistent component of OpenVPN's TLS mode, * which is preserved across SIGUSR1 resets.
@@ -2666,6 +2691,9 @@ do_init_crypto_tls_c1(struct context *c)/* initialize tls-auth/crypt/crypt-v2 key */ do_init_tls_wrap_key (c); +/* initialise auth-token crypto support */ +do_init_auth_token_key (c); +#if 0 /* was: #if ENABLE_INLINE_FILES -- Note that enabling this code will break restarts */ if (options->priv_key_file_inline) {
@@ -2838,6 +2866,7 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.auth_user_pass_file = options->auth_user_pass_file; to.auth_token_generate = options->auth_token_generate; to.auth_token_lifetime = options->auth_token_lifetime; + to.auth_token_key = c->c1.ks.auth_token_key;#endif to.x509_track = options->x509_track;
@@ -4451,6 +4480,9 @@ inherit_context_child(struct context *dest, dest->c1.authname = src->c1.authname; dest->c1.keysize = src->c1.keysize; +/* inherit auth-token */ + dest->c1.ks.auth_token_key = src->c1.ks.auth_token_key; +/* options */ dest->options = src->options;options_detach (&dest->options);
src/openvpn/openvpn.h +1 -0
@@ -68,6 +68,7 @@ struct key_schedulestruct key_ctx_bi tls_wrap_key;struct key_ctx tls_crypt_v2_server_key;struct buffer tls_crypt_v2_wkc;/**< Wrapped client key */ +struct key_ctx auth_token_key; };/*
src/openvpn/options.c +23 -1
@@ -1286,6 +1286,7 @@ show_p2mp_parms(const struct options *o)SHOW_BOOL (auth_user_pass_verify_script_via_file);SHOW_BOOL (auth_token_generate);SHOW_INT (auth_token_lifetime); +SHOW_STR (auth_token_secret_file);#if PORT_SHARE SHOW_STR (port_share_host);SHOW_STR (port_share_port);
@@ -2334,7 +2335,11 @@ options_postprocess_verify_ce(const struct options *options, const struct connec {msg (M_USAGE ,"--mode server requires --key-method 2" ); } - +if (options->auth_token_generate && !options->renegotiate_seconds) + { +msg (M_USAGE ,"--auth-gen-token needs a non-infinite " +"--renegotiate_seconds setting" ); + } {const bool ccnr = (options->auth_user_pass_verify_script || PLUGIN_OPTION_LIST(options)
@@ -6769,6 +6774,23 @@ add_option(struct options *options, options->auth_token_generate = true; options->auth_token_lifetime = p[1 ] ?positive_atoi (p[1 ]) :0 ; } +else if (streq (p[0 ],"auth-gen-token-secret" ) && p[1 ] && (!p[2 ] + || (p[2 ] &&streq (p[1 ],INLINE_FILE_TAG )))) + { +VERIFY_PERMISSION (OPT_P_GENERAL ); + options->auth_token_secret_file = p[1 ]; + +if (streq (p[1 ],INLINE_FILE_TAG ) && p[2 ]) + { + options->auth_token_secret_file_inline = p[2 ]; + } + } +else if (streq (p[0 ],"auth-gen-token-secret-genkey" ) && !p[1 ]) + { +VERIFY_PERMISSION (OPT_P_GENERAL ); + options->auth_token_gen_secret_file = true; + } +else if (streq (p[0 ],"client-connect" ) && p[1 ]) {VERIFY_PERMISSION (OPT_P_SCRIPT );
src/openvpn/options.h +4 -0
@@ -459,7 +459,11 @@ struct optionsconst char *auth_user_pass_verify_script;bool auth_user_pass_verify_script_via_file;bool auth_token_generate; +bool auth_token_gen_secret_file;unsigned int auth_token_lifetime; +const char *auth_token_secret_file; +const char *auth_token_secret_file_inline; +#if PORT_SHARE char *port_share_host;char *port_share_port;
src/openvpn/push.c +59 -11
106 lines not on this page · raw message
src/openvpn/push.h +8 -0
@@ -69,6 +69,14 @@ void send_auth_failed(struct context *c, const char *client_reason);void send_restart (struct context *c,const char *kill_msg); +/** +* Sends a push reply message only containin the auth-token to update +* the auth-token on the client +* +* @param multi - The tls_multi structure belonging to the instance to push to +*/ +void send_push_reply_auth_token (struct tls_multi *multi); +#endif #endif /* if P2MP */ #endif /* ifndef PUSH_H */
src/openvpn/ssl.c +2 -5
@@ -59,6 +59,7 @@#include "ssl.h" #include "ssl_verify.h" #include "ssl_backend.h" +#include "auth_token.h" #include "memdbg.h"
@@ -1368,11 +1369,7 @@ tls_multi_free(struct tls_multi *multi, bool clear)cert_hash_free (multi->locked_cert_hash_set); -if (multi->auth_token) - { -secure_memzero (multi->auth_token,AUTH_TOKEN_SIZE ); -free (multi->auth_token); - } +wipe_auth_token (multi);free (multi->remote_ciphername);
src/openvpn/ssl_common.h +16 -14
@@ -298,7 +298,6 @@ struct tls_options/** TLS handshake wrapping state */ struct tls_wrap_ctx tls_wrap; -/* frame parameters for TLS control channel */ struct frame frame;/* used for username/password authentication */
@@ -306,10 +305,16 @@ struct tls_optionsbool auth_user_pass_verify_script_via_file;const char *tmp_dir;const char *auth_user_pass_file; -bool auth_token_generate;/**< Generate auth-tokens on successful user/pass auth, -* set via options->auth_token_generate. */ + +#ifdef P2MP_SERVER +bool auth_token_generate;/**< Generate auth-tokens on successful +* user/pass auth,seet via +* options->auth_token_generate. */ unsigned int auth_token_lifetime; +struct key_ctx auth_token_key; +#endif +/* use the client-config-dir as a positive authenticator */ const char *client_config_dir_exclusive;
@@ -368,10 +373,6 @@ struct tls_options/** @} name Index of key_state objects within a tls_session structure */ /** @} addtogroup control_processor */ -#define AUTH_TOKEN_SIZE 32/**< Size of server side generated auth tokens. -* 32 bytes == 256 bits -*/ -/** * Security parameter state of a single session within a VPN tunnel. * @ingroup control_processor
@@ -539,6 +540,14 @@ struct tls_multi* over control channel. */ char *peer_info; +char *auth_token;/**< If server sends a generated auth-token, +* this is the token to use for future +* user/pass authentications in this session. +*/ +char *auth_token_initial; +/**< The first auth-token we sent to a client, for clients that do +* not update their auth-token (older OpenVPN3 core versions) +*/ #endif /* For P_DATA_V2 */
@@ -547,13 +556,6 @@ struct tls_multichar *remote_ciphername;/**< cipher specified in peer's config file */ -char *auth_token;/**< If server sends a generated auth-token, -* this is the token to use for future -* user/pass authentications in this session. -*/ -time_t auth_token_tstamp;/**< timestamp of the generated token */ -bool auth_token_sent;/**< If server uses --auth-gen-token and -* token has been sent to client */ /* * Our session objects. */
src/openvpn/ssl_verify.c +13 -61
129 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH 5/6 Implement a permanent session id in auth-token
In reply to Arne SchwabeFrom: Arne Schwabe <[email protected]...>
This allows an external authentication method
(e.g. management interface) to track the connection and distinguish a reconnection from multiple connections.
--- doc/openvpn.8 | 10 +++- src/openvpn/auth_token.c | 105 ++++++++++++++++++++++++++++++++------- src/openvpn/auth_token.h | 17 ++++++- src/openvpn/init.c | 1 + src/openvpn/manage.c | 4 +- src/openvpn/options.c | 14 +++++- src/openvpn/options.h | 3 +- src/openvpn/ssl_common.h | 1 + src/openvpn/ssl_verify.c | 78 ++++++++++++++++++----------- 9 files changed, 180 insertions(+), 53 deletions(-)
doc/openvpn.8 +9 -1
@@ -3710,7 +3710,7 @@ For a sample script that performs PAM authentication, see in the OpenVPN source distribution. .\"********************************************************* .TP -.B \-\-auth\-gen\-token [lifetime] +.B \-\-auth\-gen\-token [lifetime] [auth] After successful user/password authentication, the OpenVPN server will with this option generate a temporary authentication token and push that to client. On the following
@@ -3730,6 +3730,14 @@ This feature is useful for environments which is configured to use One Time Passwords (OTP) as part of the user/password authentications and that authentication mechanism does not implement any auth\-token support. + +When the auth keyword is present the normal authentication +method will be called even if auth-token succeeds. This allows +the normal to still check the validity of the account and do other +checks. The normal auth method can infer that the auth-token has been +successful from the password starting with SESS_ID_ +(invalid auth-token fail early and the normal authentication will not +be called) and the presence of a 'session_id' environment variable. .\"********************************************************* .TP .B \-\-opt\-verify
src/openvpn/auth_token.c +87 -18
204 lines not on this page · raw message
src/openvpn/auth_token.h +15 -2
@@ -34,7 +34,8 @@* * Format of the auth-token (before base64 encode) * -* uint64 timestamp (4 bytes)|uint64 timestamp (4 bytes)|sha256-hmac(32 bytes) +* session id(12 bytes)|uint64 timestamp (4 bytes)| +* uint64 timestamp (4 bytes)|sha256-hmac(32 bytes) * * The first timestamp is the time the token was initially created and is used to * determine the maximum renewable time of the token. We always include this even
@@ -44,13 +45,17 @@* to determine if this token has been renewed in the acceptable time range * (2 * renogiation timeout) * +* The session is a random string of 12 byte (or 16 in base64) that is not used by +* OpenVPN itself but kept intact so that external logging/managment can track the +* session multiple reconnects/servers +* * The hmac is calculated over the username contactinated with the * raw auth-token bytes to include authentication of the username in the token * * we prepend the session id with SESS_ID_ before sending it to the client */ void -generate_auth_token (struct user_pass *up,struct tls_multi *multi); +generate_auth_token (const struct user_pass *up,struct tls_multi *multi);/** * Verifies the auth token to be in the format that generate_auth_token
@@ -82,6 +87,14 @@ auth_token_init_secret(struct key_ctx *key_ctx, const char *key_file,void auth_token_write_server_key_file (const char *filename); +/** +* Put the session id, and auth token status into the environment +* if auth-token is enabled +* +*/ +void add_session_token_env (struct tls_session *session,struct tls_multi *multi, +const struct user_pass *up); +/** * Wipes the authentication token out of the memory, frees and cleans up * related buffers and flags
src/openvpn/init.c +1 -0
@@ -2866,6 +2866,7 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.auth_user_pass_file = options->auth_user_pass_file; to.auth_token_generate = options->auth_token_generate; to.auth_token_lifetime = options->auth_token_lifetime; + to.auth_token_call_auth = options->auth_token_call_auth; to.auth_token_key = c->c1.ks.auth_token_key;#endif
src/openvpn/manage.c +3 -1
@@ -2736,7 +2736,9 @@ env_filter_match(const char *env_str, const int env_filter_level)"ifconfig_pool_netmask=" ,"time_duration=" ,"bytes_sent=" , - "bytes_received=" +"bytes_received=" , +"session_id=" , + "session_state=" };if (env_filter_level ==0 )
src/openvpn/options.c +13 -1
@@ -6768,11 +6768,23 @@ add_option(struct options *options, &options->auth_user_pass_verify_script, p[1], "auth-user-pass-verify", true); } -else if (streq (p[0 ],"auth-gen-token" )) +else if (streq (p[0 ],"auth-gen-token" ) && !p[3 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->auth_token_generate = true; options->auth_token_lifetime = p[1 ] ?positive_atoi (p[1 ]) :0 ; +if (p[2 ]) + { +if (streq (p[2 ],"auth" )) + { + options->auth_token_call_auth = true; + } +else + { +msg (msglevel,"Invalid argument to auth-gen_token: %s" , p[2 ]); + } + } + }else if (streq (p[0 ],"auth-gen-token-secret" ) && p[1 ] && (!p[2 ] || (p[2 ] &&streq (p[1 ],INLINE_FILE_TAG ))))
src/openvpn/options.h +2 -1
@@ -460,7 +460,8 @@ struct optionsbool auth_user_pass_verify_script_via_file;bool auth_token_generate;bool auth_token_gen_secret_file; -unsigned int auth_token_lifetime; +bool auth_token_call_auth; +int auth_token_lifetime;const char *auth_token_secret_file;const char *auth_token_secret_file_inline;
src/openvpn/ssl_common.h +1 -0
@@ -310,6 +310,7 @@ struct tls_optionsbool auth_token_generate;/**< Generate auth-tokens on successful * user/pass auth,seet via * options->auth_token_generate. */ +bool auth_token_call_auth;/**< always call normal authentication */ unsigned int auth_token_lifetime;struct key_ctx auth_token_key;
src/openvpn/ssl_verify.c +49 -29
143 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH 6/6 Implement unit tests for auth-token
In reply to Arne SchwabeFrom: Arne Schwabe <[email protected]...>
--- tests/unit_tests/openvpn/Makefile.am | 18 +- tests/unit_tests/openvpn/test_auth_token.c | 309 +++++++++++++++++++++ 2 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 tests/unit_tests/openvpn/test_auth_token.c
tests/unit_tests/openvpn/Makefile.am +17 -1
@@ -6,7 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -check_PROGRAMS += crypto_testdriver packet_id_testdriver +check_PROGRAMS += crypto_testdriver packet_id_testdriver auth_token_testdriver if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += tls_crypt_testdriver endif
@@ -68,3 +68,19 @@ tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c \ $(openvpn_srcdir)/packet_id.c \ $(openvpn_srcdir)/platform.c \ $(openvpn_srcdir)/run_command.c + +auth_token_testdriver_CFLAGS = @TEST_CFLAGS@ \ + -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \ + $(OPTIONAL_CRYPTO_CFLAGS) +auth_token_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ + $(OPTIONAL_CRYPTO_LIBS) + +auth_token_testdriver_SOURCES = test_auth_token.c mock_msg.c \ + $(openvpn_srcdir)/buffer.c \ + $(openvpn_srcdir)/crypto.c \ + $(openvpn_srcdir)/crypto_mbedtls.c \ + $(openvpn_srcdir)/crypto_openssl.c \ + $(openvpn_srcdir)/otime.c \ + $(openvpn_srcdir)/packet_id.c \ + $(openvpn_srcdir)/platform.c \ + $(openvpn_srcdir)/base64.c
tests/unit_tests/openvpn/test_auth_token.c new file +309 -0
310 lines not on this page · raw message
Signature · 1 line
2.19.2
Your patch has been applied to the master branch.
commit 92a5ec31363e76e64748c4fc9aa144eefad17323
Author: Arne Schwabe Date: Mon Jan 14 16:48:14 2019 +0100
Fix loading inline tls-crypt-v2 keys with mbed TLS
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg18091.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering