aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/x509/x509_obj.h
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-11 15:28:38 -0500
committerJack Lloyd <[email protected]>2016-12-18 16:48:24 -0500
commitf3cb3edb512bdcab498d825886c3366c341b3f78 (patch)
tree645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/x509/x509_obj.h
parentc1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff)
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency, eg make_u32bit becomes make_uint32. The old typedefs remain for now since probably lots of application code uses them.
Diffstat (limited to 'src/lib/x509/x509_obj.h')
-rw-r--r--src/lib/x509/x509_obj.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/x509/x509_obj.h b/src/lib/x509/x509_obj.h
index 40324775c..c2bf7b9c2 100644
--- a/src/lib/x509/x509_obj.h
+++ b/src/lib/x509/x509_obj.h
@@ -26,12 +26,12 @@ class BOTAN_DLL X509_Object : public ASN1_Object
* The underlying data that is to be or was signed
* @return data that is or was signed
*/
- std::vector<byte> tbs_data() const;
+ std::vector<uint8_t> tbs_data() const;
/**
* @return signature on tbs_data()
*/
- std::vector<byte> signature() const;
+ std::vector<uint8_t> signature() const;
/**
* @return signature algorithm that was used to generate signature
@@ -51,10 +51,10 @@ class BOTAN_DLL X509_Object : public ASN1_Object
* @param tbs the tbs bits to be signed
* @return signed X509 object
*/
- static std::vector<byte> make_signed(class PK_Signer* signer,
+ static std::vector<uint8_t> make_signed(class PK_Signer* signer,
RandomNumberGenerator& rng,
const AlgorithmIdentifier& alg_id,
- const secure_vector<byte>& tbs);
+ const secure_vector<uint8_t>& tbs);
/**
* Check the signature on this data
@@ -86,7 +86,7 @@ class BOTAN_DLL X509_Object : public ASN1_Object
/**
* @return BER encoding of this
*/
- std::vector<byte> BER_encode() const;
+ std::vector<uint8_t> BER_encode() const;
/**
* @return PEM encoding of this
@@ -96,7 +96,7 @@ class BOTAN_DLL X509_Object : public ASN1_Object
virtual ~X509_Object() {}
protected:
X509_Object(DataSource& src, const std::string& pem_labels);
- X509_Object(const std::vector<byte>& vec, const std::string& labels);
+ X509_Object(const std::vector<uint8_t>& vec, const std::string& labels);
#if defined(BOTAN_TARGET_OS_HAS_FILESYSTEM)
X509_Object(const std::string& file, const std::string& pem_labels);
@@ -105,7 +105,7 @@ class BOTAN_DLL X509_Object : public ASN1_Object
void do_decode();
X509_Object() {}
AlgorithmIdentifier m_sig_algo;
- std::vector<byte> m_tbs_bits, m_sig;
+ std::vector<uint8_t> m_tbs_bits, m_sig;
private:
virtual void force_decode() = 0;
void init(DataSource&, const std::string&);