1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
commit 33a17ba0104cd94f2e33a3ac007b300553cdb417
Author: Valentin Rusu <kde@rusu.info>
Date: Mon Feb 16 22:44:07 2015 +0100
Fix for the random wallet open failure when updating
The problem seems to be caused by the use of BackendPersistHandler
singleton when the user has several wallets on his system and not
all of them have been updated to the new schema.
BUG: 343718
diff --git a/kwalletd/backend/backendpersisthandler.cpp b/kwalletd/backend/backendpersisthandler.cpp
index 5c321c9..b7f63f8 100644
--- a/kwalletd/backend/backendpersisthandler.cpp
+++ b/kwalletd/backend/backendpersisthandler.cpp
@@ -140,25 +140,14 @@ static int getRandomBlock(QByteArray& randBlock) {
#endif
}
-
-
-static BlowfishPersistHandler *blowfishHandler =0;
-#ifdef HAVE_QGPGME
-static GpgPersistHandler *gpgHandler =0;
-#endif // HAVE_QGPGME
-
BackendPersistHandler *BackendPersistHandler::getPersistHandler(BackendCipherType cipherType)
{
switch (cipherType){
case BACKEND_CIPHER_BLOWFISH:
- if (0 == blowfishHandler)
- blowfishHandler = new BlowfishPersistHandler;
- return blowfishHandler;
+ return new BlowfishPersistHandler;
#ifdef HAVE_QGPGME
case BACKEND_CIPHER_GPG:
- if (0 == gpgHandler)
- gpgHandler = new GpgPersistHandler;
- return gpgHandler;
+ return new GpgPersistHandler;
#endif // HAVE_QGPGME
default:
Q_ASSERT(0);
@@ -170,21 +159,16 @@ BackendPersistHandler *BackendPersistHandler::getPersistHandler(char magicBuf[12
{
if ((magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB || magicBuf[2] == KWALLET_CIPHER_BLOWFISH_CBC) &&
(magicBuf[3] == KWALLET_HASH_SHA1 || magicBuf[3] == KWALLET_HASH_PBKDF2_SHA512)) {
- if (0 == blowfishHandler) {
- bool useECBforReading = magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB;
- if (useECBforReading) {
- qDebug() << "this wallet uses ECB encryption. It'll be converted to CBC on next save.";
- }
- blowfishHandler = new BlowfishPersistHandler(useECBforReading);
+ bool useECBforReading = magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB;
+ if (useECBforReading) {
+ qDebug() << "this wallet uses ECB encryption. It'll be converted to CBC on next save.";
}
- return blowfishHandler;
+ return new BlowfishPersistHandler(useECBforReading);
}
#ifdef HAVE_QGPGME
if (magicBuf[2] == KWALLET_CIPHER_GPG &&
magicBuf[3] == 0) {
- if (0 == gpgHandler)
- gpgHandler = new GpgPersistHandler;
- return gpgHandler;
+ return new GpgPersistHandler;
}
#endif // HAVE_QGPGME
return 0; // unknown cipher or hash
diff --git a/kwalletd/backend/kwalletbackend.cc b/kwalletd/backend/kwalletbackend.cc
index 7d439e3..9240103 100644
--- a/kwalletd/backend/kwalletbackend.cc
+++ b/kwalletd/backend/kwalletbackend.cc
@@ -266,7 +266,7 @@ int Backend::open(const QByteArray& password, WId w) {
if (_open) {
return -255; // already open
}
-
+
setPassword(password);
return openInternal(w);
}
@@ -287,20 +287,20 @@ int Backend::openPreHashed(const QByteArray &passwordHash)
if (_open) {
return -255; // already open
}
-
+
// check the password hash for correct size (currently fixed)
if (passwordHash.size() != 20 && passwordHash.size() != 40 &&
passwordHash.size() != 56) {
return -42; // unsupported encryption scheme
}
-
+
_passhash = passwordHash;
_newPassHash = passwordHash;
_useNewHash = true;//Only new hash is supported
return openInternal();
}
-
+
int Backend::openInternal(WId w)
{
// No wallet existed. Let's create it.
@@ -350,7 +350,9 @@ int Backend::openInternal(WId w)
if (0 == phandler){
return 42; // unknown cipher or hash
}
- return phandler->read(this, db, w);
+ int result = phandler->read(this, db, w);
+ delete phandler;
+ return result;
}
void Backend::swapToNewHash()
@@ -427,6 +429,7 @@ int Backend::sync(WId w) {
notification->setText( i18n("Failed to sync wallet <b>%1</b> to disk. Error codes are:\nRC <b>%2</b>\nSF <b>%3</b>. Please file a BUG report using this information to bugs.kde.org").arg(_name).arg(rc).arg(sf.errorString()) );
notification->sendEvent();
}
+ delete phandler;
return rc;
}
@@ -439,7 +442,7 @@ int Backend::close(bool save) {
return rc;
}
}
-
+
// do the actual close
for (FolderMap::ConstIterator i = _entries.constBegin(); i != _entries.constEnd(); ++i) {
for (EntryMap::ConstIterator j = i.value().constBegin(); j != i.value().constEnd(); ++j) {
@@ -447,13 +450,13 @@ int Backend::close(bool save) {
}
}
_entries.clear();
-
+
// empty the password hash
_passhash.fill(0);
_newPassHash.fill(0);
_open = false;
-
+
return 0;
}
|
GitWeb