1 files changed, 11 insertions, 3 deletions
diff --git a/src/msg.c b/src/msg.c
index 6ad4fa3..be2fdcd 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -13,6 +13,8 @@
 #include <errno.h>
 #endif
 
+#include <openssl/err.h>
+
 static const char *the_prefix = NULL;
 
 const char*
@@ -118,9 +120,9 @@ p11t_msg_rv(CK_RV rv)
 static char last_error[1024];
 
 const char*
-p11t_msg_lasterr(void)
+p11t_msg_os(void)
 {
-    LPVOID lpMsgBuf;
+	LPVOID lpMsgBuf;
 	DWORD error = GetLastError();
 	DWORD dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
 	                            FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, error,
@@ -142,13 +144,19 @@ p11t_msg_lasterr(void)
 #else /* _WIN32 */
 
 const char*
-p11t_msg_lasterr(void)
+p11t_msg_os(void)
 {
 	return strerror(errno);
 }
 
 #endif /* _WIN32 */
 
+const char*
+p11t_msg_openssl(void)
+{
+	return ERR_error_string(ERR_get_error(), NULL);
+}
+
 void
 p11t_msg_va(const char *message, va_list va)
 {