While ispell may not like it, "cancelling" may be spelt with two "l"s
[openssl.git] / crypto / engine / engine_lib.c
index 48c4fb10cb052708908c2999fb5f188c026155c4..f82a20ad0302070d136c302b245cf60988ccb39c 100644 (file)
  * reference and the caller is responsible for freeing that when they
  * are finished with it (with a call to ENGINE_finish() *NOT* just
  * ENGINE_free()!!!!!!). */
+#ifndef OPENSSL_NO_RSA
 static ENGINE *engine_def_rsa = NULL;
+#endif
+#ifndef OPENSSL_NO_DSA
 static ENGINE *engine_def_dsa = NULL;
+#endif
+#ifndef OPENSSL_NO_DH
 static ENGINE *engine_def_dh = NULL;
+#endif
 static ENGINE *engine_def_rand = NULL;
 static ENGINE *engine_def_bn_mod_exp = NULL;
 static ENGINE *engine_def_bn_mod_exp_crt = NULL;
@@ -77,6 +83,10 @@ static ENGINE *engine_def_bn_mod_exp_crt = NULL;
  * initialised to suitable start-up defaults. */
 static int engine_def_flag = 0;
 
+/* When querying a ENGINE-specific control command's 'description', this string
+ * is used if the ENGINE_CMD_DEFN has cmd_desc set to NULL. */
+static const char *int_no_description = "";
+
 /* This is used in certain static utility functions to save code
  * repetition for per-algorithm functions. */
 typedef enum {
@@ -93,6 +103,8 @@ static void engine_def_check_util(ENGINE **def, ENGINE *val)
        *def = val;
        val->struct_ref++;
        val->funct_ref++;
+       engine_ref_debug(val, 0, 1)
+       engine_ref_debug(val, 1, 1)
        }
 
 /* In a slight break with convention - this static function must be
@@ -121,9 +133,15 @@ static void engine_def_check(void)
                        goto skip_set_defaults;
                /* OK, we got a functional reference, so we get one each
                 * for the defaults too. */
+#ifndef OPENSSL_NO_RSA
                engine_def_check_util(&engine_def_rsa, e);
+#endif
+#ifndef OPENSSL_NO_DSA
                engine_def_check_util(&engine_def_dsa, e);
+#endif
+#ifndef OPENSSL_NO_DH
                engine_def_check_util(&engine_def_dh, e);
+#endif
                engine_def_check_util(&engine_def_rand, e);
                engine_def_check_util(&engine_def_bn_mod_exp, e);
                engine_def_check_util(&engine_def_bn_mod_exp_crt, e);
@@ -153,13 +171,15 @@ int ENGINE_init(ENGINE *e)
        if((e->funct_ref == 0) && e->init)
                /* This is the first functional reference and the engine
                 * requires initialisation so we do it now. */
-               to_return = e->init();
+               to_return = e->init(e);
        if(to_return)
                {
                /* OK, we return a functional reference which is also a
                 * structural reference. */
                e->struct_ref++;
                e->funct_ref++;
+               engine_ref_debug(e, 0, 1)
+               engine_ref_debug(e, 1, 1)
                }
        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
        return to_return;
