Commit e70e417b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent f64f4435

engines/e_capi.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

			}

engines/e_capi_err.c

+1 −0
Original line number Diff line number Diff line
@@ -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}

engines/e_capi_err.h

+1 −0
Original line number Diff line number Diff line
@@ -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