|
@@ -111,7 +111,7 @@ discard block |
|
|
block discarded – undo |
|
111
|
111
|
public function generate() : string |
|
112
|
112
|
{ |
|
113
|
113
|
return |
|
114
|
|
- \chr(Tag3Packet::PACKET_TYPE) |
|
|
114
|
+ \chr(Tag3Packet::PACKET_TYPE) |
|
115
|
115
|
. Util::generateTagPacketLength(\strlen($this->encryptedKey) + ECRYPTFS_SALT_SIZE + 5) |
|
116
|
116
|
. \chr(Tag3Packet::PACKET_VERSION) |
|
117
|
117
|
. \chr($this->cipherCode) |
|
@@ -175,7 +175,7 @@ discard block |
|
|
block discarded – undo |
|
175
|
175
|
$cur += ECRYPTFS_SALT_SIZE; |
|
176
|
176
|
|
|
177
|
177
|
/* This conversion was taken straight from RFC2440 */ |
|
178
|
|
- $hashIterations = (16 + (\ord($data[$cur]) & 15)) << ((\ord($data[$cur]) >> 4) + 6); |
|
|
178
|
+ $hashIterations = (16 + (\ord($data[$cur]) & 15)) << ((\ord($data[$cur]) >> 4) + 6); |
|
179
|
179
|
$cur++; |
|
180
|
180
|
|
|
181
|
181
|
$encryptedKey = \substr($data, $cur, $encryptedKeySize); |
Please login to merge, or discard this patch.