projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
argc counting bug fixed.
[oweals/openssl.git]
/
apps
/
dsaparam.c
diff --git
a/apps/dsaparam.c
b/apps/dsaparam.c
index de1d0cc953ad6490b1ecbcbf114736c94e6c6caa..118d974bb03e1e61b7c340d55ad5595824b59ea5 100644
(file)
--- a/
apps/dsaparam.c
+++ b/
apps/dsaparam.c
@@
-56,18
+56,19
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#ifndef NO_DSA
#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/rand.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
@@
-83,15
+84,8
@@
* -genkey
*/
* -genkey
*/
-#ifndef NOPROTO
static void MS_CALLBACK dsa_cb(int p, int n, char *arg);
static void MS_CALLBACK dsa_cb(int p, int n, char *arg);
-#else
-static void MS_CALLBACK dsa_cb();
-#endif
-
-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;
@@
-172,7
+166,7
@@
bad:
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,"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," -in arg in
o
ut file\n");
+ BIO_printf(bio_err," -in arg in
p
ut 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," -C Output C code\n");
BIO_printf(bio_err," -out arg output file\n");
BIO_printf(bio_err," -text check the DSA parameters\n");
BIO_printf(bio_err," -C Output C code\n");
@@
-342,10
+336,7
@@
end:
EXIT(ret);
}
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, char *arg)
{
char c='*';
{
char c='*';
@@
-359,3
+350,4
@@
char *arg;
p=n;
#endif
}
p=n;
#endif
}
+#endif