Commit c927df3f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Initial DSA EVP_PKEY_METHOD. Fixup some error codes.

parent 4700aea9

crypto/dsa/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ APPS= 


LIB=$(TOP)/libcrypto.a

LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \

	dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_prn.c

	dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_pmeth.c dsa_prn.c

LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o \

	dsa_err.o dsa_ossl.o dsa_depr.o dsa_ameth.o dsa_prn.o

	dsa_err.o dsa_ossl.o dsa_depr.o dsa_ameth.o dsa_pmeth.o dsa_prn.o



SRC= $(LIBSRC)

crypto/dsa/dsa.h

+8 −0
Original line number Diff line number Diff line
@@ -245,6 +245,12 @@ int DSA_print_fp(FILE *bp, const DSA *x, int off); 
DH *DSA_dup_DH(const DSA *r);

#endif



#define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \

				EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, nbits, NULL)



#define	EVP_PKEY_CTRL_DSA_PARAMGEN_BITS		(EVP_PKEY_ALG_CTRL + 1)



/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.
@@ -272,6 +278,7 @@ void ERR_load_DSA_strings(void); 
#define DSA_F_DSA_SIG_NEW				 109

#define DSA_F_DSA_VERIFY				 108

#define DSA_F_I2D_DSA_SIG				 111

#define DSA_F_PKEY_DSA_CTRL				 120

#define DSA_F_SIG_CB					 114



/* Reason codes. */
@@ -279,6 +286,7 @@ void ERR_load_DSA_strings(void); 
#define DSA_R_BN_ERROR					 103

#define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE		 100

#define DSA_R_DECODE_ERROR				 104

#define DSA_R_INVALID_DIGEST_TYPE			 106

#define DSA_R_MISSING_PARAMETERS			 101

#define DSA_R_PARAMETER_ENCODING_ERROR			 105

crypto/dsa/dsa_err.c

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static ERR_STRING_DATA DSA_str_functs[]= 
{ERR_FUNC(DSA_F_DSA_SIG_NEW),	"DSA_SIG_new"},

{ERR_FUNC(DSA_F_DSA_VERIFY),	"DSA_verify"},

{ERR_FUNC(DSA_F_I2D_DSA_SIG),	"i2d_DSA_SIG"},

{ERR_FUNC(DSA_F_PKEY_DSA_CTRL),	"PKEY_DSA_CTRL"},

{ERR_FUNC(DSA_F_SIG_CB),	"SIG_CB"},

{0,NULL}

	};
@@ -98,6 +99,7 @@ static ERR_STRING_DATA DSA_str_reasons[]= 
{ERR_REASON(DSA_R_BN_ERROR)              ,"bn error"},

{ERR_REASON(DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),"data too large for key size"},

{ERR_REASON(DSA_R_DECODE_ERROR)          ,"decode error"},

{ERR_REASON(DSA_R_INVALID_DIGEST_TYPE)   ,"invalid digest type"},

{ERR_REASON(DSA_R_MISSING_PARAMETERS)    ,"missing parameters"},

