projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to new version numbering scheme.
[openssl.git]
/
apps
/
dsa.c
diff --git
a/apps/dsa.c
b/apps/dsa.c
index 585116a677ebf5974f7cc12fd810736ee7c6a1a6..977955ae59dcd4b184c7b0626830fb3335114e40 100644
(file)
--- a/
apps/dsa.c
+++ b/
apps/dsa.c
@@
-1,5
+1,5
@@
/* apps/dsa.c */
/* apps/dsa.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-56,17
+56,18
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#ifndef NO_DSA
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "apps.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "apps.h"
-#include
"bio.h"
-#include
"err.h"
-#include
"dsa.h"
-#include
"evp.h"
-#include
"x509.h"
-#include
"pem.h"
+#include
<openssl/bio.h>
+#include
<openssl/err.h>
+#include
<openssl/dsa.h>
+#include
<openssl/evp.h>
+#include
<openssl/x509.h>
+#include
<openssl/pem.h>
#undef PROG
#define PROG dsa_main
#undef PROG
#define PROG dsa_main
@@
-82,14
+83,12
@@
* -modulus - print the DSA public key
*/
* -modulus - print the DSA public key
*/
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
{
int ret=1;
DSA *dsa=NULL;
int i,badops=0;
{
int ret=1;
DSA *dsa=NULL;
int i,badops=0;
- EVP_CIPHER *enc=NULL;
+
const
EVP_CIPHER *enc=NULL;
BIO *in=NULL,*out=NULL;
int informat,outformat,text=0,noout=0;
char *infile,*outfile,*prog;
BIO *in=NULL,*out=NULL;
int informat,outformat,text=0,noout=0;
char *infile,*outfile,*prog;
@@
-99,7
+98,7
@@
char **argv;
if (bio_err == NULL)
if ((bio_err=BIO_new(BIO_s_file())) != NULL)
if (bio_err == NULL)
if ((bio_err=BIO_new(BIO_s_file())) != NULL)
- BIO_set_fp(bio_err,stderr,BIO_NOCLOSE);
+ BIO_set_fp(bio_err,stderr,BIO_NOCLOSE
|BIO_FP_TEXT
);
infile=NULL;
outfile=NULL;
infile=NULL;
outfile=NULL;
@@
-154,7
+153,7
@@
bad:
BIO_printf(bio_err,"where options are\n");
BIO_printf(bio_err," -inform arg input format - one of DER NET PEM\n");
BIO_printf(bio_err," -outform arg output format - one of DER NET PEM\n");
BIO_printf(bio_err,"where options are\n");
BIO_printf(bio_err," -inform arg input format - one of DER NET PEM\n");
BIO_printf(bio_err," -outform arg output format - one of DER NET 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," -des encrypt PEM output with cbc des\n");
BIO_printf(bio_err," -des3 encrypt PEM output with ede cbc des using 168 bit key\n");
BIO_printf(bio_err," -out arg output file\n");
BIO_printf(bio_err," -des encrypt PEM output with cbc des\n");
BIO_printf(bio_err," -des3 encrypt PEM output with ede cbc des using 168 bit key\n");
@@
-254,4
+253,4
@@
end:
if (dsa != NULL) DSA_free(dsa);
EXIT(ret);
}
if (dsa != NULL) DSA_free(dsa);
EXIT(ret);
}
-
+#endif