Commit e79f8773 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make EVP_CIPHER opaque and add creator/destructor/accessor/writer functions 



We follow the method used for EVP_MD.
Also, move all the internal EVP_CIPHER building macros from evp_locl.h
to evp_int.h.  This will benefit our builtin EVP_CIPHERs.

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

crypto/evp/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \ 
	evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c scrypt.c \

	e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c \

	e_aes_cbc_hmac_sha1.c e_aes_cbc_hmac_sha256.c e_rc4_hmac_md5.c \

	e_chacha20_poly1305.c

	e_chacha20_poly1305.c cmeth_lib.c



LIBOBJ=	encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \

	e_des.o e_bf.o e_idea.o e_des3.o e_camellia.o\
@@ -41,7 +41,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \ 
	evp_pkey.o evp_pbe.o p5_crpt.o p5_crpt2.o scrypt.o \

	e_old.o pmeth_lib.o pmeth_fn.o pmeth_gn.o m_sigver.o \

	e_aes_cbc_hmac_sha1.o e_aes_cbc_hmac_sha256.o e_rc4_hmac_md5.o \

	e_chacha20_poly1305.o

	e_chacha20_poly1305.o cmeth_lib.o



SRC= $(LIBSRC)

crypto/evp/cmeth_lib.c

0 → 100644
+199 −0
Original line number Diff line number Diff line 
/* cmeth_lib.c */

/*

 * Written by Richard Levitte (levitte@openssl.org) for the OpenSSL project

 * 2015.

 */

/* ====================================================================

 * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    licensing@OpenSSL.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



#include <string.h>



#include <openssl/evp.h>

#include "internal/evp_int.h"

#include "evp_locl.h"



EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)

{

    EVP_CIPHER *cipher = (EVP_CIPHER *)OPENSSL_zalloc(sizeof(EVP_CIPHER));

    if (cipher != NULL) {

        cipher->nid = cipher_type;

        cipher->block_size = block_size;

        cipher->key_len = key_len;

    }

    return cipher;

}



EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)

{

    EVP_CIPHER *to = EVP_CIPHER_meth_new(cipher->nid, cipher->block_size,

                                         cipher->key_len);

    if (cipher != NULL)

        memcpy(to, cipher, sizeof(*to));

    return to;

}



void EVP_CIPHER_meth_free(EVP_CIPHER *cipher)

{

    OPENSSL_free(cipher);

}



int EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len)

{

    cipher->iv_len = iv_len;

    return 1;

}



int EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags)

{

    cipher->flags = flags;

    return 1;

}



int EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)

{

    cipher->ctx_size = ctx_size;

    return 1;

}



int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,

                             int (*init) (EVP_CIPHER_CTX *ctx,

                                          const unsigned char *key,

                                          const unsigned char *iv,

                                          int enc))

{

    cipher->init = init;

    return 1;

}



int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,

                                  int (*do_cipher) (EVP_CIPHER_CTX *ctx,

                                                    unsigned char *out,

                                                    const unsigned char *in,

                                                    size_t inl))

{

    cipher->do_cipher = do_cipher;

    return 1;

}



int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,

                                int (*cleanup) (EVP_CIPHER_CTX *))

{

    cipher->cleanup = cleanup;

    return 1;

}



int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,

                                        int (*set_asn1_parameters) (EVP_CIPHER_CTX *,

                                                                    ASN1_TYPE *))

{

    cipher->set_asn1_parameters = set_asn1_parameters;

    return 1;

}



int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,

                                        int (*get_asn1_parameters) (EVP_CIPHER_CTX *,

                                                                    ASN1_TYPE *))

{

    cipher->get_asn1_parameters = get_asn1_parameters;

    return 1;

}



int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,

                             int (*ctrl) (EVP_CIPHER_CTX *, int type,

                                          int arg, void *ptr))

{

    cipher->ctrl = ctrl;

    return 1;

}





int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,

                                                          const unsigned char *key,

                                                          const unsigned char *iv,

                                                          int enc)

{

    return cipher->init;

}

int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,

                                                               unsigned char *out,

                                                               const unsigned char *in,

                                                               size_t inl)

{

    return cipher->do_cipher;

}



int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *)

{

    return cipher->cleanup;

}



int (*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,

                                                                     ASN1_TYPE *)

{

    return cipher->set_asn1_parameters;

}



int (*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,

                                                               ASN1_TYPE *)

{

    return cipher->get_asn1_parameters;

}



int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,

                                                          int type, int arg,

                                                          void *ptr)

{

    return cipher->ctrl;

}

crypto/evp/evp_lib.c

+5 −0
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx) 
    return ctx->cipher->block_size;

}



int EVP_CIPHER_impl_ctx_size(const EVP_CIPHER *e)

{

    return e->ctx_size;

}



int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

               const unsigned char *in, unsigned int inl)

{

crypto/evp/evp_locl.h

+0 −204
Original line number Diff line number Diff line
@@ -91,210 +91,6 @@ struct evp_cipher_ctx_st { 
    unsigned char final[EVP_MAX_BLOCK_LENGTH]; /* possible final block */

} /* EVP_CIPHER_CTX */ ;



