From 264fb4b2bb5480a28646a8465013647b2e034cf4 Mon Sep 17 00:00:00 2001
From: tomsmeding <tom.smeding@gmail.com>
Date: Sat, 8 Oct 2016 13:45:40 +0200
Subject: Fix envelope decryption bug when encrkeylen=255

---
 envelope.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/envelope.cpp b/envelope.cpp
index a8cd793..9bb011e 100644
--- a/envelope.cpp
+++ b/envelope.cpp
@@ -57,7 +57,7 @@ namespace Envelope{
 	string decrypt(const string &data,const RSA::PrivateKey &privkey){
 		cerr<<"=== DECRYPT ==="<<endl;
 		if(data.size()<2)throw invalid_argument("Envelope data length invalid");
-		int encrkeylen=((uint16_t)data[data.size()-2]<<8)+(uint16_t)data.back();
+		int encrkeylen=((uint16_t)(uint8_t)data[data.size()-2]<<8)+(uint8_t)data.back();
 		assert(encrkeylen<(1<<16));
 		cerr<<"encrkeylen="<<encrkeylen<<endl;
 		if((int)data.size()<encrkeylen+2)throw invalid_argument("Envelope key format invalid");
-- 
cgit v1.2.3-54-g00ecf