Commit e968561d authored by David Bar's avatar David Bar Committed by Rich Salz
Browse files

RT3674: Make no-cms build work. 



Also has changes from from David Woodhouse <David.Woodhouse@intel.com>
and some tweaks from me.

Signed-off-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 231efb93

crypto/dh/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 
dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h

dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

dh_gen.o: ../include/internal/cryptlib.h dh_gen.c

dh_kdf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

dh_kdf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

dh_kdf.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h

dh_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h

dh_kdf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

crypto/dh/dh_kdf.c

+6 −0
Original line number Diff line number Diff line
@@ -51,13 +51,18 @@ 
 * ====================================================================

 */



#include <e_os.h>



#ifndef OPENSSL_NO_CMS

#include <string.h>

#include <openssl/dh.h>

#include <openssl/evp.h>

#include <openssl/asn1.h>

#include <openssl/cms.h>





/* Key derivation from X9.42/RFC2631 */

/* Uses CMS functions, hence the #ifdef wrapper. */



#define DH_KDF_MAX      (1L << 30)
@@ -184,3 +189,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, 
    EVP_MD_CTX_cleanup(&mctx);

    return rv;

}

#endif

crypto/dh/dh_pmeth.c

+10 −2
Original line number Diff line number Diff line
@@ -205,7 +205,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
    case EVP_PKEY_CTRL_DH_KDF_TYPE:

        if (p1 == -2)

            return dctx->kdf_type;

#ifdef OPENSSL_NO_CMS

        if (p1 != EVP_PKEY_DH_KDF_NONE)

#else

        if (p1 != EVP_PKEY_DH_KDF_NONE && p1 != EVP_PKEY_DH_KDF_X9_42)

#endif

            return -2;

        dctx->kdf_type = p1;

        return 1;
@@ -447,7 +451,10 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, 
            return ret;

        *keylen = ret;

        return 1;

    } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {

    }

#ifndef OPENSSL_NO_CMS

    else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {



        unsigned char *Z = NULL;

        size_t Zlen = 0;

        if (!dctx->kdf_outlen || !dctx->kdf_oid)
@@ -475,7 +482,8 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, 
        OPENSSL_clear_free(Z, Zlen);

        return ret;

    }

    return 1;

#endif

    return 0;

}



const EVP_PKEY_METHOD dh_pkey_meth = {

crypto/ec/ec_ameth.c

+2 −0
Original line number Diff line number Diff line
@@ -67,8 +67,10 @@ 
#include <openssl/asn1t.h>

#include "internal/asn1_int.h"



#ifndef OPENSSL_NO_CMS

static int ecdh_cms_decrypt(CMS_RecipientInfo *ri);

static int ecdh_cms_encrypt(CMS_RecipientInfo *ri);

#endif



static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)

{

crypto/rsa/rsa_ameth.c

+8 −0
Original line number Diff line number Diff line
@@ -68,10 +68,12 @@ 
#endif

#include "internal/asn1_int.h"



#ifndef OPENSSL_NO_CMS

static int rsa_cms_sign(CMS_SignerInfo *si);

static int rsa_cms_verify(CMS_SignerInfo *si);

static int rsa_cms_decrypt(CMS_RecipientInfo *ri);

static int rsa_cms_encrypt(CMS_RecipientInfo *ri);

#endif



static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)

{
@@ -653,6 +655,7 @@ static int rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, 
    return rv;

}



#ifndef OPENSSL_NO_CMS

static int rsa_cms_verify(CMS_SignerInfo *si)

{

    int nid, nid2;
@@ -671,6 +674,7 @@ static int rsa_cms_verify(CMS_SignerInfo *si) 
    }

    return 0;

}

#endif



/*

 * Customised RSA item verification routine. This is called when a signature
@@ -693,6 +697,7 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, 
    return -1;

}



#ifndef OPENSSL_NO_CMS

static int rsa_cms_sign(CMS_SignerInfo *si)

{

    int pad_mode = RSA_PKCS1_PADDING;
@@ -717,6 +722,7 @@ static int rsa_cms_sign(CMS_SignerInfo *si) 
    X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE, os);

    return 1;

}

#endif



static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,

                         X509_ALGOR *alg1, X509_ALGOR *alg2,
@@ -750,6 +756,7 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, 
    return 2;

}



#ifndef OPENSSL_NO_CMS

static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg,

                                        X509_ALGOR **pmaskHash)

{
@@ -900,6 +907,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri) 
    ASN1_STRING_free(os);

    return rv;

}

#endif



const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = {

    {