X.509: x509_request_asymmetric_keys() doesn't need string length arguments
authorDavid Howells <dhowells@redhat.com>
Wed, 9 Jul 2014 15:48:00 +0000 (16:48 +0100)
committerDavid Howells <dhowells@redhat.com>
Mon, 28 Jul 2014 13:55:55 +0000 (14:55 +0100)
x509_request_asymmetric_keys() doesn't need the lengths of the NUL-terminated
strings passing in as it can work that out for itself.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
crypto/asymmetric_keys/x509_public_key.c

index a0f7cd196c9b031f1448f1c3b9c2795a56301b48..4ae982234d783c42fd736a274f1242eb143c5863 100644 (file)
@@ -48,11 +48,10 @@ __setup("ca_keys=", ca_keys_setup);
  */
 static struct key *x509_request_asymmetric_key(struct key *keyring,
                                               const char *signer,
-                                              size_t signer_len,
-                                              const char *authority,
-                                              size_t auth_len)
+                                              const char *authority)
 {
        key_ref_t key;
+       size_t signer_len = strlen(signer), auth_len = strlen(authority);
        char *id;
 
        /* Construct an identifier. */
@@ -193,9 +192,7 @@ static int x509_validate_trust(struct x509_certificate *cert,
                return -EPERM;
 
        key = x509_request_asymmetric_key(trust_keyring,
-                                         cert->issuer, strlen(cert->issuer),
-                                         cert->authority,
-                                         strlen(cert->authority));
+                                         cert->issuer, cert->authority);
        if (!IS_ERR(key))  {
                if (!use_builtin_keys
                    || test_bit(KEY_FLAG_BUILTIN, &key->flags))