@@ -195,6 +195,15 @@ crypto_clear_error (void)

   ERR_clear_error ();

 }

+void

+crypto_print_openssl_errors(const unsigned int flags) {

+  size_t err = 0;

+

+  while ((err = ERR_get_error ()))

+    msg (flags, "OpenSSL: %s", ERR_error_string (err, NULL));

+}

+

+

 /*

  *

  * OpenSSL memory debugging.  If dmalloc debugging is enabled, tell

@@ -70,4 +70,29 @@ typedef HMAC_CTX hmac_ctx_t;

 #define DES_KEY_LENGTH 8

 #define MD4_DIGEST_LENGTH 	16

+/**

+ * Retrieve any occurred OpenSSL errors and print those errors.

+ *

+ * Note that this function uses the not thread-safe OpenSSL error API.

+ *

+ * @param flags		Flags to indicate error type and priority.

+ */

+void crypto_print_openssl_errors(const unsigned int flags);

+

+/**

+ * Retrieve any OpenSSL errors, then print the supplied error message.

+ *

+ * This is just a convenience wrapper for often occurring situations.

+ *

+ * @param flags		Flags to indicate error type and priority.

+ * @param format	Format string to print.

+ * @param format args	(optional) arguments for the format string.

+ */

+# define crypto_msg(flags, ...) \

+do { \

+  crypto_print_openssl_errors(nonfatal(flags)); \

+  msg((flags), __VA_ARGS__); \

+} while (false)

+

+

 #endif /* CRYPTO_OPENSSL_H_ */

@@ -354,6 +354,12 @@ ignore_sys_error (const int err)

   return false;

 }

+/** Convert fatal errors to nonfatal, don't touch other errors */

+static inline const unsigned int

+nonfatal(const unsigned int err) {

+  return err & M_FATAL ? (err ^ M_FATAL) | M_NONFATAL : err;

+}

+

 #include "errlevel.h"

 #endif