From 694a649ab80f09d338949e45c2a0ac6255910f1d Mon Sep 17 00:00:00 2001
From: sth <sth@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Thu, 12 Jun 2003 21:23:01 +0000
Subject: [PATCH] Add the AuthID when writing pkcs15 data objects

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1196 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/pkcs15init/pkcs15-lib.c | 7 +++++++
 src/tools/pkcs15-init.c     | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/pkcs15init/pkcs15-lib.c b/src/pkcs15init/pkcs15-lib.c
index c5c5858e..23afe791 100644
--- a/src/pkcs15init/pkcs15-lib.c
+++ b/src/pkcs15init/pkcs15-lib.c
@@ -563,6 +563,7 @@ sc_pkcs15init_init_prkdf(struct sc_pkcs15init_prkeyargs *keyargs,
 		if (keyargs->x509_usage)
 			usage = sc_pkcs15init_map_usage(keyargs->x509_usage, 1);
 	}
+
 	if ((label = keyargs->label) == NULL)
 		label = "Private Key";
 
@@ -994,6 +995,11 @@ sc_pkcs15init_store_data_object(struct sc_pkcs15_card *p15card,
 	if ((r = select_id(p15card, SC_PKCS15_TYPE_DATA_OBJECT, &args->id)) < 0)
 		return r;
 
+	/* Set the USER PIN reference from args */
+	r = set_user_pin_from_authid(p15card, profile, &args->auth_id);
+	if (r < 0)
+		return r;
+
 #ifdef notused
 	if (args->id.len != 0) {
 		sc_pkcs15_object_t *objp;
@@ -1027,6 +1033,7 @@ sc_pkcs15init_store_data_object(struct sc_pkcs15_card *p15card,
 	object->type = SC_PKCS15_TYPE_DATA_OBJECT;
 	object->data = data_object_info;
 	object->flags = DEFAULT_DATA_FLAGS;
+	object->auth_id = args->auth_id;
 	strncpy(object->label, label, sizeof(object->label));
 	r = sc_pkcs15init_store_data(p15card, profile,
 			SC_PKCS15_TYPE_DATA_OBJECT, &args->der_encoded,
diff --git a/src/tools/pkcs15-init.c b/src/tools/pkcs15-init.c
index 1231654f..827d89b0 100644
--- a/src/tools/pkcs15-init.c
+++ b/src/tools/pkcs15-init.c
@@ -758,6 +758,8 @@ do_store_data_object(struct sc_profile *profile)
 
 	if (opt_objectid)
 		sc_pkcs15_format_id(opt_objectid, &args.id);
+	if (opt_authid)
+		sc_pkcs15_format_id(opt_authid, &args.auth_id);
 	args.label = opt_label;
 
 	r = do_read_data_object(opt_infile, &data, &datalen);