[patch] keytype patch for stunnel-4.04 (applies cleanly to 4.05)

bug64185-stunnel-4.04.keytype.patch (text/plain), 1.07 KB, created by Sascha Silbe on 2004-09-15 15:24:29 UTC

diff -ur stunnel-4.04/src/ssl.c stunnel-4.04.keytype/src/ssl.c
--- stunnel-4.04/src/ssl.c	2003-01-01 15:07:08.000000000 +0100
+++ stunnel-4.04.keytype/src/ssl.c	2003-04-07 22:33:12.000000000 +0200
@@ -107,24 +107,15 @@
         SSL_CTX_set_default_passwd_cb(ctx, pem_passwd_cb);
 #endif
         for(i=0; i<3; i++) {
-#ifdef NO_RSA
             if(SSL_CTX_use_PrivateKey_file(ctx, options.key,
                     SSL_FILETYPE_PEM))
-#else /* NO_RSA */
-            if(SSL_CTX_use_RSAPrivateKey_file(ctx, options.key,
-                    SSL_FILETYPE_PEM))
-#endif /* NO_RSA */
                 break;
             if(i<2 && ERR_GET_REASON(ERR_peek_error())==EVP_R_BAD_DECRYPT) {
                 sslerror_stack(); /* dump the error stack */
                 log(LOG_ERR, "Wrong pass phrase: retrying");
                 continue;
             }
-#ifdef NO_RSA
             sslerror("SSL_CTX_use_PrivateKey_file");
-#else /* NO_RSA */
-            sslerror("SSL_CTX_use_RSAPrivateKey_file");
-#endif /* NO_RSA */
             exit(1);
         }
         if(!SSL_CTX_check_private_key(ctx)) {