/* Macros to code block cipher wrappers */



/* Wrapper functions for each cipher mode */



#define BLOCK_CIPHER_ecb_loop() \

        size_t i, bl; \

        bl = ctx->cipher->block_size;\

        if(inl < bl) return 1;\

        inl -= bl; \

        for(i=0; i <= inl; i+=bl)



#define BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched) \

static int cname##_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \

{\

        BLOCK_CIPHER_ecb_loop() \

                cprefix##_ecb_encrypt(in + i, out + i, &((kstruct *)ctx->cipher_data)->ksched, ctx->encrypt);\

        return 1;\

}



#define EVP_MAXCHUNK ((size_t)1<<(sizeof(long)*8-2))



#define BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched) \

static int cname##_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \

{\

        while(inl>=EVP_MAXCHUNK)\

            {\

            cprefix##_ofb##cbits##_encrypt(in, out, (long)EVP_MAXCHUNK, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num);\

            inl-=EVP_MAXCHUNK;\

            in +=EVP_MAXCHUNK;\

            out+=EVP_MAXCHUNK;\

            }\

        if (inl)\

            cprefix##_ofb##cbits##_encrypt(in, out, (long)inl, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num);\

        return 1;\

}



#define BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \

static int cname##_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \

{\

        while(inl>=EVP_MAXCHUNK) \

            {\

            cprefix##_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, ctx->encrypt);\

            inl-=EVP_MAXCHUNK;\

            in +=EVP_MAXCHUNK;\

            out+=EVP_MAXCHUNK;\

            }\

        if (inl)\

            cprefix##_cbc_encrypt(in, out, (long)inl, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, ctx->encrypt);\

        return 1;\

}



#define BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched) \

static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \

{\

        size_t chunk=EVP_MAXCHUNK;\

        if (cbits==1)  chunk>>=3;\

        if (inl<chunk) chunk=inl;\

        while(inl && inl>=chunk)\

            {\

            cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits==1) && !(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS) ?inl*8:inl), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\

            inl-=chunk;\

            in +=chunk;\

            out+=chunk;\

            if(inl<chunk) chunk=inl;\

            }\

        return 1;\

}



#define BLOCK_CIPHER_all_funcs(cname, cprefix, cbits, kstruct, ksched) \

        BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \

        BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched) \

        BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched) \

        BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched)



#define BLOCK_CIPHER_def1(cname, nmode, mode, MODE, kstruct, nid, block_size, \

                          key_len, iv_len, flags, init_key, cleanup, \

                          set_asn1, get_asn1, ctrl) \

static const EVP_CIPHER cname##_##mode = { \

        nid##_##nmode, block_size, key_len, iv_len, \

        flags | EVP_CIPH_##MODE##_MODE, \

        init_key, \

        cname##_##mode##_cipher, \

        cleanup, \

        sizeof(kstruct), \

        set_asn1, get_asn1,\

        ctrl, \

        NULL \

}; \

const EVP_CIPHER *EVP_##cname##_##mode(void) { return &cname##_##mode; }



#define BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, \

                             iv_len, flags, init_key, cleanup, set_asn1, \

                             get_asn1, ctrl) \

BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \

                  iv_len, flags, init_key, cleanup, set_asn1, get_asn1, ctrl)



#define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \

                             iv_len, cbits, flags, init_key, cleanup, \

                             set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \

                  key_len, iv_len, flags, init_key, cleanup, set_asn1, \

                  get_asn1, ctrl)



