2006-09-17 13:00:18 +00:00
|
|
|
/**********************************************************************
|
2006-09-21 13:04:43 +00:00
|
|
|
* gost_pmeth.c *
|
2006-09-17 13:00:18 +00:00
|
|
|
* Copyright (c) 2005-2006 Cryptocom LTD *
|
|
|
|
* This file is distributed under the same license as OpenSSL *
|
|
|
|
* *
|
|
|
|
* Implementation of RFC 4357 (GOST R 34.10) Publick key method *
|
|
|
|
* for OpenSSL *
|
|
|
|
* Requires OpenSSL 0.9.9 for compilation *
|
|
|
|
**********************************************************************/
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/objects.h>
|
|
|
|
#include <openssl/ec.h>
|
2007-05-17 17:44:09 +00:00
|
|
|
#include <openssl/x509v3.h> /*For string_to_hex */
|
2006-09-17 13:00:18 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
2006-09-21 13:04:43 +00:00
|
|
|
#include "gost_params.h"
|
|
|
|
#include "gost_lcl.h"
|
2006-09-17 13:00:18 +00:00
|
|
|
#include "e_gost_err.h"
|
|
|
|
/*-------init, cleanup, copy - uniform for all algs ---------------*/
|
|
|
|
/* Allocates new gost_pmeth_data structure and assigns it as data */
|
2006-09-21 13:04:43 +00:00
|
|
|
static int pkey_gost_init(EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
struct gost_pmeth_data *data;
|
2009-03-17 15:38:34 +00:00
|
|
|
EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx);
|
2006-09-17 13:00:18 +00:00
|
|
|
data = OPENSSL_malloc(sizeof(struct gost_pmeth_data));
|
|
|
|
if (!data) return 0;
|
|
|
|
memset(data,0,sizeof(struct gost_pmeth_data));
|
2009-03-17 15:38:34 +00:00
|
|
|
if (pkey && EVP_PKEY_get0(pkey))
|
|
|
|
{
|
|
|
|
switch (EVP_PKEY_base_id(pkey)) {
|
|
|
|
case NID_id_GostR3410_94:
|
|
|
|
data->sign_param_nid = gost94_nid_by_params(EVP_PKEY_get0(pkey));
|
|
|
|
break;
|
|
|
|
case NID_id_GostR3410_2001:
|
|
|
|
data->sign_param_nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)pkey)));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
EVP_PKEY_CTX_set_data(ctx,data);
|
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
/* Copies contents of gost_pmeth_data structure */
|
|
|
|
static int pkey_gost_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
struct gost_pmeth_data *dst_data,*src_data;
|
2006-09-21 13:04:43 +00:00
|
|
|
if (!pkey_gost_init(dst))
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
src_data = EVP_PKEY_CTX_get_data(src);
|
|
|
|
dst_data = EVP_PKEY_CTX_get_data(dst);
|
|
|
|
*dst_data = *src_data;
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
if (src_data -> shared_ukm) {
|
|
|
|
dst_data->shared_ukm=NULL;
|
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
/* Frees up gost_pmeth_data structure */
|
2006-09-21 13:04:43 +00:00
|
|
|
static void pkey_gost_cleanup (EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx);
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
if (data->shared_ukm) OPENSSL_free(data->shared_ukm);
|
2006-09-17 13:00:18 +00:00
|
|
|
OPENSSL_free(data);
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
/* --------------------- control functions ------------------------------*/
|
2008-02-28 13:45:06 +00:00
|
|
|
static int pkey_gost_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
struct gost_pmeth_data *pctx = (struct gost_pmeth_data*)EVP_PKEY_CTX_get_data(ctx);
|
|
|
|
switch (type)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
case EVP_PKEY_CTRL_MD:
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
|
|
|
if (EVP_MD_type((const EVP_MD *)p2) != NID_id_GostR3411_94)
|
2006-09-17 13:00:18 +00:00
|
|
|
{
|
2006-09-21 13:04:43 +00:00
|
|
|
GOSTerr(GOST_F_PKEY_GOST_CTRL, GOST_R_INVALID_DIGEST_TYPE);
|
|
|
|
return 0;
|
2006-09-17 13:00:18 +00:00
|
|
|
}
|
2006-09-21 13:04:43 +00:00
|
|
|
pctx->md = (EVP_MD *)p2;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
break;
|
2006-09-17 13:00:18 +00:00
|
|
|
|
|
|
|
case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
|
|
|
|
case EVP_PKEY_CTRL_PKCS7_DECRYPT:
|
|
|
|
case EVP_PKEY_CTRL_PKCS7_SIGN:
|
2006-09-21 13:04:43 +00:00
|
|
|
return 1;
|
2006-09-17 13:00:18 +00:00
|
|
|
|
|
|
|
case EVP_PKEY_CTRL_GOST_PARAMSET:
|
|
|
|
pctx->sign_param_nid = (int)p1;
|
|
|
|
return 1;
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
case EVP_PKEY_CTRL_SET_IV:
|
|
|
|
pctx->shared_ukm=OPENSSL_malloc((int)p1);
|
|
|
|
memcpy(pctx->shared_ukm,p2,(int) p1);
|
|
|
|
return 1;
|
2009-06-16 16:39:20 +00:00
|
|
|
case EVP_PKEY_CTRL_PEER_KEY:
|
|
|
|
if (p1 == 0 || p1 == 1) /* call from EVP_PKEY_derive_set_peer */
|
|
|
|
return 1;
|
|
|
|
if (p1 == 2) /* TLS: peer key used? */
|
|
|
|
return pctx->peer_key_used;
|
|
|
|
if (p1 == 3) /* TLS: peer key used! */
|
|
|
|
return (pctx->peer_key_used = 1);
|
|
|
|
return -2;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
return -2;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
|
|
|
|
static int pkey_gost_ctrl94_str(EVP_PKEY_CTX *ctx,
|
|
|
|
const char *type, const char *value)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
int param_nid=0;
|
2006-09-21 13:04:43 +00:00
|
|
|
if(!strcmp(type, param_ctrl_string))
|
|
|
|
{
|
|
|
|
if (!value)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
if (strlen(value) == 1)
|
|
|
|
{
|
2012-01-12 16:28:03 +00:00
|
|
|
switch(toupper((unsigned char)value[0]))
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
case 'A':
|
|
|
|
param_nid = NID_id_GostR3410_94_CryptoPro_A_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
param_nid = NID_id_GostR3410_94_CryptoPro_B_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
param_nid = NID_id_GostR3410_94_CryptoPro_C_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'D':
|
|
|
|
param_nid = NID_id_GostR3410_94_CryptoPro_D_ParamSet;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
break;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
}
|
2012-01-12 16:28:03 +00:00
|
|
|
else if ((strlen(value) == 2) && (toupper((unsigned char)value[0]) == 'X'))
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2012-01-12 16:28:03 +00:00
|
|
|
switch (toupper((unsigned char)value[1]))
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
case 'A':
|
|
|
|
param_nid = NID_id_GostR3410_94_CryptoPro_XchA_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
param_nid = NID_id_GostR3410_94_CryptoPro_XchB_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
param_nid = NID_id_GostR3410_94_CryptoPro_XchC_ParamSet;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
break;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
}
|
2006-09-21 13:04:43 +00:00
|
|
|
else
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
R3410_params *p = R3410_paramset;
|
|
|
|
param_nid = OBJ_txt2nid(value);
|
2006-09-21 13:04:43 +00:00
|
|
|
if (param_nid == NID_undef)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
for (;p->nid != NID_undef;p++)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
if (p->nid == param_nid) break;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
if (p->nid == NID_undef)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
GOSTerr(GOST_F_PKEY_GOST_CTRL94_STR,
|
2006-09-21 13:04:43 +00:00
|
|
|
GOST_R_INVALID_PARAMSET);
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
}
|
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
return pkey_gost_ctrl(ctx, EVP_PKEY_CTRL_GOST_PARAMSET,
|
|
|
|
param_nid, NULL);
|
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
return -2;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
|
|
|
|
const char *type, const char *value)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
int param_nid=0;
|
2006-09-21 13:04:43 +00:00
|
|
|
if(!strcmp(type, param_ctrl_string))
|
|
|
|
{
|
|
|
|
if (!value)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
if (strlen(value) == 1)
|
|
|
|
{
|
2012-01-12 16:28:03 +00:00
|
|
|
switch(toupper((unsigned char)value[0]))
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
case 'A':
|
|
|
|
param_nid = NID_id_GostR3410_2001_CryptoPro_A_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
param_nid = NID_id_GostR3410_2001_CryptoPro_B_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
param_nid = NID_id_GostR3410_2001_CryptoPro_C_ParamSet;
|
|
|
|
break;
|
|
|
|
case '0':
|
|
|
|
param_nid = NID_id_GostR3410_2001_TestParamSet;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
break;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
}
|
2012-01-12 16:28:03 +00:00
|
|
|
else if ((strlen(value) == 2) && (toupper((unsigned char)value[0]) == 'X'))
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2012-01-12 16:28:03 +00:00
|
|
|
switch (toupper((unsigned char)value[1]))
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
case 'A':
|
|
|
|
param_nid = NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet;
|
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
param_nid = NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
break;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
}
|
2006-09-21 13:04:43 +00:00
|
|
|
else
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
R3410_2001_params *p = R3410_2001_paramset;
|
|
|
|
param_nid = OBJ_txt2nid(value);
|
2006-09-21 13:04:43 +00:00
|
|
|
if (param_nid == NID_undef)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
for (;p->nid != NID_undef;p++)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
if (p->nid == param_nid) break;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
if (p->nid == NID_undef)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
GOSTerr(GOST_F_PKEY_GOST_CTRL01_STR,
|
2006-09-21 13:04:43 +00:00
|
|
|
GOST_R_INVALID_PARAMSET);
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
}
|
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
return pkey_gost_ctrl(ctx, EVP_PKEY_CTRL_GOST_PARAMSET,
|
|
|
|
param_nid, NULL);
|
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
return -2;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
/* --------------------- key generation --------------------------------*/
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
|
2009-03-17 15:38:34 +00:00
|
|
|
static int pkey_gost_paramgen_init(EVP_PKEY_CTX *ctx) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
static int pkey_gost94_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx);
|
|
|
|
DSA *dsa=NULL;
|
2006-09-21 13:04:43 +00:00
|
|
|
if (data->sign_param_nid == NID_undef)
|
|
|
|
{
|
2009-03-17 15:38:34 +00:00
|
|
|
GOSTerr(GOST_F_PKEY_GOST94_PARAMGEN,
|
2006-09-21 13:04:43 +00:00
|
|
|
GOST_R_NO_PARAMETERS_SET);
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
dsa = DSA_new();
|
2006-09-21 13:04:43 +00:00
|
|
|
if (!fill_GOST94_params(dsa,data->sign_param_nid))
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
DSA_free(dsa);
|
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_assign(pkey,NID_id_GostR3410_94,dsa);
|
2006-09-17 13:00:18 +00:00
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2009-03-17 15:38:34 +00:00
|
|
|
static int pkey_gost01_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
struct gost_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx);
|
|
|
|
EC_KEY *ec=NULL;
|
2009-03-17 15:38:34 +00:00
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
if (data->sign_param_nid == NID_undef)
|
|
|
|
{
|
2009-03-17 15:38:34 +00:00
|
|
|
GOSTerr(GOST_F_PKEY_GOST01_PARAMGEN,
|
2006-09-21 13:04:43 +00:00
|
|
|
GOST_R_NO_PARAMETERS_SET);
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2009-03-17 15:38:34 +00:00
|
|
|
if (!ec)
|
|
|
|
ec = EC_KEY_new();
|
2006-09-21 13:04:43 +00:00
|
|
|
if (!fill_GOST2001_params(ec,data->sign_param_nid))
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
EC_KEY_free(ec);
|
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_assign(pkey,NID_id_GostR3410_2001,ec);
|
2006-09-17 13:00:18 +00:00
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2009-03-17 15:38:34 +00:00
|
|
|
/* Generates Gost_R3410_94_cp key */
|
|
|
|
static int pkey_gost94cp_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
|
|
|
{
|
|
|
|
DSA *dsa;
|
|
|
|
if (!pkey_gost94_paramgen(ctx,pkey)) return 0;
|
|
|
|
dsa = EVP_PKEY_get0(pkey);
|
|
|
|
gost_sign_keygen(dsa);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Generates GOST_R3410 2001 key and assigns it using specified type */
|
|
|
|
static int pkey_gost01cp_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
|
|
|
{
|
|
|
|
EC_KEY *ec;
|
|
|
|
if (!pkey_gost01_paramgen(ctx,pkey)) return 0;
|
|
|
|
ec = EVP_PKEY_get0(pkey);
|
|
|
|
gost2001_keygen(ec);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
/* ----------- sign callbacks --------------------------------------*/
|
|
|
|
|
|
|
|
static int pkey_gost94_cp_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
|
|
|
|
const unsigned char *tbs, size_t tbs_len)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
DSA_SIG *unpacked_sig=NULL;
|
|
|
|
EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx);
|
|
|
|
if (!siglen) return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
if (!sig)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
*siglen= 64; /* better to check size of pkey->pkey.dsa-q */
|
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
unpacked_sig = gost_do_sign(tbs,tbs_len,EVP_PKEY_get0(pkey));
|
2006-09-21 13:04:43 +00:00
|
|
|
if (!unpacked_sig)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
return pack_sign_cp(unpacked_sig,32,sig,siglen);
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
static int pkey_gost01_cp_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
|
|
|
|
const unsigned char *tbs, size_t tbs_len)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
DSA_SIG *unpacked_sig=NULL;
|
|
|
|
EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx);
|
|
|
|
if (!siglen) return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
if (!sig)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
*siglen= 64; /* better to check size of curve order*/
|
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
unpacked_sig = gost2001_do_sign(tbs,tbs_len,EVP_PKEY_get0(pkey));
|
2006-09-21 13:04:43 +00:00
|
|
|
if (!unpacked_sig)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
return pack_sign_cp(unpacked_sig,32,sig,siglen);
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
/* ------------------- verify callbacks ---------------------------*/
|
|
|
|
|
|
|
|
static int pkey_gost94_cp_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig,
|
|
|
|
size_t siglen, const unsigned char *tbs, size_t tbs_len)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
int ok = 0;
|
|
|
|
EVP_PKEY* pub_key = EVP_PKEY_CTX_get0_pkey(ctx);
|
|
|
|
DSA_SIG *s=unpack_cp_signature(sig,siglen);
|
|
|
|
if (!s) return 0;
|
|
|
|
if (pub_key) ok = gost_do_verify(tbs,tbs_len,s,EVP_PKEY_get0(pub_key));
|
|
|
|
DSA_SIG_free(s);
|
|
|
|
return ok;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
|
|
|
|
static int pkey_gost01_cp_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig,
|
|
|
|
size_t siglen, const unsigned char *tbs, size_t tbs_len)
|
2006-09-21 13:04:43 +00:00
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
int ok = 0;
|
|
|
|
EVP_PKEY* pub_key = EVP_PKEY_CTX_get0_pkey(ctx);
|
|
|
|
DSA_SIG *s=unpack_cp_signature(sig,siglen);
|
|
|
|
if (!s) return 0;
|
2006-12-22 09:21:29 +00:00
|
|
|
#ifdef DEBUG_SIGN
|
2006-09-17 13:00:18 +00:00
|
|
|
fprintf(stderr,"R=");
|
|
|
|
BN_print_fp(stderr,s->r);
|
|
|
|
fprintf(stderr,"\nS=");
|
|
|
|
BN_print_fp(stderr,s->s);
|
|
|
|
fprintf(stderr,"\n");
|
2006-12-22 09:21:29 +00:00
|
|
|
#endif
|
2006-09-17 13:00:18 +00:00
|
|
|
if (pub_key) ok = gost2001_do_verify(tbs,tbs_len,s,EVP_PKEY_get0(pub_key));
|
|
|
|
DSA_SIG_free(s);
|
|
|
|
return ok;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
|
|
|
|
2006-09-17 13:00:18 +00:00
|
|
|
/* ------------- encrypt init -------------------------------------*/
|
|
|
|
/* Generates ephermeral key */
|
2006-09-21 13:04:43 +00:00
|
|
|
static int pkey_gost_encrypt_init(EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
/* --------------- Derive init ------------------------------------*/
|
2007-11-16 03:03:01 +00:00
|
|
|
static int pkey_gost_derive_init(EVP_PKEY_CTX *ctx)
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
2007-05-17 17:44:09 +00:00
|
|
|
/* -------- PKEY_METHOD for GOST MAC algorithm --------------------*/
|
|
|
|
static int pkey_gost_mac_init(EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
|
|
|
struct gost_mac_pmeth_data *data;
|
|
|
|
data = OPENSSL_malloc(sizeof(struct gost_mac_pmeth_data));
|
|
|
|
if (!data) return 0;
|
|
|
|
memset(data,0,sizeof(struct gost_mac_pmeth_data));
|
|
|
|
EVP_PKEY_CTX_set_data(ctx,data);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
static void pkey_gost_mac_cleanup (EVP_PKEY_CTX *ctx)
|
|
|
|
{
|
|
|
|
struct gost_mac_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx);
|
|
|
|
OPENSSL_free(data);
|
|
|
|
}
|
|
|
|
static int pkey_gost_mac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
|
|
|
|
{
|
|
|
|
struct gost_mac_pmeth_data *dst_data,*src_data;
|
|
|
|
if (!pkey_gost_mac_init(dst))
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
src_data = EVP_PKEY_CTX_get_data(src);
|
|
|
|
dst_data = EVP_PKEY_CTX_get_data(dst);
|
|
|
|
*dst_data = *src_data;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-02-28 13:45:06 +00:00
|
|
|
static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
|
2007-05-17 17:44:09 +00:00
|
|
|
{
|
|
|
|
struct gost_mac_pmeth_data *data =
|
|
|
|
(struct gost_mac_pmeth_data*)EVP_PKEY_CTX_get_data(ctx);
|
2006-09-21 13:04:43 +00:00
|
|
|
|
2007-05-17 17:44:09 +00:00
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case EVP_PKEY_CTRL_MD:
|
|
|
|
{
|
2007-05-22 12:58:39 +00:00
|
|
|
if (EVP_MD_type((const EVP_MD *)p2) != NID_id_Gost28147_89_MAC)
|
2007-05-17 17:44:09 +00:00
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL, GOST_R_INVALID_DIGEST_TYPE);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
data->md = (EVP_MD *)p2;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
|
|
|
|
case EVP_PKEY_CTRL_PKCS7_DECRYPT:
|
|
|
|
case EVP_PKEY_CTRL_PKCS7_SIGN:
|
|
|
|
return 1;
|
|
|
|
case EVP_PKEY_CTRL_SET_MAC_KEY:
|
|
|
|
if (p1 != 32)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL,
|
|
|
|
GOST_R_INVALID_MAC_KEY_LENGTH);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(data->key,p2,32);
|
|
|
|
data->key_set = 1;
|
|
|
|
return 1;
|
|
|
|
case EVP_PKEY_CTRL_DIGESTINIT:
|
|
|
|
{
|
|
|
|
EVP_MD_CTX *mctx = p2;
|
|
|
|
void *key;
|
|
|
|
if (!data->key_set)
|
|
|
|
{
|
|
|
|
EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx);
|
|
|
|
if (!pkey)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL,GOST_R_MAC_KEY_NOT_SET);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
key = EVP_PKEY_get0(pkey);
|
|
|
|
if (!key)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL,GOST_R_MAC_KEY_NOT_SET);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
key = &(data->key);
|
|
|
|
}
|
2007-05-21 12:16:36 +00:00
|
|
|
return mctx->digest->md_ctrl(mctx,EVP_MD_CTRL_SET_KEY,32,key);
|
2007-05-17 17:44:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
static int pkey_gost_mac_ctrl_str(EVP_PKEY_CTX *ctx,
|
|
|
|
const char *type, const char *value)
|
|
|
|
{
|
|
|
|
if (!strcmp(type, key_ctrl_string))
|
|
|
|
{
|
|
|
|
if (strlen(value)!=32)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR,
|
|
|
|
GOST_R_INVALID_MAC_KEY_LENGTH);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return pkey_gost_mac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
|
|
|
|
32,(char *)value);
|
|
|
|
}
|
|
|
|
if (!strcmp(type, hexkey_ctrl_string))
|
|
|
|
{
|
|
|
|
long keylen; int ret;
|
|
|
|
unsigned char *keybuf=string_to_hex(value,&keylen);
|
|
|
|
if (keylen != 32)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR,
|
|
|
|
GOST_R_INVALID_MAC_KEY_LENGTH);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
ret= pkey_gost_mac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
|
|
|
|
32,keybuf);
|
|
|
|
OPENSSL_free(keybuf);
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
}
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int pkey_gost_mac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
|
|
|
{
|
|
|
|
struct gost_mac_pmeth_data *data = EVP_PKEY_CTX_get_data(ctx);
|
|
|
|
unsigned char *keydata;
|
|
|
|
if (!data->key_set)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PKEY_GOST_MAC_KEYGEN,GOST_R_MAC_KEY_NOT_SET);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
keydata = OPENSSL_malloc(32);
|
|
|
|
memcpy(keydata,data->key,32);
|
|
|
|
EVP_PKEY_assign(pkey, NID_id_Gost28147_89_MAC, keydata);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int pkey_gost_mac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
|
|
|
|
{
|
2007-05-18 15:55:55 +00:00
|
|
|
return 1;
|
2007-05-17 17:44:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int pkey_gost_mac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, EVP_MD_CTX *mctx)
|
|
|
|
{
|
2007-05-31 12:32:27 +00:00
|
|
|
unsigned int tmpsiglen=*siglen; /* for platforms where sizeof(int)!=sizeof(size_t)*/
|
|
|
|
int ret;
|
2007-05-17 17:44:09 +00:00
|
|
|
if (!sig)
|
|
|
|
{
|
|
|
|
*siglen = 4;
|
|
|
|
return 1;
|
|
|
|
}
|
2007-05-31 12:32:27 +00:00
|
|
|
ret=EVP_DigestFinal_ex(mctx,sig,&tmpsiglen);
|
|
|
|
*siglen = tmpsiglen;
|
|
|
|
return ret;
|
2007-05-17 17:44:09 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
/* ----------------------------------------------------------------*/
|
2006-09-21 13:04:43 +00:00
|
|
|
int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth,int flags)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
*pmeth = EVP_PKEY_meth_new(id, flags);
|
|
|
|
if (!*pmeth) return 0;
|
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
switch (id)
|
|
|
|
{
|
2006-09-17 13:00:18 +00:00
|
|
|
case NID_id_GostR3410_94:
|
|
|
|
EVP_PKEY_meth_set_ctrl(*pmeth,pkey_gost_ctrl, pkey_gost_ctrl94_str);
|
|
|
|
EVP_PKEY_meth_set_keygen(*pmeth,NULL,pkey_gost94cp_keygen);
|
|
|
|
EVP_PKEY_meth_set_sign(*pmeth, NULL, pkey_gost94_cp_sign);
|
|
|
|
EVP_PKEY_meth_set_verify(*pmeth, NULL, pkey_gost94_cp_verify);
|
2006-09-21 13:04:43 +00:00
|
|
|
EVP_PKEY_meth_set_encrypt(*pmeth,
|
2006-09-17 13:00:18 +00:00
|
|
|
pkey_gost_encrypt_init, pkey_GOST94cp_encrypt);
|
2006-09-21 13:04:43 +00:00
|
|
|
EVP_PKEY_meth_set_decrypt(*pmeth, NULL, pkey_GOST94cp_decrypt);
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_meth_set_derive(*pmeth,
|
|
|
|
pkey_gost_derive_init, pkey_gost94_derive);
|
2009-03-17 15:38:34 +00:00
|
|
|
EVP_PKEY_meth_set_paramgen(*pmeth, pkey_gost_paramgen_init,pkey_gost94_paramgen);
|
2006-09-17 13:00:18 +00:00
|
|
|
break;
|
|
|
|
case NID_id_GostR3410_2001:
|
|
|
|
EVP_PKEY_meth_set_ctrl(*pmeth,pkey_gost_ctrl, pkey_gost_ctrl01_str);
|
|
|
|
EVP_PKEY_meth_set_sign(*pmeth, NULL, pkey_gost01_cp_sign);
|
|
|
|
EVP_PKEY_meth_set_verify(*pmeth, NULL, pkey_gost01_cp_verify);
|
|
|
|
|
|
|
|
EVP_PKEY_meth_set_keygen(*pmeth, NULL, pkey_gost01cp_keygen);
|
|
|
|
|
2006-09-21 13:04:43 +00:00
|
|
|
EVP_PKEY_meth_set_encrypt(*pmeth,
|
2006-09-17 13:00:18 +00:00
|
|
|
pkey_gost_encrypt_init, pkey_GOST01cp_encrypt);
|
2006-09-21 13:04:43 +00:00
|
|
|
EVP_PKEY_meth_set_decrypt(*pmeth, NULL, pkey_GOST01cp_decrypt);
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_meth_set_derive(*pmeth,
|
|
|
|
pkey_gost_derive_init, pkey_gost2001_derive);
|
2009-03-17 15:38:34 +00:00
|
|
|
EVP_PKEY_meth_set_paramgen(*pmeth, pkey_gost_paramgen_init,pkey_gost01_paramgen);
|
2006-09-17 13:00:18 +00:00
|
|
|
break;
|
2007-05-17 17:44:09 +00:00
|
|
|
case NID_id_Gost28147_89_MAC:
|
|
|
|
EVP_PKEY_meth_set_ctrl(*pmeth,pkey_gost_mac_ctrl, pkey_gost_mac_ctrl_str);
|
|
|
|
EVP_PKEY_meth_set_signctx(*pmeth,pkey_gost_mac_signctx_init, pkey_gost_mac_signctx);
|
|
|
|
EVP_PKEY_meth_set_keygen(*pmeth,NULL, pkey_gost_mac_keygen);
|
|
|
|
EVP_PKEY_meth_set_init(*pmeth,pkey_gost_mac_init);
|
|
|
|
EVP_PKEY_meth_set_cleanup(*pmeth,pkey_gost_mac_cleanup);
|
|
|
|
EVP_PKEY_meth_set_copy(*pmeth,pkey_gost_mac_copy);
|
|
|
|
return 1;
|
2006-09-21 13:24:46 +00:00
|
|
|
default: /*Unsupported method*/
|
2006-09-17 13:00:18 +00:00
|
|
|
return 0;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
EVP_PKEY_meth_set_init(*pmeth, pkey_gost_init);
|
|
|
|
EVP_PKEY_meth_set_cleanup(*pmeth, pkey_gost_cleanup);
|
|
|
|
|
|
|
|
EVP_PKEY_meth_set_copy(*pmeth, pkey_gost_copy);
|
2006-09-21 13:24:46 +00:00
|
|
|
/*FIXME derive etc...*/
|
2006-09-17 13:00:18 +00:00
|
|
|
|
|
|
|
return 1;
|
2006-09-21 13:04:43 +00:00
|
|
|
}
|
2006-09-17 13:00:18 +00:00
|
|
|
|