projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always return a value.
[oweals/openssl.git]
/
apps
/
dsaparam.c
diff --git
a/apps/dsaparam.c
b/apps/dsaparam.c
index e01f93974892fac327779d045850766771977c12..f861ec7b1ad8cf2d1c6e31b70b5c85d30f2974a2 100644
(file)
--- a/
apps/dsaparam.c
+++ b/
apps/dsaparam.c
@@
-56,23
+56,24
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#ifndef NO_DSA
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <string.h>
#include "apps.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <string.h>
#include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "rand.h"
-#include "dsa.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
#undef PROG
#define PROG dsaparam_main
#undef PROG
#define PROG dsaparam_main
-/* -inform arg - input format - default PEM (
one of DER, TXT
or PEM)
+/* -inform arg - input format - default PEM (
DER
or PEM)
* -outform arg - output format - default PEM
* -in arg - input file - default stdin
* -out arg - output file - default stdout
* -outform arg - output format - default PEM
* -in arg - input file - default stdin
* -out arg - output file - default stdout
@@
-83,15
+84,11
@@
* -genkey
*/
* -genkey
*/
-#ifndef NOPROTO
-static void MS_CALLBACK dsa_cb(int p, int n, char *arg);
-#else
-static void MS_CALLBACK dsa_cb();
-#endif
+static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
+
+int MAIN(int, char **);
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
{
DSA *dsa=NULL;
int i,badops=0,text=0;
{
DSA *dsa=NULL;
int i,badops=0,text=0;
@@
-99,7
+96,7
@@
char **argv;
int informat,outformat,noout=0,C=0,ret=1;
char *infile,*outfile,*prog,*inrand=NULL;
int numbits= -1,num,genkey=0;
int informat,outformat,noout=0,C=0,ret=1;
char *infile,*outfile,*prog,*inrand=NULL;
int numbits= -1,num,genkey=0;
-
char buffer[200],*randfile=NULL
;
+
int need_rand=0
;
apps_startup();
apps_startup();
@@
-142,11
+139,15
@@
char **argv;
else if (strcmp(*argv,"-C") == 0)
C=1;
else if (strcmp(*argv,"-genkey") == 0)
else if (strcmp(*argv,"-C") == 0)
C=1;
else if (strcmp(*argv,"-genkey") == 0)
+ {
genkey=1;
genkey=1;
+ need_rand=1;
+ }
else if (strcmp(*argv,"-rand") == 0)
{
if (--argc < 1) goto bad;
inrand= *(++argv);
else if (strcmp(*argv,"-rand") == 0)
{
if (--argc < 1) goto bad;
inrand= *(++argv);
+ need_rand=1;
}
else if (strcmp(*argv,"-noout") == 0)
noout=1;
}
else if (strcmp(*argv,"-noout") == 0)
noout=1;
@@
-154,6
+155,7
@@
char **argv;
{
/* generate a key */
numbits=num;
{
/* generate a key */
numbits=num;
+ need_rand=1;
}
else
{
}
else
{
@@
-170,11
+172,11
@@
char **argv;
bad:
BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
BIO_printf(bio_err,"where options are\n");
bad:
BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
BIO_printf(bio_err,"where options are\n");
- BIO_printf(bio_err," -inform arg input format -
one of DER TXT
PEM\n");
- BIO_printf(bio_err," -outform arg output format -
one of DER TXT
PEM\n");
+ BIO_printf(bio_err," -inform arg input format -
DER or
PEM\n");
+ BIO_printf(bio_err," -outform arg output format -
DER or
PEM\n");
BIO_printf(bio_err," -in arg input file\n");
BIO_printf(bio_err," -out arg output file\n");
BIO_printf(bio_err," -in arg input file\n");
BIO_printf(bio_err," -out arg output file\n");
- BIO_printf(bio_err," -text
check the DSA parameters
\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," -noout no output\n");
BIO_printf(bio_err," -rand files to use for random number input\n");
BIO_printf(bio_err," -C Output C code\n");
BIO_printf(bio_err," -noout no output\n");
BIO_printf(bio_err," -rand files to use for random number input\n");
@@
-203,7
+205,15
@@
bad:
}
}
if (outfile == NULL)
}
}
if (outfile == NULL)
+ {
BIO_set_fp(out,stdout,BIO_NOCLOSE);
BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef VMS
+ {
+ BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+ out = BIO_push(tmpbio, out);
+ }
+#endif
+ }
else
{
if (BIO_write_filename(out,outfile) <= 0)
else
{
if (BIO_write_filename(out,outfile) <= 0)
@@
-213,20
+223,25
@@
bad:
}
}
}
}
- if (n
umbits > 0
)
+ if (n
eed_rand
)
{
{
- randfile=RAND_file_name(buffer,200);
- RAND_load_file(randfile,1024L*1024L);
+ app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+ if (inrand != NULL)
+ BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+ app_RAND_load_files(inrand));
+ }
+ if (numbits > 0)
+ {
+ assert(need_rand);
BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
BIO_printf(bio_err,"This could take some time\n");
BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
BIO_printf(bio_err,"This could take some time\n");
- dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL,
- dsa_cb,(char *)bio_err);
+ dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL, dsa_cb,bio_err);
}
else if (informat == FORMAT_ASN1)
dsa=d2i_DSAparams_bio(in,NULL);
else if (informat == FORMAT_PEM)
}
else if (informat == FORMAT_ASN1)
dsa=d2i_DSAparams_bio(in,NULL);
else if (informat == FORMAT_PEM)
- dsa=PEM_read_bio_DSAparams(in,NULL,NULL);
+ dsa=PEM_read_bio_DSAparams(in,NULL,NULL
,NULL
);
else
{
BIO_printf(bio_err,"bad input format specified\n");
else
{
BIO_printf(bio_err,"bad input format specified\n");
@@
-253,10
+268,10
@@
bad:
bits_p=BN_num_bits(dsa->p);
bits_q=BN_num_bits(dsa->q);
bits_g=BN_num_bits(dsa->g);
bits_p=BN_num_bits(dsa->p);
bits_q=BN_num_bits(dsa->q);
bits_g=BN_num_bits(dsa->g);
- data=(unsigned char *)
M
alloc(len+20);
+ data=(unsigned char *)
OPENSSL_m
alloc(len+20);
if (data == NULL)
{
if (data == NULL)
{
- perror("
M
alloc");
+ perror("
OPENSSL_m
alloc");
goto end;
}
l=BN_bn2bin(dsa->p,data);
goto end;
}
l=BN_bn2bin(dsa->p,data);
@@
-313,7
+328,7
@@
bad:
}
if (!i)
{
}
if (!i)
{
- BIO_printf(bio_err,"unable to write DSA param
a
ters\n");
+ BIO_printf(bio_err,"unable to write DSA param
e
ters\n");
ERR_print_errors(bio_err);
goto end;
}
ERR_print_errors(bio_err);
goto end;
}
@@
-322,30
+337,30
@@
bad:
{
DSA *dsakey;
{
DSA *dsakey;
+ assert(need_rand);
if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
if (!DSA_generate_key(dsakey)) goto end;
if (outformat == FORMAT_ASN1)
i=i2d_DSAPrivateKey_bio(out,dsakey);
else if (outformat == FORMAT_PEM)
if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
if (!DSA_generate_key(dsakey)) goto end;
if (outformat == FORMAT_ASN1)
i=i2d_DSAPrivateKey_bio(out,dsakey);
else if (outformat == FORMAT_PEM)
- i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL);
+ i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL
,NULL
);
else {
BIO_printf(bio_err,"bad output format specified for outfile\n");
goto end;
}
DSA_free(dsakey);
}
else {
BIO_printf(bio_err,"bad output format specified for outfile\n");
goto end;
}
DSA_free(dsakey);
}
+ if (need_rand)
+ app_RAND_write_file(NULL, bio_err);
ret=0;
end:
if (in != NULL) BIO_free(in);
ret=0;
end:
if (in != NULL) BIO_free(in);
- if (out != NULL) BIO_free(out);
+ if (out != NULL) BIO_free
_all
(out);
if (dsa != NULL) DSA_free(dsa);
EXIT(ret);
}
if (dsa != NULL) DSA_free(dsa);
EXIT(ret);
}
-static void MS_CALLBACK dsa_cb(p, n, arg)
-int p;
-int n;
-char *arg;
+static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
{
char c='*';
{
char c='*';
@@
-353,9
+368,10
@@
char *arg;
if (p == 1) c='+';
if (p == 2) c='*';
if (p == 3) c='\n';
if (p == 1) c='+';
if (p == 2) c='*';
if (p == 3) c='\n';
- BIO_write(
(BIO *)
arg,&c,1);
-
BIO_flush((BIO *)
arg);
+ BIO_write(arg,&c,1);
+
(void)BIO_flush(
arg);
#ifdef LINT
p=n;
#endif
}
#ifdef LINT
p=n;
#endif
}
+#endif