[BACK]Return to pkeyparam.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/pkeyparam.c between version 1.6 and 1.7

version 1.6, 2015/08/22 16:36:05 version 1.7, 2015/09/11 14:30:23
Line 66 
Line 66 
 #include <openssl/pem.h>  #include <openssl/pem.h>
   
 struct {  struct {
 #ifndef OPENSSL_NO_ENGINE  
         char *engine;  
 #endif  
         char *infile;          char *infile;
         int noout;          int noout;
         char *outfile;          char *outfile;
Line 76 
Line 73 
 } pkeyparam_config;  } pkeyparam_config;
   
 struct option pkeyparam_options[] = {  struct option pkeyparam_options[] = {
 #ifndef OPENSSL_NO_ENGINE  
         {          {
                 .name = "engine",  
                 .argname = "id",  
                 .desc = "Use the engine specified by the given identifier",  
                 .type = OPTION_ARG,  
                 .opt.arg = &pkeyparam_config.engine,  
         },  
 #endif  
         {  
                 .name = "in",                  .name = "in",
                 .argname = "file",                  .argname = "file",
                 .desc = "Input file (default stdin)",                  .desc = "Input file (default stdin)",
Line 118 
Line 106 
 pkeyparam_usage()  pkeyparam_usage()
 {  {
         fprintf(stderr,          fprintf(stderr,
             "usage: pkeyparam [-engine id] [-in file] [-noout] [-out file] "              "usage: pkeyparam [-in file] [-noout] [-out file] "
             "[-text]\n");              "[-text]\n");
         options_usage(pkeyparam_options);          options_usage(pkeyparam_options);
 }  }
Line 136 
Line 124 
                 pkeyparam_usage();                  pkeyparam_usage();
                 return (1);                  return (1);
         }          }
   
 #ifndef OPENSSL_NO_ENGINE  
         setup_engine(bio_err, pkeyparam_config.engine, 0);  
 #endif  
   
         if (pkeyparam_config.infile) {          if (pkeyparam_config.infile) {
                 if (!(in = BIO_new_file(pkeyparam_config.infile, "r"))) {                  if (!(in = BIO_new_file(pkeyparam_config.infile, "r"))) {

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7