izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant stringification for decrypt().

Browse Source
This commit is contained in:
John Hood
2016-03-24 00:21:08 -04:00
parent 6075209038
commit 7af87d85cc
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/crypto/crypto.cc
+3 -5
View File
@@ -250,15 +250,13 @@ const string Session::encrypt( const Message & plaintext )
return plaintext.nonce.cc_str() + text;
}
const Message Session::decrypt( const string & ciphertext )
const Message Session::decrypt( const char *str, size_t len )
{
if ( ciphertext.size() < 24 ) {
if ( len < 24 ) {
throw CryptoException( "Ciphertext must contain nonce and tag." );
}
const char *str = ciphertext.data();
int body_len = ciphertext.size() - 8;
int body_len = len - 8;
int pt_len = body_len - 16;
if ( pt_len < 0 ) { /* super-assertion that pt_len does not equal AE_INVALID */