propagate from branch 'net.randombit.botan' (head cfb19182987fc95b2a8885584a38edb10b4709b3)

            to branch 'net.randombit.botan.c++0x' (head 1570877c463fed4b632bc49a5b5ee27c57de2cb5)

4 files changed, 5 insertions, 5 deletions

diff --git a/src/pubkey/dlies/dlies.cpp b/src/pubkey/dlies/dlies.cpp
index c441ed17c..0f5d76726 100644
--- a/src/pubkey/dlies/dlies.cpp
+++ b/src/pubkey/dlies/dlies.cpp
@@ -36,7 +36,7 @@ SecureVector<byte> DLIES_Encryptor::enc(const byte in[], u32bit length,
    {
    if(length > maximum_input_size())
       throw Invalid_Argument("DLIES: Plaintext too large");
-   if(other_key.is_empty())
+   if(other_key.empty())
       throw Invalid_State("DLIES: The other key was never set");
 
    MemoryVector<byte> v = key.public_value();
diff --git a/src/pubkey/pk_codecs/pkcs8.cpp b/src/pubkey/pk_codecs/pkcs8.cpp
index 87f05da92..b5b0044a8 100644
--- a/src/pubkey/pk_codecs/pkcs8.cpp
+++ b/src/pubkey/pk_codecs/pkcs8.cpp
@@ -66,7 +66,7 @@ SecureVector<byte> PKCS8_decode(DataSource& source, const User_Interface& ui,
             throw PKCS8_Exception("Unknown PEM label " + label);
          }
 
-      if(key_data.is_empty())
+      if(key_data.empty())
          throw PKCS8_Exception("No key data found");
       }
    catch(Decoding_Error)
@@ -126,7 +126,7 @@ SecureVector<byte> PKCS8_decode(DataSource& source, const User_Interface& ui,
          }
       }
 
-   if(key.is_empty())
+   if(key.empty())
       throw Decoding_Error("PKCS #8 private key decoding failed");
    return key;
    }
diff --git a/src/pubkey/pk_codecs/x509_key.cpp b/src/pubkey/pk_codecs/x509_key.cpp
index f1fc59410..1a2acfa64 100644
--- a/src/pubkey/pk_codecs/x509_key.cpp
+++ b/src/pubkey/pk_codecs/x509_key.cpp
@@ -86,7 +86,7 @@ Public_Key* load_key(DataSource& source)
          .end_cons();
          }
 
-      if(key_bits.is_empty())
+      if(key_bits.empty())
          throw Decoding_Error("X.509 public key decoding failed");
 
       const std::string alg_name = OIDS::lookup(alg_id.oid);
diff --git a/src/pubkey/pk_filts.cpp b/src/pubkey/pk_filts.cpp
index 18da9c10b..d604436e0 100644
--- a/src/pubkey/pk_filts.cpp
+++ b/src/pubkey/pk_filts.cpp
@@ -72,7 +72,7 @@ void PK_Verifier_Filter::write(const byte input[], u32bit length)
 */
 void PK_Verifier_Filter::end_msg()
    {
-   if(signature.is_empty())
+   if(signature.empty())
       throw Exception("PK_Verifier_Filter: No signature to check against");
    bool is_valid = verifier->check_signature(signature, signature.size());
    send((is_valid ? 1 : 0));