*
*/
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <openssl/dh.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
-#include <openssl/engine.h>
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
#include <openssl/dsa.h>
#endif
int MAIN(int argc, char **argv)
{
- ENGINE *e = NULL;
DH *dh=NULL;
int i,badops=0,text=0;
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
int dsaparam=0;
#endif
BIO *in=NULL,*out=NULL;
int informat,outformat,check=0,noout=0,C=0,ret=1;
char *infile,*outfile,*prog;
- char *inrand=NULL,*engine=NULL;
+ char *inrand=NULL;
int num = 0, g = 0;
apps_startup();
if (--argc < 1) goto bad;
outfile= *(++argv);
}
- else if (strcmp(*argv,"-engine") == 0)
- {
- if (--argc < 1) goto bad;
- engine= *(++argv);
- }
else if (strcmp(*argv,"-check") == 0)
check=1;
else if (strcmp(*argv,"-text") == 0)
text=1;
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
else if (strcmp(*argv,"-dsaparam") == 0)
dsaparam=1;
#endif
BIO_printf(bio_err," -outform arg output format - one of DER PEM\n");
BIO_printf(bio_err," -in arg input file\n");
BIO_printf(bio_err," -out arg output file\n");
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
BIO_printf(bio_err," -dsaparam read or generate DSA parameters, convert to DH\n");
#endif
BIO_printf(bio_err," -check check the DH parameters\n");
BIO_printf(bio_err," -2 generate parameters using 2 as the generator value\n");
BIO_printf(bio_err," -5 generate parameters using 5 as the generator value\n");
BIO_printf(bio_err," numbits number of bits in to generate (default 512)\n");
- BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n");
BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
BIO_printf(bio_err," - load the file (or the files in the directory) into\n");
BIO_printf(bio_err," the random number generator\n");
ERR_load_crypto_strings();
- if (engine != NULL)
- {
- if((e = ENGINE_by_id(engine)) == NULL)
- {
- BIO_printf(bio_err,"invalid engine \"%s\"\n",
- engine);
- goto end;
- }
- if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
- {
- BIO_printf(bio_err,"can't use that engine\n");
- goto end;
- }
- BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
- /* Free our "structural" reference. */
- ENGINE_free(e);
- }
-
if (g && !num)
num = DEFBITS;
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
if (dsaparam)
{
if (g)
BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
app_RAND_load_files(inrand));
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
if (dsaparam)
{
DSA *dsa;
goto end;
}
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
if (dsaparam)
{
DSA *dsa;