From f2528a2a6055e79fd417001ff39262f12bcdd075 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@gmail.com>
Date: Tue, 30 Dec 2014 07:08:42 +1000
Subject: [PATCH] Add const to keySize, blockSize, ivSize

---
 libraries/Crypto/AES.h         | 8 ++++----
 libraries/Crypto/AES128.cpp    | 2 +-
 libraries/Crypto/AES192.cpp    | 2 +-
 libraries/Crypto/AES256.cpp    | 2 +-
 libraries/Crypto/AESCommon.cpp | 2 +-
 libraries/Crypto/Arcfour.cpp   | 4 ++--
 libraries/Crypto/Arcfour.h     | 4 ++--
 libraries/Crypto/BlockCipher.h | 4 ++--
 libraries/Crypto/Cipher.h      | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libraries/Crypto/AES.h b/libraries/Crypto/AES.h
index 632e5878..b46b2117 100644
--- a/libraries/Crypto/AES.h
+++ b/libraries/Crypto/AES.h
@@ -30,7 +30,7 @@ class AESCommon : public BlockCipher
 public:
     virtual ~AESCommon();
 
-    size_t blockSize();
+    size_t blockSize() const;
 
     void encryptBlock(uint8_t *output, const uint8_t *input);
     void decryptBlock(uint8_t *output, const uint8_t *input);
@@ -59,7 +59,7 @@ public:
     AES128();
     virtual ~AES128();
 
-    size_t keySize();
+    size_t keySize() const;
 
     bool setKey(const uint8_t *key, size_t len);
 
@@ -73,7 +73,7 @@ public:
     AES192();
     virtual ~AES192();
 
-    size_t keySize();
+    size_t keySize() const;
 
     bool setKey(const uint8_t *key, size_t len);
 
@@ -87,7 +87,7 @@ public:
     AES256();
     virtual ~AES256();
 
-    size_t keySize();
+    size_t keySize() const;
 
     bool setKey(const uint8_t *key, size_t len);
 
diff --git a/libraries/Crypto/AES128.cpp b/libraries/Crypto/AES128.cpp
index c660a741..b758059f 100644
--- a/libraries/Crypto/AES128.cpp
+++ b/libraries/Crypto/AES128.cpp
@@ -52,7 +52,7 @@ AES128::~AES128()
  * \brief Size of a 128-bit AES key in bytes.
  * \return Always returns 16.
  */
-size_t AES128::keySize()
+size_t AES128::keySize() const
 {
     return 16;
 }
diff --git a/libraries/Crypto/AES192.cpp b/libraries/Crypto/AES192.cpp
index f853267f..7c1d0a48 100644
--- a/libraries/Crypto/AES192.cpp
+++ b/libraries/Crypto/AES192.cpp
@@ -52,7 +52,7 @@ AES192::~AES192()
  * \brief Size of a 192-bit AES key in bytes.
  * \return Always returns 24.
  */
-size_t AES192::keySize()
+size_t AES192::keySize() const
 {
     return 24;
 }
diff --git a/libraries/Crypto/AES256.cpp b/libraries/Crypto/AES256.cpp
index e987abe9..c85ba752 100644
--- a/libraries/Crypto/AES256.cpp
+++ b/libraries/Crypto/AES256.cpp
@@ -52,7 +52,7 @@ AES256::~AES256()
  * \brief Size of a 256-bit AES key in bytes.
  * \return Always returns 32.
  */
-size_t AES256::keySize()
+size_t AES256::keySize() const
 {
     return 32;
 }
diff --git a/libraries/Crypto/AESCommon.cpp b/libraries/Crypto/AESCommon.cpp
index 431600e5..cf52f0af 100644
--- a/libraries/Crypto/AESCommon.cpp
+++ b/libraries/Crypto/AESCommon.cpp
@@ -130,7 +130,7 @@ AESCommon::~AESCommon()
  * \brief Size of an AES block in bytes.
  * \return Always returns 16.
  */
-size_t AESCommon::blockSize()
+size_t AESCommon::blockSize() const
 {
     return 16;
 }
diff --git a/libraries/Crypto/Arcfour.cpp b/libraries/Crypto/Arcfour.cpp
index 659872cc..a0fcdd1d 100644
--- a/libraries/Crypto/Arcfour.cpp
+++ b/libraries/Crypto/Arcfour.cpp
@@ -72,7 +72,7 @@ Arcfour::~Arcfour()
  *
  * \sa setKey()
  */
-size_t Arcfour::keySize()
+size_t Arcfour::keySize() const
 {
     return 16;
 }
@@ -82,7 +82,7 @@ size_t Arcfour::keySize()
  *
  * \return Always returns 0 because Arcfour does not use initialization vectors.
  */
-size_t Arcfour::ivSize()
+size_t Arcfour::ivSize() const
 {
     return 0;
 }
diff --git a/libraries/Crypto/Arcfour.h b/libraries/Crypto/Arcfour.h
index c17fc3f8..03902e9d 100644
--- a/libraries/Crypto/Arcfour.h
+++ b/libraries/Crypto/Arcfour.h
@@ -31,8 +31,8 @@ public:
     Arcfour();
     virtual ~Arcfour();
 
-    size_t keySize();
-    size_t ivSize();
+    size_t keySize() const;
+    size_t ivSize() const;
 
     bool setKey(const uint8_t *key, size_t len);
     bool setIV(const uint8_t *iv, size_t len);
diff --git a/libraries/Crypto/BlockCipher.h b/libraries/Crypto/BlockCipher.h
index b36e2e26..1d374d02 100644
--- a/libraries/Crypto/BlockCipher.h
+++ b/libraries/Crypto/BlockCipher.h
@@ -32,8 +32,8 @@ public:
     BlockCipher();
     virtual ~BlockCipher();
 
-    virtual size_t blockSize() = 0;
-    virtual size_t keySize() = 0;
+    virtual size_t blockSize() const = 0;
+    virtual size_t keySize() const = 0;
 
     virtual bool setKey(const uint8_t *key, size_t len) = 0;
 
diff --git a/libraries/Crypto/Cipher.h b/libraries/Crypto/Cipher.h
index 6d43cce0..8d498d8f 100644
--- a/libraries/Crypto/Cipher.h
+++ b/libraries/Crypto/Cipher.h
@@ -32,8 +32,8 @@ public:
     Cipher();
     virtual ~Cipher();
 
-    virtual size_t keySize() = 0;
-    virtual size_t ivSize() = 0;
+    virtual size_t keySize() const = 0;
+    virtual size_t ivSize() const = 0;
 
     virtual bool setKey(const uint8_t *key, size_t len) = 0;
     virtual bool setIV(const uint8_t *iv, size_t len) = 0;