Merge the engine branch into the main trunk. All conflicts resolved.
At the same time, add VMS support for Rijndael.
diff --git a/apps/s_client.c b/apps/s_client.c
index c935317..45d627a 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -79,6 +79,7 @@
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/pem.h>
+#include <openssl/engine.h>
#include "s_apps.h"
#ifdef WINDOWS
@@ -152,6 +153,7 @@
BIO_printf(bio_err," -bugs - Switch on all SSL implementation bug workarounds\n");
BIO_printf(bio_err," -cipher - preferred cipher to use, use the 'openssl ciphers'\n");
BIO_printf(bio_err," command to see what is available\n");
+ BIO_printf(bio_err," -engine id - Initialise and use the specified engine\n");
}
@@ -179,6 +181,8 @@
int prexit = 0;
SSL_METHOD *meth=NULL;
BIO *sbio;
+ char *engine_id=NULL;
+ ENGINE *e=NULL;
#ifdef WINDOWS
struct timeval tv;
#endif
@@ -316,6 +320,11 @@
else if (strcmp(*argv,"-nbio") == 0)
{ c_nbio=1; }
#endif
+ else if (strcmp(*argv,"-engine") == 0)
+ {
+ if (--argc < 1) goto bad;
+ engine_id = *(++argv);
+ }
else
{
BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -349,6 +358,30 @@
OpenSSL_add_ssl_algorithms();
SSL_load_error_strings();
+
+ if (engine_id != NULL)
+ {
+ if((e = ENGINE_by_id(engine_id)) == NULL)
+ {
+ BIO_printf(bio_err,"invalid engine\n");
+ ERR_print_errors(bio_err);
+ goto end;
+ }
+ if (c_debug)
+ {
+ ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM,
+ 0, bio_err, 0);
+ }
+ if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
+ {
+ BIO_printf(bio_err,"can't use that engine\n");
+ ERR_print_errors(bio_err);
+ goto end;
+ }
+ BIO_printf(bio_err,"engine \"%s\" set.\n", engine_id);
+ ENGINE_free(e);
+ }
+
ctx=SSL_CTX_new(meth);
if (ctx == NULL)
{
