Fix email address delete code.

[openssl.git] / apps / crl2p7.c

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 40565916769896f35ca44437cf85488786b75b31..8729068462baa840f934e5c13bac4d38c784767c 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -141,7 +141,7 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-certfile") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       if(!certflst) certflst = sk_new(NULL);
+                       if(!certflst) certflst = sk_new_null();
                        sk_push(certflst,*(++argv));
                        }
                else
@@ -166,7 +166,8 @@ bad:
                BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
                BIO_printf(bio_err,"                (can be used more than once)\n");
                BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
-               EXIT(1);
+               ret = 1;
+               goto end;
                }
 
        ERR_load_crypto_strings();
@@ -215,15 +216,15 @@ bad:
        p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
 
        if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
-       if ((crl_stack=sk_X509_CRL_new(NULL)) == NULL) goto end;
+       if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
        p7s->crl=crl_stack;
        if (crl != NULL)
                {
                sk_X509_CRL_push(crl_stack,crl);
-               crl=NULL; /* now part of p7 for Freeing */
+               crl=NULL; /* now part of p7 for OPENSSL_freeing */
                }
 
-       if ((cert_stack=sk_X509_new(NULL)) == NULL) goto end;
+       if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
        p7s->cert=cert_stack;
 
        if(certflst) for(i = 0; i < sk_num(certflst); i++) {
@@ -239,7 +240,15 @@ bad:
        sk_free(certflst);
 
        if (outfile == NULL)
+               {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+               {
+               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+               out = BIO_push(tmpbio, out);
+               }
+#endif
+               }
        else
                {
                if (BIO_write_filename(out,outfile) <= 0)
@@ -266,10 +275,11 @@ bad:
        ret=0;
 end:
        if (in != NULL) BIO_free(in);
-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);
        if (p7 != NULL) PKCS7_free(p7);
        if (crl != NULL) X509_CRL_free(crl);
 
+       apps_shutdown();
        EXIT(ret);
        }
 
@@ -327,7 +337,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 
        ret=count;
 end:
-       /* never need to Free x */
+       /* never need to OPENSSL_free x */
        if (in != NULL) BIO_free(in);
        if (sk != NULL) sk_X509_INFO_free(sk);
        return(ret);