Submitted by: "Victor B. Wagner" <vitus@cryptocom.ru>

[openssl.git] / demos / x509 / mkcert.c

diff --git a/demos/x509/mkcert.c b/demos/x509/mkcert.c
index 4709e18e7c95ec30f8b67af102200e99f7b1a3e0..c5e67b8e28e47dde3249d6964daacc82063ea480 100644 (file)
--- a/demos/x509/mkcert.c
+++ b/demos/x509/mkcert.c
@@ -9,7 +9,9 @@
 #include <openssl/pem.h>
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 
 int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days);
 int add_ext(X509 *cert, int nid, char *value);
@@ -35,7 +37,9 @@ int main(int argc, char **argv)
        X509_free(x509);
        EVP_PKEY_free(pkey);
 
+#ifndef OPENSSL_NO_ENGINE
        ENGINE_cleanup();
+#endif
        CRYPTO_cleanup_all_ex_data();
 
        CRYPTO_mem_leaks(bio_err);
@@ -88,7 +92,7 @@ int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days)
                }
        rsa=NULL;
 
-       X509_set_version(x,3);
+       X509_set_version(x,2);
        ASN1_INTEGER_set(X509_get_serialNumber(x),serial);
        X509_gmtime_adj(X509_get_notBefore(x),0);
        X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days);