diff options
| author |   David Howells <dhowells@redhat.com> | 2013-08-30 16:15:18 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2013-09-25 15:51:07 +0100 |
| commit | 206ce59a109f3b4bb352845bcd04f3cf504ae592 (patch) | |
| tree | 5afe846814b64a64cb5bc6f27a9125eec435575a /crypto/asymmetric_keys/x509_public_key.c | |
| parent | KEYS: Rename public key parameter name arrays (diff) | |
| download | linux-dev-206ce59a109f3b4bb352845bcd04f3cf504ae592.tar.xz linux-dev-206ce59a109f3b4bb352845bcd04f3cf504ae592.zip | |
KEYS: Move the algorithm pointer array from x509 to public_key.c
Move the public-key algorithm pointer array from x509_public_key.c to
public_key.c as it isn't X.509 specific.
Note that to make this configure correctly, the public key part must be
dependent on the RSA module rather than the other way round. This needs a
further patch to make use of the crypto module loading stuff rather than using
a fixed table.
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Josh Boyer <jwboyer@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | crypto/asymmetric_keys/x509_public_key.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c index afbbc362f85a..fe38628adae9 100644 --- a/crypto/asymmetric_keys/x509_public_key.c +++ b/crypto/asymmetric_keys/x509_public_key.c @@ -23,15 +23,6 @@ #include "public_key.h" #include "x509_parser.h" -static const -struct public_key_algorithm *x509_public_key_algorithms[PKEY_ALGO__LAST] = { - [PKEY_ALGO_DSA] = NULL, -#if defined(CONFIG_PUBLIC_KEY_ALGO_RSA) || \ - defined(CONFIG_PUBLIC_KEY_ALGO_RSA_MODULE) - [PKEY_ALGO_RSA] = &RSA_public_key_algorithm, -#endif -}; - /* * Check the signature on a certificate using the provided public key */ @@ -174,7 +165,7 @@ static int x509_key_preparse(struct key_preparsed_payload *prep) goto error_free_cert; } - cert->pub->algo = x509_public_key_algorithms[cert->pkey_algo]; + cert->pub->algo = pkey_algo[cert->pkey_algo]; cert->pub->id_type = PKEY_ID_X509; /* Check the signature on the key */ |