crypto: KEYS: convert public key and digsig asym to the akcipher api

This patch converts the module verification code to the new akcipher API.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 10 insertions, 24 deletions

diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
index cc2516df0efa..50ac8759d7ee 100644
--- a/include/crypto/public_key.h
+++ b/include/crypto/public_key.h
@@ -24,7 +24,6 @@ enum pkey_algo {
 };
 
 extern const char *const pkey_algo_name[PKEY_ALGO__LAST];
-extern const struct public_key_algorithm *pkey_algo[PKEY_ALGO__LAST];
 
 /* asymmetric key implementation supports only up to SHA224 */
 #define PKEY_HASH__LAST         (HASH_ALGO_SHA224 + 1)
@@ -59,31 +58,10 @@ extern const char *const key_being_used_for[NR__KEY_BEING_USED_FOR];
  * part.
  */
 struct public_key {
-        const struct public_key_algorithm *algo;
-        u8      capabilities;
-#define PKEY_CAN_ENCRYPT        0x01
-#define PKEY_CAN_DECRYPT        0x02
-#define PKEY_CAN_SIGN           0x04
-#define PKEY_CAN_VERIFY         0x08
+        void *key;
+        u32 keylen;
         enum pkey_algo pkey_algo : 8;
         enum pkey_id_type id_type : 8;
-        union {
-                MPI     mpi[5];
-                struct {
-                        MPI     p;      /* DSA prime */
-                        MPI     q;      /* DSA group order */
-                        MPI     g;      /* DSA group generator */
-                        MPI     y;      /* DSA public-key value = g^x mod p */
-                        MPI     x;      /* DSA secret exponent (if present) */
-                } dsa;
-                struct {
-                        MPI     n;      /* RSA public modulus */
-                        MPI     e;      /* RSA public encryption exponent */
-                        MPI     d;      /* RSA secret encryption exponent (if present) */
-                        MPI     p;      /* RSA secret prime (if present) */
-                        MPI     q;      /* RSA secret prime (if present) */
-                } rsa;
-        };
 };
 
 extern void public_key_destroy(void *payload);
@@ -92,6 +70,8 @@ extern void public_key_destroy(void *payload);
  * Public key cryptography signature data
  */
 struct public_key_signature {
+        u8 *s;                  /* Signature */
+        u32 s_size;             /* Number of bytes in signature */
         u8 *digest;
         u8 digest_size;                 /* Number of bytes in digest */
         u8 nr_mpi;                      /* Occupancy of mpi[] */
@@ -109,6 +89,7 @@ struct public_key_signature {
         };
 };
 
+extern struct asymmetric_key_subtype public_key_subtype;
 struct key;
 extern int verify_signature(const struct key *key,
                             const struct public_key_signature *sig);
@@ -119,4 +100,9 @@ extern struct key *x509_request_asymmetric_key(struct key *keyring,
                                                const struct asymmetric_key_id *skid,
                                                bool partial);
 
+int public_key_verify_signature(const struct public_key *pkey,
+                                const struct public_key_signature *sig);
+
+int rsa_verify_signature(const struct public_key *pkey,
+                         const struct public_key_signature *sig);
 #endif /* _LINUX_PUBLIC_KEY_H */