Skip to content

Commit d87688b

Browse files
committed
follow up to #26 to update comments about PKCS#7 vs W3C padding scheme
1 parent 3567779 commit d87688b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/lcp-client-lib/AesCbcSymmetricAlgorithm.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ namespace lcp
7878
cipherData, cipherSize, true,
7979
new CryptoPP::StreamTransformationFilter(m_decryptor,
8080
new CryptoPP::StringSink(decryptedDataStr),
81-
CryptoPP::BlockPaddingSchemeDef::W3C_PADDING
81+
CryptoPP::BlockPaddingSchemeDef::W3C_PADDING // Note that handling of W3C padding scheme during decryption also handles PKCS#7 (which is BlockPaddingSchemeDef::PKCS_PADDING in CryptoPP, with AES CBC Block Size > 8 (not PKCS#5))
8282
)
8383
);
8484

@@ -97,7 +97,7 @@ namespace lcp
9797
dataLength,
9898
decryptedData,
9999
decryptedDataLength,
100-
BlockPaddingSchemeDef::W3C_PADDING // == PKCS_PADDING => PKCS#7 (AES CBC Block Size > 8)
100+
BlockPaddingSchemeDef::W3C_PADDING // Note that handling of W3C padding scheme during decryption also handles PKCS#7 (which is BlockPaddingSchemeDef::PKCS_PADDING in CryptoPP, with AES CBC Block Size > 8 (not PKCS#5))
101101
);
102102
}
103103

@@ -119,7 +119,7 @@ namespace lcp
119119
inBuffer.size(),
120120
&outBuffer.at(0),
121121
outBuffer.size(),
122-
BlockPaddingSchemeDef::W3C_PADDING // == PKCS_PADDING => PKCS#7 (AES CBC Block Size > 8)
122+
BlockPaddingSchemeDef::W3C_PADDING // Note that handling of W3C padding scheme during decryption also handles PKCS#7 (which is BlockPaddingSchemeDef::PKCS_PADDING in CryptoPP, with AES CBC Block Size > 8 (not PKCS#5))
123123
);
124124

125125
return static_cast<size_t>(stream->Size())
@@ -171,7 +171,7 @@ namespace lcp
171171
size_t sizeWithoutPaddedBlock = plainTextSize - (plainTextSize % CryptoPP::AES::BLOCKSIZE);
172172
if (rangeInfo.position + rangeInfo.length > sizeWithoutPaddedBlock)
173173
{
174-
padding = BlockPaddingSchemeDef::W3C_PADDING; // == PKCS_PADDING => PKCS#7 (AES CBC Block Size > 8)
174+
padding = BlockPaddingSchemeDef::W3C_PADDING; // Note that handling of W3C padding scheme during decryption also handles PKCS#7 (which is BlockPaddingSchemeDef::PKCS_PADDING in CryptoPP, with AES CBC Block Size > 8 (not PKCS#5))
175175
}
176176

177177
// Read data from the stream

0 commit comments

Comments
 (0)