projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: 1868
[oweals/openssl.git]
/
engines
/
e_capi.c
diff --git
a/engines/e_capi.c
b/engines/e_capi.c
index 7a7064c216a834053b0c006c5a724ea935e9d6fd..e98946c85a0a288c8ac925db665785f980bc32fe 100644
(file)
--- a/
engines/e_capi.c
+++ b/
engines/e_capi.c
@@
-716,7
+716,7
@@
static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY *key)
return ret;
memerr:
return ret;
memerr:
- CAPIerr(CAPI_F_CAPI_
LOAD_PRIV
KEY, ERR_R_MALLOC_FAILURE);
+ CAPIerr(CAPI_F_CAPI_
GET_P
KEY, ERR_R_MALLOC_FAILURE);
goto err;
}
goto err;
}
@@
-1716,7
+1716,7
@@
static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
CERT_STORE_CREATE_NEW_FLAG, NULL);
if (!dstore)
{
CERT_STORE_CREATE_NEW_FLAG, NULL);
if (!dstore)
{
- CAPIerr(CAPI_F_C
LIENT_CERT_SELECT
, CAPI_R_ERROR_CREATING_STORE);
+ CAPIerr(CAPI_F_C
ERT_SELECT_DIALOG
, CAPI_R_ERROR_CREATING_STORE);
capi_addlasterror();
goto err;
}
capi_addlasterror();
goto err;
}
@@
-1729,7
+1729,7
@@
static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
if (!CertAddCertificateContextToStore(dstore, key->pcert,
CERT_STORE_ADD_NEW, NULL))
{
if (!CertAddCertificateContextToStore(dstore, key->pcert,
CERT_STORE_ADD_NEW, NULL))
{
- CAPIerr(CAPI_F_C
LIENT_CERT_SELECT
, CAPI_R_ERROR_ADDING_CERT);
+ CAPIerr(CAPI_F_C
ERT_SELECT_DIALOG
, CAPI_R_ERROR_ADDING_CERT);
capi_addlasterror();
goto err;
}
capi_addlasterror();
goto err;
}
@@
-1770,5
+1770,12
@@
static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
}
#endif
}
#endif
+#endif
+#else /* !WIN32 */
+#include <openssl/engine.h>
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
+OPENSSL_EXPORT
+int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
+IMPLEMENT_DYNAMIC_CHECK_FN()
#endif
#endif
#endif
#endif