aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Warta <[email protected]>2015-12-09 12:52:54 +0100
committerSimon Warta <[email protected]>2015-12-09 15:26:48 +0100
commit897b95f03a73ac453a4e3b672ee3d2b918e49320 (patch)
tree2bac2ba16a00a01870518ac0a892679cbc4bb375
parent631fef26ead7e2da64aa4618bb16a716813b3e8c (diff)
Minor sanity updates for OctetString
-rw-r--r--src/lib/base/symkey.cpp26
-rw-r--r--src/lib/base/symkey.h21
2 files changed, 24 insertions, 23 deletions
diff --git a/src/lib/base/symkey.cpp b/src/lib/base/symkey.cpp
index 2c98da051..2f739998f 100644
--- a/src/lib/base/symkey.cpp
+++ b/src/lib/base/symkey.cpp
@@ -18,7 +18,7 @@ namespace Botan {
OctetString::OctetString(RandomNumberGenerator& rng,
size_t length)
{
- bits = rng.random_vec(length);
+ m_data = rng.random_vec(length);
}
/*
@@ -26,8 +26,8 @@ OctetString::OctetString(RandomNumberGenerator& rng,
*/
OctetString::OctetString(const std::string& hex_string)
{
- bits.resize(1 + hex_string.length() / 2);
- bits.resize(hex_decode(bits.data(), hex_string));
+ m_data.resize(1 + hex_string.length() / 2);
+ m_data.resize(hex_decode(m_data.data(), hex_string));
}
/*
@@ -35,7 +35,7 @@ OctetString::OctetString(const std::string& hex_string)
*/
OctetString::OctetString(const byte in[], size_t n)
{
- bits.assign(in, in + n);
+ m_data.assign(in, in + n);
}
/*
@@ -67,8 +67,8 @@ void OctetString::set_odd_parity()
0xF1, 0xF1, 0xF2, 0xF2, 0xF4, 0xF4, 0xF7, 0xF7, 0xF8, 0xF8, 0xFB, 0xFB,
0xFD, 0xFD, 0xFE, 0xFE };
- for(size_t j = 0; j != bits.size(); ++j)
- bits[j] = ODD_PARITY[bits[j]];
+ for(size_t j = 0; j != m_data.size(); ++j)
+ m_data[j] = ODD_PARITY[m_data[j]];
}
/*
@@ -76,7 +76,7 @@ void OctetString::set_odd_parity()
*/
std::string OctetString::as_string() const
{
- return hex_encode(bits.data(), bits.size());
+ return hex_encode(m_data.data(), m_data.size());
}
/*
@@ -84,8 +84,8 @@ std::string OctetString::as_string() const
*/
OctetString& OctetString::operator^=(const OctetString& k)
{
- if(&k == this) { zeroise(bits); return (*this); }
- xor_buf(bits.data(), k.begin(), std::min(length(), k.length()));
+ if(&k == this) { zeroise(m_data); return (*this); }
+ xor_buf(m_data.data(), k.begin(), std::min(length(), k.length()));
return (*this);
}
@@ -121,11 +121,11 @@ OctetString operator+(const OctetString& k1, const OctetString& k2)
*/
OctetString operator^(const OctetString& k1, const OctetString& k2)
{
- secure_vector<byte> ret(std::max(k1.length(), k2.length()));
+ secure_vector<byte> out(std::max(k1.length(), k2.length()));
- copy_mem(ret.data(), k1.begin(), k1.length());
- xor_buf(ret.data(), k2.begin(), k2.length());
- return OctetString(ret);
+ copy_mem(out.data(), k1.begin(), k1.length());
+ xor_buf(out.data(), k2.begin(), k2.length());
+ return OctetString(out);
}
}
diff --git a/src/lib/base/symkey.h b/src/lib/base/symkey.h
index 23b7d030b..3b0208e51 100644
--- a/src/lib/base/symkey.h
+++ b/src/lib/base/symkey.h
@@ -22,23 +22,23 @@ class BOTAN_DLL OctetString
/**
* @return size of this octet string in bytes
*/
- size_t length() const { return bits.size(); }
- size_t size() const { return bits.size(); }
+ size_t length() const { return m_data.size(); }
+ size_t size() const { return m_data.size(); }
/**
* @return this object as a secure_vector<byte>
*/
- secure_vector<byte> bits_of() const { return bits; }
+ secure_vector<byte> bits_of() const { return m_data; }
/**
* @return start of this string
*/
- const byte* begin() const { return bits.data(); }
+ const byte* begin() const { return m_data.data(); }
/**
* @return end of this string
*/
- const byte* end() const { return begin() + bits.size(); }
+ const byte* end() const { return begin() + m_data.size(); }
/**
* @return this encoded as hex
@@ -81,15 +81,16 @@ class BOTAN_DLL OctetString
* Create a new OctetString
* @param in a bytestring
*/
- OctetString(const secure_vector<byte>& in) : bits(in) {}
+ OctetString(const secure_vector<byte>& in) : m_data(in) {}
/**
* Create a new OctetString
* @param in a bytestring
*/
- OctetString(const std::vector<byte>& in) : bits(in.begin(), in.end()) {}
+ OctetString(const std::vector<byte>& in) : m_data(in.begin(), in.end()) {}
+
private:
- secure_vector<byte> bits;
+ secure_vector<byte> m_data;
};
/**
@@ -132,12 +133,12 @@ BOTAN_DLL OctetString operator^(const OctetString& x,
/**
* Alternate name for octet string showing intent to use as a key
*/
-typedef OctetString SymmetricKey;
+using SymmetricKey = OctetString;
/**
* Alternate name for octet string showing intent to use as an IV
*/
-typedef OctetString InitializationVector;
+using InitializationVector = OctetString;
}