Drop support for OpenSSL 1.0.1
PATCH 1/3 Drop support for OpenSSL 1.0.1
OpenSSL 1.0.1 was supported until 2016-12-31. Rhel6/Centos6 still use this version but considering that RHEL7 and RHEL8 are already out, these versions can also stay with OpenVPN 2.4.
All the supported Debian based distributions also come with at least 1.0.2
This also allows the tls groups commit to be applied without adding ifdefs to disable that functionality on OpenSSL 1.0.1
--- .travis.yml | 8 -------- Changes.rst | 5 ++++- configure.ac | 3 +-- src/openvpn/crypto.c | 7 ------- src/openvpn/openssl_compat.h | 14 -------------- src/openvpn/ssl_openssl.c | 32 +------------------------------- 6 files changed, 6 insertions(+), 63 deletions(-)
.travis.yml +0 -8
@@ -35,10 +35,6 @@ jobs: env: SSLLIB="openssl" RUN_COVERITY="1" os: linux compiler: gcc - - name: gcc | openssl-1.0.1u - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u" - os: linux - compiler: gcc - name: gcc | openssl-1.1.1d env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" os: linux
@@ -87,10 +83,6 @@ jobs: env: SSLLIB="mbedtls" os: osx compiler: clang - - name: mingw64 | openssl-1.0.1u - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u" - os: linux - compiler: ": Win64 build only" - name: mingw64 | openssl-1.1.1d env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1d" os: linux
Changes.rst +4 -1
@@ -31,7 +31,10 @@ https://community.openvpn.net/openvpn/wiki/DeprecatedOptions With the improved and matured data channel cipher negotiation, the use of ``ncp-disable`` should not be necessary anymore. - +- Support for building with OpenSSL 1.0.1 has been removed. The minimum + supported OpenSSL version is now 1.0.2. + + Overview of changes in 2.4 ==========================
configure.ac +1 -2
@@ -839,7 +839,7 @@ if test "${with_crypto_library}" = "openssl"; then # if the user did not explicitly specify flags, try to autodetect PKG_CHECK_MODULES( [OPENSSL], - [openssl >= 1.0.1], + [openssl >= 1.0.2], [have_openssl="yes"], [] # If this fails, we will do another test next )
@@ -931,7 +931,6 @@ if test "${with_crypto_library}" = "openssl"; then X509_STORE_get0_objects \ X509_OBJECT_free \ X509_OBJECT_get_type \ - EVP_PKEY_id \ EVP_PKEY_get0_RSA \ EVP_PKEY_get0_DSA \ EVP_PKEY_get0_EC_KEY \
src/openvpn/crypto.c +0 -7
@@ -428,13 +428,6 @@ openvpn_decrypt_aead(struct buffer *buf, struct buffer work, tag_ptr =BPTR (buf);ASSERT (buf_advance (buf, tag_size));dmsg (D_PACKET_CONTENT ,"DECRYPT MAC: %s" ,format_hex (tag_ptr, tag_size,0 , &gc)); -#if defined(ENABLE_CRYPTO_OPENSSL ) &&OPENSSL_VERSION_NUMBER <0x10001040L -/* OpenSSL <= 1.0.1c bug requires set tag before processing ciphertext */ -if (!EVP_CIPHER_CTX_ctrl (ctx->cipher,EVP_CTRL_GCM_SET_TAG , tag_size, tag_ptr)) - { -CRYPT_ERROR ("setting tag failed" ); - } -#endif if (buf->len <1 ) {
src/openvpn/openssl_compat.h +0 -14
@@ -271,20 +271,6 @@ EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) }#endif -#if !defined(HAVE_EVP_PKEY_ID ) -/** -* Get the PKEY type -* -* @param pkey Public key object -* @return The key type -*/ -static inline int -EVP_PKEY_id (const EVP_PKEY *pkey) -{ -return pkey ? pkey->type :EVP_PKEY_NONE ; -} -#endif -#if !defined(HAVE_EVP_PKEY_GET0_DSA )/** * Get the DSA object of a public key
src/openvpn/ssl_openssl.c +1 -31
@@ -573,19 +573,11 @@ tls_ctx_check_cert_time(const struct tls_root_ctx *ctx)ASSERT (ctx); -#if (OPENSSL_VERSION_NUMBER >=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER )) \ - ||LIBRESSL_VERSION_NUMBER >=0x2070000fL -/* OpenSSL 1.0.2 and up */ cert =SSL_CTX_get0_certificate (ctx->ctx); -#else -/* OpenSSL 1.0.1 and earlier need an SSL object to get at the certificate */ -SSL *ssl =SSL_new (ctx->ctx); - cert =SSL_get_certificate (ssl); -#endif if (cert ==NULL ) { - goto cleanup;/* Nothing to check if there is no certificate */ +return ;/* Nothing to check if there is no certificate */ } ret =X509_cmp_time (X509_get0_notBefore (cert),NULL );
@@ -607,13 +599,6 @@ tls_ctx_check_cert_time(const struct tls_root_ctx *ctx) {msg (M_WARN ,"WARNING: Your certificate has expired!" ); } - -cleanup: -#if OPENSSL_VERSION_NUMBER <0x10002000L \ - || (defined(LIBRESSL_VERSION_NUMBER ) &&LIBRESSL_VERSION_NUMBER <0x2070000fL ) -SSL_free (ssl); -#endif -return ; }void
@@ -1462,15 +1447,7 @@ tls_ctx_use_management_external_key(struct tls_root_ctx *ctx)ASSERT (NULL != ctx); -#if (OPENSSL_VERSION_NUMBER >=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER )) \ - ||LIBRESSL_VERSION_NUMBER >=0x2070000fL -/* OpenSSL 1.0.2 and up */ X509 *cert =SSL_CTX_get0_certificate (ctx->ctx); -#else -/* OpenSSL 1.0.1 and earlier need an SSL object to get at the certificate */ -SSL *ssl =SSL_new (ctx->ctx); -X509 *cert =SSL_get_certificate (ssl); -#endif ASSERT (NULL != cert);
@@ -1510,13 +1487,6 @@ tls_ctx_use_management_external_key(struct tls_root_ctx *ctx) ret =0 ; cleanup: -#if OPENSSL_VERSION_NUMBER <0x10002000L \ - || (defined(LIBRESSL_VERSION_NUMBER ) &&LIBRESSL_VERSION_NUMBER <0x2070000fL ) -if (ssl) - { -SSL_free (ssl); - } -#endif if (ret) {crypto_msg (M_FATAL ,"Cannot enable SSL external private key capability" );
Signature · 1 line
2.26.2
PATCH v5 2/3 Implement tls-groups option to specify eliptic curves/groups
By default OpenSSL 1.1+ only allows signatures and ecdh/ecdhx from the default list of X25519:secp256r1:X448:secp521r1:secp384r1. In TLS1.3 key exchange is independent from the signature/key of the certificates, so allowing all groups per default is not a sensible choice anymore and instead a shorter list is reasonable.
However, when using certificates with exotic curves that are not on the group list, the signatures of these certificates will no longer be accepted.
The tls-groups option allows to modify the group list to account for these corner cases.
Patch V2: Uses local gc_arena instead of malloc/free, reword commit
message. Fix other typos/clarify messages
Patch V3: Style fixes, adjust code to changes from mbed tls session
fix
Patch V5: Fix compilation with OpenSSL 1.0.2
--- README.ec | 7 +++-- configure.ac | 1 + doc/openvpn.8 | 33 +++++++++++++++++++++- src/openvpn/openssl_compat.h | 6 ++++ src/openvpn/options.c | 10 ++++++- src/openvpn/options.h | 1 + src/openvpn/ssl.c | 6 ++++ src/openvpn/ssl_backend.h | 10 +++++++ src/openvpn/ssl_mbedtls.c | 46 ++++++++++++++++++++++++++++++ src/openvpn/ssl_mbedtls.h | 1 + src/openvpn/ssl_openssl.c | 55 +++++++++++++++++++++++++++++++++++- 11 files changed, 170 insertions(+), 6 deletions(-)
README.ec +4 -3
@@ -12,14 +12,15 @@ OpenVPN 2.4.0 and newer automatically initialize ECDH parameters. When ECDSA is used for authentication, the curve used for the server certificate will be used for ECDH too. When autodetection fails (e.g. when using RSA certificates) OpenVPN lets the crypto library decide if possible, or falls back to the -secp384r1 curve. +secp384r1 curve. The list of groups/curves that the crypto library will choose +from can be set with the --tls-groups <grouplist> option. An administrator can force an OpenVPN/OpenSSL server to use a specific curve using the --ecdh-curve <curvename> option with one of the curves listed as -available by the --show-curves option. Clients will use the same curve as +available by the --show-groups option. Clients will use the same curve as selected by the server. -Note that not all curves listed by --show-curves are available for use with TLS; +Note that not all curves listed by --show-groups are available for use with TLS; in that case connecting will fail with a 'no shared cipher' TLS error. Authentication (ECDSA)
configure.ac +1 -0
@@ -924,6 +924,7 @@ if test "${with_crypto_library}" = "openssl"; then OpenSSL_version \ SSL_CTX_get_default_passwd_cb \ SSL_CTX_get_default_passwd_cb_userdata \ + SSL_CTX_set1_groups \ SSL_CTX_set_security_level \ X509_get0_notBefore \ X509_get0_notAfter \
doc/openvpn.8 +32 -1
@@ -5135,6 +5135,8 @@ Use to see a list of TLS ciphers supported by your crypto library. Warning! +.B \-\-tls\-groups +, .B \-\-tls\-cipher and .B \-\-tls\-ciphersuites
@@ -5150,6 +5152,33 @@ OpenSSL. The default for \-\-tls\-ciphersuites is to use the crypto library's default. .\"********************************************************* .TP +.B \-\-tls\-groups l +A list +.B l +of allowable groups/curves in order of preference. + +Set the allowed elictipic curves/groups for the TLS session. +These groups are allowed to be used in signatures and key exchange. + +mbed TLS currently allows all known curves per default. + +OpenSSL 1.1+ restricts the list per default to +"X25519:secp256r1:X448:secp521r1:secp384r1". + +If you use certificates that use non-standard curves, you +might need to add them here. If you do not force the ecdh curve +by using +.B \-\-ecdh\-curve +, the groups for ecdh will also be picked from this list. + +OpenVPN maps the curve name secp256r1 to prime256v1 to allow +specifying the same tls-groups option for mbed TLS and OpenSSL. + +Warning: this option not only affects eliptic curve certificates +but also the key exchange in TLS 1.3 and using this option improperly +will disable TLS 1.3. +.\"********************************************************* +.TP .B \-\-tls\-cert\-profile profile Set the allowed cryptographic algorithms for certificates according to .B profile\fN.
@@ -5915,8 +5944,10 @@ engines supported by the OpenSSL library. .TP .B \-\-show\-curves (Standalone) -Show all available elliptic curves to use with the +Show all available elliptic groups/curves to use with the .B \-\-ecdh\-curve +and +.B \-\-tls\-groups option. .\"********************************************************* .SS Generating key material:
src/openvpn/openssl_compat.h +6 -0
@@ -183,6 +183,12 @@ SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) }#endif +/* This function is implemented as macro, so the configure check for the +* function may fail, so we check for both variants here */ +#if !defined(HAVE_SSL_CTX_SET1_GROUPS ) && !defined(SSL_CTX_set1_groups) +#define SSL_CTX_set1_groups SSL_CTX_set1_curves +#endif +#if !defined(HAVE_X509_GET0_PUBKEY )/** * Get the public key from a X509 certificate
src/openvpn/options.c +9 -1
@@ -8040,7 +8040,7 @@ add_option(struct options *options,VERIFY_PERMISSION (OPT_P_GENERAL ); options->show_tls_ciphers = true; } -else if (streq (p[0 ],"show-curves" ) && !p[1 ]) +else if ((streq (p[0 ],"show-curves" ) ||streq (p[0 ],"show-groups" )) && !p[1 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->show_curves = true;
@@ -8048,6 +8048,9 @@ add_option(struct options *options,else if (streq (p[0 ],"ecdh-curve" ) && p[1 ] && !p[2 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); +msg (M_WARN ,"Consider setting groups/curves preference with " +"tls-groups instead of forcing a specific curve with " +"ecdh-curve." ); options->ecdh_curve = p[1 ]; }else if (streq (p[0 ],"tls-server" ) && !p[1 ])
@@ -8218,6 +8221,11 @@ add_option(struct options *options,VERIFY_PERMISSION (OPT_P_GENERAL ); options->cipher_list_tls13 = p[1 ]; } +else if (streq (p[0 ],"tls-groups" ) && p[1 ] && !p[2 ]) + { +VERIFY_PERMISSION (OPT_P_GENERAL ); + options->tls_groups = p[1 ]; + }else if (streq (p[0 ],"crl-verify" ) && p[1 ] && ((p[2 ] &&streq (p[2 ],"dir" )) || !p[2 ])) {
src/openvpn/options.h +1 -0
@@ -542,6 +542,7 @@ struct optionsbool pkcs12_file_inline;const char *cipher_list;const char *cipher_list_tls13; +const char *tls_groups;const char *tls_cert_profile;const char *ecdh_curve;const char *tls_verify;
src/openvpn/ssl.c +6 -0
@@ -630,6 +630,12 @@ init_ssl(const struct options *options, struct tls_root_ctx *new_ctx)tls_ctx_restrict_ciphers (new_ctx, options->cipher_list);tls_ctx_restrict_ciphers_tls13 (new_ctx, options->cipher_list_tls13); +/* Set the allow groups/curves for TLS if we want to override them */ +if (options->tls_groups) + { +tls_ctx_set_tls_groups (new_ctx, options->tls_groups); + } +if (!tls_ctx_set_options (new_ctx, options->ssl_flags)) { goto err;
src/openvpn/ssl_backend.h +10 -0
@@ -198,6 +198,16 @@ void tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *cipher*/ void tls_ctx_set_cert_profile (struct tls_root_ctx *ctx,const char *profile); +/** +* Set the allowed (eliptic curve) group allowed for signatures and +* key exchange. +* +* @param ctx TLS context to restrict, must be valid. +* @param groups List of groups that will be allowed, in priority, +* separated by : +*/ +void tls_ctx_set_tls_groups (struct tls_root_ctx *ctx,const char *groups); +/** * Check our certificate notBefore and notAfter fields, and warn if the cert is * either not yet valid or has expired. Note that this is a non-fatal error,
src/openvpn/ssl_mbedtls.c +46 -0
64 lines not on this page · raw message
src/openvpn/ssl_mbedtls.h +1 -0
@@ -105,6 +105,7 @@ struct tls_root_ctx {#endif struct external_context external_key;/**< External key context */ int *allowed_ciphers;/**< List of allowed ciphers for this connection */ +mbedtls_ecp_group_id *groups;/**< List of allowed groups for this connection */ mbedtls_x509_crt_profile cert_profile;/**< Allowed certificate types */ };
src/openvpn/ssl_openssl.c +54 -1
73 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 3/3 Remove key-method 1
In reply to Arne Schwabe--- doc/doxygen/doc_control_processor.h | 6 +- doc/doxygen/doc_key_generation.h | 6 +- doc/doxygen/doc_protocol_overview.h | 2 +- src/openvpn/forward.c | 2 +- src/openvpn/helper.c | 5 - src/openvpn/init.c | 1 - src/openvpn/options.c | 37 +----- src/openvpn/options.h | 4 - src/openvpn/ssl.c | 180 +++------------------------- src/openvpn/ssl.h | 6 +- src/openvpn/ssl_common.h | 1 - 11 files changed, 23 insertions(+), 227 deletions(-)
doc/doxygen/doc_control_processor.h +1 -5
@@ -175,11 +175,7 @@* appropriate messages to be sent. * * @par Functions which control data channel key generation -* - Key method 1 key exchange functions: -* - \c key_method_1_write(), generates and processes key material to -* be sent to the remote OpenVPN peer. -* - \c key_method_1_read(), processes key material received from the -* remote OpenVPN peer. +* - Key method 1 key exchange functions were removed from OpenVPN 2.5 * - Key method 2 key exchange functions: * - \c key_method_2_write(), generates and processes key material to * be sent to the remote OpenVPN peer.
doc/doxygen/doc_key_generation.h +1 -5
@@ -131,11 +131,7 @@ S_ACTIVE S_ACTIVE* control_processor Control Channel Processor module's\endlink \c * tls_process() function and control the %key generation and exchange * process as follows: -* - %Key method 1: -* - \c key_method_1_write(): generate random material locally, and load -* as "sending" keys. -* - \c key_method_1_read(): read random material received from remote -* peer, and load as "receiving" keys. +* - %Key method 1 has been removed in OpenVPN 2.5 * - %Key method 2: * - \c key_method_2_write(): generate random material locally, and if * in server mode generate %key expansion.
doc/doxygen/doc_protocol_overview.h +1 -1
@@ -150,7 +150,7 @@* * @subsection network_protocol_control_plaintext Structure of plaintext control channel messages * -* - %Key method 1: +* - %Key method 1 (support removed in OpenVPN 2.5): * - Cipher %key length in bytes (1 byte). * - Cipher %key (n bytes). * - HMAC %key length in bytes (1 byte).
src/openvpn/forward.c +1 -1
@@ -1100,7 +1100,7 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boo floated, &ad_start)) {/* Restore pre-NCP frame parameters */ -if (is_hard_reset (opcode, c->options.key_method)) +if (is_hard_reset (opcode,KEY_METHOD_2 )) { c->c2.frame = c->c2.frame_initial;#ifdef ENABLE_FRAGMENT
src/openvpn/helper.c +0 -5
@@ -490,11 +490,6 @@ helper_client_server(struct options *o)*/ if (o->client) { -if (o->key_method !=2 ) - { -msg (M_USAGE ,"--client requires --key-method 2" ); - } - o->pull = true; o->tls_client = true; }
src/openvpn/init.c +0 -1
@@ -2852,7 +2852,6 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.ssl_ctx = c->c1.ks.ssl_ctx; to.key_type = c->c1.ks.key_type; to.server = options->tls_server; - to.key_method = options->key_method; to.replay = options->replay; to.replay_window = options->replay_window; to.replay_time = options->replay_time;
src/openvpn/options.c +3 -34
@@ -886,7 +886,6 @@ init_options(struct options *o, const bool init_gc)#ifdef ENABLE_PREDICTION_RESISTANCE o->use_prediction_resistance = false;#endif - o->key_method =2 ; o->tls_timeout =2 ; o->renegotiate_bytes =-1 ; o->renegotiate_seconds =3600 ;
@@ -1709,7 +1708,6 @@ show_settings(const struct options *o)SHOW_BOOL (tls_server);SHOW_BOOL (tls_client); -SHOW_INT (key_method);SHOW_STR (ca_file);SHOW_STR (ca_path);SHOW_STR (dh_file);
@@ -2370,10 +2368,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec {msg (M_USAGE ,"--ccd-exclusive must be used with --client-config-dir" ); } -if (options->key_method !=2 ) - { -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 "
@@ -2540,13 +2534,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec "may accept clients which do not present a certificate"); } -if (options->key_method ==1 ) - { -msg (M_WARN ,"WARNING: --key-method 1 is deprecated and will be removed " -"in OpenVPN 2.5. By default --key-method 2 will be used if not set " -"in the configuration file, which is the recommended approach." ); - } -const int tls_version_max = (options->ssl_flags >>SSLF_TLS_VERSION_MAX_SHIFT ) &SSLF_TLS_VERSION_MAX_MASK ;
@@ -2788,7 +2775,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connecMUST_BE_UNDEF (push_peer_info);MUST_BE_UNDEF (tls_exit);MUST_BE_UNDEF (crl_file); -MUST_BE_UNDEF (key_method);MUST_BE_UNDEF (ns_cert_type);MUST_BE_UNDEF (remote_cert_ku[0 ]);MUST_BE_UNDEF (remote_cert_eku);
@@ -3817,10 +3803,9 @@ options_string(const struct options *o,* tls-auth/tls-crypt does not match. Removing tls-auth here would * break stuff, so leaving that in place. */ -if (o->key_method >1 ) - { -buf_printf (&out,",key-method %d" , o->key_method); - } + + +buf_printf (&out,",key-method %d" ,2 ); }if (remote)
@@ -8459,22 +8444,6 @@ add_option(struct options *options,VERIFY_PERMISSION (OPT_P_GENERAL ); options->tls_crypt_v2_verify_script = p[1 ]; } -else if (streq (p[0 ],"key-method" ) && p[1 ] && !p[2 ]) - { -int key_method; - -VERIFY_PERMISSION (OPT_P_GENERAL ); - key_method =atoi (p[1 ]); -if (key_method <KEY_METHOD_MIN || key_method >KEY_METHOD_MAX ) - { -msg (msglevel,"key_method parameter (%d) must be >= %d and <= %d" , - key_method, -KEY_METHOD_MIN , -KEY_METHOD_MAX ); - goto err; - } - options->key_method = key_method; - }else if (streq (p[0 ],"x509-track" ) && p[1 ] && !p[2 ]) {VERIFY_PERMISSION (OPT_P_GENERAL );
src/openvpn/options.h +0 -4
@@ -572,10 +572,6 @@ struct options#ifdef ENABLE_CRYPTOAPI const char *cryptoapi_cert;#endif - -/* data channel key exchange method */ -int key_method; -/* Per-packet timeout on control channel */ int tls_timeout;
src/openvpn/ssl.c +15 -165
260 lines not on this page · raw message
src/openvpn/ssl.h +1 -5
@@ -109,11 +109,7 @@/* Default field in X509 to be username */ #define X509_USERNAME_FIELD_DEFAULT "CN" -/* -* Range of key exchange methods -*/ -#define KEY_METHOD_MIN 1 -#define KEY_METHOD_MAX 2 +#define KEY_METHOD_2 2/* key method taken from lower 4 bits */ #define KEY_METHOD_MASK 0x0F
src/openvpn/ssl_common.h +0 -1
@@ -262,7 +262,6 @@ struct tls_options#endif /* from command line */ -int key_method;bool replay;bool single_session;#ifdef ENABLE_OCC
Signature · 1 line
2.26.2
A message that is not in the archive (sent off-list or not yet received): [email protected]...
Re: [Openvpn-devel] [PATCH 3/3] Remove key-method 1
Am 15.07.20 um 16:34 schrieb Steffan Karger:
Quoted 12 lines
Hi
src/openvpn/forward.c process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boo · line 1104
Quoted 7 lines · Arne Schwabe
src/openvpn/forward.c +1
-1@@ -1100,7 +1100,7 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boo floated, &ad_start)) {/* Restore pre-NCP frame parameters */ -if (is_hard_reset (opcode, c->options.key_method)) +if (is_hard_reset (opcode,KEY_METHOD_2 )) {Can't we just remove the
key_methodparameter fromis_hard_reset()?
Some code still checks if it is a general hard reset or if it is a v2 hard reset. I agree that we can do more cleanup in this area but that would make more code changes. Should we pull that into this change?
Quoted 17 lines
src/openvpn/options.c options_string(const struct options *o, · line 3808
Quoted 11 lines
src/openvpn/options.c +3
-4@@ -3817,10 +3803,9 @@ options_string(const struct options *o,* tls-auth/tls-crypt does not match. Removing tls-auth here would * break stuff, so leaving that in place. */ -if (o->key_method >1 ) - { -buf_printf (&out,",key-method %d" , o->key_method); - } + + +buf_printf (&out,",key-method %d" ,2 );This could do with one less newline.
Quoted 3 lines
(quoted diff) +0
-0@@ -2404,7 +2348,7 @@ key_method_2_write(struct buffer *buf, struct tls_session *session) }
Quoted 9 lines
src/openvpn/ssl.c key_method_2_write(struct buffer *buf, struct tls_session *session) · line 2354
Quoted 6 lines
src/openvpn/ssl.c +1
-1/* write key_method + flags */ -if (!buf_write_u8 (buf, (session->opt->key_method &KEY_METHOD_MASK ))) +if (!buf_write_u8 (buf, (KEY_METHOD_2 &KEY_METHOD_MASK ))) { goto error; }The masking looks a bit silly now. Maybe replace with a
static_assert()if you want to be sure that no "wrong" bits are set?
Yeah I think the mask is silly here. I will just remove it.
Quoted 30 lines
Quoted 20 lines
static bool
key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_session *session){ struct key_state *ks = &session->key[KS_PRIMARY]; /* primary key */src/openvpn/ssl.c +0
-3-int key_method_flags;bool username_status, password_status;struct gc_arena gc =gc_new ();@@ -2582,8 +2464,6 @@ key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_sessio/* allocate temporary objects */ ALLOC_ARRAY_CLEAR_GC (options, char,TLS_OPTIONS_LEN , &gc); -ASSERT (session->opt->key_method ==2 ); -/* discard leading uint32 */ if (!buf_advance (buf,4 )) {src/openvpn/ssl.c key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_sessio · line 2476
Quoted 5 lines
src/openvpn/ssl.c +1
-1@@ -2593,7 +2473,7 @@ key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_sessio }/* get key method */ - key_method_flags =buf_read_u8 (buf); +int key_method_flags =buf_read_u8 (buf);This variable declaration is now *after* a "goto error" jump. Currently not harmful, because the variable isn't used after the error label, but static analyzers might complain about "jump past initialization".
Quoted 2 lines
Otherwise this looks good based on stare-at-code. Didn't have time to test yet.
Clang/gcc will already complain/error out if you actually jump past initialisation. So I think we are good here. Static analyzer are hopefully not that broken.
Arne
A message that is not in the archive (sent off-list or not yet received): [email protected]...
Quoted 5 lines
Also, there's some
export_keying_materialand "security level" related #ifdefs that look liek they can go now. Just git grep for "0x10001" and "1\.0\.1" in the code and you'll see.
I missed that, will update the patch accordingly.
Quoted 2 lines
Finally, did you check
openssl_compat.hto see of we can get rid of some of the compat functions now?
Yes. And it is only the one I removed in this patch (EVP_PKEY_id) :(
Arne