aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-10-16 12:37:46 -0400
committerJack Lloyd <[email protected]>2019-10-16 12:37:46 -0400
commit16367f7468c9257f8eee2f5fcc26887e794bb6c7 (patch)
treec7320d26d7ac2b6277003623d25ea2c28c8be087
parentf557d215ad04d93c0e89caaa89d452528f652a58 (diff)
parentbbd1639873c098196298c83ac076f6db096654ed (diff)
Merge GH #2157 Handle new RoughtimeError type
-rw-r--r--src/lib/ffi/ffi.cpp2
-rw-r--r--src/lib/ffi/ffi.h1
-rw-r--r--src/lib/utils/exceptn.cpp2
3 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp
index bd05943e9..58afb1c56 100644
--- a/src/lib/ffi/ffi.cpp
+++ b/src/lib/ffi/ffi.cpp
@@ -76,6 +76,8 @@ int ffi_map_error_type(Botan::ErrorType err)
return BOTAN_FFI_ERROR_HTTP_ERROR;
case Botan::ErrorType::TLSError:
return BOTAN_FFI_ERROR_TLS_ERROR;
+ case Botan::ErrorType::RoughtimeError:
+ return BOTAN_FFI_ERROR_ROUGHTIME_ERROR;
}
return BOTAN_FFI_ERROR_UNKNOWN_ERROR;
diff --git a/src/lib/ffi/ffi.h b/src/lib/ffi/ffi.h
index f140f617a..aac196494 100644
--- a/src/lib/ffi/ffi.h
+++ b/src/lib/ffi/ffi.h
@@ -84,6 +84,7 @@ enum BOTAN_FFI_ERROR {
BOTAN_FFI_ERROR_TLS_ERROR = -75,
BOTAN_FFI_ERROR_HTTP_ERROR = -76,
+ BOTAN_FFI_ERROR_ROUGHTIME_ERROR = -77,
BOTAN_FFI_ERROR_UNKNOWN_ERROR = -100,
};
diff --git a/src/lib/utils/exceptn.cpp b/src/lib/utils/exceptn.cpp
index d5845e09d..e6d067f34 100644
--- a/src/lib/utils/exceptn.cpp
+++ b/src/lib/utils/exceptn.cpp
@@ -46,6 +46,8 @@ std::string to_string(ErrorType type)
return "HttpError";
case ErrorType::InvalidTag:
return "InvalidTag";
+ case ErrorType::RoughtimeError:
+ return "RoughtimeError";
case ErrorType::OpenSSLError :
return "OpenSSLError";
case ErrorType::CommonCryptoError: