CreateCertIcingaCA(EVP_PKEY*, X509_NAME*): enable optional CA creation

Al2Klimov · Al2Klimov · commit d1098dc95983 · 2023-12-18T17:07:44.000+01:00
diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp
@@ -706,7 +706,7 @@ String GetIcingaCADir()
 	return Configuration::DataDir + "/ca";
 }
 
-std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY *pubkey, X509_NAME *subject)
+std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY *pubkey, X509_NAME *subject, bool ca)
 {
 	char errbuf[256];
 
@@ -743,7 +743,7 @@ std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY *pubkey, X509_NAME *subject)
 	EVP_PKEY *privkey = EVP_PKEY_new();
 	EVP_PKEY_assign_RSA(privkey, rsa);
 
-	return CreateCert(pubkey, subject, X509_get_subject_name(cacert.get()), privkey, false);
+	return CreateCert(pubkey, subject, X509_get_subject_name(cacert.get()), privkey, ca);
 }
 
 std::shared_ptr<X509> CreateCertIcingaCA(const std::shared_ptr<X509>& cert)
diff --git a/lib/base/tlsutility.hpp b/lib/base/tlsutility.hpp
@@ -58,7 +58,7 @@ String GetIcingaCADir();
 String CertificateToString(const std::shared_ptr<X509>& cert);
 
 std::shared_ptr<X509> StringToCertificate(const String& cert);
-std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY *pubkey, X509_NAME *subject);
+std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY *pubkey, X509_NAME *subject, bool ca = false);
 std::shared_ptr<X509> CreateCertIcingaCA(const std::shared_ptr<X509>& cert);
 bool IsCertUptodate(const std::shared_ptr<X509>& cert);
 bool IsCaUptodate(X509* cert);

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ String GetIcingaCADir()`
`706`	`706`	`return Configuration::DataDir + "/ca";`
`707`	`707`	`}`
`708`	`708`
`709`		`-std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY pubkey, X509_NAME subject)`
	`709`	`+std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY pubkey, X509_NAME subject, bool ca)`
`710`	`710`	`{`
`711`	`711`	`char errbuf[256];`
`712`	`712`
`@@ -743,7 +743,7 @@ std::shared_ptr<X509> CreateCertIcingaCA(EVP_PKEY pubkey, X509_NAME subject)`
`743`	`743`	`EVP_PKEY *privkey = EVP_PKEY_new();`
`744`	`744`	`EVP_PKEY_assign_RSA(privkey, rsa);`
`745`	`745`
`746`		`- return CreateCert(pubkey, subject, X509_get_subject_name(cacert.get()), privkey, false);`
	`746`	`+ return CreateCert(pubkey, subject, X509_get_subject_name(cacert.get()), privkey, ca);`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`std::shared_ptr<X509> CreateCertIcingaCA(const std::shared_ptr<X509>& cert)`