mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 21:35:47 +03:00
Use standardized filename
See https://github.com/nextcloud/end_to_end_encryption_rfc/issues/13 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
080c5ea678
commit
1eb7ba72f0
3 changed files with 6 additions and 6 deletions
|
@ -65,12 +65,12 @@ namespace {
|
|||
}
|
||||
}
|
||||
|
||||
QByteArray EncryptionHelper::generateRandomString(int size)
|
||||
QByteArray EncryptionHelper::generateRandomFilename()
|
||||
{
|
||||
const QByteArray possibleCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
||||
const QByteArray possibleCharacters = "0123456789abcdef";
|
||||
|
||||
QByteArray randomString(size, '\0');
|
||||
for(int i=0; i < size; ++i)
|
||||
QByteArray randomString(32, '\0');
|
||||
for(int i=0; i < 32; ++i)
|
||||
{
|
||||
int index = qrand() % possibleCharacters.length();
|
||||
randomString[i] = possibleCharacters.at(index);
|
||||
|
|
|
@ -28,7 +28,7 @@ QString baseUrl();
|
|||
|
||||
class EncryptionHelper {
|
||||
public:
|
||||
static QByteArray generateRandomString(int size);
|
||||
static QByteArray generateRandomFilename();
|
||||
static QByteArray generateRandom(int size);
|
||||
static QByteArray generatePassword(const QString &wordlist, const QByteArray& salt);
|
||||
static QByteArray encryptPrivateKey(
|
||||
|
|
|
@ -132,7 +132,7 @@ void PropagateUploadEncrypted::slotFolderEncriptedMetadataReceived(const QJsonDo
|
|||
|
||||
// New encrypted file so set it all up!
|
||||
if (encryptedFile.encryptedFilename.isEmpty()) {
|
||||
encryptedFile.encryptedFilename = EncryptionHelper::generateRandomString(20);
|
||||
encryptedFile.encryptedFilename = EncryptionHelper::generateRandomFilename();
|
||||
encryptedFile.fileVersion = 1;
|
||||
encryptedFile.metadataKey = 1;
|
||||
encryptedFile.originalFilename = info.fileName();
|
||||
|
|
Loading…
Reference in a new issue