Commit 690ecff7 authored by Bodo Möller's avatar Bodo Möller
Browse files

Fixes for 'no-hw' combined with 'no-SOME_CIPHER'. 

Fix dsaparam usage output.

Submitted by: Nils Larsch
parent 234c7376

apps/apps.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ static UI_METHOD *ui_method = NULL; 
static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);

static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);

static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);

static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);





#ifndef OPENSSL_NO_RC4

#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)

/* Looks like this stuff is worth moving into separate function */

/* Looks like this stuff is worth moving into separate function */

static EVP_PKEY *

static EVP_PKEY *

load_netscape_key(BIO *err, BIO *key, const char *file,

load_netscape_key(BIO *err, BIO *key, const char *file,
@@ -832,7 +832,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, 
		pkey=PEM_read_bio_PrivateKey(key,NULL,

		pkey=PEM_read_bio_PrivateKey(key,NULL,

			(pem_password_cb *)password_callback, &cb_data);

			(pem_password_cb *)password_callback, &cb_data);

		}

		}

#ifndef OPENSSL_NO_RC4

#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)

	else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)

	else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)

		pkey = load_netscape_key(err, key, file, key_descrip, format);

		pkey = load_netscape_key(err, key, file, key_descrip, format);

#endif

#endif
@@ -901,7 +901,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, 
		pkey=PEM_read_bio_PUBKEY(key,NULL,

		pkey=PEM_read_bio_PUBKEY(key,NULL,

			(pem_password_cb *)password_callback, &cb_data);

			(pem_password_cb *)password_callback, &cb_data);

		}

		}

#ifndef OPENSSL_NO_RC4

#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)

	else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)

	else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)

		pkey = load_netscape_key(err, key, file, key_descrip, format);

		pkey = load_netscape_key(err, key, file, key_descrip, format);

#endif

#endif
@@ -917,7 +917,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, 
	return(pkey);

	return(pkey);

	}

	}





#ifndef OPENSSL_NO_RC4

#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)

EVP_PKEY *

EVP_PKEY *

load_netscape_key(BIO *err, BIO *key, const char *file,

load_netscape_key(BIO *err, BIO *key, const char *file,

		const char *key_descrip, int format)

		const char *key_descrip, int format)

apps/dsaparam.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ bad: 
		BIO_printf(bio_err," -text         print the key in text\n");

		BIO_printf(bio_err," -text         print the key in text\n");

		BIO_printf(bio_err," -C            Output C code\n");

		BIO_printf(bio_err," -C            Output C code\n");

		BIO_printf(bio_err," -noout        no output\n");

		BIO_printf(bio_err," -noout        no output\n");

		BIO_printf(bio_err," -genkey       generate a DSA key\n");

		BIO_printf(bio_err," -rand         files to use for random number input\n");

		BIO_printf(bio_err," -rand         files to use for random number input\n");

		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");

		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");

		BIO_printf(bio_err," number        number of bits to use for generating private key\n");

		BIO_printf(bio_err," number        number of bits to use for generating private key\n");

apps/pkcs8.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ int MAIN(int argc, char **argv) 
	int nocrypt = 0;

	int nocrypt = 0;

	X509_SIG *p8;

	X509_SIG *p8;

	PKCS8_PRIV_KEY_INFO *p8inf;

	PKCS8_PRIV_KEY_INFO *p8inf;

	EVP_PKEY *pkey;

	EVP_PKEY *pkey=NULL;

	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;

	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;

	int badarg = 0;

	int badarg = 0;

	char *engine=NULL;

	char *engine=NULL;

apps/speed.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -372,11 +372,10 @@ int MAIN(int argc, char **argv) 
	ENGINE *e = NULL;

	ENGINE *e = NULL;

	unsigned char *buf=NULL,*buf2=NULL;

	unsigned char *buf=NULL,*buf2=NULL;

	int mret=1;

	int mret=1;

	long count=0,save_count=0;

	long count=0,save_count=0, rsa_count;

	int i,j,k;

	int i,j,k;

#ifndef OPENSSL_NO_RSA

#ifndef OPENSSL_NO_RSA

	unsigned rsa_num;

	unsigned rsa_num;

	long rsa_count;

#endif

#endif

	unsigned char md[EVP_MAX_MD_SIZE];

	unsigned char md[EVP_MAX_MD_SIZE];

#ifndef OPENSSL_NO_MD2

#ifndef OPENSSL_NO_MD2

crypto/asn1/x_pubkey.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) 
	long j;

	long j;

	int type;

	int type;

	unsigned char *p;

	unsigned char *p;

#ifndef OPENSSL_NO_DSA

#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)

	const unsigned char *cp;

	const unsigned char *cp;

	X509_ALGOR *a;

	X509_ALGOR *a;

#endif

#endif
@@ -237,7 +237,9 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) 




	/* the parameters must be extracted before the public key (ECDSA!) */

	/* the parameters must be extracted before the public key (ECDSA!) */

	

	

#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)

	a=key->algor;

	a=key->algor;

#endif





	if (0)

	if (0)

		;

		;