mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '1673-lib-isc-pk11-c-depend-on-libdns-headers' into 'master'

Browse Source 
Use ISC_R_CRYPTOFAILURE instead DST_R_CRYPTOFAILURE in libisc

Closes #1673

See merge request isc-projects/bind9!3220
This commit is contained in:
Ondřej Surý
2020-03-12 19:05:29 +00:00
parent bc10d88c25 e67ce7e966
commit c34b9364c0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/isc/pk11.c
View File

@@ -34,8 +34,6 @@
#include <pkcs11/eddsa.h> #include <pkcs11/eddsa.h>
#include <pkcs11/pkcs11.h> #include <pkcs11/pkcs11.h>
#include <dst/result.h>
/* was 32 octets, Petr Spacek suggested 1024, SoftHSMv2 uses 256... */ /* was 32 octets, Petr Spacek suggested 1024, SoftHSMv2 uses 256... */
#ifndef PINLEN #ifndef PINLEN
#define PINLEN 256 #define PINLEN 256
@@ -422,7 +420,7 @@ free_session_list(pk11_sessionlist_t *slist) {
if (sp->session != CK_INVALID_HANDLE) { if (sp->session != CK_INVALID_HANDLE) {
rv = pkcs_C_CloseSession(sp->session); rv = pkcs_C_CloseSession(sp->session);
if (rv != CKR_OK) { if (rv != CKR_OK) {
ret = DST_R_CRYPTOFAILURE; ret = ISC_R_CRYPTOFAILURE;
} }
} }
LOCK(&sessionlock); LOCK(&sessionlock);
@@ -445,7 +443,7 @@ setup_session(pk11_session_t *sp, pk11_token_t *token, bool rw) {
rv = pkcs_C_OpenSession(token->slotid, flags, NULL_PTR, NULL_PTR, rv = pkcs_C_OpenSession(token->slotid, flags, NULL_PTR, NULL_PTR,
&sp->session); &sp->session);
if (rv != CKR_OK) { if (rv != CKR_OK) {
return (DST_R_CRYPTOFAILURE); return (ISC_R_CRYPTOFAILURE);
} }
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }