APPS & TEST: Use ossl_[u]intmax_t rather than [u]intmax_t

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15825)

diff --git a/apps/x509.c b/apps/x509.c
index 25c75e85745c3c7985d6cd5572cce764ef67d5ef..558351ba304c875797a7fc048fe803bef1edcb7b 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -553,11 +553,11 @@ int x509_main(int argc, char **argv)
         case OPT_CHECKEND:
             checkend = 1;
             {
-                intmax_t temp = 0;
+                ossl_intmax_t temp = 0;
                 if (!opt_intmax(opt_arg(), &temp))
                     goto opthelp;
                 checkoffset = (time_t)temp;
-                if ((intmax_t)checkoffset != temp) {
+                if ((ossl_intmax_t)checkoffset != temp) {
                     BIO_printf(bio_err, "%s: Checkend time out of range %s\n",
                                prog, opt_arg());
                     goto opthelp;

diff --git a/test/ecstresstest.c b/test/ecstresstest.c
index 1ffb7e522ee8e3c4a42c81db70594c7e19896769..22d46c50da2cc9f6d1559485b4630c83591fc35f 100644 (file)
--- a/test/ecstresstest.c
+++ b/test/ecstresstest.c
@@ -18,7 +18,7 @@
 
 #define NUM_REPEATS "1000000"
 
-static intmax_t num_repeats;
+static ossl_intmax_t num_repeats;
 static int print_mode = 0;
 
 #ifndef OPENSSL_NO_EC
@@ -39,10 +39,11 @@ static const char *kP256DefaultResult =
  * point multiplication.
  * Returns the X-coordinate of the end result or NULL on error.
  */
-static BIGNUM *walk_curve(const EC_GROUP *group, EC_POINT *point, intmax_t num)
+static BIGNUM *walk_curve(const EC_GROUP *group, EC_POINT *point,
+                          ossl_intmax_t num)
 {
     BIGNUM *scalar = NULL;
-    intmax_t i;
+    ossl_intmax_t i;
 
     if (!TEST_ptr(scalar = BN_new())
             || !TEST_true(EC_POINT_get_affine_coordinates(group, point, scalar,