upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit c34b9364c0
1 changed files with 2 additions and 4 deletions
Show stats 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/pkcs11.h>
#include <dst/result.h>
/* was 32 octets, Petr Spacek suggested 1024, SoftHSMv2 uses 256... */
#ifndef PINLEN
#define PINLEN 256
@ -422,7 +420,7 @@ free_session_list(pk11_sessionlist_t *slist) {
if (sp->session != CK_INVALID_HANDLE) {
rv = pkcs_C_CloseSession(sp->session);
if (rv != CKR_OK) {
ret = DST_R_CRYPTOFAILURE;
ret = ISC_R_CRYPTOFAILURE;
}
}
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,
&sp->session);
if (rv != CKR_OK) {
return (DST_R_CRYPTOFAILURE);
return (ISC_R_CRYPTOFAILURE);
}
return (ISC_R_SUCCESS);
}