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.

2 files changed, 25 insertions, 25 deletions

diff --git a/src/lib/pk_pad/hash_id/hash_id.cpp b/src/lib/pk_pad/hash_id/hash_id.cpp
index 2af0f6878..70b7470c4 100644
--- a/src/lib/pk_pad/hash_id/hash_id.cpp
+++ b/src/lib/pk_pad/hash_id/hash_id.cpp
@@ -12,39 +12,39 @@ namespace Botan {
 
 namespace {
 
-const byte MD5_PKCS_ID[] = {
+const uint8_t MD5_PKCS_ID[] = {
 0x30, 0x20, 0x30, 0x0C, 0x06, 0x08, 0x2A, 0x86, 0x48, 0x86,
 0xF7, 0x0D, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10 };
 
-const byte RIPEMD_160_PKCS_ID[] = {
+const uint8_t RIPEMD_160_PKCS_ID[] = {
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2B, 0x24, 0x03, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x14 };
 
-const byte SHA_160_PKCS_ID[] = {
+const uint8_t SHA_160_PKCS_ID[] = {
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2B, 0x0E, 0x03, 0x02,
 0x1A, 0x05, 0x00, 0x04, 0x14 };
 
-const byte SHA_224_PKCS_ID[] = {
+const uint8_t SHA_224_PKCS_ID[] = {
 0x30, 0x2D, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01,
 0x65, 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1C };
 
-const byte SHA_256_PKCS_ID[] = {
+const uint8_t SHA_256_PKCS_ID[] = {
 0x30, 0x31, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01,
 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 };
 
-const byte SHA_384_PKCS_ID[] = {
+const uint8_t SHA_384_PKCS_ID[] = {
 0x30, 0x41, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01,
 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30 };
 
-const byte SHA_512_PKCS_ID[] = {
+const uint8_t SHA_512_PKCS_ID[] = {
 0x30, 0x51, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01,
 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 };
 
-const byte SHA_512_256_PKCS_ID[] = {
+const uint8_t SHA_512_256_PKCS_ID[] = {
 0x30, 0x31, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01,
 0x65, 0x03, 0x04, 0x02, 0x06, 0x05, 0x00, 0x04, 0x20 };
 
-const byte TIGER_PKCS_ID[] = {
+const uint8_t TIGER_PKCS_ID[] = {
 0x30, 0x29, 0x30, 0x0D, 0x06, 0x09, 0x2B, 0x06, 0x01, 0x04,
 0x01, 0xDA, 0x47, 0x0C, 0x02, 0x05, 0x00, 0x04, 0x18 };
 
@@ -53,46 +53,46 @@ const byte TIGER_PKCS_ID[] = {
 /*
 * HashID as specified by PKCS
 */
-std::vector<byte> pkcs_hash_id(const std::string& name)
+std::vector<uint8_t> pkcs_hash_id(const std::string& name)
    {
    // Special case for SSL/TLS RSA signatures
    if(name == "Parallel(MD5,SHA-160)")
-      return std::vector<byte>();
+      return std::vector<uint8_t>();
 
    if(name == "MD5")
-      return std::vector<byte>(MD5_PKCS_ID,
+      return std::vector<uint8_t>(MD5_PKCS_ID,
                                MD5_PKCS_ID + sizeof(MD5_PKCS_ID));
 
    if(name == "RIPEMD-160")
-      return std::vector<byte>(RIPEMD_160_PKCS_ID,
+      return std::vector<uint8_t>(RIPEMD_160_PKCS_ID,
                                RIPEMD_160_PKCS_ID + sizeof(RIPEMD_160_PKCS_ID));
 
    if(name == "SHA-160")
-      return std::vector<byte>(SHA_160_PKCS_ID,
+      return std::vector<uint8_t>(SHA_160_PKCS_ID,
                                SHA_160_PKCS_ID + sizeof(SHA_160_PKCS_ID));
 
    if(name == "SHA-224")
-      return std::vector<byte>(SHA_224_PKCS_ID,
+      return std::vector<uint8_t>(SHA_224_PKCS_ID,
                                SHA_224_PKCS_ID + sizeof(SHA_224_PKCS_ID));
 
    if(name == "SHA-256")
-      return std::vector<byte>(SHA_256_PKCS_ID,
+      return std::vector<uint8_t>(SHA_256_PKCS_ID,
                                SHA_256_PKCS_ID + sizeof(SHA_256_PKCS_ID));
 
    if(name == "SHA-384")
-      return std::vector<byte>(SHA_384_PKCS_ID,
+      return std::vector<uint8_t>(SHA_384_PKCS_ID,
                                SHA_384_PKCS_ID + sizeof(SHA_384_PKCS_ID));
 
    if(name == "SHA-512")
-      return std::vector<byte>(SHA_512_PKCS_ID,
+      return std::vector<uint8_t>(SHA_512_PKCS_ID,
                                SHA_512_PKCS_ID + sizeof(SHA_512_PKCS_ID));
 
    if(name == "SHA-512-256")
-      return std::vector<byte>(SHA_512_256_PKCS_ID,
+      return std::vector<uint8_t>(SHA_512_256_PKCS_ID,
                                SHA_512_256_PKCS_ID + sizeof(SHA_512_256_PKCS_ID));
 
    if(name == "Tiger(24,3)")
-      return std::vector<byte>(TIGER_PKCS_ID,
+      return std::vector<uint8_t>(TIGER_PKCS_ID,
                                TIGER_PKCS_ID + sizeof(TIGER_PKCS_ID));
 
    throw Invalid_Argument("No PKCS #1 identifier for " + name);
@@ -101,7 +101,7 @@ std::vector<byte> pkcs_hash_id(const std::string& name)
 /*
 * HashID as specified by IEEE 1363/X9.31
 */
-byte ieee1363_hash_id(const std::string& name)
+uint8_t ieee1363_hash_id(const std::string& name)
    {
    if(name == "SHA-160")    return 0x33;
 
diff --git a/src/lib/pk_pad/hash_id/hash_id.h b/src/lib/pk_pad/hash_id/hash_id.h
index 5eab8bc2b..4e5492bd0 100644
--- a/src/lib/pk_pad/hash_id/hash_id.h
+++ b/src/lib/pk_pad/hash_id/hash_id.h
@@ -17,17 +17,17 @@ namespace Botan {
 * Return the PKCS #1 hash identifier
 * @see RFC 3447 section 9.2
 * @param hash_name the name of the hash function
-* @return byte sequence identifying the hash
+* @return uint8_t sequence identifying the hash
 * @throw Invalid_Argument if the hash has no known PKCS #1 hash id
 */
-BOTAN_DLL std::vector<byte> pkcs_hash_id(const std::string& hash_name);
+BOTAN_DLL std::vector<uint8_t> pkcs_hash_id(const std::string& hash_name);
 
 /**
 * Return the IEEE 1363 hash identifier
 * @param hash_name the name of the hash function
-* @return byte code identifying the hash, or 0 if not known
+* @return uint8_t code identifying the hash, or 0 if not known
 */
-BOTAN_DLL byte ieee1363_hash_id(const std::string& hash_name);
+BOTAN_DLL uint8_t ieee1363_hash_id(const std::string& hash_name);
 
 }