Commit 6e98c810 authored by Holger Dengler's avatar Holger Dengler Committed by Heiko Carstens
Browse files

s390/crypto: Generalize parameters for key conversion 



As a preparation for multiple key tokens in a key_blob structure, use
separate pointer and length parameters for __paes_keyblob2pkey()
instead a pointer to the struct key_blob.

The functionality of the paes module is not affected by this commit.

Reviewed-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Signed-off-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent e665b969

arch/s390/crypto/paes_s390.c

+7 −7
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ struct s390_pxts_ctx { 
	unsigned long fc;

};



static inline int __paes_keyblob2pkey(struct key_blob *kb,

static inline int __paes_keyblob2pkey(const u8 *key, unsigned int keylen,

				      struct paes_protkey *pk)

{

	int i, rc = -EIO;
@@ -140,8 +140,8 @@ static inline int __paes_keyblob2pkey(struct key_blob *kb, 
			if (msleep_interruptible(1000))

				return -EINTR;

		}

		rc = pkey_key2protkey(kb->key, kb->keylen,

				      pk->protkey, &pk->len, &pk->type);

		rc = pkey_key2protkey(key, keylen, pk->protkey, &pk->len,

				      &pk->type);

	}



	return rc;
@@ -153,7 +153,7 @@ static inline int __paes_convert_key(struct s390_paes_ctx *ctx) 
	int rc;



	pk.len = sizeof(pk.protkey);

	rc = __paes_keyblob2pkey(&ctx->kb, &pk);

	rc = __paes_keyblob2pkey(ctx->kb.key, ctx->kb.keylen, &pk);

	if (rc)

		return rc;
@@ -425,8 +425,8 @@ static inline int __xts_paes_convert_key(struct s390_pxts_ctx *ctx) 
	pk0.len = sizeof(pk0.protkey);

	pk1.len = sizeof(pk1.protkey);



	if (__paes_keyblob2pkey(&ctx->kb[0], &pk0) ||

	    __paes_keyblob2pkey(&ctx->kb[1], &pk1))

	if (__paes_keyblob2pkey(ctx->kb[0].key, ctx->kb[0].keylen, &pk0) ||

	    __paes_keyblob2pkey(ctx->kb[1].key, ctx->kb[1].keylen, &pk1))

		return -EINVAL;



	spin_lock_bh(&ctx->pk_lock);