New function ASN1_mbstring_copy() to handle ASN1 string copying. Ultimately

[openssl.git] / apps / dsa.c

diff --git a/apps/dsa.c b/apps/dsa.c
index 585116a677ebf5974f7cc12fd810736ee7c6a1a6..229f2ea24664661c4196420fff73ef396743185b 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -1,5 +1,5 @@
 /* apps/dsa.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -56,17 +56,18 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DSA
 #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
@@ -82,16 +83,15 @@
  * -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;
-       EVP_CIPHER *enc=NULL;
+       const EVP_CIPHER *enc=NULL;
        BIO *in=NULL,*out=NULL;
        int informat,outformat,text=0,noout=0;
+       int pubin = 0, pubout = 0;
        char *infile,*outfile,*prog;
        int modulus=0;
 
@@ -99,7 +99,7 @@ char **argv;
 
        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;
@@ -137,6 +137,10 @@ char **argv;
                        text=1;
                else if (strcmp(*argv,"-modulus") == 0)
                        modulus=1;
+               else if (strcmp(*argv,"-pubin") == 0)
+                       pubin=1;
+               else if (strcmp(*argv,"-pubout") == 0)
+                       pubout=1;
                else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
                        {
                        BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -152,9 +156,9 @@ char **argv;
 bad:
                BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
                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       inout file\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," -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");
@@ -188,19 +192,21 @@ bad:
                        }
                }
 
-       BIO_printf(bio_err,"read DSA private key\n");
-       if      (informat == FORMAT_ASN1)
-               dsa=d2i_DSAPrivateKey_bio(in,NULL);
-       else if (informat == FORMAT_PEM)
-               dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL);
-       else
+       BIO_printf(bio_err,"read DSA key\n");
+       if      (informat == FORMAT_ASN1) {
+               if(pubin) dsa=d2i_DSAPublicKey_bio(in,NULL);
+               else dsa=d2i_DSAPrivateKey_bio(in,NULL);
+       } else if (informat == FORMAT_PEM) {
+               if(pubin) dsa=PEM_read_bio_DSAPublicKey(in,NULL, NULL, NULL);
+               else dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL,NULL);
+       } else
                {
                BIO_printf(bio_err,"bad input format specified for key\n");
                goto end;
                }
        if (dsa == NULL)
                {
-               BIO_printf(bio_err,"unable to load Private Key\n");
+               BIO_printf(bio_err,"unable to load Key\n");
                ERR_print_errors(bio_err);
                goto end;
                }
@@ -232,12 +238,15 @@ bad:
                }
 
        if (noout) goto end;
-       BIO_printf(bio_err,"writing DSA private key\n");
-       if      (outformat == FORMAT_ASN1)
-               i=i2d_DSAPrivateKey_bio(out,dsa);
-       else if (outformat == FORMAT_PEM)
-               i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL);
-       else    {
+       BIO_printf(bio_err,"writing DSA key\n");
+       if      (outformat == FORMAT_ASN1) {
+               if(pubin || pubout) i=i2d_DSAPublicKey_bio(out,dsa);
+               else i=i2d_DSAPrivateKey_bio(out,dsa);
+       } else if (outformat == FORMAT_PEM) {
+               if(pubin || pubout)
+                       i=PEM_write_bio_DSAPublicKey(out,dsa);
+               else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL,NULL);
+       } else  {
                BIO_printf(bio_err,"bad output format specified for outfile\n");
                goto end;
                }
@@ -254,4 +263,4 @@ end:
        if (dsa != NULL) DSA_free(dsa);
        EXIT(ret);
        }
-
+#endif