GH408 follow-on: update buflen
[openssl.git] / apps / nseq.c
index cc88d50ceba50ef82b1a0beb0f1c1cea23d855cc..06893c82ce6647a41e9c220593d9954cdbbe8f3e 100644 (file)
@@ -1,6 +1,6 @@
-/* nseq.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
 
 #include <stdio.h>
 #include <string.h>
+#include "apps.h"
 #include <openssl/pem.h>
 #include <openssl/err.h>
-#include "apps.h"
 
-#undef PROG
-#define PROG nseq_main
+typedef enum OPTION_choice {
+    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+    OPT_TOSEQ, OPT_IN, OPT_OUT
+} OPTION_CHOICE;
 
-int MAIN(int, char **);
+OPTIONS nseq_options[] = {
+    {"help", OPT_HELP, '-', "Display this summary"},
+    {"toseq", OPT_TOSEQ, '-', "Output NS Sequence file"},
+    {"in", OPT_IN, '<', "Input file"},
+    {"out", OPT_OUT, '>', "Output file"},
+    {NULL}
+};
 
-int MAIN(int argc, char **argv)
+int nseq_main(int argc, char **argv)
 {
-       char **args, *infile = NULL, *outfile = NULL;
-       BIO *in = NULL, *out = NULL;
-       int toseq = 0;
-       X509 *x509 = NULL;
-       NETSCAPE_CERT_SEQUENCE *seq = NULL;
-       int i, ret = 1;
-       int badarg = 0;
-       if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
-       ERR_load_crypto_strings();
-       args = argv + 1;
-       while (!badarg && *args && *args[0] == '-') {
-               if (!strcmp (*args, "-toseq")) toseq = 1;
-               else if (!strcmp (*args, "-in")) {
-                       if (args[1]) {
-                               args++;
-                               infile = *args;
-                       } else badarg = 1;
-               } else if (!strcmp (*args, "-out")) {
-                       if (args[1]) {
-                               args++;
-                               outfile = *args;
-                       } else badarg = 1;
-               } else badarg = 1;
-               args++;
-       }
+    BIO *in = NULL, *out = NULL;
+    X509 *x509 = NULL;
+    NETSCAPE_CERT_SEQUENCE *seq = NULL;
+    OPTION_CHOICE o;
+    int toseq = 0, ret = 1, i;
+    char *infile = NULL, *outfile = NULL, *prog;
 
-       if (badarg) {
-               BIO_printf (bio_err, "Netscape certificate sequence utility\n");
-               BIO_printf (bio_err, "Usage nseq [options]\n");
-               BIO_printf (bio_err, "where options are\n");
-               BIO_printf (bio_err, "-in file  input file\n");
-               BIO_printf (bio_err, "-out file output file\n");
-               BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
-               EXIT(1);
-       }
+    prog = opt_init(argc, argv, nseq_options);
+    while ((o = opt_next()) != OPT_EOF) {
+        switch (o) {
+        case OPT_EOF:
+        case OPT_ERR:
+            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+            goto end;
+        case OPT_HELP:
+            ret = 0;
+            opt_help(nseq_options);
+            goto end;
+        case OPT_TOSEQ:
+            toseq = 1;
+            break;
+        case OPT_IN:
+            infile = opt_arg();
+            break;
+        case OPT_OUT:
+            outfile = opt_arg();
+            break;
+        }
+    }
+    argc = opt_num_rest();
+    argv = opt_rest();
 
-       if (infile) {
-               if (!(in = BIO_new_file (infile, "r"))) {
-                       BIO_printf (bio_err,
-                                "Can't open input file %s\n", infile);
-                       goto end;
-               }
-       } else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    if (!app_load_modules(NULL))
+        goto end;
 
-       if (outfile) {
-               if (!(out = BIO_new_file (outfile, "w"))) {
-                       BIO_printf (bio_err,
-                                "Can't open output file %s\n", outfile);
-                       goto end;
-               }
-       } else out = BIO_new_fp(stdout, BIO_NOCLOSE);
+    in = bio_open_default(infile, 'r', FORMAT_PEM);
+    if (in == NULL)
+        goto end;
+    out = bio_open_default(outfile, 'w', FORMAT_PEM);
+    if (out == NULL)
+        goto end;
 
-       if (toseq) {
-               seq = NETSCAPE_CERT_SEQUENCE_new();
-               seq->certs = sk_X509_new(NULL);
-               while((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL))) 
-                   sk_X509_push(seq->certs,x509);
+    if (toseq) {
+        seq = NETSCAPE_CERT_SEQUENCE_new();
+        seq->certs = sk_X509_new_null();
+        if (!seq->certs)
+            goto end;
+        while ((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL)))
+            sk_X509_push(seq->certs, x509);
 
-               if(!sk_X509_num(seq->certs))
-               {
-                       BIO_printf (bio_err, "Error reading certs file %s\n", infile);
-                       ERR_print_errors(bio_err);
-                       goto end;
-               }
-               PEM_write_bio_NETSCAPE_CERT_SEQUENCE(out, seq);
-               ret = 0;
-               goto end;
-       }
+        if (!sk_X509_num(seq->certs)) {
+            BIO_printf(bio_err, "%s: Error reading certs file %s\n",
+                       prog, infile);
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+        PEM_write_bio_NETSCAPE_CERT_SEQUENCE(out, seq);
+        ret = 0;
+        goto end;
+    }
 
-       if (!(seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL))) {
-               BIO_printf (bio_err, "Error reading sequence file %s\n", infile);
-               ERR_print_errors(bio_err);
-               goto end;
-       }
+    seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL);
+    if (seq == NULL) {
+        BIO_printf(bio_err, "%s: Error reading sequence file %s\n",
+                   prog, infile);
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-       for(i = 0; i < sk_X509_num(seq->certs); i++) {
-               x509 = sk_X509_value(seq->certs, i);
-               dump_cert_text(out, x509);
-               PEM_write_bio_X509(out, x509);
-       }
-       ret = 0;
-end:
-       BIO_free(in);
-       BIO_free(out);
-       NETSCAPE_CERT_SEQUENCE_free(seq);
+    for (i = 0; i < sk_X509_num(seq->certs); i++) {
+        x509 = sk_X509_value(seq->certs, i);
+        dump_cert_text(out, x509);
+        PEM_write_bio_X509(out, x509);
+    }
+    ret = 0;
+ end:
+    BIO_free(in);
+    BIO_free_all(out);
+    NETSCAPE_CERT_SEQUENCE_free(seq);
 
-       EXIT(ret);
+    return (ret);
 }
-