From 4ec78e3746bf16cc5f6dd3d352f9c47f81d39fde Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Sep 2025 22:39:40 -0500 Subject: Fix OpenSSL command line arguments --- src/libtdeldap.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp index a084d81..ef620c7 100644 --- a/src/libtdeldap.cpp +++ b/src/libtdeldap.cpp @@ -4510,7 +4510,7 @@ int LDAPManager::generatePublicKerberosCertificate(LDAPCertConfig certinfo, LDAP } subject = TQString("/C=%1/ST=%2/L=%3/O=%4/OU=%5%6%7").arg(certinfo.countryName).arg(certinfo.stateOrProvinceName).arg(certinfo.localityName).arg(certinfo.organizationName).arg(certinfo.orgUnitName).arg(openssldcForRealm(realmcfg.name)).arg(common_name); - command = TQString("openssl req -days %1 -new -out \"%2\" -key \"%3\" -config \"%4\" -subj \"%5\"").arg(certinfo.kerberosExpiryDays).arg(kdc_reqfile).arg(kdc_keyfile).arg(OPENSSL_EXTENSIONS_FILE).arg(subject).local8Bit(); + command = TQString("openssl req -new -out \"%2\" -key \"%3\" -config \"%4\" -subj \"%5\"").arg(kdc_reqfile).arg(kdc_keyfile).arg(OPENSSL_EXTENSIONS_FILE).arg(subject).local8Bit(); if (system(command) < 0) { printf("ERROR: Execution of \"%s\" failed!\n", command.data()); return -1; @@ -4561,7 +4561,7 @@ int LDAPManager::generatePublicLDAPCertificate(LDAPCertConfig certinfo, LDAPReal } subject = TQString("/C=%1/ST=%2/L=%3/O=%4/OU=%5%6%7").arg(certinfo.countryName).arg(certinfo.stateOrProvinceName).arg(certinfo.localityName).arg(certinfo.organizationName).arg(certinfo.orgUnitName).arg(openssldcForRealm(realmcfg.name)).arg(common_name); - command = TQString("openssl req -days %1 -new -out \"%2\" -key \"%3\" -config \"%4\" -subj \"%5\"").arg(certinfo.ldapExpiryDays).arg(ldap_reqfile).arg(ldap_keyfile).arg(OPENSSL_EXTENSIONS_FILE).arg(subject).local8Bit(); + command = TQString("openssl req -new -out \"%2\" -key \"%3\" -config \"%4\" -subj \"%5\"").arg(ldap_reqfile).arg(ldap_keyfile).arg(OPENSSL_EXTENSIONS_FILE).arg(subject).local8Bit(); if (system(command) < 0) { printf("ERROR: Execution of \"%s\" failed!\n", command.data()); return -1; @@ -4664,7 +4664,7 @@ int LDAPManager::generateClientCertificatePublicCertificate(int expirydays, LDAP } subject = TQString("%1%2").arg(openssldcForRealm(realmcfg.name)).arg(common_name); - command = TQString("openssl req -days %1 -new -out \"%2\" -key \"%3\" -config \"%4\" -subj \"%5\"").arg(expirydays).arg(client_reqfile).arg(client_keyfile).arg(client_cfgfile).arg(subject).local8Bit(); + command = TQString("openssl req -new -out \"%2\" -key \"%3\" -config \"%4\" -subj \"%5\"").arg(client_reqfile).arg(client_keyfile).arg(client_cfgfile).arg(subject).local8Bit(); if (system(command) < 0) { if (errstr) *errstr = TQString("Execution of \"%s\" failed").arg(command); return -1; @@ -4733,7 +4733,7 @@ int LDAPManager::generatePKICRL(int expirydays, LDAPRealmConfig realmcfg, TQStri return -1; } - command = TQString("openssl ca -days %1 -crldays %2 -gencrl -out \"%3\" -config \"%4\"").arg(expirydays).arg(expirydays).arg(crl_certfile).arg(OPENSSL_EXTENSIONS_FILE).local8Bit(); + command = TQString("openssl ca -crldays %2 -gencrl -out \"%3\" -config \"%4\"").arg(expirydays).arg(crl_certfile).arg(OPENSSL_EXTENSIONS_FILE).local8Bit(); if (system(command) < 0) { if (errstr) *errstr = TQString("Execution of \"%s\" failed").arg(command); return -1; @@ -4796,7 +4796,7 @@ int LDAPManager::generatePKICRL(int expirydays, LDAPRealmConfig realmcfg, TQStri } // Regenerate CRL certificate - command = TQString("openssl ca -days %1 -crldays %2 -gencrl -out \"%3\" -config \"%4\"").arg(expirydays).arg(expirydays).arg(crl_certfile).arg(OPENSSL_EXTENSIONS_FILE).local8Bit(); + command = TQString("openssl ca -crldays %2 -gencrl -out \"%3\" -config \"%4\"").arg(expirydays).arg(crl_certfile).arg(OPENSSL_EXTENSIONS_FILE).local8Bit(); if (system(command) < 0) { if (errstr) *errstr = TQString("Execution of \"%s\" failed").arg(command); return -1; -- cgit v1.2.3