@@ -176,48 +196,43 @@ int ENGINE_finish(ENGINE *e)
                return 0;
                }
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-       if((e->funct_ref == 1) && e->finish)
-#if 0
-               /* This is the last functional reference and the engine
-                * requires cleanup so we do it now. */
-               to_return = e->finish();
-       if(to_return)
-               {
-               /* Cleanup the functional reference which is also a
-                * structural reference. */
-               e->struct_ref--;
-               e->funct_ref--;
-               }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-#else
-               /* I'm going to deliberately do a convoluted version of this
-                * piece of code because we don't want "finish" functions
-                * being called inside a locked block of code, if at all
-                * possible. I'd rather have this call take an extra couple
-                * of ticks than have throughput serialised on a externally-
-                * provided callback function that may conceivably never come
-                * back. :-( */
+       /* Reduce the functional reference count here so if it's the terminating
+        * case, we can release the lock safely and call the finish() handler
+        * without risk of a race. We get a race if we leave the count until
+        * after and something else is calling "finish" at the same time -
+        * there's a chance that both threads will together take the count from
+        * 2 to 0 without either calling finish(). */
+       e->funct_ref--;
+       engine_ref_debug(e, 1, -1)
+       if((e->funct_ref == 0) && e->finish)
                {
                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-               /* CODE ALERT: This *IS* supposed to be "=" and NOT "==" :-) */
-               if((to_return = e->finish()))
+               if(!(to_return = e->finish(e)))
                        {
-                       CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                       /* Cleanup the functional reference which is also a
-                        * structural reference. */
-                       e->struct_ref--;
-                       e->funct_ref--;
-                       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
+                       ENGINEerr(ENGINE_F_ENGINE_FINISH,ENGINE_R_FINISH_FAILED);
+                       return 0;
                        }
                }
        else
                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
+#ifdef REF_CHECK
+       if(e->funct_ref < 0)
+               {
+               fprintf(stderr,"ENGINE_finish, bad functional reference count\n");
+               abort();
+               }
 #endif
+       /* Release the structural reference too */
+       if(!ENGINE_free(e))
+               {
+               ENGINEerr(ENGINE_F_ENGINE_FINISH,ENGINE_R_FINISH_FAILED);
+               return 0;
+               }
        return to_return;
        }
 
 EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-       const char *passphrase)
