generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make no-engine work again...

Browse Source
This commit is contained in:
Dr. Stephen Henson 2008-12-20 17:04:09 +00:00
parent 2a76c68842
commit 2cad035c01
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dsa.c
View File

@ -96,9 +96,7 @@ int MAIN(int, char **);
int MAIN(int argc, char **argv) int MAIN(int argc, char **argv)
{ {
#ifndef OPENSSL_NO_ENGINE
ENGINE *e = NULL; ENGINE *e = NULL;
#endif
int ret=1; int ret=1;
DSA *dsa=NULL; DSA *dsa=NULL;
int i,badops=0; int i,badops=0;

2
apps/engine.c
View File

@ -56,7 +56,6 @@
* *
*/ */
#ifndef OPENSSL_NO_ENGINE
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -66,6 +65,7 @@
#endif #endif
#include "apps.h" #include "apps.h"
#include <openssl/err.h> #include <openssl/err.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h> #include <openssl/engine.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>

3
apps/s_client.c
View File

@ -321,8 +321,9 @@ int MAIN(int argc, char **argv)
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
char *engine_id=NULL; char *engine_id=NULL;
char *ssl_client_engine_id=NULL; char *ssl_client_engine_id=NULL;
ENGINE *e=NULL, *ssl_client_engine=NULL; ENGINE *ssl_client_engine=NULL;
#endif #endif
ENGINE *e=NULL;
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
struct timeval tv; struct timeval tv;
#endif #endif

2
apps/s_server.c
View File

@ -764,9 +764,7 @@ int MAIN(int argc, char *argv[])
int state=0; int state=0;
SSL_METHOD *meth=NULL; SSL_METHOD *meth=NULL;
int socket_type=SOCK_STREAM; int socket_type=SOCK_STREAM;
#ifndef OPENSSL_NO_ENGINE
ENGINE *e=NULL; ENGINE *e=NULL;
#endif
char *inrand=NULL; char *inrand=NULL;
int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM; int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
char *passarg = NULL, *pass = NULL; char *passarg = NULL, *pass = NULL;

2
crypto/engine/enginetest.c
View File

@ -58,6 +58,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <openssl/e_os2.h>
#ifdef OPENSSL_NO_ENGINE #ifdef OPENSSL_NO_ENGINE
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -66,7 +67,6 @@ int main(int argc, char *argv[])
return(0); return(0);
} }
#else #else
#include <openssl/e_os2.h>
#include <openssl/buffer.h> #include <openssl/buffer.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/engine.h> #include <openssl/engine.h>