propagate from branch 'net.randombit.botan.tls-state-machine' (head a4741cd07f50a9e1b29b0dd97c6fb8697c038ade)

            to branch 'net.randombit.botan.cxx11' (head 116e5ff139c07000be431e07d3472cc8f3919b91)

1 files changed, 11 insertions, 3 deletions

diff --git a/src/tls/tls_alert.cpp b/src/tls/tls_alert.cpp
index 30c51d4c8..9b37a282f 100644
--- a/src/tls/tls_alert.cpp
+++ b/src/tls/tls_alert.cpp
@@ -90,14 +90,22 @@ std::string Alert::type_string() const
 
       case UNSUPPORTED_EXTENSION:
          return "unsupported_extension";
+      case CERTIFICATE_UNOBTAINABLE:
+         return "certificate_unobtainable";
       case UNRECOGNIZED_NAME:
          return "unrecognized_name";
-
+      case BAD_CERTIFICATE_STATUS_RESPONSE:
+         return "bad_certificate_status_response";
+      case BAD_CERTIFICATE_HASH_VALUE:
+         return "bad_certificate_hash_value";
       case UNKNOWN_PSK_IDENTITY:
          return "unknown_psk_identity";
 
       case NULL_ALERT:
-         return "";
+         return "none";
+
+      case HEARTBEAT_PAYLOAD:
+         return "heartbeat_payload";
       }
 
    /*
@@ -106,7 +114,7 @@ std::string Alert::type_string() const
    * compiler can warn us that it is not included in the switch
    * statement.
    */
-   return "unrecognized_alert_" + std::to_string(type());
+   return "unrecognized_alert_" + to_string(type());
    }