#define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \

                             iv_len, cbits, flags, init_key, cleanup, \

                             set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, 1, \

                  key_len, iv_len, flags, init_key, cleanup, set_asn1, \

                  get_asn1, ctrl)



#define BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, \

                             flags, init_key, cleanup, set_asn1, \

                             get_asn1, ctrl) \

BLOCK_CIPHER_def1(cname, ecb, ecb, ECB, kstruct, nid, block_size, key_len, \

                  0, flags, init_key, cleanup, set_asn1, get_asn1, ctrl)



#define BLOCK_CIPHER_defs(cname, kstruct, \

                          nid, block_size, key_len, iv_len, cbits, flags, \

                          init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, iv_len, flags, \

                     init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, iv_len, cbits, \

                     flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, iv_len, cbits, \

                     flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, flags, \

                     init_key, cleanup, set_asn1, get_asn1, ctrl)



/*-

#define BLOCK_CIPHER_defs(cname, kstruct, \

                                nid, block_size, key_len, iv_len, flags,\

                                 init_key, cleanup, set_asn1, get_asn1, ctrl)\

static const EVP_CIPHER cname##_cbc = {\

        nid##_cbc, block_size, key_len, iv_len, \

        flags | EVP_CIPH_CBC_MODE,\

        init_key,\

        cname##_cbc_cipher,\

        cleanup,\

        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\

                sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\

        set_asn1, get_asn1,\

        ctrl, \

        NULL \

};\

const EVP_CIPHER *EVP_##cname##_cbc(void) { return &cname##_cbc; }\

static const EVP_CIPHER cname##_cfb = {\

        nid##_cfb64, 1, key_len, iv_len, \

        flags | EVP_CIPH_CFB_MODE,\

        init_key,\

        cname##_cfb_cipher,\

        cleanup,\

        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\

                sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\

        set_asn1, get_asn1,\

        ctrl,\

        NULL \

};\

const EVP_CIPHER *EVP_##cname##_cfb(void) { return &cname##_cfb; }\

static const EVP_CIPHER cname##_ofb = {\

        nid##_ofb64, 1, key_len, iv_len, \

        flags | EVP_CIPH_OFB_MODE,\

        init_key,\

        cname##_ofb_cipher,\

        cleanup,\

        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\

                sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\

        set_asn1, get_asn1,\

        ctrl,\

        NULL \

};\

const EVP_CIPHER *EVP_##cname##_ofb(void) { return &cname##_ofb; }\

static const EVP_CIPHER cname##_ecb = {\

        nid##_ecb, block_size, key_len, iv_len, \

        flags | EVP_CIPH_ECB_MODE,\

        init_key,\

        cname##_ecb_cipher,\

        cleanup,\

        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\

                sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\

        set_asn1, get_asn1,\

        ctrl,\

        NULL \

};\

const EVP_CIPHER *EVP_##cname##_ecb(void) { return &cname##_ecb; }

*/



#define IMPLEMENT_BLOCK_CIPHER(cname, ksched, cprefix, kstruct, nid, \

                               block_size, key_len, iv_len, cbits, \

                               flags, init_key, \

                               cleanup, set_asn1, get_asn1, ctrl) \

        BLOCK_CIPHER_all_funcs(cname, cprefix, cbits, kstruct, ksched) \

        BLOCK_CIPHER_defs(cname, kstruct, nid, block_size, key_len, iv_len, \

                          cbits, flags, init_key, cleanup, set_asn1, \

                          get_asn1, ctrl)



#define EVP_C_DATA(kstruct, ctx)        ((kstruct *)(ctx)->cipher_data)



#define IMPLEMENT_CFBR(cipher,cprefix,kstruct,ksched,keysize,cbits,iv_len,fl) \

        BLOCK_CIPHER_func_cfb(cipher##_##keysize,cprefix,cbits,kstruct,ksched) \

        BLOCK_CIPHER_def_cfb(cipher##_##keysize,kstruct, \

                             NID_##cipher##_##keysize, keysize/8, iv_len, cbits, \

                             (fl)|EVP_CIPH_FLAG_DEFAULT_ASN1, \

                             cipher##_init_key, NULL, NULL, NULL, NULL)



int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,

                             int passlen, ASN1_TYPE *param,

                             const EVP_CIPHER *c, const EVP_MD *md,

crypto/include/internal/evp_int.h

+238 −0

File changed.

Preview size limit exceeded, changes collapsed.