Merge tag 'please-pull-vm_unwrapped' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / security / integrity / digsig.c

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index 2dc167d7cde9f1ca3158eacbead2c2aa7cb06a48..0b759e17a1311abc3a2fb1f6fbf7e554b8f71ce5 100644 (file)
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -44,5 +44,14 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
                }
        }
 
-       return digsig_verify(keyring[id], sig, siglen, digest, digestlen);
+       switch (sig[0]) {
+       case 1:
+               return digsig_verify(keyring[id], sig, siglen,
+                                    digest, digestlen);
+       case 2:
+               return asymmetric_verify(keyring[id], sig, siglen,
+                                        digest, digestlen);
+       }
+
+       return -EOPNOTSUPP;
 }