Add command for importing objects into a PKCS#11 token

Signed-off-by: Zoltan Fridrich <[email protected]>
p11-glue · Oct 17, 2023 · 79090fd · 79090fd
1 parent e5f0be3
commit 79090fd
Show file tree

Hide file tree

Showing 8 changed files with 597 additions and 1 deletion.
diff --git a/bash-completion/p11-kit b/bash-completion/p11-kit
@@ -10,7 +10,7 @@ _p11-kit()
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
         return
     elif [[ $cword -eq 1 ]]; then
-        local commands='list-mechanisms generate-keypair export-object delete-object list-objects add-profile delete-profile list-profiles list-modules list-tokens print-config extract server remote'
+        local commands='import-object list-mechanisms generate-keypair export-object delete-object list-objects add-profile delete-profile list-profiles list-modules list-tokens print-config extract server remote'
         COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
     fi
 } &&

diff --git a/common/compat.c b/common/compat.c
@@ -308,6 +308,8 @@ p11_mmap_open (const char *path,
 void
 p11_mmap_close (p11_mmap *map)
 {
+	if (map == NULL)
+		return;
 	if (map->size)
 		munmap (map->data, map->size);
 	close (map->fd);

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
@@ -266,6 +266,7 @@ p11_kit_p11_kit_SOURCES = \
 	p11-kit/delete-profile.c \
 	p11-kit/export-object.c \
 	p11-kit/generate-keypair.c \
+	p11-kit/import-object.c \
 	p11-kit/list-objects.c \
 	p11-kit/list-profiles.c \
 	p11-kit/list-mechanisms.c \
@@ -431,6 +432,7 @@ sh_tests += \
 if WITH_ASN1
 sh_tests += \
 	p11-kit/test-export-public.sh \
+	p11-kit/test-import-public.sh \
 	p11-kit/test-profiles.sh \
 	$(NULL)
 endif
@@ -632,6 +634,7 @@ EXTRA_DIST += \
 	p11-kit/test-server.sh \
 	p11-kit/test-list-tokens.sh \
 	p11-kit/test-export-public.sh \
+	p11-kit/test-import-public.sh \
 	p11-kit/test-list-mechanisms.sh \
 	p11-kit/test-generate-keypair.sh \
 	$(NULL)