Commit 34d6245f authored by Hans de Goede's avatar Hans de Goede Committed by Herbert Xu
Browse files

crypto: sha256 - Merge crypto/sha256.h into crypto/sha.h 



The generic sha256 implementation from lib/crypto/sha256.c uses data
structs defined in crypto/sha.h, so lets move the function prototypes
there too.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 527aa895

arch/s390/purgatory/purgatory.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include <linux/kexec.h>

#include <linux/string.h>

#include <crypto/sha256.h>

#include <crypto/sha.h>

#include <asm/purgatory.h>



int verify_sha256_digest(void)

arch/x86/purgatory/purgatory.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



#include <linux/bug.h>

#include <crypto/sha256.h>

#include <crypto/sha.h>

#include <asm/purgatory.h>



#include "../boot/string.h"

crypto/sha256_generic.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/mm.h>

#include <linux/types.h>

#include <crypto/sha.h>

#include <crypto/sha256.h>

#include <crypto/sha256_base.h>

#include <asm/byteorder.h>

#include <asm/unaligned.h>

include/crypto/sha.h

+21 −0
Original line number Diff line number Diff line
@@ -112,4 +112,25 @@ extern int crypto_sha512_update(struct shash_desc *desc, const u8 *data, 


extern int crypto_sha512_finup(struct shash_desc *desc, const u8 *data,

			       unsigned int len, u8 *hash);



/*

 * Stand-alone implementation of the SHA256 algorithm. It is designed to

 * have as little dependencies as possible so it can be used in the

 * kexec_file purgatory. In other cases you should generally use the

 * hash APIs from include/crypto/hash.h. Especially when hashing large

 * amounts of data as those APIs may be hw-accelerated.

 *

 * For details see lib/crypto/sha256.c

 */



extern int sha256_init(struct sha256_state *sctx);

extern int sha256_update(struct sha256_state *sctx, const u8 *input,

			 unsigned int length);

extern int sha256_final(struct sha256_state *sctx, u8 *hash);



extern int sha224_init(struct sha256_state *sctx);

extern int sha224_update(struct sha256_state *sctx, const u8 *input,

			 unsigned int length);

extern int sha224_final(struct sha256_state *sctx, u8 *hash);



#endif

include/crypto/sha256.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 *  Copyright (C) 2014 Red Hat Inc.

 *

 *  Author: Vivek Goyal <vgoyal@redhat.com>

 */



#ifndef SHA256_H

#define SHA256_H



#include <linux/types.h>

#include <crypto/sha.h>



/*

 * Stand-alone implementation of the SHA256 algorithm. It is designed to

 * have as little dependencies as possible so it can be used in the

 * kexec_file purgatory. In other cases you should generally use the

 * hash APIs from include/crypto/hash.h. Especially when hashing large

 * amounts of data as those APIs may be hw-accelerated.

 *

 * For details see lib/crypto/sha256.c

 */



extern int sha256_init(struct sha256_state *sctx);

extern int sha256_update(struct sha256_state *sctx, const u8 *input,

			 unsigned int length);

extern int sha256_final(struct sha256_state *sctx, u8 *hash);



extern int sha224_init(struct sha256_state *sctx);

extern int sha224_update(struct sha256_state *sctx, const u8 *input,

			 unsigned int length);

extern int sha224_final(struct sha256_state *sctx, u8 *hash);



#endif /* SHA256_H */