From: David Sommerseth Date: Wed, 22 Nov 2023 19:00:57 +0000 (+0100) Subject: Remove superfluous x509_write_pem() X-Git-Tag: v2.6.9~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5552391a362e16f02e41b056ea18b89b2e49a757;p=thirdparty%2Fopenvpn.git Remove superfluous x509_write_pem() After removing --tls-export-cert, this function was left in the code base with no other users. This was an oversight in the previous change. Removing it to avoid leaving dead code behind. Signed-off-by: David Sommerseth Acked-by: Gert Doering Message-Id: <20231122190057.120384-1-dazo+openvpn@eurephia.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg27561.html Signed-off-by: Gert Doering (cherry picked from commit f015643fe23d7847ad45b7763f31bfc6baed2159) --- diff --git a/src/openvpn/ssl_verify_backend.h b/src/openvpn/ssl_verify_backend.h index 3b7988112..d402b1f24 100644 --- a/src/openvpn/ssl_verify_backend.h +++ b/src/openvpn/ssl_verify_backend.h @@ -249,17 +249,6 @@ result_t x509_verify_cert_ku(openvpn_x509_cert_t *x509, const unsigned *const ex */ result_t x509_verify_cert_eku(openvpn_x509_cert_t *x509, const char *const expected_oid); -/* - * Store the given certificate in pem format in a temporary file in tmp_dir - * - * @param cert Certificate to store - * @param tmp_dir Temporary directory to store the directory - * @param gc gc_arena to store temporary objects in - * - * - */ -result_t x509_write_pem(FILE *peercert_file, openvpn_x509_cert_t *peercert); - /** * Return true iff a CRL is configured, but is not loaded. This can be caused * by e.g. a CRL parsing error, a missing CRL file or CRL file permission diff --git a/src/openvpn/ssl_verify_mbedtls.c b/src/openvpn/ssl_verify_mbedtls.c index a1ddf8d0b..4596843c0 100644 --- a/src/openvpn/ssl_verify_mbedtls.c +++ b/src/openvpn/ssl_verify_mbedtls.c @@ -547,13 +547,6 @@ x509_verify_cert_eku(mbedtls_x509_crt *cert, const char *const expected_oid) return fFound; } -result_t -x509_write_pem(FILE *peercert_file, mbedtls_x509_crt *peercert) -{ - msg(M_WARN, "mbed TLS does not support writing peer certificate in PEM format"); - return FAILURE; -} - bool tls_verify_crl_missing(const struct tls_options *opt) { diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c index 3194c232a..5afffc1fd 100644 --- a/src/openvpn/ssl_verify_openssl.c +++ b/src/openvpn/ssl_verify_openssl.c @@ -762,17 +762,6 @@ x509_verify_cert_eku(X509 *x509, const char *const expected_oid) return fFound; } -result_t -x509_write_pem(FILE *peercert_file, X509 *peercert) -{ - if (PEM_write_X509(peercert_file, peercert) < 0) - { - msg(M_NONFATAL, "Failed to write peer certificate in PEM format"); - return FAILURE; - } - return SUCCESS; -} - bool tls_verify_crl_missing(const struct tls_options *opt) {