Commit 10b0b5ec authored by Richard Levitte's avatar Richard Levitte
Browse files

Revert "Move algorithm specific ppccap code from crypto/ppccap.c" 



Now that we can link specifically with static libraries, the immediate
need to split ppccap.c (and eventually other *cap.c files) is no more.

This reverts commit e3fb4d3d.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent de4d764e

Configurations/00-base-templates.conf

+5 −5
Original line number Diff line number Diff line
@@ -279,17 +279,17 @@ 
    ppc32_asm => {

	template	=> 1,

	cpuid_asm_src   => "ppccpuid.s ppccap.c",

	bn_asm_src      => "bn-ppc.s ppc-mont.s bn_ppccap.c",

	bn_asm_src      => "bn-ppc.s ppc-mont.s",

	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 sha_ppccap.c",

	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 chacha_ppccap.c",

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

	chacha_asm_src	=> "chacha-ppc.s",

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

    },

    ppc64_asm => {

	inherit_from	=> [ "ppc32_asm" ],

	template	=> 1,

	ec_asm_src	=> "ecp_nistz256.c ecp_nistz256-ppc64.s ec_ppccap.c",

	ec_asm_src	=> "ecp_nistz256.c ecp_nistz256-ppc64.s",



    },

);

crypto/bn/bn_ppccap.c

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <openssl/opensslconf.h>

#include <openssl/bn.h>

#include "../ppc_arch.h"



#ifndef OPENSSL_BN_ASM_MONT

NON_EMPTY_TRANSLATION_UNIT

#else

int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,

                const BN_ULONG *np, const BN_ULONG *n0, int num)

{

    int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,

                        const BN_ULONG *np, const BN_ULONG *n0, int num);

    int bn_mul4x_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,

                          const BN_ULONG *np, const BN_ULONG *n0, int num);



    if (num < 4)

        return 0;



    if ((num & 3) == 0)

        return bn_mul4x_mont_int(rp, ap, bp, np, n0, num);



    /*

     * There used to be [optional] call to bn_mul_mont_fpu64 here,

     * but above subroutine is faster on contemporary processors.

     * Formulation means that there might be old processors where

     * FPU code path would be faster, POWER6 perhaps, but there was

     * no opportunity to figure it out...

     */



    return bn_mul_mont_int(rp, ap, bp, np, n0, num);

}

#endif

crypto/chacha/chacha_ppccap.c

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <openssl/opensslconf.h>

#include <openssl/crypto.h>

#include "../ppc_arch.h"



#ifdef OPENSSL_NO_CHACHA

NON_EMPTY_TRANSLATION_UNIT

#else

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);

}

#endif

crypto/ec/ec_ppccap.c

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <openssl/opensslconf.h>

#include "../ppc_arch.h"



#ifndef ECP_NISTZ256_ASM

NON_EMPTY_TRANSLATION_UNIT

#else

void ecp_nistz256_mul_mont(unsigned long res[4], const unsigned long a[4],

                           const unsigned long b[4]);



void ecp_nistz256_to_mont(unsigned long res[4], const unsigned long in[4]);

void ecp_nistz256_to_mont(unsigned long res[4], const unsigned long in[4])

{

    static const unsigned long RR[] = { 0x0000000000000003U,

                                        0xfffffffbffffffffU,

                                        0xfffffffffffffffeU,

                                        0x00000004fffffffdU };



    ecp_nistz256_mul_mont(res, in, RR);

}



void ecp_nistz256_from_mont(unsigned long res[4], const unsigned long in[4]);

void ecp_nistz256_from_mont(unsigned long res[4], const unsigned long in[4])

{

    static const unsigned long one[] = { 1, 0, 0, 0 };



    ecp_nistz256_mul_mont(res, in, one);

}

#endif

crypto/poly1305/poly1305_ppccap.c

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <stdlib.h>

#include <openssl/opensslconf.h>

#include "../ppc_arch.h"



#ifdef OPENSSL_NO_POLY1305

NON_EMPTY_TRANSLATION_UNIT

#else

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;

}

#endif