VMS below version 7 doesn't have strcasecmp, so let's roll our own on VMS.

[openssl.git] / apps / nseq.c

diff --git a/apps/nseq.c b/apps/nseq.c
index 2fdba2d6b98150bc94093a4ad5b6ca094ffcd47d..c26f62cb6137d07c2a26d8b7dd56c3f559d6caeb 100644 (file)
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -58,14 +58,14 @@
 
 #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
 
-static int dump_cert_text(BIO *out, X509 *x);
+int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
@@ -99,9 +99,9 @@ int MAIN(int argc, char **argv)
                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");
+               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);
        }
 
@@ -119,12 +119,19 @@ int MAIN(int argc, char **argv)
                                 "Can't open output file %s\n", outfile);
                        goto end;
                }
-       } else out = BIO_new_fp(stdout, BIO_NOCLOSE);
-
+       } else {
+               out = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+               {
+               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+               out = BIO_push(tmpbio, out);
+               }
+#endif
+       }
        if (toseq) {
                seq = NETSCAPE_CERT_SEQUENCE_new();
-               seq->certs = sk_X509_new(NULL);
-               while((x509 = PEM_read_bio_X509(in, NULL, NULL))) 
+               seq->certs = sk_X509_new_null();
+               while((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL))) 
                    sk_X509_push(seq->certs,x509);
 
                if(!sk_X509_num(seq->certs))
@@ -138,7 +145,7 @@ int MAIN(int argc, char **argv)
                goto end;
        }
 
-       if (!(seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL))) {
+       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;
@@ -152,23 +159,9 @@ int MAIN(int argc, char **argv)
        ret = 0;
 end:
        BIO_free(in);
-       BIO_free(out);
+       BIO_free_all(out);
        NETSCAPE_CERT_SEQUENCE_free(seq);
 
        EXIT(ret);
 }
 
-static int dump_cert_text(BIO *out, X509 *x)
-{
-        char buf[256];
-        X509_NAME_oneline(X509_get_subject_name(x),buf,256);
-        BIO_puts(out,"subject=");
-        BIO_puts(out,buf);
-
-        X509_NAME_oneline(X509_get_issuer_name(x),buf,256);
-        BIO_puts(out,"\nissuer= ");
-        BIO_puts(out,buf);
-        BIO_puts(out,"\n");
-        return 0;
-}
-