Skip to content

Commit 15cb842

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 6563b2a commit 15cb842

File tree

5 files changed

+48
-59
lines changed

5 files changed

+48
-59
lines changed

‎demos/demo5/demo5.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
5656
// Setup private and public key/certificate in PKCS#12 format
5757

5858
message.setKeyFile(QLatin1String("your_private_key.p12"),
59-
QLatin1String("your_private_key_password"));
59+
QLatin1String("your_private_key_password"));
6060
message.setPublicKey(QLatin1String("recipient_public_key.cert"));
6161

6262
// Sign the message. Only your private key is required.

‎src/smimemessage.cpp‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,23 @@ SMimeMessage::SMimeMessage()
1212

1313
SMimeMessage::~SMimeMessage()
1414
{
15-
1615
}
1716

1817
void SMimeMessage::setKeyFile(const QString &filename, const QString &password)
1918
{
20-
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate*>(d.data());
19+
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate *>(d.data());
2120
dPtr->_smimePart->setKeyFile(filename, password);
2221
}
2322

2423
void SMimeMessage::setPublicKey(const QString &filename)
2524
{
26-
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate*>(d.data());
25+
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate *>(d.data());
2726
dPtr->_smimePart->setPublicKey(filename);
2827
}
2928

3029
bool SMimeMessage::sign()
3130
{
32-
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate*>(d.data());
31+
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate *>(d.data());
3332
dPtr->_smimePart->writeMimeMessageBuffer(this->getContent());
3433

3534
MimeMultiPart *multiPartSigned = new MimeMultiPart(MimeMultiPart::Signed);
@@ -43,7 +42,7 @@ bool SMimeMessage::sign()
4342

4443
bool SMimeMessage::encrypt()
4544
{
46-
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate*>(d.data());
45+
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate *>(d.data());
4746
dPtr->_smimePart->writeMimeMessageBuffer(this->getContent());
4847
bool ret = dPtr->_smimePart->encrypt();
4948
setContent(dPtr->_smimePart);
@@ -52,11 +51,9 @@ bool SMimeMessage::encrypt()
5251

5352
bool SMimeMessage::signAndEncrypt()
5453
{
55-
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate*>(d.data());
54+
SMimeMessagePrivate *dPtr = static_cast<SMimeMessagePrivate *>(d.data());
5655
dPtr->_smimePart->writeMimeMessageBuffer(this->getContent());
5756
bool ret = dPtr->_smimePart->signAndEncrypt();
5857
setContent(dPtr->_smimePart);
5958
return ret;
6059
}
61-
62-

‎src/smimepart.cpp‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ SMimePart::~SMimePart()
2929

3030
void SMimePart::setKeyFile(const QString &filename, const QString &password)
3131
{
32-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
33-
d->_keyfile = filename;
34-
d->_password = password;
32+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
33+
d->_keyfile = filename;
34+
d->_password = password;
3535
loadPKCS12PrivateKey();
3636
}
3737

3838
void SMimePart::setPublicKey(const QString &filename)
3939
{
40-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
41-
d->_publicKeyfile = filename;
40+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
41+
d->_publicKeyfile = filename;
4242
loadPKCS12PublicKey();
4343
}
4444

4545
bool SMimePart::sign()
4646
{
47-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
48-
bool ret = false;
49-
PKCS7 *p7 = nullptr;
47+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
48+
bool ret = false;
49+
PKCS7 *p7 = nullptr;
5050

5151
if (!d->_certificate || !d->_privateKey) {
5252
qCDebug(SIMPLEMAIL_SMIMEPART) << "no certificate or private key";
@@ -94,9 +94,9 @@ bool SMimePart::sign()
9494

9595
bool SMimePart::encrypt()
9696
{
97-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
98-
bool ret = false;
99-
PKCS7 *p7 = nullptr;
97+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
98+
bool ret = false;
99+
PKCS7 *p7 = nullptr;
100100

101101
if (!d->_recipsReceiver) {
102102
qCDebug(SIMPLEMAIL_SMIMEPART) << "no public key";
@@ -130,10 +130,10 @@ bool SMimePart::encrypt()
130130

131131
bool SMimePart::signAndEncrypt()
132132
{
133-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
134-
bool ret = false;
135-
PKCS7 *p7 = nullptr;
136-
BIO *signedContent = nullptr;
133+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
134+
bool ret = false;
135+
PKCS7 *p7 = nullptr;
136+
BIO *signedContent = nullptr;
137137
if (!d->_certificate || !d->_privateKey) {
138138
qCDebug(SIMPLEMAIL_SMIMEPART) << "no certificate or private key";
139139
return ret;
@@ -204,7 +204,7 @@ void SMimePart::setEncryptionHeader()
204204

205205
void SMimePart::loadPKCS12PrivateKey()
206206
{
207-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
207+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
208208
QFile file(d->_keyfile);
209209
if (!file.exists())
210210
return;
@@ -226,8 +226,8 @@ void SMimePart::loadPKCS12PrivateKey()
226226
qCDebug(SIMPLEMAIL_SMIMEPART) << "Error reading PKCS#12 file";
227227
}
228228

229-
EVP_PKEY *privateKey = nullptr;
230-
X509 *certificate = nullptr;
229+
EVP_PKEY *privateKey = nullptr;
230+
X509 *certificate = nullptr;
231231
STACK_OF(X509) *certificateCA = nullptr;
232232
if (!PKCS12_parse(
233233
p12, d->_password.toStdString().c_str(), &privateKey, &certificate, &certificateCA)) {
@@ -250,7 +250,7 @@ void SMimePart::loadPKCS12PrivateKey()
250250

251251
void SMimePart::loadPKCS12PublicKey()
252252
{
253-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
253+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
254254
QFile file(d->_publicKeyfile);
255255
if (!file.exists())
256256
return;
@@ -268,7 +268,6 @@ void SMimePart::loadPKCS12PublicKey()
268268
X509 *publicrcert = PEM_read_bio_X509(keyBuffer, NULL, 0, NULL);
269269
BIO_free(keyBuffer);
270270

271-
272271
STACK_OF(X509) *recipsReceiver = sk_X509_new_null();
273272

274273
if (!recipsReceiver || !sk_X509_push(recipsReceiver, publicrcert)) {
@@ -286,9 +285,9 @@ void SMimePart::initOpenSSL()
286285

287286
bool SMimePart::writeInputBuffer()
288287
{
289-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
290-
BIO *input = BIO_new(BIO_s_mem());
291-
d->_input = std::unique_ptr<BIO>(input);
288+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
289+
BIO *input = BIO_new(BIO_s_mem());
290+
d->_input = std::unique_ptr<BIO>(input);
292291
if (!d->_input)
293292
return false;
294293
if (!BIO_write(d->_input.get(), (void *) d->_message.data(), d->_message.length()))
@@ -298,7 +297,7 @@ bool SMimePart::writeInputBuffer()
298297

299298
bool SMimePart::writeMimeMessageBuffer(const std::shared_ptr<SimpleMail::MimePart> &mimeParts)
300299
{
301-
SMimePartPrivate *d = static_cast<SMimePartPrivate*>(d_ptr.data());
300+
SMimePartPrivate *d = static_cast<SMimePartPrivate *>(d_ptr.data());
302301
QBuffer buffer;
303302
buffer.open(QBuffer::ReadWrite);
304303

‎src/smimepart_p.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ using namespace SimpleMail;
44

55
SMimePartPrivate::~SMimePartPrivate()
66
{
7-
_input = nullptr;
8-
_privateKey = nullptr;
9-
_certificate = nullptr;
10-
_certificateCA = nullptr;
7+
_input = nullptr;
8+
_privateKey = nullptr;
9+
_certificate = nullptr;
10+
_certificateCA = nullptr;
1111
_recipsReceiver = nullptr;
1212
}

‎src/smimepart_p.h‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,36 @@
22
#define SMIMEPART_P_H
33

44
#include "mimepart_p.h"
5-
#include <openssl/pkcs12.h>
5+
66
#include <openssl/bio.h>
7+
#include <openssl/pkcs12.h>
78

8-
template<> class std::default_delete<BIO>
9+
template <>
10+
class std::default_delete<BIO>
911
{
1012
public:
11-
void operator()(BIO *ptr) const
12-
{
13-
BIO_free(ptr);
14-
}
13+
void operator()(BIO *ptr) const { BIO_free(ptr); }
1514
};
1615

17-
template<> class std::default_delete<EVP_PKEY>
16+
template <>
17+
class std::default_delete<EVP_PKEY>
1818
{
1919
public:
20-
void operator()(EVP_PKEY *ptr) const
21-
{
22-
EVP_PKEY_free(ptr);
23-
}
20+
void operator()(EVP_PKEY *ptr) const { EVP_PKEY_free(ptr); }
2421
};
2522

26-
template<> class std::default_delete<X509>
23+
template <>
24+
class std::default_delete<X509>
2725
{
2826
public:
29-
void operator()(X509 *ptr) const
30-
{
31-
X509_free(ptr);
32-
}
27+
void operator()(X509 *ptr) const { X509_free(ptr); }
3328
};
3429

35-
template<> class std::default_delete<STACK_OF(X509)>
30+
template <>
31+
class std::default_delete<STACK_OF(X509)>
3632
{
3733
public:
38-
void operator()(STACK_OF(X509) *ptr) const
39-
{
40-
sk_X509_pop_free(ptr, X509_free);
41-
}
34+
void operator()(STACK_OF(X509) * ptr) const { sk_X509_pop_free(ptr, X509_free); }
4235
};
4336

4437
namespace SimpleMail {
@@ -56,7 +49,7 @@ class SMimePartPrivate : public MimePartPrivate
5649
std::unique_ptr<EVP_PKEY> _privateKey = nullptr;
5750

5851
// certificate from private Key
59-
std::unique_ptr<X509> _certificate = nullptr;
52+
std::unique_ptr<X509> _certificate = nullptr;
6053
std::unique_ptr<STACK_OF(X509)> _certificateCA = nullptr;
6154
// certificate from public key, used for encrypting
6255
std::unique_ptr<STACK_OF(X509)> _recipsReceiver = nullptr;

0 commit comments

Comments
 (0)