Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 21:34:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix incorrect TLV Signature DataType.

Browse Source 
This will cause loss of all forums (again). 
 Sorry - I don't lightly change datatypes... but better to do it all at once.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3258 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-07-05 18:32:53 +00:00
parent e7d659946d
commit 0c4bf7be54
1 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libretroshare/src/serialiser/rstlvkeys.cc
View File

@ -35,6 +35,7 @@
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
//#define TLV_DEBUG 1
/************************************* RsTlvSecurityKey ************************************/ /************************************* RsTlvSecurityKey ************************************/
@ -88,7 +89,13 @@ bool RsTlvSecurityKey::SetTlv(void *data, uint32_t size, uint32_t *offset) /* s
uint32_t tlvend = *offset + tlvsize; uint32_t tlvend = *offset + tlvsize;
if (size < tlvend) if (size < tlvend)
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvSecurityKey::SetTlv() Failed not enough space";
std::cerr << std::endl;
#endif
return false; /* not enough space */ return false; /* not enough space */
}
bool ok = true; bool ok = true;
@ -118,10 +125,22 @@ bool RsTlvSecurityKey::GetTlv(void *data, uint32_t size, uint32_t *offset) /* s
uint32_t tlvend = *offset + tlvsize; uint32_t tlvend = *offset + tlvsize;
if (size < tlvend) /* check size */ if (size < tlvend) /* check size */
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvSecurityKey::GetTlv() Fail, not enough space";
std::cerr << std::endl;
#endif
return false; /* not enough space */ return false; /* not enough space */
}
if (tlvtype != TLV_TYPE_SECURITYKEY) /* check type */ if (tlvtype != TLV_TYPE_SECURITYKEY) /* check type */
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvSecurityKey::GetTlv() Fail, wrong type";
std::cerr << std::endl;
#endif
return false; return false;
}
bool ok = true; bool ok = true;
@ -153,6 +172,14 @@ bool RsTlvSecurityKey::GetTlv(void *data, uint32_t size, uint32_t *offset) /* s
*offset = tlvend; *offset = tlvend;
} }
if (!ok)
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvSecurityKey::GetTlv() Failed somewhere ok == false";
std::cerr << std::endl;
#endif
}
return ok; return ok;
} }
@ -225,7 +252,13 @@ bool RsTlvSecurityKeySet::SetTlv(void *data, uint32_t size, uint32_t *offset) /
uint32_t tlvend = *offset + tlvsize; uint32_t tlvend = *offset + tlvsize;
if (size < tlvend) if (size < tlvend)
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvSecurityKeySet::SetTlv() Failed not enough space";
std::cerr << std::endl;
#endif
return false; /* not enough space */ return false; /* not enough space */
}
bool ok = true; bool ok = true;
@ -382,18 +415,32 @@ bool RsTlvKeySignature::SetTlv(void *data, uint32_t size, uint32_t *offset) /*
uint32_t tlvend = *offset + tlvsize; uint32_t tlvend = *offset + tlvsize;
if (size < tlvend) if (size < tlvend)
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvKeySignature::SetTlv() Fail, not enough space";
std::cerr << std::endl;
#endif
return false; /* not enough space */ return false; /* not enough space */
}
bool ok = true; bool ok = true;
/* start at data[offset] */ /* start at data[offset] */
/* add mandatory parts first */ /* add mandatory parts first */
ok &= SetTlvBase(data, tlvend, offset, TLV_TYPE_SECURITYKEY, tlvsize); ok &= SetTlvBase(data, tlvend, offset, TLV_TYPE_KEYSIGNATURE, tlvsize);
ok &= SetTlvString(data, tlvend, offset, TLV_TYPE_STR_KEYID, keyId); ok &= SetTlvString(data, tlvend, offset, TLV_TYPE_STR_KEYID, keyId);
ok &= signData.SetTlv(data, tlvend, offset); ok &= signData.SetTlv(data, tlvend, offset);
if (!ok)
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvKeySignature::SetTlv() Failed somewhere";
std::cerr << std::endl;
#endif
}
return ok; return ok;
} }
@ -409,10 +456,22 @@ bool RsTlvKeySignature::GetTlv(void *data, uint32_t size, uint32_t *offset) /*
uint32_t tlvend = *offset + tlvsize; uint32_t tlvend = *offset + tlvsize;
if (size < tlvend) /* check size */ if (size < tlvend) /* check size */
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvKeySignature::GetTlv() Not Enough Space";
std::cerr << std::endl;
#endif
return false; /* not enough space */ return false; /* not enough space */
}
if (tlvtype != TLV_TYPE_SECURITYKEY) /* check type */ if (tlvtype != TLV_TYPE_KEYSIGNATURE) /* check type */
{
#ifdef TLV_DEBUG
std::cerr << "RsTlvKeySignature::GetTlv() Type Fail";
std::cerr << std::endl;
#endif
return false; return false;
}
bool ok = true; bool ok = true;