Remove old digest type hacks for non RSA keys.

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 1b7ca6961f545f7a1a5c7924de3b8ff5b5c440f7..d2b0c565a04af64ecc18f402cff70363543d5640 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1437,6 +1437,10 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
 
 int load_config(BIO *err, CONF *cnf)
        {
+       static int load_config_called = 0;
+       if (load_config_called)
+               return 1;
+       load_config_called = 1;
        if (!cnf)
                cnf = config;
        if (!cnf)
@@ -2304,11 +2308,11 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
        return ret;
        }
 
-int pkey_ctrl_string(BIO *err, EVP_PKEY_CTX *ctx, char *value)
+int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value)
        {
+       int rv;
        char *stmp, *vtmp = NULL;
        stmp = BUF_strdup(value);
-       int rv;
        if (!stmp)
                return -1;
        vtmp = strchr(stmp, ':');
@@ -2673,7 +2677,7 @@ int raw_read_stdin(void *buf,int siz)
 #endif
 
 #if defined(_WIN32) && defined(STD_OUTPUT_HANDLE)
-int raw_write_stdout(void *buf,int siz)
+int raw_write_stdout(const void *buf,int siz)
        {
        DWORD n;
        if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE),buf,siz,&n,NULL))