Improve support for running everything as a monolithic application.

Submitted by: Lennart Bång, Bodo Möller

2 files changed, 5 insertions, 0 deletions

diff --git a/apps/ca.c b/apps/ca.c
index d12530ad98..8d33bc91ce 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -603,12 +603,14 @@ bad:
 			perror(outdir);
 			goto err;
 			}
+#ifdef S_IFDIR
 		if (!(sb.st_mode & S_IFDIR))
 			{
 			BIO_printf(bio_err,"%s need to be a directory\n",outdir);
 			perror(outdir);
 			goto err;
 			}
+#endif
 		}
 
 	/*****************************************************************/
@@ -1902,6 +1904,8 @@ err:
 		X509_NAME_free(CAname);
 	if (subject != NULL)
 		X509_NAME_free(subject);
+	if (tmptm != NULL)
+		ASN1_UTCTIME_free(tmptm);
 	if (ok <= 0)
 		{
 		if (ret != NULL) X509_free(ret);
diff --git a/apps/x509.c b/apps/x509.c
index 70bd1391a7..9d2a0c8d2a 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -754,6 +754,7 @@ end:
 	EVP_PKEY_free(CApkey);
 	X509_REQ_free(rq);
 	X509V3_EXT_cleanup();
+	X509_PURPOSE_cleanup();
 	EXIT(ret);
 	}