[pkg-opensc-commit] [opensc] 34/295: PKCS15-OpenPGP: Change error log

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository opensc.

commit 91fc129f190fa1760d617d8a0f31cd8ffaf8df9e
Author: Nguyễn Hồng Quân <ng.hong.quan at gmail.com>
Date:   Wed Mar 27 11:39:33 2013 +0700

    PKCS15-OpenPGP: Change error log
    
    Only one DO is supported now.
---
 src/libopensc/pkcs15-openpgp.c  | 2 +-
 src/pkcs15init/pkcs15-openpgp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
index 20b6566..10d3d50 100644
--- a/src/libopensc/pkcs15-openpgp.c
+++ b/src/libopensc/pkcs15-openpgp.c
@@ -398,7 +398,7 @@ sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
 		 */
 		r = read_file(p15card->card, path, content, sizeof(content));
 		if (r <= 0 ) {
-			sc_log(ctx, "No data get from DO 010%d", i);
+			sc_log(ctx, "Cannot read DO 010%d or there is no data in it", i);
 			/* Skip */
 			continue;
 		}
diff --git a/src/pkcs15init/pkcs15-openpgp.c b/src/pkcs15init/pkcs15-openpgp.c
index f5d6089..95ba5ae 100755
--- a/src/pkcs15init/pkcs15-openpgp.c
+++ b/src/pkcs15init/pkcs15-openpgp.c
@@ -306,7 +306,7 @@ static int openpgp_store_data(struct sc_pkcs15_card *p15card, struct sc_profile
 		}
 		if (r > 0) {
 			sc_log(ctx, "DO 0101 is full.");
-			r = SC_ERROR_TOO_MANY_OBJECTS;
+			r = SC_ERROR_NOT_ENOUGH_MEMORY;
 			break;
 		}
 		r = sc_pkcs15init_authenticate(profile, p15card, file, SC_AC_OP_UPDATE);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git