Use apps_shutdown() in all applications, in case someone decides not
authorRichard Levitte <levitte@openssl.org>
Sat, 23 Jun 2001 16:37:32 +0000 (16:37 +0000)
committerRichard Levitte <levitte@openssl.org>
Sat, 23 Jun 2001 16:37:32 +0000 (16:37 +0000)
to go the monolith way (does anyone do that these days?).

NOTE: a few applications are missing in this commit.  I've a few more
changes in them that I haven't tested yet.

26 files changed:
apps/asn1pars.c
apps/ciphers.c
apps/crl.c
apps/crl2p7.c
apps/dgst.c
apps/dh.c
apps/dhparam.c
apps/dsa.c
apps/dsaparam.c
apps/enc.c
apps/engine.c
apps/errstr.c
apps/gendh.c
apps/gendsa.c
apps/genrsa.c
apps/passwd.c
apps/pkcs7.c
apps/rand.c
apps/rsa.c
apps/s_client.c
apps/s_server.c
apps/s_time.c
apps/sess_id.c
apps/speed.c
apps/version.c
apps/x509.c

index 108ed7d..4918bcb 100644 (file)
@@ -329,6 +329,7 @@ end:
        if (at != NULL) ASN1_TYPE_free(at);
        if (osk != NULL) sk_free(osk);
        OBJ_cleanup();
+       apps_shutdown();
        EXIT(ret);
        }
 
index c3bd859..2d6e104 100644 (file)
@@ -202,6 +202,7 @@ end:
        if (ctx != NULL) SSL_CTX_free(ctx);
        if (ssl != NULL) SSL_free(ssl);
        if (STDout != NULL) BIO_free_all(STDout);
+       apps_shutdown();
        EXIT(ret);
        }
 
index fb36ed5..82ef8ce 100644 (file)
@@ -364,6 +364,7 @@ end:
                X509_STORE_CTX_cleanup(&ctx);
                X509_STORE_free(store);
        }
+       apps_shutdown();
        EXIT(ret);
        }
 
index 36d8afe..8729068 100644 (file)
@@ -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();
@@ -278,6 +279,7 @@ end:
        if (p7 != NULL) PKCS7_free(p7);
        if (crl != NULL) X509_CRL_free(crl);
 
+       apps_shutdown();
        EXIT(ret);
        }
 
index 1fbef6b..e3edf30 100644 (file)
@@ -347,6 +347,7 @@ end:
        EVP_PKEY_free(sigkey);
        if(sigbuf) OPENSSL_free(sigbuf);
        if (bmd != NULL) BIO_free(bmd);
+       apps_shutdown();
        EXIT(err);
        }
 
index 20581f6..603ea5b 100644 (file)
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -330,6 +330,7 @@ end:
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
        if (dh != NULL) DH_free(dh);
+       apps_shutdown();
        EXIT(ret);
        }
 #endif
index 51aee97..00cf87b 100644 (file)
@@ -516,6 +516,7 @@ end:
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
        if (dh != NULL) DH_free(dh);
+       apps_shutdown();
        EXIT(ret);
        }
 
index f18d13d..09ddb23 100644 (file)
@@ -304,6 +304,7 @@ end:
        if(dsa != NULL) DSA_free(dsa);
        if(passin) OPENSSL_free(passin);
        if(passout) OPENSSL_free(passout);
+       apps_shutdown();
        EXIT(ret);
        }
 #endif
index 983cd04..4196413 100644 (file)
@@ -368,6 +368,7 @@ end:
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
        if (dsa != NULL) DSA_free(dsa);
+       apps_shutdown();
        EXIT(ret);
        }
 
index ac3014b..49cae75 100644 (file)
@@ -575,6 +575,7 @@ end:
        if (benc != NULL) BIO_free(benc);
        if (b64 != NULL) BIO_free(b64);
        if(pass) OPENSSL_free(pass);
+       apps_shutdown();
        EXIT(ret);
        }
 
index 537aefd..1308b6b 100644 (file)
@@ -486,5 +486,6 @@ end:
        sk_pop_free(pre_cmds, identity);
        sk_pop_free(post_cmds, identity);
        if (bio_out != NULL) BIO_free_all(bio_out);
+       apps_shutdown();
        EXIT(ret);
        }
index c411eff..fedb568 100644 (file)
@@ -121,5 +121,6 @@ int MAIN(int argc, char **argv)
                        ret++;
                        }
                }
