kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zkey: Add EP11 library helper routines

Browse Source 
Add a new source file that contains EP11 specific helper routines.
These routines require to load the EP11 host library.

Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Ingo Franzki
2019-11-12 12:35:58 +01:00
committed by Jan Höppner
parent d91e728e3c
commit b48aa5f435
8 changed files with 531 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zkey/zkey-cryptsetup.c
+13
View File
@@ -35,6 +35,7 @@
#include "misc.h"
#include "pkey.h"
#include "cca.h"
#include "ep11.h"
#include "utils.h"
/* Detect if cryptsetup 2.1 or later is available */
@@ -105,12 +106,16 @@ static struct zkey_cryptsetup_globals {
bool batch_mode;
bool debug;
bool verbose;
struct ext_lib lib;
struct cca_lib cca;
struct ep11_lib ep11;
int pkey_fd;
struct crypt_device *cd;
} g = {
.tries = 3,
.pkey_fd = -1,
.lib.cca = &g.cca,
.lib.ep11 = &g.ep11,
};
/*
@@ -269,6 +274,7 @@ struct zkey_cryptsetup_command {
unsigned int abbrev_len;
int (*function)(void);
int need_cca_library;
int need_ep11_library;
int need_pkey_device;
char *short_desc;
char *long_desc;
@@ -2435,6 +2441,13 @@ int main(int argc, char *argv[])
goto out;
}
}
if (command->need_ep11_library) {
rc = load_ep11_library(&g.ep11, g.verbose);
if (rc != 0) {
rc = EXIT_FAILURE;
goto out;
}
}
if (command->need_pkey_device) {
g.pkey_fd = open_pkey_device(g.verbose);
if (g.pkey_fd == -1) {