提交 8c8fbca9 编写于 作者: B Bernd Edlinger

Fix --strict-warnings build of ppc-linux target

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6191)
上级 7d859d1c
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
#endif #endif
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <internal/cryptlib.h>
#include <internal/chacha.h>
#include "bn/bn_lcl.h"
#include "ppc_arch.h" #include "ppc_arch.h"
...@@ -64,6 +67,7 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, ...@@ -64,6 +67,7 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
void sha256_block_p8(void *ctx, const void *inp, size_t len); void sha256_block_p8(void *ctx, const void *inp, size_t len);
void sha256_block_ppc(void *ctx, const void *inp, size_t len); void sha256_block_ppc(void *ctx, const void *inp, size_t len);
void sha256_block_data_order(void *ctx, const void *inp, size_t len);
void sha256_block_data_order(void *ctx, const void *inp, size_t len) void sha256_block_data_order(void *ctx, const void *inp, size_t len)
{ {
OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) : OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) :
...@@ -72,6 +76,7 @@ void sha256_block_data_order(void *ctx, const void *inp, size_t len) ...@@ -72,6 +76,7 @@ void sha256_block_data_order(void *ctx, const void *inp, size_t len)
void sha512_block_p8(void *ctx, const void *inp, size_t len); void sha512_block_p8(void *ctx, const void *inp, size_t len);
void sha512_block_ppc(void *ctx, const void *inp, size_t len); void sha512_block_ppc(void *ctx, const void *inp, size_t len);
void sha512_block_data_order(void *ctx, const void *inp, size_t len);
void sha512_block_data_order(void *ctx, const void *inp, size_t len) void sha512_block_data_order(void *ctx, const void *inp, size_t len)
{ {
OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) : OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) :
...@@ -106,16 +111,17 @@ void poly1305_blocks_fpu(void *ctx, const unsigned char *inp, size_t len, ...@@ -106,16 +111,17 @@ void poly1305_blocks_fpu(void *ctx, const unsigned char *inp, size_t len,
unsigned int padbit); unsigned int padbit);
void poly1305_emit_fpu(void *ctx, unsigned char mac[16], void poly1305_emit_fpu(void *ctx, unsigned char mac[16],
const unsigned int nonce[4]); const unsigned int nonce[4]);
int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]);
int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]) int poly1305_init(void *ctx, const unsigned char key[16], void *func[2])
{ {
if (sizeof(size_t) == 4 && (OPENSSL_ppccap_P & PPC_FPU)) { if (sizeof(size_t) == 4 && (OPENSSL_ppccap_P & PPC_FPU)) {
poly1305_init_fpu(ctx, key); poly1305_init_fpu(ctx, key);
func[0] = poly1305_blocks_fpu; func[0] = (void*)(uintptr_t)poly1305_blocks_fpu;
func[1] = poly1305_emit_fpu; func[1] = (void*)(uintptr_t)poly1305_emit_fpu;
} else { } else {
poly1305_init_int(ctx, key); poly1305_init_int(ctx, key);
func[0] = poly1305_blocks; func[0] = (void*)(uintptr_t)poly1305_blocks;
func[1] = poly1305_emit; func[1] = (void*)(uintptr_t)poly1305_emit;
} }
return 1; return 1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册