TEST: fix test/errtest.c

test/errtest.c used the system error code 1 for EPERM.  However, EPERM
may be coded differently on different systems, so we switch to using
EPERM instead.  However, because we know that the ERR sub-system
truncates system error codes that occupy more than 24 bits, we check
that the reason code in the recorded error matches our EPERM, and skip
the test if not.

To be safe (even though the error string for that code is well defined
in POSIX), we also use strerror() to retrieve the string for that
error code instead of using a hard coded value.

Fixes #12276
Fixes #12217
Fixes #12354

Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/12343)

diff --git a/test/errtest.c b/test/errtest.c
index f7a6f85470cd33f321110ad00fd1ef2c4c9edb88..e8c7d44306da19200b7147fd325a55c971d61efd 100644 (file)
--- a/test/errtest.c
+++ b/test/errtest.c
@@ -25,24 +25,53 @@
 
 static int test_print_error_format(void)
 {
-    static const char expected_format[] =
-        ":error::system library:%s:Operation not permitted:"
+    /* Variables used to construct an error line */
+    const char *func = OPENSSL_FUNC;
 # ifndef OPENSSL_NO_FILENAMES
-        "errtest.c:30:";
+    const char *file = OPENSSL_FILE;
+    const int line = OPENSSL_LINE;
 # else
-        ":0:";
+    const char *file = "";
+    const int line = 0;
 # endif
-    char expected[256];
+    /* The format for OpenSSL error lines */
+    const char *expected_format = ":error::system library:%s:%s:%s:%d";
+    /*-
+     *                                                    ^^ ^^ ^^ ^^
+     * function name -------------------------------------++ || || ||
+     * reason string (system error string) ------------------++ || ||
+     * file name -----------------------------------------------++ ||
+     * line number ------------------------------------------------++
+     */
+    char expected[512];
+
     char *out = NULL, *p = NULL;
     int ret = 0, len;
     BIO *bio = NULL;
+    const int syserr = EPERM;
+    int reasoncode;
+
+    /*
+     * We set a mark here so we can clear the system error that we generate
+     * with ERR_PUT_error().  That is, after all, just a simulation to verify
+     * ERR_print_errors() output, not a real error.
+     */
+    ERR_set_mark();
 
-    BIO_snprintf(expected, sizeof(expected), expected_format, OPENSSL_FUNC);
+    ERR_PUT_error(ERR_LIB_SYS, 0, syserr, file, line);
+    reasoncode = ERR_GET_REASON(ERR_peek_error());
+
+    if (!TEST_int_eq(reasoncode, syserr)) {
+        ERR_pop_to_mark();
+        goto err;
+    }
+
+    BIO_snprintf(expected, sizeof(expected), expected_format,
+                 func, strerror(syserr), file, line);
 
     if (!TEST_ptr(bio = BIO_new(BIO_s_mem())))
-        return 0;
+        goto err;
 
-    ERR_PUT_error(ERR_LIB_SYS, 0, 1, "errtest.c", 30);
     ERR_print_errors(bio);
 
     if (!TEST_int_gt(len = BIO_get_mem_data(bio, &out), 0))
@@ -106,7 +135,7 @@ static int raised_error(void)
     file = __FILE__;
     line = __LINE__ + 2; /* The error is generated on the ERR_raise_data line */
 #endif
-    ERR_raise_data(ERR_LIB_SYS, ERR_R_INTERNAL_ERROR,
+    ERR_raise_data(ERR_LIB_NONE, ERR_R_INTERNAL_ERROR,
                    "calling exit()");
     if (!TEST_ulong_ne(e = ERR_get_error_all(&f, &l, NULL, &data, NULL), 0)
             || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR)