Skip to content

Commit 217481b

Browse files
committed
fix ca path and return the encryption method
1 parent 1f65284 commit 217481b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/dtlsthread.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ std::vector<QString> Dtlsthread::getCmdInput(Packet sendpacket, QSettings& setti
5555
//get the pathes for verification from the settings
5656
QString defaultCertFile = CERTFILE;
5757
QString defaultKeyFile = KEYFILE;
58+
QString defaultCAFile = CAFILE;
5859
cmdComponents.push_back(settings.value("sslPrivateKeyPath", defaultKeyFile).toString());
5960
cmdComponents.push_back(settings.value("sslLocalCertificatePath", defaultCertFile).toString());
60-
QString sslCaPath = settings.value("sslCaPath", "").toString();
61+
QString sslCaPath = settings.value("sslCaPath", defaultCAFile).toString();
6162

6263

6364
//get the full path to to ca-signed-cert.pem file
@@ -73,10 +74,10 @@ std::vector<QString> Dtlsthread::getCmdInput(Packet sendpacket, QSettings& setti
7374
// Select the first file that matches the filter
7475
cmdComponents.push_back(dir.filePath(fileList.first()));
7576
} else {
76-
qDebug() << "No matching files found.";
77+
QDEBUG() << "No matching files found.";
7778
}
7879
} else {
79-
qDebug() << "Directory does not exist.";
80+
QDEBUG() << "Directory does not exist.";
8081
}
8182
cmdComponents.push_back(settings.value("cipher", "AES256-GCM-SHA384").toString());
8283
return cmdComponents;
@@ -99,6 +100,8 @@ void Dtlsthread::writeMassage(Packet packetToSend, DtlsAssociation* dtlsAssociat
99100
//}
100101
return;
101102
}
103+
104+
packetToSend.errorString = dtlsAssociation->crypto.sessionCipher().encryptionMethod();
102105
emit packetSent(packetToSend);
103106
}
104107

0 commit comments

Comments
 (0)