diff options
| author | Bodo Möller <bodo@openssl.org> | 2008-08-13 19:44:15 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2008-08-13 19:44:15 +0000 |
| commit | 9be8035b11ba781e513f31241a34ac2bfd406d93 (patch) | |
| tree | 2a166c3ba7711bae994f4571976b132239ae9532 /engines | |
| parent | 2ecd2ededece66bf090fefc93ef3ddb672d9e71a (diff) | |
fix error function codes
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_capi.c | 6 | ||||
| -rw-r--r-- | engines/e_capi_err.c | 1 | ||||
| -rw-r--r-- | engines/e_capi_err.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/engines/e_capi.c b/engines/e_capi.c index 7a7064c216..3a291f0d18 100644 --- 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: - CAPIerr(CAPI_F_CAPI_LOAD_PRIVKEY, ERR_R_MALLOC_FAILURE); + CAPIerr(CAPI_F_CAPI_GET_PKEY, ERR_R_MALLOC_FAILURE); 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) { - CAPIerr(CAPI_F_CLIENT_CERT_SELECT, CAPI_R_ERROR_CREATING_STORE); + CAPIerr(CAPI_F_CERT_SELECT_DIALOG, CAPI_R_ERROR_CREATING_STORE); 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)) { - CAPIerr(CAPI_F_CLIENT_CERT_SELECT, CAPI_R_ERROR_ADDING_CERT); + CAPIerr(CAPI_F_CERT_SELECT_DIALOG, CAPI_R_ERROR_ADDING_CERT); capi_addlasterror(); goto err; } diff --git a/engines/e_capi_err.c b/engines/e_capi_err.c index 64d7f7237b..73bbaaa718 100644 --- a/engines/e_capi_err.c +++ b/engines/e_capi_err.c @@ -86,6 +86,7 @@ static ERR_STRING_DATA CAPI_str_functs[]= {ERR_FUNC(CAPI_F_CAPI_RSA_PRIV_DEC), "CAPI_RSA_PRIV_DEC"}, {ERR_FUNC(CAPI_F_CAPI_RSA_PRIV_ENC), "CAPI_RSA_PRIV_ENC"}, {ERR_FUNC(CAPI_F_CAPI_RSA_SIGN), "CAPI_RSA_SIGN"}, +{ERR_FUNC(CAPI_F_CERT_SELECT_DIALOG), "CERT_SELECT_DIALOG"}, {ERR_FUNC(CAPI_F_CLIENT_CERT_SELECT), "CLIENT_CERT_SELECT"}, {ERR_FUNC(CAPI_F_WIDE_TO_ASC), "WIDE_TO_ASC"}, {0,NULL} diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h index c8cf4671ee..efdb751251 100644 --- a/engines/e_capi_err.h +++ b/engines/e_capi_err.h @@ -83,6 +83,7 @@ static void ERR_CAPI_error(int function, int reason, char *file, int line); #define CAPI_F_CAPI_RSA_PRIV_DEC 110 #define CAPI_F_CAPI_RSA_PRIV_ENC 111 #define CAPI_F_CAPI_RSA_SIGN 112 +#define CAPI_F_CERT_SELECT_DIALOG 117 #define CAPI_F_CLIENT_CERT_SELECT 116 #define CAPI_F_WIDE_TO_ASC 113 |