+       UI_METHOD *ui_method, void *callback_data)
        {
        EVP_PKEY *pkey;
 
@@ -230,18 +245,19 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
        if(e->funct_ref == 0)
                {
+               CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
                ENGINEerr(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY,
                        ENGINE_R_NOT_INITIALISED);
                return 0;
                }
+       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
        if (!e->load_privkey)
                {
                ENGINEerr(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY,
                        ENGINE_R_NO_LOAD_FUNCTION);
                return 0;
                }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-       pkey = e->load_privkey(key_id, passphrase);
+       pkey = e->load_privkey(e, key_id, ui_method, callback_data);
        if (!pkey)
                {
                ENGINEerr(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY,
@@ -252,7 +268,7 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
        }
 
 EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-       const char *passphrase)
+       UI_METHOD *ui_method, void *callback_data)
        {
        EVP_PKEY *pkey;
 
@@ -265,18 +281,19 @@ EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
        if(e->funct_ref == 0)
                {
+               CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
                ENGINEerr(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY,
                        ENGINE_R_NOT_INITIALISED);
                return 0;
                }
+       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
        if (!e->load_pubkey)
                {
                ENGINEerr(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY,
                        ENGINE_R_NO_LOAD_FUNCTION);
                return 0;
                }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-       pkey = e->load_pubkey(key_id, passphrase);
+       pkey = e->load_pubkey(e, key_id, ui_method, callback_data);
        if (!pkey)
                {
                ENGINEerr(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY,
@@ -286,26 +303,328 @@ EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
        return pkey;
        }
 
+/* These internal functions handle 'CMD'-related control commands when the
+ * ENGINE in question has asked us to take care of it (ie. the ENGINE did not
+ * set the ENGINE_FLAGS_MANUAL_CMD_CTRL flag. */
+
+static int int_ctrl_cmd_is_null(const ENGINE_CMD_DEFN *defn)
+       {
+       if((defn->cmd_num == 0) || (defn->cmd_name == NULL))
+               return 1;
+       return 0;
+       }
+
+static int int_ctrl_cmd_by_name(const ENGINE_CMD_DEFN *defn, const char *s)
+       {
+       int idx = 0;
+       while(!int_ctrl_cmd_is_null(defn) && (strcmp(defn->cmd_name, s) != 0))
+               {
+               idx++;
+               defn++;
+               }
+       if(int_ctrl_cmd_is_null(defn))
+               /* The given name wasn't found */
+               return -1;
+       return idx;
+       }
+
+static int int_ctrl_cmd_by_num(const ENGINE_CMD_DEFN *defn, unsigned int num)
+       {
+       int idx = 0;
+       /* NB: It is stipulated that 'cmd_defn' lists are ordered by cmd_num. So
+        * our searches don't need to take any longer than necessary. */
+       while(!int_ctrl_cmd_is_null(defn) && (defn->cmd_num < num))
+               {
+               idx++;
+               defn++;
+               }
+       if(defn->cmd_num == num)
+               return idx;
+       /* The given cmd_num wasn't found */
+       return -1;
+       }
+
+static int int_ctrl_helper(ENGINE *e, int cmd, long i, void *p, void (*f)())
+       {
+       int idx;
+       char *s = (char *)p;
+       /* Take care of the easy one first (eg. it requires no searches) */
+       if(cmd == ENGINE_CTRL_GET_FIRST_CMD_TYPE)
+               {
+               if((e->cmd_defns == NULL) || int_ctrl_cmd_is_null(e->cmd_defns))
+                       return 0;
+               return e->cmd_defns->cmd_num;
+               }
+       /* One or two commands require that "p" be a valid string buffer */
+       if((cmd == ENGINE_CTRL_GET_CMD_FROM_NAME) ||
+                       (cmd == ENGINE_CTRL_GET_NAME_FROM_CMD) ||
+                       (cmd == ENGINE_CTRL_GET_DESC_FROM_CMD))
+               {
+               if(s == NULL)
+                       {
+                       ENGINEerr(ENGINE_F_INT_CTRL_HELPER,
+                               ERR_R_PASSED_NULL_PARAMETER);
+                       return -1;
+                       }
+               }
+       /* Now handle cmd_name -> cmd_num conversion */
+       if(cmd == ENGINE_CTRL_GET_CMD_FROM_NAME)
+               {
+               if((e->cmd_defns == NULL) || ((idx = int_ctrl_cmd_by_name(
+                                               e->cmd_defns, s)) < 0))
+                       {
+                       ENGINEerr(ENGINE_F_INT_CTRL_HELPER,
+                               ENGINE_R_INVALID_CMD_NAME);
+                       return -1;
+                       }
+               return e->cmd_defns[idx].cmd_num;
+               }
+       /* For the rest of the commands, the 'long' argument must specify a
+        * valie command number - so we need to conduct a search. */
+       if((e->cmd_defns == NULL) || ((idx = int_ctrl_cmd_by_num(e->cmd_defns,
+                                       (unsigned int)i)) < 0))
+               {
+               ENGINEerr(ENGINE_F_INT_CTRL_HELPER,
+                       ENGINE_R_INVALID_CMD_NUMBER);
+               return -1;
+               }
+       /* Now the logic splits depending on command type */
+       switch(cmd)
+               {
+       case ENGINE_CTRL_GET_NEXT_CMD_TYPE:
+               idx++;
+               if(int_ctrl_cmd_is_null(e->cmd_defns + idx))
+                       /* end-of-list */
+                       return 0;
+               else
+                       return e->cmd_defns[idx].cmd_num;
+       case ENGINE_CTRL_GET_NAME_LEN_FROM_CMD:
+               return strlen(e->cmd_defns[idx].cmd_name);
+       case ENGINE_CTRL_GET_NAME_FROM_CMD:
+               return sprintf(s, "%s", e->cmd_defns[idx].cmd_name);
+       case ENGINE_CTRL_GET_DESC_LEN_FROM_CMD:
+               if(e->cmd_defns[idx].cmd_desc)
+                       return strlen(e->cmd_defns[idx].cmd_desc);
+               return strlen(int_no_description);
+       case ENGINE_CTRL_GET_DESC_FROM_CMD:
+               if(e->cmd_defns[idx].cmd_desc)
+                       return sprintf(s, "%s", e->cmd_defns[idx].cmd_desc);
+               return sprintf(s, "%s", int_no_description);
+       case ENGINE_CTRL_GET_CMD_FLAGS:
+               return e->cmd_defns[idx].cmd_flags;
+               }
+       /* Shouldn't really be here ... */
+       ENGINEerr(ENGINE_F_INT_CTRL_HELPER,ENGINE_R_INTERNAL_LIST_ERROR);
+       return -1;
+       }
+
 int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
        {
+       int ctrl_exists, ref_exists;
        if(e == NULL)
                {
                ENGINEerr(ENGINE_F_ENGINE_CTRL,ERR_R_PASSED_NULL_PARAMETER);
                return 0;
                }
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-       if(e->struct_ref == 0)
+       ref_exists = ((e->struct_ref > 0) ? 1 : 0);
+       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
+       ctrl_exists = ((e->ctrl == NULL) ? 0 : 1);
+       if(!ref_exists)
                {
                ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_REFERENCE);
                return 0;
                }
-       if (!e->ctrl)
+       /* Intercept any "root-level" commands before trying to hand them on to
+        * ctrl() handlers. */
+       switch(cmd)
+               {
+       case ENGINE_CTRL_HAS_CTRL_FUNCTION:
+               return ctrl_exists;
+       case ENGINE_CTRL_GET_FIRST_CMD_TYPE:
+       case ENGINE_CTRL_GET_NEXT_CMD_TYPE:
+       case ENGINE_CTRL_GET_CMD_FROM_NAME:
+       case ENGINE_CTRL_GET_NAME_LEN_FROM_CMD:
+       case ENGINE_CTRL_GET_NAME_FROM_CMD:
+       case ENGINE_CTRL_GET_DESC_LEN_FROM_CMD:
+       case ENGINE_CTRL_GET_DESC_FROM_CMD:
+       case ENGINE_CTRL_GET_CMD_FLAGS:
+               if(ctrl_exists && !(e->flags & ENGINE_FLAGS_MANUAL_CMD_CTRL))
+                       return int_ctrl_helper(e,cmd,i,p,f);
+               if(!ctrl_exists)
+                       {
+                       ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_CONTROL_FUNCTION);
+                       /* For these cmd-related functions, failure is indicated
+                        * by a -1 return value (because 0 is used as a valid
+                        * return in some places). */
+                       return -1;
+                       }
+       default:
+               break;
+               }
+       /* Anything else requires a ctrl() handler to exist. */
+       if(!ctrl_exists)
                {
                ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_CONTROL_FUNCTION);
                return 0;
                }
