aboutsummaryrefslogtreecommitdiffstats
path: root/vmime
diff options
context:
space:
mode:
Diffstat (limited to 'vmime')
-rw-r--r--vmime/security/cert/X509Certificate.hpp2
-rw-r--r--vmime/security/digest/md5/md5MessageDigest.hpp12
-rw-r--r--vmime/security/digest/messageDigest.hpp12
-rw-r--r--vmime/security/digest/sha1/sha1MessageDigest.hpp18
-rw-r--r--vmime/security/sasl/SASLContext.hpp4
-rw-r--r--vmime/security/sasl/SASLMechanism.hpp12
-rw-r--r--vmime/security/sasl/SASLSession.hpp4
-rw-r--r--vmime/security/sasl/SASLSocket.hpp2
-rw-r--r--vmime/security/sasl/builtinSASLMechanism.hpp12
-rw-r--r--vmime/types.hpp4
-rw-r--r--vmime/utility/stream.hpp4
11 files changed, 43 insertions, 43 deletions
diff --git a/vmime/security/cert/X509Certificate.hpp b/vmime/security/cert/X509Certificate.hpp
index f328e412..959abff7 100644
--- a/vmime/security/cert/X509Certificate.hpp
+++ b/vmime/security/cert/X509Certificate.hpp
@@ -83,7 +83,7 @@ public:
* @return a X.509 certificate, or NULL if the given data does not
* represent a valid certificate
*/
- static ref <X509Certificate> import(const byte* data, const unsigned int length);
+ static ref <X509Certificate> import(const byte_t* data, const unsigned int length);
/** Exports this X.509 certificate to the specified format.
*
diff --git a/vmime/security/digest/md5/md5MessageDigest.hpp b/vmime/security/digest/md5/md5MessageDigest.hpp
index 0b93c850..002ba0c6 100644
--- a/vmime/security/digest/md5/md5MessageDigest.hpp
+++ b/vmime/security/digest/md5/md5MessageDigest.hpp
@@ -40,18 +40,18 @@ public:
md5MessageDigest();
- void update(const byte b);
+ void update(const byte_t b);
void update(const string& s);
- void update(const byte* buffer, const unsigned long len);
- void update(const byte* buffer, const unsigned long offset, const unsigned long len);
+ void update(const byte_t* buffer, const unsigned long len);
+ void update(const byte_t* buffer, const unsigned long offset, const unsigned long len);
void finalize();
void finalize(const string& s);
- void finalize(const byte* buffer, const unsigned long len);
- void finalize(const byte* buffer, const unsigned long offset, const unsigned long len);
+ void finalize(const byte_t* buffer, const unsigned long len);
+ void finalize(const byte_t* buffer, const unsigned long offset, const unsigned long len);
const int getDigestLength() const;
- const byte* getDigest() const;
+ const byte_t* getDigest() const;
void reset();
diff --git a/vmime/security/digest/messageDigest.hpp b/vmime/security/digest/messageDigest.hpp
index 230bbd64..8f375f3c 100644
--- a/vmime/security/digest/messageDigest.hpp
+++ b/vmime/security/digest/messageDigest.hpp
@@ -52,14 +52,14 @@ public:
*
* @param b the byte with which to update the digest.
*/
- virtual void update(const byte b) = 0;
+ virtual void update(const byte_t b) = 0;
/** Updates the digest using the specified array of bytes.
*
* @param buffer array of bytes
* @param len number of bytes to use in the buffer
*/
- virtual void update(const byte* buffer, const unsigned long len) = 0;
+ virtual void update(const byte_t* buffer, const unsigned long len) = 0;
/** Updates the digest using the specified array of bytes,
* starting at the specified offset.
@@ -68,7 +68,7 @@ public:
* @param offset offset to start from in the array of bytes
* @param len number of bytes to use, starting at offset
*/
- virtual void update(const byte* buffer,
+ virtual void update(const byte_t* buffer,
const unsigned long offset,
const unsigned long len) = 0;
@@ -87,14 +87,14 @@ public:
* such as padding. This is equivalent to calling update() and
* then finalize().
*/
- virtual void finalize(const byte* buffer,
+ virtual void finalize(const byte_t* buffer,
const unsigned long len) = 0;
/** Completes the hash computation by performing final operations
* such as padding. This is equivalent to calling update() and
* then finalize().
*/
- virtual void finalize(const byte* buffer,
+ virtual void finalize(const byte_t* buffer,
const unsigned long offset,
const unsigned long len) = 0;
@@ -112,7 +112,7 @@ public:
*
* @return computed hash
*/
- virtual const byte* getDigest() const = 0;
+ virtual const byte_t* getDigest() const = 0;
/** Returns the hash as an hexadecimal string.
* You must call finalize() before using this function, or the
diff --git a/vmime/security/digest/sha1/sha1MessageDigest.hpp b/vmime/security/digest/sha1/sha1MessageDigest.hpp
index 78667d33..4268749d 100644
--- a/vmime/security/digest/sha1/sha1MessageDigest.hpp
+++ b/vmime/security/digest/sha1/sha1MessageDigest.hpp
@@ -40,18 +40,18 @@ public:
sha1MessageDigest();
- void update(const byte b);
+ void update(const byte_t b);
void update(const string& s);
- void update(const byte* buffer, const unsigned long len);
- void update(const byte* buffer, const unsigned long offset, const unsigned long len);
+ void update(const byte_t* buffer, const unsigned long len);
+ void update(const byte_t* buffer, const unsigned long offset, const unsigned long len);
void finalize();
void finalize(const string& s);
- void finalize(const byte* buffer, const unsigned long len);
- void finalize(const byte* buffer, const unsigned long offset, const unsigned long len);
+ void finalize(const byte_t* buffer, const unsigned long len);
+ void finalize(const byte_t* buffer, const unsigned long offset, const unsigned long len);
const int getDigestLength() const;
- const byte* getDigest() const;
+ const byte_t* getDigest() const;
void reset();
@@ -59,13 +59,13 @@ protected:
void init();
- static void transform(unsigned long state[5], const byte buffer[64]);
+ static void transform(unsigned long state[5], const byte_t buffer[64]);
unsigned long m_state[5];
unsigned long m_count[2];
- byte m_buffer[64];
+ byte_t m_buffer[64];
- byte m_digest[20];
+ byte_t m_digest[20];
};
diff --git a/vmime/security/sasl/SASLContext.hpp b/vmime/security/sasl/SASLContext.hpp
index afc8a377..437ebb6e 100644
--- a/vmime/security/sasl/SASLContext.hpp
+++ b/vmime/security/sasl/SASLContext.hpp
@@ -87,7 +87,7 @@ public:
* @param output output buffer
* @param outputLen length of output buffer
*/
- void decodeB64(const string& input, byte** output, int* outputLen);
+ void decodeB64(const string& input, byte_t** output, int* outputLen);
/** Helper function for encoding challenge in Base64.
*
@@ -95,7 +95,7 @@ public:
* @param inputLen length of input buffer
* @return Base64-encoded challenge
*/
- const string encodeB64(const byte* input, const int inputLen);
+ const string encodeB64(const byte_t* input, const int inputLen);
private:
diff --git a/vmime/security/sasl/SASLMechanism.hpp b/vmime/security/sasl/SASLMechanism.hpp
index 4fd8ca00..f4f8aa91 100644
--- a/vmime/security/sasl/SASLMechanism.hpp
+++ b/vmime/security/sasl/SASLMechanism.hpp
@@ -66,8 +66,8 @@ public:
*/
virtual const bool step
(ref <SASLSession> sess,
- const byte* challenge, const int challengeLen,
- byte** response, int* responseLen) = 0;
+ const byte_t* challenge, const int challengeLen,
+ byte_t** response, int* responseLen) = 0;
/** Check whether authentication has completed. If false, more
* calls to evaluateChallenge() are needed to complete the
@@ -92,8 +92,8 @@ public:
* 'outputLen' are undetermined)
*/
virtual void encode(ref <SASLSession> sess,
- const byte* input, const int inputLen,
- byte** output, int* outputLen) = 0;
+ const byte_t* input, const int inputLen,
+ byte_t** output, int* outputLen) = 0;
/** Decode data according to negotiated SASL mechanism. This
* might mean that data is integrity or privacy protected.
@@ -109,8 +109,8 @@ public:
* 'outputLen' are undetermined)
*/
virtual void decode(ref <SASLSession> sess,
- const byte* input, const int inputLen,
- byte** output, int* outputLen) = 0;
+ const byte_t* input, const int inputLen,
+ byte_t** output, int* outputLen) = 0;
};
diff --git a/vmime/security/sasl/SASLSession.hpp b/vmime/security/sasl/SASLSession.hpp
index ec722b99..37080584 100644
--- a/vmime/security/sasl/SASLSession.hpp
+++ b/vmime/security/sasl/SASLSession.hpp
@@ -102,8 +102,8 @@ public:
* 'responseLen' are undetermined)
*/
const bool evaluateChallenge
- (const byte* challenge, const int challengeLen,
- byte** response, int* responseLen);
+ (const byte_t* challenge, const int challengeLen,
+ byte_t** response, int* responseLen);
/** Return a socket in which transmitted data is integrity
* and/or privacy protected, depending on the QOP (Quality of
diff --git a/vmime/security/sasl/SASLSocket.hpp b/vmime/security/sasl/SASLSocket.hpp
index 1ab95afc..fb2e93fe 100644
--- a/vmime/security/sasl/SASLSocket.hpp
+++ b/vmime/security/sasl/SASLSocket.hpp
@@ -63,7 +63,7 @@ private:
ref <SASLSession> m_session;
ref <net::socket> m_wrapped;
- byte* m_pendingBuffer;
+ byte_t* m_pendingBuffer;
int m_pendingPos;
int m_pendingLen;
diff --git a/vmime/security/sasl/builtinSASLMechanism.hpp b/vmime/security/sasl/builtinSASLMechanism.hpp
index 93e6d9cd..11b27353 100644
--- a/vmime/security/sasl/builtinSASLMechanism.hpp
+++ b/vmime/security/sasl/builtinSASLMechanism.hpp
@@ -51,18 +51,18 @@ public:
const bool step
(ref <SASLSession> sess,
- const byte* challenge, const int challengeLen,
- byte** response, int* responseLen);
+ const byte_t* challenge, const int challengeLen,
+ byte_t** response, int* responseLen);
const bool isComplete() const;
void encode(ref <SASLSession> sess,
- const byte* input, const int inputLen,
- byte** output, int* outputLen);
+ const byte_t* input, const int inputLen,
+ byte_t** output, int* outputLen);
void decode(ref <SASLSession> sess,
- const byte* input, const int inputLen,
- byte** output, int* outputLen);
+ const byte_t* input, const int inputLen,
+ byte_t** output, int* outputLen);
private:
diff --git a/vmime/types.hpp b/vmime/types.hpp
index 5cace618..06a1d8da 100644
--- a/vmime/types.hpp
+++ b/vmime/types.hpp
@@ -44,8 +44,8 @@ namespace vmime
typedef int char_t;
- typedef vmime_uint8 byte;
- typedef std::vector <byte> byteArray;
+ typedef vmime_uint8 byte_t;
+ typedef std::vector <byte_t> byteArray;
// Some aliases
namespace utils = utility;
diff --git a/vmime/utility/stream.hpp b/vmime/utility/stream.hpp
index 5a057953..edde8444 100644
--- a/vmime/utility/stream.hpp
+++ b/vmime/utility/stream.hpp
@@ -362,7 +362,7 @@ class inputStreamByteBufferAdapter : public inputStream
{
public:
- inputStreamByteBufferAdapter(const byte* buffer, size_type length);
+ inputStreamByteBufferAdapter(const byte_t* buffer, size_type length);
const bool eof() const;
void reset();
@@ -371,7 +371,7 @@ public:
private:
- const byte* m_buffer;
+ const byte_t* m_buffer;
const size_type m_length;
size_type m_pos;