+       apps_shutdown();
        EXIT(ret);
        }
index 14928d8..e8f8493 100644 (file)
@@ -195,6 +195,7 @@ end:
                ERR_print_errors(bio_err);
        if (out != NULL) BIO_free_all(out);
        if (dh != NULL) DH_free(dh);
+       apps_shutdown();
        EXIT(ret);
        }
 
index 57ef0da..b990eec 100644 (file)
@@ -231,6 +231,7 @@ end:
        if (out != NULL) BIO_free_all(out);
        if (dsa != NULL) DSA_free(dsa);
        if(passout) OPENSSL_free(passout);
+       apps_shutdown();
        EXIT(ret);
        }
 #endif
index dfcb523..a5669de 100644 (file)
@@ -242,6 +242,7 @@ err:
        if(passout) OPENSSL_free(passout);
        if (ret != 0)
                ERR_print_errors(bio_err);
+       apps_shutdown();
        EXIT(ret);
        }
 
index 750a3cb..5e7195f 100644 (file)
@@ -289,6 +289,7 @@ err:
                BIO_free(in);
        if (out)
                BIO_free_all(out);
+       apps_shutdown();
        EXIT(ret);
        }
 
index f3df25f..a0b2134 100644 (file)
@@ -163,7 +163,8 @@ bad:
                BIO_printf(bio_err," -text         print full details of certificates\n");
                BIO_printf(bio_err," -noout        don't output encoded data\n");
                BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
-               EXIT(1);
+               ret = 1;
+               goto end;
                }
 
        ERR_load_crypto_strings();
@@ -300,5 +301,6 @@ end:
        if (p7 != NULL) PKCS7_free(p7);
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
+       apps_shutdown();
        EXIT(ret);
        }
index 10adf0e..faba057 100644 (file)
@@ -157,5 +157,6 @@ err:
        ERR_print_errors(bio_err);
        if (out)
                BIO_free_all(out);
+       apps_shutdown();
        EXIT(ret);
        }
index 5b671e1..18964fe 100644 (file)
@@ -400,6 +400,7 @@ end:
        if(rsa != NULL) RSA_free(rsa);
        if(passin) OPENSSL_free(passin);
        if(passout) OPENSSL_free(passout);
+       apps_shutdown();
        EXIT(ret);
        }
 #else /* !OPENSSL_NO_RSA */
index 009aa83..ac5d2f1 100644 (file)
@@ -803,6 +803,7 @@ end:
                BIO_free(bio_c_out);
                bio_c_out=NULL;
                }
+       apps_shutdown();
        EXIT(ret);
        }
 
index 11971cb..6ed2349 100644 (file)
@@ -799,6 +799,7 @@ end:
                BIO_free(bio_s_out);
                bio_s_out=NULL;
                }
+       apps_shutdown();
        EXIT(ret);
        }
 
index 3bdf898..0e2f456 100644 (file)
@@ -443,7 +443,6 @@ int MAIN(int argc, char **argv)
 
        if (tm_cipher == NULL ) {
                fprintf( stderr, "No CIPHER specified\n" );
-/*             EXIT(1); */
        }
 
        if (!(perform & 1)) goto next;
@@ -610,6 +609,7 @@ end:
                SSL_CTX_free(tm_ctx);
                tm_ctx=NULL;
                }
+       apps_shutdown();
        EXIT(ret);
        }
 
index 7f5c55b..41c3b3f 100644 (file)
@@ -272,6 +272,7 @@ bad:
 end:
        if (out != NULL) BIO_free_all(out);
        if (x != NULL) SSL_SESSION_free(x);
+       apps_shutdown();
        EXIT(ret);
        }
 
index dbf7732..a7842ce 100644 (file)
@@ -1470,6 +1470,7 @@ end:
                if (dsa_key[i] != NULL)
                        DSA_free(dsa_key[i]);
 #endif
+       apps_shutdown();
        EXIT(mret);
        }
 
index efa0d0d..65b5935 100644 (file)
@@ -131,5 +131,6 @@ int MAIN(int argc, char **argv)
        if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
        if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
 end:
+       apps_shutdown();
        EXIT(ret);
        }
index b2e4ec6..8a392d8 100644 (file)
@@ -1009,6 +1009,7 @@ end:
        sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
        sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
        if (passin) OPENSSL_free(passin);
+       apps_shutdown();
        EXIT(ret);
        }