[gnome-keyring] gcr: Stop parsing PKCS#12 bag if locked

[Stefan Walter <stefw src gnome org>]

commit 72c5bdb912861204cf0d560f4817b92453d2170e
Author: Stef Walter <stefw collabora co uk>
Date:   Fri Sep 2 13:43:49 2011 +0200

    gcr: Stop parsing PKCS#12 bag if locked
    
     * This allows GcrUnlockRenderer to work correctly for certain
       types of PKCS#12 files it was screwing up on before.

 gcr/gcr-parser.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index b051752..e4585b7 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -948,7 +948,9 @@ handle_pkcs12_bag (GcrParser *self, const guchar *data, gsize n_data)
 		if (friendly != NULL)
 			parsed_label (self, NULL);
 
-		if (r == GCR_ERROR_FAILURE || r == GCR_ERROR_CANCELLED) {
+		if (r == GCR_ERROR_FAILURE ||
+		    r == GCR_ERROR_CANCELLED ||
+		    r == GCR_ERROR_LOCKED) {
 			ret = r;
 			goto done;
 		}