From: Dmitry Belyavskiy Date: Sat, 2 Jan 2016 20:00:42 +0000 (+0300) Subject: Merge https://github.com/gost-engine/engine X-Git-Tag: v1.1.0.2~34 X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=98a1b3fcae5a4efe29774a96ce860dc52b24549b;hp=2533ba072e6f5a4f0584bf7306c1f9ffa5c65dd4;p=openssl-gost%2Fengine.git Merge https://github.com/gost-engine/engine --- diff --git a/Makefile b/Makefile index 087fc8b..f4867c2 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ all: lib tags: ctags $(SRC) +links: + errors: $(PERL) ../../util/mkerr.pl -conf gost.ec -nostatic -write $(SRC) @@ -161,8 +163,9 @@ gost_ec_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost_ec_keyx.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_ec_keyx.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_ec_keyx.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_ec_keyx.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_ec_keyx.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +gost_ec_keyx.o: ../../include/openssl/err.h ../../include/openssl/evp.h +gost_ec_keyx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +gost_ec_keyx.o: ../../include/openssl/objects.h gost_ec_keyx.o: ../../include/openssl/opensslconf.h gost_ec_keyx.o: ../../include/openssl/opensslv.h gost_ec_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h diff --git a/e_gost_err.c b/e_gost_err.c index 101f047..488e0e9 100644 --- a/e_gost_err.c +++ b/e_gost_err.c @@ -1,6 +1,6 @@ /* e_gost_err.c */ /* ==================================================================== - * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2016 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 @@ -128,6 +128,7 @@ static ERR_STRING_DATA GOST_str_reasons[] = { {ERR_REASON(GOST_R_INVALID_IV_LENGTH), "invalid iv length"}, {ERR_REASON(GOST_R_INVALID_MAC_KEY_LENGTH), "invalid mac key length"}, {ERR_REASON(GOST_R_INVALID_MAC_KEY_SIZE), "invalid mac key size"}, + {ERR_REASON(GOST_R_INVALID_MAC_PARAMS), "invalid mac params"}, {ERR_REASON(GOST_R_INVALID_MAC_SIZE), "invalid mac size"}, {ERR_REASON(GOST_R_INVALID_PARAMSET), "invalid paramset"}, {ERR_REASON(GOST_R_KEY_IS_NOT_INITIALIZED), "key is not initialized"}, diff --git a/e_gost_err.h b/e_gost_err.h index b52811d..5a60008 100644 --- a/e_gost_err.h +++ b/e_gost_err.h @@ -121,6 +121,7 @@ void ERR_GOST_error(int function, int reason, char *file, int line); # define GOST_R_INVALID_IV_LENGTH 112 # define GOST_R_INVALID_MAC_KEY_LENGTH 113 # define GOST_R_INVALID_MAC_KEY_SIZE 128 +# define GOST_R_INVALID_MAC_PARAMS 130 # define GOST_R_INVALID_MAC_SIZE 129 # define GOST_R_INVALID_PARAMSET 114 # define GOST_R_KEY_IS_NOT_INITIALIZED 115 diff --git a/gost_crypt.c b/gost_crypt.c index 3523b38..66e769d 100644 --- a/gost_crypt.c +++ b/gost_crypt.c @@ -766,24 +766,46 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) return 1; case EVP_MD_CTRL_SET_KEY: { - if (arg != 32) { - GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE); - return 0; + struct ossl_gost_imit_ctx *gost_imit_ctx = ctx->md_data; + + if (ctx->digest->init(ctx) <= 0) { + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET); + return 0; + } + ctx->flags |= EVP_MD_CTX_FLAG_NO_INIT; + + if (arg == 0) { + struct gost_mac_key *key = (struct gost_mac_key*) ptr; + if (key->mac_param_nid != NID_undef) { + const struct gost_cipher_info *param = get_encryption_params(OBJ_nid2obj(key->mac_param_nid)); + if (param == NULL) + { + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_PARAMS); + return 0; + } + gost_init(&(gost_imit_ctx->cctx), param->sblock); + } + gost_key(&(gost_imit_ctx->cctx), key->key); + gost_imit_ctx->key_set = 1; + + return 1; } - - gost_key(&(((struct ossl_gost_imit_ctx *)(ctx->md_data))->cctx), - ptr); - ((struct ossl_gost_imit_ctx *)(ctx->md_data))->key_set = 1; + else if (arg == 32) + { + gost_key(&(gost_imit_ctx->cctx), ptr); + gost_imit_ctx->key_set = 1; return 1; - + } + GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE); + return 0; } case EVP_MD_CTRL_MAC_LEN: { + struct ossl_gost_imit_ctx *c = ctx->md_data; if (arg < 1 || arg > 8) { GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE); return 0; } - struct ossl_gost_imit_ctx *c = ctx->md_data; c->dgst_size=arg; return 1; } diff --git a/gost_lcl.h b/gost_lcl.h index b89c453..376e39c 100644 --- a/gost_lcl.h +++ b/gost_lcl.h @@ -72,10 +72,16 @@ struct gost_pmeth_data { struct gost_mac_pmeth_data { short int key_set; - short int mac_size; + short int mac_size; + int mac_param_nid; EVP_MD *md; unsigned char key[32]; }; + +struct gost_mac_key { + int mac_param_nid; + unsigned char key[32]; +}; /* GOST-specific ASN1 structures */ typedef struct { diff --git a/gost_pmeth.c b/gost_pmeth.c index 896dabb..f07c4da 100644 --- a/gost_pmeth.c +++ b/gost_pmeth.c @@ -466,11 +466,21 @@ static int pkey_gost_derive_init(EVP_PKEY_CTX *ctx) static int pkey_gost_mac_init(EVP_PKEY_CTX *ctx) { struct gost_mac_pmeth_data *data = OPENSSL_malloc(sizeof(*data)); + EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx); if (!data) return 0; memset(data, 0, sizeof(*data)); - data->mac_size = 4; + data->mac_size = 4; + data->mac_param_nid = NID_undef; + + if (pkey) { + struct gost_mac_key *key = EVP_PKEY_get0(pkey); + if (key) { + data->mac_param_nid = key->mac_param_nid; + } + } + EVP_PKEY_CTX_set_data(ctx, data); return 1; } @@ -532,10 +542,24 @@ static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) memcpy(data->key, p2, 32); data->key_set = 1; return 1; + case EVP_PKEY_CTRL_GOST_PARAMSET: + { + struct gost_cipher_info *param = p2; + data->mac_param_nid = param->nid; + struct gost_mac_key *key = NULL; + EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx); + if (pkey) { + key = EVP_PKEY_get0(pkey); + if (key) { + key->mac_param_nid = param->nid; + } + } + return 1; + } case EVP_PKEY_CTRL_DIGESTINIT: { EVP_MD_CTX *mctx = p2; - void *key; + struct gost_mac_key *key; if (!data->key_set) { EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx); if (!pkey) { @@ -549,8 +573,9 @@ static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) GOST_R_MAC_KEY_NOT_SET); return 0; } + return mctx->digest->md_ctrl(mctx, EVP_MD_CTRL_SET_KEY, 0, key); } else { - key = &(data->key); + return mctx->digest->md_ctrl(mctx, EVP_MD_CTRL_SET_KEY, 32, &(data->key)); } return mctx->digest->md_ctrl(mctx, EVP_MD_CTRL_SET_KEY, 32, key); } @@ -606,6 +631,23 @@ static int pkey_gost_mac_ctrl_str(EVP_PKEY_CTX *ctx, } return pkey_gost_mac_ctrl(ctx, EVP_PKEY_CTRL_MAC_LEN,size,NULL); } + if (strcmp(type, param_ctrl_string) == 0) + { + ASN1_OBJECT *obj = OBJ_txt2obj(value, 0); + const struct gost_cipher_info *param = NULL; + if (obj == NULL) { + GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR, GOST_R_INVALID_MAC_PARAMS); + return 0; + } + + param = get_encryption_params(obj); + if (param == NULL) { + GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR, GOST_R_INVALID_MAC_PARAMS); + return 0; + } + + return pkey_gost_mac_ctrl(ctx, EVP_PKEY_CTRL_GOST_PARAMSET, 0, (void *)param); + } return -2; } @@ -613,15 +655,16 @@ static int pkey_gost_mac_keygen_base(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey, int mac_nid) { struct gost_mac_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx); - unsigned char *keydata; + struct gost_mac_key *keydata; if (!data || !data->key_set) { GOSTerr(GOST_F_PKEY_GOST_MAC_KEYGEN, GOST_R_MAC_KEY_NOT_SET); return 0; } - keydata = OPENSSL_malloc(32); + keydata = OPENSSL_malloc(sizeof(struct gost_mac_key)); if (keydata == NULL) return 0; - memcpy(keydata, data->key, 32); + memcpy(keydata->key, data->key, 32); + keydata->mac_param_nid = data->mac_param_nid; EVP_PKEY_assign(pkey, mac_nid, keydata); return 1; }