-       CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-       return e->ctrl(cmd, i, p, f);
+       return e->ctrl(e, cmd, i, p, f);
+       }
+
+int ENGINE_cmd_is_executable(ENGINE *e, int cmd)
+       {
+       int flags;
+       if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, cmd, NULL, NULL)) < 0)
+               {
+               ENGINEerr(ENGINE_F_ENGINE_CMD_IS_EXECUTABLE,
+                       ENGINE_R_INVALID_CMD_NUMBER);
+               return 0;
+               }
+       if(!(flags & ENGINE_CMD_FLAG_NO_INPUT) &&
+                       !(flags & ENGINE_CMD_FLAG_NUMERIC) &&
+                       !(flags & ENGINE_CMD_FLAG_STRING))
+               return 0;
+       return 1;
+       }
+
+int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
+        long i, void *p, void (*f)(), int cmd_optional)
+        {
+       int num;
+
+       if((e == NULL) || (cmd_name == NULL))
+               {
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ERR_R_PASSED_NULL_PARAMETER);
+               return 0;
+               }
+       if((e->ctrl == NULL) || ((num = ENGINE_ctrl(e,
+                                       ENGINE_CTRL_GET_CMD_FROM_NAME,
+                                       0, (void *)cmd_name, NULL)) <= 0))
+               {
+               /* If the command didn't *have* to be supported, we fake
+                * success. This allows certain settings to be specified for
+                * multiple ENGINEs and only require a change of ENGINE id
+                * (without having to selectively apply settings). Eg. changing
+                * from a hardware device back to the regular software ENGINE
+                * without editing the config file, etc. */
+               if(cmd_optional)
+                       {
+                       ERR_clear_error();
+                       return 1;
+                       }
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD,
+                       ENGINE_R_INVALID_CMD_NAME);
+               return 0;
+               }
+       /* Force the result of the control command to 0 or 1, for the reasons
+        * mentioned before. */
+        if (ENGINE_ctrl(e, num, i, p, f))
+                return 1;
+        return 0;
+        }
+
+int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
+                               int cmd_optional)
+       {
+       int num, flags;
+       long l;
+       char *ptr;
+       if((e == NULL) || (cmd_name == NULL))
+               {
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ERR_R_PASSED_NULL_PARAMETER);
+               return 0;
+               }
+       if((e->ctrl == NULL) || ((num = ENGINE_ctrl(e,
+                                       ENGINE_CTRL_GET_CMD_FROM_NAME,
+                                       0, (void *)cmd_name, NULL)) <= 0))
+               {
+               /* If the command didn't *have* to be supported, we fake
+                * success. This allows certain settings to be specified for
+                * multiple ENGINEs and only require a change of ENGINE id
+                * (without having to selectively apply settings). Eg. changing
+                * from a hardware device back to the regular software ENGINE
+                * without editing the config file, etc. */
+               if(cmd_optional)
+                       {
+                       ERR_clear_error();
+                       return 1;
+                       }
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ENGINE_R_INVALID_CMD_NAME);
+               return 0;
+               }
+       if(!ENGINE_cmd_is_executable(e, num))
+               {
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ENGINE_R_CMD_NOT_EXECUTABLE);
+               return 0;
+               }
+       if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num, NULL, NULL)) < 0)
+               {
+               /* Shouldn't happen, given that ENGINE_cmd_is_executable()
+                * returned success. */
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ENGINE_R_INTERNAL_LIST_ERROR);
+               return 0;
+               }
+       /* If the command takes no input, there must be no input. And vice
+        * versa. */
+       if(flags & ENGINE_CMD_FLAG_NO_INPUT)
+               {
+               if(arg != NULL)
+                       {
+                       ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                               ENGINE_R_COMMAND_TAKES_NO_INPUT);
+                       return 0;
+                       }
+               /* We deliberately force the result of ENGINE_ctrl() to 0 or 1
+                * rather than returning it as "return data". This is to ensure
+                * usage of these commands is consistent across applications and
+                * that certain applications don't understand it one way, and
+                * others another. */
+               if(ENGINE_ctrl(e, num, 0, (void *)arg, NULL))
+                       return 1;
+               return 0;
+               }
+       /* So, we require input */
+       if(arg == NULL)
+               {
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ENGINE_R_COMMAND_TAKES_INPUT);
+               return 0;
+               }
+       /* If it takes string input, that's easy */
+       if(flags & ENGINE_CMD_FLAG_STRING)
+               {
+               /* Same explanation as above */
+               if(ENGINE_ctrl(e, num, 0, (void *)arg, NULL))
+                       return 1;
+               return 0;
+               }
+       /* If it doesn't take numeric either, then it is unsupported for use in
+        * a config-setting situation, which is what this function is for. This
+        * should never happen though, because ENGINE_cmd_is_executable() was
+        * used. */
+       if(!(flags & ENGINE_CMD_FLAG_NUMERIC))
+               {
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ENGINE_R_INTERNAL_LIST_ERROR);
+               return 0;
+               }
+       l = strtol(arg, &ptr, 10);
+       if((arg == ptr) || (*ptr != '\0'))
+               {
+               ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
+                       ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER);
+               return 0;
+               }
+       /* Force the result of the control command to 0 or 1, for the reasons
+        * mentioned before. */
+       if(ENGINE_ctrl(e, num, l, NULL, NULL))
+               return 1;
+       return 0;
        }
 
 static ENGINE *engine_get_default_type(ENGINE_TYPE t)
