Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / crypto / asymmetric_keys / x509_cert_parser.c

diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index 96151b2..a668d90 100644 (file)
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -435,9 +435,11 @@ int x509_process_extension(void *context, size_t hdrlen,
                v += 2;
                vlen -= 2;
 
-               kid = asymmetric_key_generate_id(v, vlen,
-                                                ctx->cert->raw_subject,
-                                                ctx->cert->raw_subject_size);
+               ctx->cert->raw_skid_size = vlen;
+               ctx->cert->raw_skid = v;
+               kid = asymmetric_key_generate_id(ctx->cert->raw_subject,
+                                                ctx->cert->raw_subject_size,
+                                                v, vlen);
                if (IS_ERR(kid))
                        return PTR_ERR(kid);
                ctx->cert->skid = kid;
@@ -491,9 +493,9 @@ int x509_process_extension(void *context, size_t hdrlen,
                        v += (sub + 2);
                }
 
-               kid = asymmetric_key_generate_id(v, vlen,
-                                                ctx->cert->raw_issuer,
-                                                ctx->cert->raw_issuer_size);
+               kid = asymmetric_key_generate_id(ctx->cert->raw_issuer,
+                                                ctx->cert->raw_issuer_size,
+                                                v, vlen);
                if (IS_ERR(kid))
                        return PTR_ERR(kid);
                pr_debug("authkeyid %*phN\n", kid->len, kid->data);