{ERR_REASON(DSA_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"},

{0,NULL}

crypto/dsa/dsa_pmeth.c

0 → 100644
+233 −0
Original line number Diff line number Diff line 
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL

 * project 2006.

 */

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

 * Copyright (c) 2006 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 <stdio.h>

#include "cryptlib.h"

#include <openssl/asn1t.h>

#include <openssl/x509.h>

#include <openssl/rsa.h>

#include <openssl/evp.h>

#include "evp_locl.h"



/* DSA pkey context structure */



typedef struct

	{

	/* Parameter gen parameters */

	int nbits;

	/* Keygen callback info */

	int gentmp[2];

	/* message digest */

	const EVP_MD *md;

	} DSA_PKEY_CTX;



static int pkey_dsa_init(EVP_PKEY_CTX *ctx)

	{

	DSA_PKEY_CTX *dctx;

	dctx = OPENSSL_malloc(sizeof(DSA_PKEY_CTX));

	if (!dctx)

		return 0;

	dctx->nbits = 1024;

	dctx->md = NULL;



	ctx->data = dctx;

	ctx->keygen_info = dctx->gentmp;

	ctx->keygen_info_count = 2;

	

	return 1;

	}



static void pkey_dsa_cleanup(EVP_PKEY_CTX *ctx)

	{

	DSA_PKEY_CTX *dctx = ctx->data;

	if (dctx)

		OPENSSL_free(dctx);

	}



static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, int *siglen,

					const unsigned char *tbs, int tbslen)

	{

	int ret, type;

	unsigned int sltmp;

	DSA_PKEY_CTX *dctx = ctx->data;

	DSA *dsa = ctx->pkey->pkey.dsa;



	if (dctx->md)

		type = EVP_MD_type(dctx->md);

	else

		type = NID_sha1;



	ret = DSA_sign(type, tbs, tbslen, sig, &sltmp, dsa);



	if (ret < 0)

		return ret;

	*siglen = sltmp;

	return 1;

	}



static int pkey_dsa_verify(EVP_PKEY_CTX *ctx,

					const unsigned char *sig, int siglen,

					const unsigned char *tbs, int tbslen)

	{

	int ret, type;

	DSA_PKEY_CTX *dctx = ctx->data;

	DSA *dsa = ctx->pkey->pkey.dsa;



	if (dctx->md)

		type = EVP_MD_type(dctx->md);

	else

		type = NID_sha1;



	ret = DSA_verify(type, tbs, tbslen, sig, siglen, dsa);



	return ret;

	}



static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)

	{

	DSA_PKEY_CTX *dctx = ctx->data;

	switch (type)

		{

		case EVP_PKEY_CTRL_DSA_PARAMGEN_BITS:

		if (p1 < 256)

			return -2;

		dctx->nbits = p1;

		return 1;



		case EVP_PKEY_CTRL_MD:

		if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1)

			{

			DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);

			return 0;

			}

		dctx->md = p2;

		return 1;



		default:

		return -2;



		}

	}

			

static int pkey_dsa_ctrl_str(EVP_PKEY_CTX *ctx,

			const char *type, const char *value)

	{

	if (!strcmp(type, "dsa_paramgen_bits"))

		{

		int nbits;

		nbits = atoi(value);

		return EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits);

		}

	return -2;

	}



static int pkey_dsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)

	{

	DSA *dsa = NULL;

	DSA_PKEY_CTX *dctx = ctx->data;

	BN_GENCB *pcb, cb;

	int ret;

	if (ctx->pkey_gencb)

		{

		pcb = &cb;

		evp_pkey_set_cb_translate(pcb, ctx);

		}

	else

		pcb = NULL;

	dsa = DSA_new();

	if (!dsa)

		return 0;

	ret = DSA_generate_parameters_ex(dsa, dctx->nbits, NULL, 0, NULL, NULL,

									pcb);

	if (ret)

		EVP_PKEY_assign_DSA(pkey, dsa);

	else

		DSA_free(dsa);

	return ret;

	}



const EVP_PKEY_METHOD dsa_pkey_meth = 

	{

	EVP_PKEY_DSA,

	0,

	pkey_dsa_init,

	pkey_dsa_cleanup,



	0,

	pkey_dsa_paramgen,



	0,0,



	0,

	pkey_dsa_sign,



	0,

	pkey_dsa_verify,



	0,0,



	0,0,0,0,



	0,0,



	0,0,



	pkey_dsa_ctrl,

	pkey_dsa_ctrl_str





	};

crypto/evp/evp.h

+3 −0
Original line number Diff line number Diff line
@@ -1012,10 +1012,13 @@ void ERR_load_EVP_strings(void); 
#define EVP_F_EVP_PKEY2PKCS8_BROKEN			 113

#define EVP_F_EVP_PKEY_COPY_PARAMETERS			 103

#define EVP_F_EVP_PKEY_CTX_CTRL				 137

#define EVP_F_EVP_PKEY_CTX_CTRL_STR			 150

#define EVP_F_EVP_PKEY_DECRYPT				 104

#define EVP_F_EVP_PKEY_DECRYPT_INIT			 138

#define EVP_F_EVP_PKEY_DECRYPT_OLD			 151

#define EVP_F_EVP_PKEY_ENCRYPT				 105

#define EVP_F_EVP_PKEY_ENCRYPT_INIT			 139

#define EVP_F_EVP_PKEY_ENCRYPT_OLD			 152

#define EVP_F_EVP_PKEY_GET1_DH				 119

#define EVP_F_EVP_PKEY_GET1_DSA				 120

#define EVP_F_EVP_PKEY_GET1_ECDSA			 130