Add forgotten "-passin" option to smime.c usage help.

[oweals/openssl.git] / apps / dh.c

diff --git a/apps/dh.c b/apps/dh.c
index 9efdcd78a36ac8a85754e4aba2dbc40df403151f..7465442e49f1c07f8d766029ca8bdfe599c0eb43 100644 (file)
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -1,4 +1,5 @@
 /* apps/dh.c */
+/* obsoleted by dhparam.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -72,7 +73,7 @@
 #undef PROG
 #define PROG   dh_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
@@ -82,6 +83,8 @@
  * -C
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        DH *dh=NULL;
@@ -149,8 +152,8 @@ int MAIN(int argc, 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 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 - one of DER PEM\n");
+               BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
                BIO_printf(bio_err," -in arg       input file\n");
                BIO_printf(bio_err," -out arg      output file\n");
                BIO_printf(bio_err," -check        check the DH parameters\n");
@@ -181,7 +184,15 @@ bad:
                        }
                }
        if (outfile == NULL)
+               {
                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)
@@ -219,7 +230,7 @@ bad:
                BN_print(stdout,dh->g);
                printf("\n");
                if (dh->length != 0)
-                       printf("recomented private length=%ld\n",dh->length);
+                       printf("recommended private length=%ld\n",dh->length);
 #endif
                }
        
@@ -232,8 +243,8 @@ bad:
                        }
                if (i & DH_CHECK_P_NOT_PRIME)
                        printf("p value is not prime\n");
-               if (i & DH_CHECK_P_NOT_STRONG_PRIME)
-                       printf("p value is not a strong prime\n");
+               if (i & DH_CHECK_P_NOT_SAFE_PRIME)
+                       printf("p value is not a safe prime\n");
                if (i & DH_UNABLE_TO_CHECK_GENERATOR)
                        printf("unable to check the generator value\n");
                if (i & DH_NOT_SUITABLE_GENERATOR)
@@ -248,10 +259,10 @@ bad:
 
                len=BN_num_bytes(dh->p);
                bits=BN_num_bits(dh->p);
-               data=(unsigned char *)Malloc(len);
+               data=(unsigned char *)OPENSSL_malloc(len);
                if (data == NULL)
                        {
-                       perror("Malloc");
+                       perror("OPENSSL_malloc");
                        goto end;
                        }
                l=BN_bn2bin(dh->p,data);
@@ -282,6 +293,7 @@ bad:
                printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
                printf("\t\treturn(NULL);\n");
                printf("\treturn(dh);\n\t}\n");
+               OPENSSL_free(data);
                }
 
 
@@ -297,7 +309,7 @@ bad:
                        }
                if (!i)
                        {
-                       BIO_printf(bio_err,"unable to write DH paramaters\n");
+                       BIO_printf(bio_err,"unable to write DH parameters\n");
                        ERR_print_errors(bio_err);
                        goto end;
                        }
@@ -305,7 +317,7 @@ bad:
        ret=0;
 end:
        if (in != NULL) BIO_free(in);
-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);
        if (dh != NULL) DH_free(dh);
        EXIT(ret);
        }