]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
pkcs11_openssl: Disable unused code
authorFrank Lichtenheld <frank@lichtenheld.com>
Fri, 28 Jul 2023 12:42:01 +0000 (14:42 +0200)
committerGert Doering <gert@greenie.muc.de>
Fri, 11 Aug 2023 15:05:50 +0000 (17:05 +0200)
Coverity: CID 1539183 (#1 of 1): Structurally dead code (UNREACHABLE)

Change-Id: I889de8bafb581b810a026c7359fbfee94f1b5a4e
Gerrit: http://gerrit.openvpn.net/c/openvpn/+/317
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Selva Nair <selva.nair@gmail.com>
Message-Id: <6b941ce86c4031a5535d6c1997e6ae06c9aec7b3-HTML@gerrit.openvpn.net>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26901.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 38fbddc94596b6b2d8fa93a8bd0aca7dbb220def)

src/openvpn/pkcs11_openssl.c

index 9b0ab39f9cf814f3d19f5dfe25f795cd616fed8c..57fa1371a532ff49f721aedd22c4b9fa4b6abe9c 100644 (file)
@@ -333,8 +333,7 @@ pkcs11_init_tls_session(pkcs11h_certificate_t certificate,
 
 #ifdef HAVE_XKEY_PROVIDER
     return (xkey_load_from_pkcs11h(certificate, ssl_ctx) == 0); /* inverts the return value */
-#endif
-
+#else
     int ret = 1;
 
     X509 *x509 = NULL;
@@ -404,6 +403,7 @@ cleanup:
         openssl_session = NULL;
     }
     return ret;
+#endif /* ifdef HAVE_XKEY_PROVIDER */
 }
 
 char *