@@ -319,18 +638,26 @@ static ENGINE *engine_get_default_type(ENGINE_TYPE t)
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
        switch(t)
                {
+#ifndef OPENSSL_NO_RSA
        case ENGINE_TYPE_RSA:
                ret = engine_def_rsa; break;
+#endif
+#ifndef OPENSSL_NO_DSA
        case ENGINE_TYPE_DSA:
                ret = engine_def_dsa; break;
+#endif
+#ifndef OPENSSL_NO_DH
        case ENGINE_TYPE_DH:
                ret = engine_def_dh; break;
+#endif
        case ENGINE_TYPE_RAND:
                ret = engine_def_rand; break;
        case ENGINE_TYPE_BN_MOD_EXP:
                ret = engine_def_bn_mod_exp; break;
        case ENGINE_TYPE_BN_MOD_EXP_CRT:
                ret = engine_def_bn_mod_exp_crt; break;
+       default:
+               break;
                }
        /* Unforunately we can't do this work outside the lock with a
         * call to ENGINE_init() because that would leave a race
@@ -339,25 +666,33 @@ static ENGINE *engine_get_default_type(ENGINE_TYPE t)
                {
                ret->struct_ref++;
                ret->funct_ref++;
+               engine_ref_debug(ret, 0, 1)
+               engine_ref_debug(ret, 1, 1)
                }
        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
        return ret;
        }
 
+#ifndef OPENSSL_NO_RSA
 ENGINE *ENGINE_get_default_RSA(void)
        {
        return engine_get_default_type(ENGINE_TYPE_RSA);
        }
+#endif
 
+#ifndef OPENSSL_NO_DSA
 ENGINE *ENGINE_get_default_DSA(void)
        {
        return engine_get_default_type(ENGINE_TYPE_DSA);
        }
+#endif
 
+#ifndef OPENSSL_NO_DH
 ENGINE *ENGINE_get_default_DH(void)
        {
        return engine_get_default_type(ENGINE_TYPE_DH);
        }
+#endif
 
 ENGINE *ENGINE_get_default_RAND(void)
        {
@@ -378,12 +713,6 @@ static int engine_set_default_type(ENGINE_TYPE t, ENGINE *e)
        {
        ENGINE *old = NULL;
 
-       if(e == NULL)
-               {
-               ENGINEerr(ENGINE_F_ENGINE_SET_DEFAULT_TYPE,
-                       ERR_R_PASSED_NULL_PARAMETER);
-               return 0;
-               }
        /* engine_def_check is lean and mean and won't replace any
         * prior default engines ... so we must ensure that it is always
         * the first function to get to touch the default values. */
