Commit b3214008 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configurations: engage PPC ChaCha20 and Poly1305 modules. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 9e58d119

Configurations/00-base-templates.conf

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ 
	aes_asm_src     => "aes_core.c aes_cbc.c aes-ppc.s vpaes-ppc.s aesp8-ppc.s",

	sha1_asm_src    => "sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s",

	modes_asm_src   => "ghashp8-ppc.s",

	chacha_asm_src	=> "chacha-ppc.s",

	poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",

    },

    ppc32_asm => {

	inherit_from	=> [ "ppc64_asm" ],

crypto/ppccap.c

+39 −0
Original line number Diff line number Diff line
@@ -79,6 +79,45 @@ void sha512_block_data_order(void *ctx, const void *inp, size_t len) 
        sha512_block_ppc(ctx, inp, len);

}



void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp,

                        size_t len, const unsigned int key[8],

                        const unsigned int counter[4]);

void ChaCha20_ctr32_vmx(unsigned char *out, const unsigned char *inp,

                        size_t len, const unsigned int key[8],

                        const unsigned int counter[4]);

void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp,

                    size_t len, const unsigned int key[8],

                    const unsigned int counter[4])

{

    OPENSSL_ppccap_P & PPC_ALTIVEC

        ? ChaCha20_ctr32_vmx(out, inp, len, key, counter)

        : ChaCha20_ctr32_int(out, inp, len, key, counter);

}



void poly1305_init_int(void *ctx, const unsigned char key[16]);

void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,

                         unsigned int padbit);

void poly1305_emit(void *ctx, unsigned char mac[16],

                       const unsigned int nonce[4]);

void poly1305_init_fpu(void *ctx, const unsigned char key[16]);

void poly1305_blocks_fpu(void *ctx, const unsigned char *inp, size_t len,

                         unsigned int padbit);

void poly1305_emit_fpu(void *ctx, unsigned char mac[16],

                       const unsigned int nonce[4]);

int poly1305_init(void *ctx, const unsigned char key[16], void *func[2])

{

    if (sizeof(size_t) == 4 && (OPENSSL_ppccap_P & PPC_FPU)) {

        poly1305_init_fpu(ctx,key);

        func[0] = poly1305_blocks_fpu;

        func[1] = poly1305_emit_fpu;

    } else {

        poly1305_init_int(ctx,key);

        func[0] = poly1305_blocks;

        func[1] = poly1305_emit;

    }

    return 1;

}



static sigjmp_buf ill_jmp;

static void ill_handler(int sig)

{