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

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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/asn1/asn1_dn.cpp b/src/asn1/asn1_dn.cpp
index dd5bc94dc..d86edcd84 100644
--- a/src/asn1/asn1_dn.cpp
+++ b/src/asn1/asn1_dn.cpp
@@ -255,7 +255,7 @@ void X509_DN::encode_into(DER_Encoder& der) const
 
    der.start_cons(SEQUENCE);
 
-   if(dn_bits.has_items())
+   if(!dn_bits.empty())
       der.raw_bytes(dn_bits);
    else
       {
diff --git a/src/asn1/ber_dec.cpp b/src/asn1/ber_dec.cpp
index ce6046652..b34bf8ca2 100644
--- a/src/asn1/ber_dec.cpp
+++ b/src/asn1/ber_dec.cpp
@@ -205,7 +205,7 @@ BER_Object BER_Decoder::get_next_object()
       return next;
 
    u32bit length = decode_length(source);
-   next.value.create(length);
+   next.value.resize(length);
    if(source->read(next.value, length) != length)
       throw BER_Decoding_Error("Value truncated");
 
@@ -392,7 +392,7 @@ BER_Decoder& BER_Decoder::decode(BigInt& out,
    BER_Object obj = get_next_object();
    obj.assert_is_a(type_tag, class_tag);
 
-   if(obj.value.is_empty())
+   if(obj.value.empty())
       out = 0;
    else
       {