projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Honor BUFSIZZ definition in s_server, don't use tiny 32 byte
[openssl.git]
/
apps
/
dsaparam.c
diff --git
a/apps/dsaparam.c
b/apps/dsaparam.c
index e01f93974892fac327779d045850766771977c12..fb8d47110876d17df933b378b6ee6a3c20dd40c3 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;
@@
-226,7
+220,7
@@
bad:
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");
@@
-327,7
+321,7
@@
bad:
if (outformat == FORMAT_ASN1)
i=i2d_DSAPrivateKey_bio(out,dsakey);
else if (outformat == FORMAT_PEM)
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;
else {
BIO_printf(bio_err,"bad output format specified for outfile\n");
goto end;
@@
-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='*';
@@
-354,8
+345,9
@@
char *arg;
if (p == 2) c='*';
if (p == 3) c='\n';
BIO_write((BIO *)arg,&c,1);
if (p == 2) c='*';
if (p == 3) c='\n';
BIO_write((BIO *)arg,&c,1);
- BIO_flush((BIO *)arg);
+
(void)
BIO_flush((BIO *)arg);
#ifdef LINT
p=n;
#endif
}
#ifdef LINT
p=n;
#endif
}
+#endif