@@ -391,7 +720,7 @@ static int engine_set_default_type(ENGINE_TYPE t, ENGINE *e)
        /* Attempt to get a functional reference (we need one anyway, but
         * also, 'e' may be just a structural reference being passed in so
         * this call may actually be the first). */
-       if(!ENGINE_init(e))
+       if(e && !ENGINE_init(e))
                {
                ENGINEerr(ENGINE_F_ENGINE_SET_DEFAULT_TYPE,
                        ENGINE_R_INIT_FAILED);
@@ -400,15 +729,21 @@ static int engine_set_default_type(ENGINE_TYPE t, ENGINE *e)
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
        switch(t)
                {
+#ifndef OPENSSL_NO_RSA
        case ENGINE_TYPE_RSA:
                old = engine_def_rsa;
                engine_def_rsa = e; break;
+#endif
+#ifndef OPENSSL_NO_DSA
        case ENGINE_TYPE_DSA:
                old = engine_def_dsa;
                engine_def_dsa = e; break;
+#endif
+#ifndef OPENSSL_NO_DH
        case ENGINE_TYPE_DH:
                old = engine_def_dh;
                engine_def_dh = e; break;
+#endif
        case ENGINE_TYPE_RAND:
                old = engine_def_rand;
                engine_def_rand = e; break;
@@ -418,6 +753,8 @@ static int engine_set_default_type(ENGINE_TYPE t, ENGINE *e)
        case ENGINE_TYPE_BN_MOD_EXP_CRT:
                old = engine_def_bn_mod_exp_crt;
                engine_def_bn_mod_exp_crt = e; break;
+       default:
+               break;
                }
        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
        /* If we've replaced a previous value, then we need to remove the
@@ -431,20 +768,26 @@ static int engine_set_default_type(ENGINE_TYPE t, ENGINE *e)
        return 1;
        }
 
+#ifndef OPENSSL_NO_RSA
 int ENGINE_set_default_RSA(ENGINE *e)
        {
        return engine_set_default_type(ENGINE_TYPE_RSA, e);
        }
+#endif
 
+#ifndef OPENSSL_NO_DSA
 int ENGINE_set_default_DSA(ENGINE *e)
        {
        return engine_set_default_type(ENGINE_TYPE_DSA, e);
        }
+#endif
 
+#ifndef OPENSSL_NO_DH
 int ENGINE_set_default_DH(ENGINE *e)
        {
        return engine_set_default_type(ENGINE_TYPE_DH, e);
        }
+#endif
 
 int ENGINE_set_default_RAND(ENGINE *e)
        {
@@ -463,15 +806,21 @@ int ENGINE_set_default_BN_mod_exp_crt(ENGINE *e)
 
 int ENGINE_set_default(ENGINE *e, unsigned int flags)
        {
+#ifndef OPENSSL_NO_RSA
        if((flags & ENGINE_METHOD_RSA) && e->rsa_meth &&
                        !ENGINE_set_default_RSA(e))
                return 0;
+#endif
+#ifndef OPENSSL_NO_DSA
        if((flags & ENGINE_METHOD_DSA) && e->dsa_meth &&
                        !ENGINE_set_default_DSA(e))
                return 0;
+#endif
+#ifndef OPENSSL_NO_DH
        if((flags & ENGINE_METHOD_DH) && e->dh_meth &&
                        !ENGINE_set_default_DH(e))
                return 0;
+#endif
        if((flags & ENGINE_METHOD_RAND) && e->rand_meth &&
                        !ENGINE_set_default_RAND(e))
                return 0;
@@ -484,3 +833,32 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
        return 1;
        }
 
+int ENGINE_clear_defaults(void)
+       {
+       /* If the defaults haven't even been set yet, don't bother. Any kind of
+        * "cleanup" has a kind of implicit race-condition if another thread is
+        * trying to keep going, so we don't address that with locking. The
+        * first ENGINE_set_default_*** call will actually *create* a standard
+        * set of default ENGINEs (including init() and functional reference
+        * counts aplenty) before the rest of this function undoes them all. So
+        * save some hassle ... */
+       if(!engine_def_flag)
+               return 1;
+       if((0 == 1) ||
+#ifndef OPENSSL_NO_RSA
+                       !ENGINE_set_default_RSA(NULL) ||
+#endif
+#ifndef OPENSSL_NO_DSA
+                       !ENGINE_set_default_DSA(NULL) ||
+#endif
+#ifndef OPENSSL_NO_DH
+                       !ENGINE_set_default_DH(NULL) ||
+#endif
+                       !ENGINE_set_default_RAND(NULL) ||
+                       !ENGINE_set_default_BN_mod_exp(NULL) ||
+                       !ENGINE_set_default_BN_mod_exp_crt(NULL) ||
+                       !RAND_set_rand_method(NULL))
+               return 0;
+       return 1;
+       }
+