Skip PSK tests for no-psk

[openssl.git] / engines / e_atalla.c

diff --git a/engines/e_atalla.c b/engines/e_atalla.c
index 6a324e6766b063606af2154aa308706e80d4dbff..211f29f541da64d2ee0694acf75a9d3cf901964e 100644 (file)
--- a/engines/e_atalla.c
+++ b/engines/e_atalla.c
@@ -324,8 +324,7 @@ static const char *get_ATALLA_LIBNAME(void)
 
 static void free_ATALLA_LIBNAME(void)
 {
-    if (ATALLA_LIBNAME)
-        OPENSSL_free((void *)ATALLA_LIBNAME);
+    OPENSSL_free(ATALLA_LIBNAME);
     ATALLA_LIBNAME = NULL;
 }
 
@@ -383,13 +382,10 @@ static int atalla_init(ENGINE *e)
         ATALLAerr(ATALLA_F_ATALLA_INIT, ATALLA_R_NOT_LOADED);
         goto err;
     }
-    if (!
-        (p1 =
-         (tfnASI_GetHardwareConfig *) DSO_bind_func(atalla_dso, ATALLA_F1))
-|| !(p2 = (tfnASI_RSAPrivateKeyOpFn *) DSO_bind_func(atalla_dso, ATALLA_F2))
-|| !(p3 =
-     (tfnASI_GetPerformanceStatistics *) DSO_bind_func(atalla_dso,
-                                                       ATALLA_F3))) {
+#define BINDIT(t, name) (t *)DSO_bind_func(atalla_dso, name)
+    if ((p1 = BINDIT(tfnASI_GetHardwareConfig, ATALLA_F1)) == NULL
+        || (p2 = BINDIT(tfnASI_RSAPrivateKeyOpFn, ATALLA_F2)) == NULL
+        || (p3 = BINDIT(tfnASI_GetPerformanceStatistics, ATALLA_F3)) == NULL) {
         ATALLAerr(ATALLA_F_ATALLA_INIT, ATALLA_R_NOT_LOADED);
         goto err;
     }
@@ -407,8 +403,7 @@ static int atalla_init(ENGINE *e)
     /* Everything's fine. */
     return 1;
  err:
-    if (atalla_dso)
-        DSO_free(atalla_dso);
+    DSO_free(atalla_dso);
     atalla_dso = NULL;
     p_Atalla_GetHardwareConfig = NULL;
     p_Atalla_RSAPrivateKeyOpFn = NULL;
@@ -494,7 +489,7 @@ static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         goto err;
     }
     /* Prepare the key-data */
-    memset(&keydata, 0, sizeof keydata);
+    memset(&keydata, 0, sizeof(keydata));
     numbytes = BN_num_bytes(m);
     memset(exponent->d, 0, numbytes);
     memset(modulus->d, 0, numbytes);