mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move BIO2ByteArray to annonymous namespace

Browse source 
This has no use outside of the clientsidenecryption.cpp
This commit is contained in:
Tomaz Canabrava 2018-02-18 01:04:44 +01:00
parent 99117078f3
commit 5faeca1b82
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libsync/clientsideencryption.cpp
View file

@ -58,6 +58,17 @@ namespace {
} // ns
namespace {
QByteArray BIO2ByteArray(BIO *b) {
int pending = BIO_ctrl_pending(b);
char *tmp = (char *)calloc(pending+1, sizeof(char));
BIO_read(b, tmp, pending);
QByteArray res(tmp, pending);
free(tmp);
return res;
}
void handleErrors(void)
{
ERR_print_errors_fp(stdout); // This line is not printing anything.
@ -592,17 +603,6 @@ QByteArray EncryptionHelper::encryptStringAsymmetric(EVP_PKEY *publicKey, const
return raw.toBase64();
}
QByteArray EncryptionHelper::BIO2ByteArray(BIO *b) {
int pending = BIO_ctrl_pending(b);
char *tmp = (char *)calloc(pending+1, sizeof(char));
BIO_read(b, tmp, pending);
QByteArray res(tmp, pending);
free(tmp);
return res;
}
ClientSideEncryption::ClientSideEncryption()
{
}
@ -847,7 +847,7 @@ void ClientSideEncryption::generateKeyPair()
qCInfo(lcCse()) << "Could not read private key from bio.";
return;
}
QByteArray key = EncryptionHelper::BIO2ByteArray(privKey);
QByteArray key = BIO2ByteArray(privKey);
_privateKey = QSslKey(key, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
qCInfo(lcCse()) << "Keys generated correctly, sending to server.";
@ -907,7 +907,7 @@ void ClientSideEncryption::generateCSR(EVP_PKEY *keyPair)
BIO *out = BIO_new(BIO_s_mem());
ret = PEM_write_bio_X509_REQ(out, x509_req);
QByteArray output = EncryptionHelper::BIO2ByteArray(out);
QByteArray output = BIO2ByteArray(out);
BIO_free(out);
EVP_PKEY_free(keyPair);

2
src/libsync/clientsideencryption.h
View file

@ -61,8 +61,6 @@ public:
const QByteArray& data
);
static QByteArray BIO2ByteArray(BIO *b);
static bool fileEncryption(const QByteArray &key, const QByteArray &iv,
QFile *input, QFile *output, QByteArray& returnTag);