2006-09-17 21:00:18 +08:00
|
|
|
/**********************************************************************
|
2006-09-21 21:04:43 +08:00
|
|
|
* gost_ameth.c *
|
2006-09-17 21:00:18 +08:00
|
|
|
* Copyright (c) 2005-2006 Cryptocom LTD *
|
|
|
|
* This file is distributed under the same license as OpenSSL *
|
|
|
|
* *
|
|
|
|
* Implementation of RFC 4490/4491 ASN1 method *
|
|
|
|
* for OpenSSL *
|
|
|
|
* Requires OpenSSL 0.9.9 for compilation *
|
|
|
|
**********************************************************************/
|
2008-03-17 05:05:46 +08:00
|
|
|
#include <string.h>
|
|
|
|
#include <openssl/crypto.h>
|
|
|
|
#include <openssl/err.h>
|
2006-09-17 21:00:18 +08:00
|
|
|
#include <openssl/engine.h>
|
|
|
|
#include <openssl/evp.h>
|
2007-05-18 01:44:09 +08:00
|
|
|
#include <openssl/asn1.h>
|
2012-03-11 21:40:17 +08:00
|
|
|
#ifndef OPENSSL_NO_CMS
|
|
|
|
#include <openssl/cms.h>
|
|
|
|
#endif
|
2006-09-21 21:04:43 +08:00
|
|
|
#include "gost_params.h"
|
|
|
|
#include "gost_lcl.h"
|
2006-09-17 21:00:18 +08:00
|
|
|
#include "e_gost_err.h"
|
|
|
|
|
|
|
|
int gost94_nid_by_params(DSA *p)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
R3410_params *gost_params;
|
|
|
|
BIGNUM *q=BN_new();
|
2006-09-21 21:04:43 +08:00
|
|
|
for (gost_params = R3410_paramset;gost_params->q!=NULL; gost_params++)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
BN_dec2bn(&q,gost_params->q);
|
|
|
|
if (!BN_cmp(q,p->q))
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
BN_free(q);
|
|
|
|
return gost_params->nid;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
BN_free(q);
|
|
|
|
return NID_undef;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
|
|
|
static ASN1_STRING *encode_gost_algor_params(const EVP_PKEY *key)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_STRING *params = ASN1_STRING_new();
|
|
|
|
GOST_KEY_PARAMS *gkp = GOST_KEY_PARAMS_new();
|
|
|
|
int pkey_param_nid = NID_undef;
|
2010-06-12 22:13:23 +08:00
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!params || !gkp)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_ENCODE_GOST_ALGOR_PARAMS,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
ASN1_STRING_free(params);
|
|
|
|
params = NULL;
|
|
|
|
goto err;
|
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
switch (EVP_PKEY_base_id(key))
|
|
|
|
{
|
|
|
|
case NID_id_GostR3410_2001:
|
|
|
|
pkey_param_nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)key)));
|
|
|
|
break;
|
|
|
|
case NID_id_GostR3410_94:
|
|
|
|
pkey_param_nid = (int) gost94_nid_by_params(EVP_PKEY_get0((EVP_PKEY *)key));
|
|
|
|
if (pkey_param_nid == NID_undef)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_ENCODE_GOST_ALGOR_PARAMS,
|
|
|
|
GOST_R_INVALID_GOST94_PARMSET);
|
|
|
|
ASN1_STRING_free(params);
|
|
|
|
params=NULL;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
gkp->key_params = OBJ_nid2obj(pkey_param_nid);
|
|
|
|
gkp->hash_params = OBJ_nid2obj(NID_id_GostR3411_94_CryptoProParamSet);
|
|
|
|
/*gkp->cipher_params = OBJ_nid2obj(cipher_param_nid);*/
|
|
|
|
params->length = i2d_GOST_KEY_PARAMS(gkp, ¶ms->data);
|
|
|
|
if (params->length <=0 )
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_ENCODE_GOST_ALGOR_PARAMS,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
ASN1_STRING_free(params);
|
|
|
|
params = NULL;
|
|
|
|
goto err;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
params ->type = V_ASN1_SEQUENCE;
|
2006-09-21 21:04:43 +08:00
|
|
|
err:
|
2006-09-17 21:00:18 +08:00
|
|
|
GOST_KEY_PARAMS_free(gkp);
|
|
|
|
return params;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
/* Parses GOST algorithm parameters from X509_ALGOR and
|
|
|
|
* modifies pkey setting NID and parameters
|
|
|
|
*/
|
|
|
|
static int decode_gost_algor_params(EVP_PKEY *pkey, X509_ALGOR *palg)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_OBJECT *palg_obj =NULL;
|
|
|
|
int ptype = V_ASN1_UNDEF;
|
|
|
|
int pkey_nid = NID_undef,param_nid = NID_undef;
|
2006-11-08 17:45:12 +08:00
|
|
|
void *_pval;
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_STRING *pval = NULL;
|
|
|
|
const unsigned char *p;
|
|
|
|
GOST_KEY_PARAMS *gkp = NULL;
|
|
|
|
|
2006-11-08 17:45:12 +08:00
|
|
|
X509_ALGOR_get0(&palg_obj, &ptype, &_pval, palg);
|
|
|
|
pval = _pval;
|
2006-09-21 21:04:43 +08:00
|
|
|
if (ptype != V_ASN1_SEQUENCE)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_DECODE_GOST_ALGOR_PARAMS,
|
|
|
|
GOST_R_BAD_KEY_PARAMETERS_FORMAT);
|
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
p=pval->data;
|
|
|
|
pkey_nid = OBJ_obj2nid(palg_obj);
|
|
|
|
|
|
|
|
gkp = d2i_GOST_KEY_PARAMS(NULL,&p,pval->length);
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!gkp)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_DECODE_GOST_ALGOR_PARAMS,
|
2006-09-21 21:04:43 +08:00
|
|
|
GOST_R_BAD_PKEY_PARAMETERS_FORMAT);
|
2007-04-04 22:38:59 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
param_nid = OBJ_obj2nid(gkp->key_params);
|
|
|
|
GOST_KEY_PARAMS_free(gkp);
|
|
|
|
EVP_PKEY_set_type(pkey,pkey_nid);
|
2006-09-21 21:04:43 +08:00
|
|
|
switch (pkey_nid)
|
|
|
|
{
|
|
|
|
case NID_id_GostR3410_94:
|
|
|
|
{
|
|
|
|
DSA *dsa= EVP_PKEY_get0(pkey);
|
|
|
|
if (!dsa)
|
|
|
|
{
|
|
|
|
dsa = DSA_new();
|
|
|
|
if (!EVP_PKEY_assign(pkey,pkey_nid,dsa)) return 0;
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!fill_GOST94_params(dsa,param_nid)) return 0;
|
|
|
|
break;
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
case NID_id_GostR3410_2001:
|
|
|
|
{
|
|
|
|
EC_KEY *ec = EVP_PKEY_get0(pkey);
|
|
|
|
if (!ec)
|
|
|
|
{
|
|
|
|
ec = EC_KEY_new();
|
|
|
|
if (!EVP_PKEY_assign(pkey,pkey_nid,ec)) return 0;
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!fill_GOST2001_params(ec,param_nid)) return 0;
|
|
|
|
}
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
|
|
|
return 1;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
|
|
|
static int gost_set_priv_key(EVP_PKEY *pkey,BIGNUM *priv)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
|
|
|
switch (EVP_PKEY_base_id(pkey))
|
|
|
|
{
|
|
|
|
case NID_id_GostR3410_94:
|
|
|
|
{
|
|
|
|
DSA *dsa = EVP_PKEY_get0(pkey);
|
|
|
|
if (!dsa)
|
|
|
|
{
|
|
|
|
dsa = DSA_new();
|
|
|
|
EVP_PKEY_assign(pkey,EVP_PKEY_base_id(pkey),dsa);
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
dsa->priv_key = BN_dup(priv);
|
|
|
|
if (!EVP_PKEY_missing_parameters(pkey))
|
|
|
|
gost94_compute_public(dsa);
|
|
|
|
break;
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
case NID_id_GostR3410_2001:
|
|
|
|
{
|
|
|
|
EC_KEY *ec = EVP_PKEY_get0(pkey);
|
|
|
|
if (!ec)
|
|
|
|
{
|
|
|
|
ec = EC_KEY_new();
|
|
|
|
EVP_PKEY_assign(pkey,EVP_PKEY_base_id(pkey),ec);
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!EC_KEY_set_private_key(ec,priv)) return 0;
|
|
|
|
if (!EVP_PKEY_missing_parameters(pkey))
|
|
|
|
gost2001_compute_public(ec);
|
|
|
|
break;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
|
|
|
return 1;
|
2006-09-21 21:04:43 +08: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 20:06:36 +08:00
|
|
|
BIGNUM* gost_get0_priv_key(const EVP_PKEY *pkey)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
|
|
|
switch (EVP_PKEY_base_id(pkey))
|
|
|
|
{
|
|
|
|
case NID_id_GostR3410_94:
|
|
|
|
{
|
|
|
|
DSA *dsa = EVP_PKEY_get0((EVP_PKEY *)pkey);
|
|
|
|
if (!dsa)
|
|
|
|
{
|
|
|
|
return NULL;
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!dsa->priv_key) return NULL;
|
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 20:06:36 +08:00
|
|
|
return dsa->priv_key;
|
2006-09-21 21:04:43 +08:00
|
|
|
break;
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
case NID_id_GostR3410_2001:
|
|
|
|
{
|
|
|
|
EC_KEY *ec = EVP_PKEY_get0((EVP_PKEY *)pkey);
|
|
|
|
const BIGNUM* priv;
|
|
|
|
if (!ec)
|
|
|
|
{
|
|
|
|
return NULL;
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!(priv=EC_KEY_get0_private_key(ec))) return NULL;
|
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 20:06:36 +08:00
|
|
|
return (BIGNUM *)priv;
|
2006-09-21 21:04:43 +08:00
|
|
|
break;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
|
|
|
return NULL;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pkey_ctrl_gost(EVP_PKEY *pkey, int op,
|
2006-09-21 21:04:43 +08:00
|
|
|
long arg1, void *arg2)
|
2006-09-17 21:00:18 +08:00
|
|
|
{
|
2006-09-21 21:04:43 +08:00
|
|
|
switch (op)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
case ASN1_PKEY_CTRL_PKCS7_SIGN:
|
2006-09-21 21:04:43 +08:00
|
|
|
if (arg1 == 0)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
X509_ALGOR *alg1 = NULL, *alg2 = NULL;
|
|
|
|
int nid = EVP_PKEY_base_id(pkey);
|
|
|
|
PKCS7_SIGNER_INFO_get0_algs((PKCS7_SIGNER_INFO*)arg2,
|
2006-09-21 21:04:43 +08:00
|
|
|
NULL, &alg1, &alg2);
|
2006-09-17 21:00:18 +08:00
|
|
|
X509_ALGOR_set0(alg1, OBJ_nid2obj(NID_id_GostR3411_94),
|
2006-09-21 21:04:43 +08:00
|
|
|
V_ASN1_NULL, 0);
|
|
|
|
if (nid == NID_undef)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
return (-1);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
X509_ALGOR_set0(alg2, OBJ_nid2obj(nid), V_ASN1_NULL, 0);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
return 1;
|
2012-03-11 21:40:17 +08:00
|
|
|
#ifndef OPENSSL_NO_CMS
|
|
|
|
case ASN1_PKEY_CTRL_CMS_SIGN:
|
|
|
|
if (arg1 == 0)
|
|
|
|
{
|
|
|
|
X509_ALGOR *alg1 = NULL, *alg2 = NULL;
|
|
|
|
int nid = EVP_PKEY_base_id(pkey);
|
|
|
|
CMS_SignerInfo_get0_algs((CMS_SignerInfo *)arg2,
|
|
|
|
NULL, NULL, &alg1, &alg2);
|
|
|
|
X509_ALGOR_set0(alg1, OBJ_nid2obj(NID_id_GostR3411_94),
|
|
|
|
V_ASN1_NULL, 0);
|
|
|
|
if (nid == NID_undef)
|
|
|
|
{
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
X509_ALGOR_set0(alg2, OBJ_nid2obj(nid), V_ASN1_NULL, 0);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
#endif
|
2006-09-17 21:00:18 +08:00
|
|
|
case ASN1_PKEY_CTRL_PKCS7_ENCRYPT:
|
|
|
|
if (arg1 == 0)
|
|
|
|
{
|
|
|
|
X509_ALGOR *alg;
|
|
|
|
ASN1_STRING * params = encode_gost_algor_params(pkey);
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!params)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
return -1;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
PKCS7_RECIP_INFO_get0_alg((PKCS7_RECIP_INFO*)arg2, &alg);
|
|
|
|
X509_ALGOR_set0(alg, OBJ_nid2obj(pkey->type),
|
2006-09-21 21:04:43 +08:00
|
|
|
V_ASN1_SEQUENCE, params);
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
|
|
|
return 1;
|
2012-03-11 21:40:17 +08:00
|
|
|
#ifndef OPENSSL_NO_CMS
|
|
|
|
case ASN1_PKEY_CTRL_CMS_ENVELOPE:
|
|
|
|
if (arg1 == 0)
|
|
|
|
{
|
2014-06-01 20:03:05 +08:00
|
|
|
X509_ALGOR *alg = NULL;
|
2012-03-11 21:40:17 +08:00
|
|
|
ASN1_STRING * params = encode_gost_algor_params(pkey);
|
|
|
|
if (!params)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
CMS_RecipientInfo_ktri_get0_algs((CMS_RecipientInfo *)arg2, NULL, NULL, &alg);
|
|
|
|
X509_ALGOR_set0(alg, OBJ_nid2obj(pkey->type),
|
|
|
|
V_ASN1_SEQUENCE, params);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
#endif
|
2006-09-17 21:00:18 +08:00
|
|
|
case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
|
2006-09-21 21:04:43 +08:00
|
|
|
*(int *)arg2 = NID_id_GostR3411_94;
|
|
|
|
return 2;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
|
|
|
return -2;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
/*----------------------- free functions * ------------------------------*/
|
2006-09-21 21:04:43 +08:00
|
|
|
static void pkey_free_gost94(EVP_PKEY *key)
|
|
|
|
{
|
|
|
|
if (key->pkey.dsa)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
DSA_free(key->pkey.dsa);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
|
|
|
|
static void pkey_free_gost01(EVP_PKEY *key)
|
|
|
|
{
|
|
|
|
if (key->pkey.ec)
|
|
|
|
{
|
|
|
|
EC_KEY_free(key->pkey.ec);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
/* ------------------ private key functions -----------------------------*/
|
|
|
|
static int priv_decode_gost( EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
const unsigned char *pkey_buf = NULL,*p=NULL;
|
|
|
|
int priv_len = 0;
|
|
|
|
BIGNUM *pk_num=NULL;
|
|
|
|
int ret =0;
|
|
|
|
X509_ALGOR *palg =NULL;
|
|
|
|
ASN1_OBJECT *palg_obj = NULL;
|
|
|
|
ASN1_INTEGER *priv_key=NULL;
|
|
|
|
|
|
|
|
if (!PKCS8_pkey_get0(&palg_obj,&pkey_buf,&priv_len,&palg,p8inf))
|
|
|
|
return 0;
|
|
|
|
p = pkey_buf;
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!decode_gost_algor_params(pk,palg))
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
if (V_ASN1_OCTET_STRING == *p)
|
|
|
|
{
|
|
|
|
/* New format - Little endian octet string */
|
|
|
|
unsigned char rev_buf[32];
|
|
|
|
int i;
|
|
|
|
ASN1_OCTET_STRING *s = d2i_ASN1_OCTET_STRING(NULL,&p,priv_len);
|
|
|
|
if (!s||s->length !=32)
|
|
|
|
{
|
2008-02-28 21:45:06 +08:00
|
|
|
GOSTerr(GOST_F_PRIV_DECODE_GOST,
|
2006-09-21 21:04:43 +08:00
|
|
|
EVP_R_DECODE_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
for (i=0;i<32;i++)
|
|
|
|
{
|
|
|
|
rev_buf[31-i]=s->data[i];
|
|
|
|
}
|
|
|
|
ASN1_STRING_free(s);
|
|
|
|
pk_num = getbnfrombuf(rev_buf,32);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
priv_key=d2i_ASN1_INTEGER(NULL,&p,priv_len);
|
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 20:06:36 +08:00
|
|
|
if (!priv_key) return 0;
|
|
|
|
ret= ((pk_num = ASN1_INTEGER_to_BN(priv_key, NULL))!=NULL) ;
|
|
|
|
ASN1_INTEGER_free(priv_key);
|
|
|
|
if (!ret)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2008-02-28 21:45:06 +08:00
|
|
|
GOSTerr(GOST_F_PRIV_DECODE_GOST,
|
2006-09-21 21:04:43 +08:00
|
|
|
EVP_R_DECODE_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
|
|
|
ret= gost_set_priv_key(pk,pk_num);
|
|
|
|
BN_free(pk_num);
|
|
|
|
return ret;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
/* ----------------------------------------------------------------------*/
|
|
|
|
static int priv_encode_gost(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_OBJECT *algobj = OBJ_nid2obj(EVP_PKEY_base_id(pk));
|
|
|
|
ASN1_STRING *params = encode_gost_algor_params(pk);
|
|
|
|
unsigned char *priv_buf = NULL;
|
|
|
|
int priv_len;
|
|
|
|
|
|
|
|
ASN1_INTEGER *asn1key=NULL;
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!params)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08: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 20:06:36 +08:00
|
|
|
asn1key = BN_to_ASN1_INTEGER(gost_get0_priv_key(pk),NULL);
|
2006-09-17 21:00:18 +08:00
|
|
|
priv_len = i2d_ASN1_INTEGER(asn1key,&priv_buf);
|
|
|
|
ASN1_INTEGER_free(asn1key);
|
|
|
|
return PKCS8_pkey_set0(p8,algobj,0,V_ASN1_SEQUENCE,params,
|
|
|
|
priv_buf,priv_len);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2007-11-21 20:39:12 +08:00
|
|
|
/* --------- printing keys --------------------------------*/
|
|
|
|
static int print_gost_94(BIO *out, const EVP_PKEY *pkey, int indent,
|
|
|
|
ASN1_PCTX *pctx, int type)
|
|
|
|
{
|
|
|
|
int param_nid = NID_undef;
|
|
|
|
|
|
|
|
if (type == 2)
|
|
|
|
{
|
|
|
|
BIGNUM *key;
|
|
|
|
|
|
|
|
if (!BIO_indent(out,indent,128)) return 0;
|
|
|
|
BIO_printf(out,"Private key: ");
|
|
|
|
key = gost_get0_priv_key(pkey);
|
|
|
|
if (!key)
|
|
|
|
BIO_printf(out,"<undefined>");
|
|
|
|
else
|
|
|
|
BN_print(out,key);
|
|
|
|
BIO_printf(out,"\n");
|
|
|
|
}
|
|
|
|
if (type >= 1)
|
|
|
|
{
|
|
|
|
BIGNUM *pubkey;
|
|
|
|
|
|
|
|
pubkey = ((DSA *)EVP_PKEY_get0((EVP_PKEY *)pkey))->pub_key;
|
|
|
|
BIO_indent(out,indent,128);
|
|
|
|
BIO_printf(out,"Public key: ");
|
|
|
|
BN_print(out,pubkey);
|
|
|
|
BIO_printf(out,"\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
param_nid = gost94_nid_by_params(EVP_PKEY_get0((EVP_PKEY *)pkey));
|
|
|
|
BIO_indent(out,indent,128);
|
|
|
|
BIO_printf(out, "Parameter set: %s\n",OBJ_nid2ln(param_nid));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int param_print_gost94(BIO *out, const EVP_PKEY *pkey, int indent,
|
|
|
|
ASN1_PCTX *pctx)
|
|
|
|
{
|
|
|
|
return print_gost_94(out, pkey, indent, pctx,0);
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
2007-11-21 20:39:12 +08:00
|
|
|
static int pub_print_gost94(BIO *out, const EVP_PKEY *pkey, int indent,
|
|
|
|
ASN1_PCTX *pctx)
|
|
|
|
{
|
|
|
|
return print_gost_94(out,pkey, indent, pctx,1);
|
|
|
|
}
|
|
|
|
static int priv_print_gost94(BIO *out,const EVP_PKEY *pkey, int indent,
|
2006-09-21 21:04:43 +08:00
|
|
|
ASN1_PCTX *pctx)
|
|
|
|
{
|
2007-11-21 20:39:12 +08:00
|
|
|
return print_gost_94(out,pkey,indent,pctx,2);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int print_gost_01(BIO *out, const EVP_PKEY *pkey, int indent,
|
|
|
|
ASN1_PCTX *pctx, int type)
|
|
|
|
{
|
|
|
|
int param_nid = NID_undef;
|
|
|
|
if (type == 2)
|
|
|
|
{
|
|
|
|
BIGNUM *key;
|
|
|
|
|
|
|
|
if (!BIO_indent(out,indent,128)) return 0;
|
|
|
|
BIO_printf(out,"Private key: ");
|
|
|
|
key = gost_get0_priv_key(pkey);
|
|
|
|
if (!key)
|
|
|
|
BIO_printf(out,"<undefined)");
|
|
|
|
else
|
|
|
|
BN_print(out,key);
|
|
|
|
BIO_printf(out,"\n");
|
|
|
|
}
|
2008-12-14 01:28:25 +08:00
|
|
|
if (type >= 1)
|
2007-11-21 20:39:12 +08:00
|
|
|
{
|
|
|
|
BN_CTX *ctx = BN_CTX_new();
|
|
|
|
BIGNUM *X,*Y;
|
|
|
|
const EC_POINT *pubkey;
|
|
|
|
const EC_GROUP *group;
|
2008-12-14 01:28:25 +08:00
|
|
|
|
2007-11-21 20:39:12 +08:00
|
|
|
if (!ctx)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PRINT_GOST_01,ERR_R_MALLOC_FAILURE);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-12-14 01:28:25 +08:00
|
|
|
BN_CTX_start(ctx);
|
|
|
|
X = BN_CTX_get(ctx);
|
|
|
|
Y = BN_CTX_get(ctx);
|
2007-11-21 20:39:12 +08:00
|
|
|
pubkey = EC_KEY_get0_public_key((EC_KEY *)EVP_PKEY_get0((EVP_PKEY *)pkey));
|
|
|
|
group = EC_KEY_get0_group((EC_KEY *)EVP_PKEY_get0((EVP_PKEY *)pkey));
|
|
|
|
if (!EC_POINT_get_affine_coordinates_GFp(group,pubkey,X,Y,ctx))
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PRINT_GOST_01,ERR_R_EC_LIB);
|
|
|
|
BN_CTX_free(ctx);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!BIO_indent(out,indent,128)) return 0;
|
|
|
|
BIO_printf(out,"Public key:\n");
|
|
|
|
if (!BIO_indent(out,indent+3,128)) return 0;
|
|
|
|
BIO_printf(out,"X:");
|
|
|
|
BN_print(out,X);
|
|
|
|
BIO_printf(out,"\n");
|
|
|
|
BIO_indent(out,indent+3,128);
|
|
|
|
BIO_printf(out,"Y:");
|
|
|
|
BN_print(out,Y);
|
|
|
|
BIO_printf(out,"\n");
|
|
|
|
BN_CTX_end(ctx);
|
|
|
|
BN_CTX_free(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
param_nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)pkey)));
|
2006-09-17 21:00:18 +08:00
|
|
|
if (!BIO_indent(out,indent,128)) return 0;
|
2007-11-21 20:39:12 +08:00
|
|
|
BIO_printf(out,"Parameter set: %s\n",OBJ_nid2ln(param_nid));
|
2006-09-17 21:00:18 +08:00
|
|
|
return 1;
|
2007-11-21 20:39:12 +08:00
|
|
|
}
|
|
|
|
static int param_print_gost01(BIO *out, const EVP_PKEY *pkey, int indent,
|
|
|
|
ASN1_PCTX *pctx)
|
|
|
|
{
|
|
|
|
return print_gost_01(out,pkey,indent,pctx,0);
|
|
|
|
}
|
|
|
|
static int pub_print_gost01(BIO *out, const EVP_PKEY *pkey, int indent,
|
|
|
|
ASN1_PCTX *pctx)
|
|
|
|
{
|
|
|
|
return print_gost_01(out,pkey, indent, pctx,1);
|
|
|
|
}
|
|
|
|
static int priv_print_gost01(BIO *out,const EVP_PKEY *pkey, int indent,
|
|
|
|
ASN1_PCTX *pctx)
|
|
|
|
{
|
|
|
|
return print_gost_01(out,pkey,indent,pctx,2);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
/* ---------------------------------------------------------------------*/
|
|
|
|
static int param_missing_gost94(const EVP_PKEY *pk)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
const DSA *dsa = EVP_PKEY_get0((EVP_PKEY *)pk);
|
|
|
|
if (!dsa) return 1;
|
|
|
|
if (!dsa->q) return 1;
|
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int param_missing_gost01(const EVP_PKEY *pk)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
const EC_KEY *ec = EVP_PKEY_get0((EVP_PKEY *)pk);
|
|
|
|
if (!ec) return 1;
|
|
|
|
if (!EC_KEY_get0_group(ec)) return 1;
|
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
|
|
|
static int param_copy_gost94(EVP_PKEY *to, const EVP_PKEY *from)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
const DSA *dfrom = EVP_PKEY_get0((EVP_PKEY *)from);
|
|
|
|
DSA *dto = EVP_PKEY_get0(to);
|
|
|
|
if (EVP_PKEY_base_id(from) != EVP_PKEY_base_id(to))
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_PARAM_COPY_GOST94,
|
2006-09-21 21:04:43 +08:00
|
|
|
GOST_R_INCOMPATIBLE_ALGORITHMS);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
if (!dfrom)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_PARAM_COPY_GOST94,
|
2006-09-21 21:04:43 +08:00
|
|
|
GOST_R_KEY_PARAMETERS_MISSING);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
if (!dto)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
dto = DSA_new();
|
|
|
|
EVP_PKEY_assign(to,EVP_PKEY_base_id(from),dto);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
#define COPYBIGNUM(a,b,x) if (a->x) BN_free(a->x); a->x=BN_dup(b->x);
|
|
|
|
COPYBIGNUM(dto,dfrom,p)
|
2006-09-21 21:04:43 +08:00
|
|
|
COPYBIGNUM(dto,dfrom,q)
|
|
|
|
COPYBIGNUM(dto,dfrom,g)
|
2006-09-17 21:00:18 +08:00
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
if (dto->priv_key)
|
|
|
|
gost94_compute_public(dto);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 1;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
static int param_copy_gost01(EVP_PKEY *to, const EVP_PKEY *from)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
EC_KEY *eto = EVP_PKEY_get0(to);
|
|
|
|
const EC_KEY *efrom = EVP_PKEY_get0((EVP_PKEY *)from);
|
2006-09-21 21:04:43 +08:00
|
|
|
if (EVP_PKEY_base_id(from) != EVP_PKEY_base_id(to))
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_PARAM_COPY_GOST01,
|
2006-09-21 21:04:43 +08:00
|
|
|
GOST_R_INCOMPATIBLE_ALGORITHMS);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
if (!efrom)
|
|
|
|
{
|
2008-02-28 21:45:06 +08:00
|
|
|
GOSTerr(GOST_F_PARAM_COPY_GOST01,
|
2006-09-21 21:04:43 +08:00
|
|
|
GOST_R_KEY_PARAMETERS_MISSING);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
if (!eto)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
eto = EC_KEY_new();
|
|
|
|
EVP_PKEY_assign(to,EVP_PKEY_base_id(from),eto);
|
2006-09-21 21:04:43 +08: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 20:06:36 +08:00
|
|
|
EC_KEY_set_group(eto,EC_KEY_get0_group(efrom));
|
2006-09-21 21:04:43 +08:00
|
|
|
if (EC_KEY_get0_private_key(eto))
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
gost2001_compute_public(eto);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
return 1;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
static int param_cmp_gost94(const EVP_PKEY *a, const EVP_PKEY *b)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
const DSA *da = EVP_PKEY_get0((EVP_PKEY *)a);
|
|
|
|
const DSA *db = EVP_PKEY_get0((EVP_PKEY *)b);
|
|
|
|
if (!BN_cmp(da->q,db->q)) return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-21 21:04:43 +08:00
|
|
|
|
|
|
|
static int param_cmp_gost01(const EVP_PKEY *a, const EVP_PKEY *b)
|
|
|
|
{
|
|
|
|
if (EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)a)))==
|
|
|
|
EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)b))))
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
/* ---------- Public key functions * --------------------------------------*/
|
|
|
|
static int pub_decode_gost94(EVP_PKEY *pk, X509_PUBKEY *pub)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
X509_ALGOR *palg = NULL;
|
|
|
|
const unsigned char *pubkey_buf = NULL;
|
|
|
|
unsigned char *databuf;
|
|
|
|
ASN1_OBJECT *palgobj = NULL;
|
|
|
|
int pub_len,i,j;
|
|
|
|
DSA *dsa;
|
|
|
|
ASN1_OCTET_STRING *octet= NULL;
|
|
|
|
|
|
|
|
if (!X509_PUBKEY_get0_param(&palgobj,&pubkey_buf,&pub_len,
|
2006-09-21 21:04:43 +08:00
|
|
|
&palg, pub)) return 0;
|
2006-09-17 21:00:18 +08:00
|
|
|
EVP_PKEY_assign(pk,OBJ_obj2nid(palgobj),NULL);
|
|
|
|
if (!decode_gost_algor_params(pk,palg)) return 0;
|
|
|
|
octet = d2i_ASN1_OCTET_STRING(NULL,&pubkey_buf,pub_len);
|
|
|
|
if (!octet)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_PUB_DECODE_GOST94,ERR_R_MALLOC_FAILURE);
|
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
databuf = OPENSSL_malloc(octet->length);
|
2013-12-09 05:53:29 +08:00
|
|
|
if (databuf == NULL)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PUB_DECODE_GOST94,ERR_R_MALLOC_FAILURE);
|
|
|
|
ASN1_OCTET_STRING_free(octet);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
for (i=0,j=octet->length-1;i<octet->length;i++,j--)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
databuf[j]=octet->data[i];
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
dsa = EVP_PKEY_get0(pk);
|
|
|
|
dsa->pub_key=BN_bin2bn(databuf,octet->length,NULL);
|
|
|
|
ASN1_OCTET_STRING_free(octet);
|
|
|
|
OPENSSL_free(databuf);
|
|
|
|
return 1;
|
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pub_encode_gost94(X509_PUBKEY *pub,const EVP_PKEY *pk)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_OBJECT *algobj = NULL;
|
|
|
|
ASN1_OCTET_STRING *octet = NULL;
|
|
|
|
void *pval = NULL;
|
|
|
|
unsigned char *buf=NULL,*databuf,*sptr;
|
|
|
|
int i,j,data_len,ret=0;
|
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
int ptype = V_ASN1_UNDEF;
|
2006-09-17 21:00:18 +08:00
|
|
|
DSA *dsa = EVP_PKEY_get0((EVP_PKEY *)pk);
|
|
|
|
algobj = OBJ_nid2obj(EVP_PKEY_base_id(pk));
|
2006-09-21 21:04:43 +08:00
|
|
|
if (pk->save_parameters)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_STRING *params = encode_gost_algor_params(pk);
|
|
|
|
pval = params;
|
|
|
|
ptype = V_ASN1_SEQUENCE;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
data_len = BN_num_bytes(dsa->pub_key);
|
|
|
|
databuf = OPENSSL_malloc(data_len);
|
2013-12-09 05:53:29 +08:00
|
|
|
if (databuf == NULL)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PUB_ENCODE_GOST94,ERR_R_MALLOC_FAILURE);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
BN_bn2bin(dsa->pub_key,databuf);
|
|
|
|
octet = ASN1_OCTET_STRING_new();
|
2013-12-09 05:53:29 +08:00
|
|
|
if (octet == NULL)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PUB_ENCODE_GOST94,ERR_R_MALLOC_FAILURE);
|
|
|
|
OPENSSL_free(databuf);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_STRING_set(octet,NULL,data_len);
|
|
|
|
sptr = ASN1_STRING_data(octet);
|
|
|
|
for (i=0,j=data_len-1; i< data_len;i++,j--)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
sptr[i]=databuf[j];
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
OPENSSL_free(databuf);
|
|
|
|
ret = i2d_ASN1_OCTET_STRING(octet,&buf);
|
|
|
|
ASN1_BIT_STRING_free(octet);
|
|
|
|
if (ret <0) return 0;
|
|
|
|
return X509_PUBKEY_set0_param(pub,algobj,ptype,pval,buf,ret);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pub_decode_gost01(EVP_PKEY *pk,X509_PUBKEY *pub)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
X509_ALGOR *palg = NULL;
|
|
|
|
const unsigned char *pubkey_buf = NULL;
|
|
|
|
unsigned char *databuf;
|
|
|
|
ASN1_OBJECT *palgobj = NULL;
|
|
|
|
int pub_len,i,j;
|
|
|
|
EC_POINT *pub_key;
|
|
|
|
BIGNUM *X,*Y;
|
|
|
|
ASN1_OCTET_STRING *octet= NULL;
|
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 20:06:36 +08:00
|
|
|
int len;
|
2006-09-17 21:00:18 +08:00
|
|
|
const EC_GROUP *group;
|
|
|
|
|
|
|
|
if (!X509_PUBKEY_get0_param(&palgobj,&pubkey_buf,&pub_len,
|
2006-09-21 21:04:43 +08:00
|
|
|
&palg, pub)) return 0;
|
2006-09-17 21:00:18 +08:00
|
|
|
EVP_PKEY_assign(pk,OBJ_obj2nid(palgobj),NULL);
|
|
|
|
if (!decode_gost_algor_params(pk,palg)) return 0;
|
|
|
|
group = EC_KEY_get0_group(EVP_PKEY_get0(pk));
|
|
|
|
octet = d2i_ASN1_OCTET_STRING(NULL,&pubkey_buf,pub_len);
|
|
|
|
if (!octet)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2008-02-28 21:45:06 +08:00
|
|
|
GOSTerr(GOST_F_PUB_DECODE_GOST01,ERR_R_MALLOC_FAILURE);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
databuf = OPENSSL_malloc(octet->length);
|
2013-12-09 05:53:29 +08:00
|
|
|
if (databuf == NULL)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PUB_DECODE_GOST01,ERR_R_MALLOC_FAILURE);
|
|
|
|
ASN1_OCTET_STRING_free(octet);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
for (i=0,j=octet->length-1;i<octet->length;i++,j--)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
databuf[j]=octet->data[i];
|
2006-09-21 21:04:43 +08: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 20:06:36 +08:00
|
|
|
len=octet->length/2;
|
|
|
|
ASN1_OCTET_STRING_free(octet);
|
|
|
|
|
|
|
|
Y= getbnfrombuf(databuf,len);
|
|
|
|
X= getbnfrombuf(databuf+len,len);
|
2006-09-17 21:00:18 +08:00
|
|
|
OPENSSL_free(databuf);
|
|
|
|
pub_key = EC_POINT_new(group);
|
|
|
|
if (!EC_POINT_set_affine_coordinates_GFp(group
|
2006-09-21 21:04:43 +08:00
|
|
|
,pub_key,X,Y,NULL))
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_PUB_DECODE_GOST01,
|
2006-09-21 21:04:43 +08:00
|
|
|
ERR_R_EC_LIB);
|
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 20:06:36 +08:00
|
|
|
EC_POINT_free(pub_key);
|
|
|
|
BN_free(X);
|
|
|
|
BN_free(Y);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
BN_free(X);
|
|
|
|
BN_free(Y);
|
|
|
|
if (!EC_KEY_set_public_key(EVP_PKEY_get0(pk),pub_key))
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_PUB_DECODE_GOST01,
|
2006-09-21 21:04:43 +08:00
|
|
|
ERR_R_EC_LIB);
|
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 20:06:36 +08:00
|
|
|
EC_POINT_free(pub_key);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08: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 20:06:36 +08:00
|
|
|
EC_POINT_free(pub_key);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 1;
|
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pub_encode_gost01(X509_PUBKEY *pub,const EVP_PKEY *pk)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_OBJECT *algobj = NULL;
|
|
|
|
ASN1_OCTET_STRING *octet = NULL;
|
|
|
|
void *pval = NULL;
|
|
|
|
unsigned char *buf=NULL,*databuf,*sptr;
|
|
|
|
int i,j,data_len,ret=0;
|
|
|
|
const EC_POINT *pub_key;
|
|
|
|
BIGNUM *X,*Y,*order;
|
|
|
|
const EC_KEY *ec = EVP_PKEY_get0((EVP_PKEY *)pk);
|
2006-09-21 21:04:43 +08:00
|
|
|
int ptype = V_ASN1_UNDEF;
|
2006-09-17 21:00:18 +08:00
|
|
|
|
|
|
|
algobj = OBJ_nid2obj(EVP_PKEY_base_id(pk));
|
2006-09-21 21:04:43 +08:00
|
|
|
if (pk->save_parameters)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_STRING *params = encode_gost_algor_params(pk);
|
|
|
|
pval = params;
|
|
|
|
ptype = V_ASN1_SEQUENCE;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
order = BN_new();
|
|
|
|
EC_GROUP_get_order(EC_KEY_get0_group(ec),order,NULL);
|
|
|
|
pub_key=EC_KEY_get0_public_key(ec);
|
2006-09-21 21:04:43 +08:00
|
|
|
if (!pub_key)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
GOSTerr(GOST_F_PUB_ENCODE_GOST01,
|
2006-09-21 21:04:43 +08:00
|
|
|
GOST_R_PUBLIC_KEY_UNDEFINED);
|
2013-12-09 05:53:29 +08:00
|
|
|
BN_free(order);
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
X=BN_new();
|
|
|
|
Y=BN_new();
|
|
|
|
EC_POINT_get_affine_coordinates_GFp(EC_KEY_get0_group(ec),
|
|
|
|
pub_key,X,Y,NULL);
|
|
|
|
data_len = 2*BN_num_bytes(order);
|
|
|
|
BN_free(order);
|
|
|
|
databuf = OPENSSL_malloc(data_len);
|
2013-12-09 05:53:29 +08:00
|
|
|
if (databuf == NULL)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PUB_ENCODE_GOST01,ERR_R_MALLOC_FAILURE);
|
|
|
|
BN_free(X);
|
|
|
|
BN_free(Y);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
memset(databuf,0,data_len);
|
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 20:06:36 +08:00
|
|
|
|
|
|
|
store_bignum(X,databuf+data_len/2,data_len/2);
|
|
|
|
store_bignum(Y,databuf,data_len/2);
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
BN_free(X);
|
|
|
|
BN_free(Y);
|
|
|
|
octet = ASN1_OCTET_STRING_new();
|
2013-12-09 05:53:29 +08:00
|
|
|
if (octet == NULL)
|
|
|
|
{
|
|
|
|
GOSTerr(GOST_F_PUB_ENCODE_GOST01,ERR_R_MALLOC_FAILURE);
|
|
|
|
OPENSSL_free(databuf);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
ASN1_STRING_set(octet,NULL,data_len);
|
|
|
|
sptr=ASN1_STRING_data(octet);
|
2006-09-21 21:04:43 +08:00
|
|
|
for (i=0,j=data_len-1;i<data_len;i++,j--)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
sptr[i]=databuf[j];
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
OPENSSL_free(databuf);
|
|
|
|
ret = i2d_ASN1_OCTET_STRING(octet,&buf);
|
|
|
|
ASN1_BIT_STRING_free(octet);
|
|
|
|
if (ret <0) return 0;
|
|
|
|
return X509_PUBKEY_set0_param(pub,algobj,ptype,pval,buf,ret);
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pub_cmp_gost94(const EVP_PKEY *a, const EVP_PKEY *b)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
const DSA *da = EVP_PKEY_get0((EVP_PKEY *)a);
|
|
|
|
const DSA *db = EVP_PKEY_get0((EVP_PKEY *)b);
|
|
|
|
if (da && db && da->pub_key && db->pub_key
|
2006-09-21 21:04:43 +08:00
|
|
|
&& !BN_cmp(da->pub_key,db->pub_key))
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pub_cmp_gost01(const EVP_PKEY *a,const EVP_PKEY *b)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
const EC_KEY *ea = EVP_PKEY_get0((EVP_PKEY *)a);
|
|
|
|
const EC_KEY *eb = EVP_PKEY_get0((EVP_PKEY *)b);
|
|
|
|
const EC_POINT *ka,*kb;
|
|
|
|
int ret=0;
|
|
|
|
if (!ea || !eb) return 0;
|
|
|
|
ka = EC_KEY_get0_public_key(ea);
|
|
|
|
kb = EC_KEY_get0_public_key(eb);
|
|
|
|
if (!ka || !kb) return 0;
|
|
|
|
ret = (0==EC_POINT_cmp(EC_KEY_get0_group(ea),ka,kb,NULL)) ;
|
|
|
|
return ret;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-11-21 20:39:12 +08:00
|
|
|
|
2006-09-21 21:04:43 +08:00
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pkey_size_gost(const EVP_PKEY *pk)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
return 64;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
static int pkey_bits_gost(const EVP_PKEY *pk)
|
2006-09-21 21:04:43 +08:00
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
return 256;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2007-05-18 01:44:09 +08:00
|
|
|
/*------------------------ ASN1 METHOD for GOST MAC -------------------*/
|
|
|
|
static void mackey_free_gost(EVP_PKEY *pk)
|
|
|
|
{
|
|
|
|
if (pk->pkey.ptr) {
|
|
|
|
OPENSSL_free(pk->pkey.ptr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static int mac_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2)
|
|
|
|
{
|
|
|
|
switch (op)
|
|
|
|
{
|
|
|
|
case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
|
2010-04-08 18:55:04 +08:00
|
|
|
*(int *)arg2 = NID_id_Gost28147_89_MAC;
|
2007-05-18 01:44:09 +08:00
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
return -2;
|
|
|
|
}
|
2009-03-17 23:38:34 +08:00
|
|
|
|
2009-04-01 03:54:51 +08:00
|
|
|
static int gost94_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
|
2009-03-17 23:38:34 +08:00
|
|
|
{
|
|
|
|
int nid=gost94_nid_by_params(EVP_PKEY_get0((EVP_PKEY *)pkey));
|
|
|
|
return i2d_ASN1_OBJECT(OBJ_nid2obj(nid),pder);
|
|
|
|
}
|
2009-04-01 03:54:51 +08:00
|
|
|
static int gost2001_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
|
2009-03-17 23:38:34 +08:00
|
|
|
{
|
|
|
|
int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(EVP_PKEY_get0((EVP_PKEY *)pkey)));
|
|
|
|
return i2d_ASN1_OBJECT(OBJ_nid2obj(nid),pder);
|
|
|
|
}
|
|
|
|
|
2009-04-01 03:54:51 +08:00
|
|
|
static int gost94_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
|
2009-03-17 23:38:34 +08:00
|
|
|
{
|
|
|
|
ASN1_OBJECT *obj=NULL;
|
|
|
|
DSA *dsa = EVP_PKEY_get0(pkey);
|
|
|
|
int nid;
|
|
|
|
if (d2i_ASN1_OBJECT(&obj,pder,derlen)==NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
nid = OBJ_obj2nid(obj);
|
|
|
|
ASN1_OBJECT_free(obj);
|
|
|
|
if (!dsa)
|
|
|
|
{
|
|
|
|
dsa=DSA_new();
|
|
|
|
if (!EVP_PKEY_assign(pkey,NID_id_GostR3410_94,dsa)) return 0;
|
|
|
|
}
|
|
|
|
if (!fill_GOST94_params(dsa,nid)) return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-04-01 03:54:51 +08:00
|
|
|
static int gost2001_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen) {
|
2009-03-17 23:38:34 +08:00
|
|
|
ASN1_OBJECT *obj=NULL;
|
|
|
|
int nid;
|
|
|
|
EC_KEY *ec = EVP_PKEY_get0(pkey);
|
|
|
|
if (d2i_ASN1_OBJECT(&obj,pder,derlen)==NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
nid = OBJ_obj2nid(obj);
|
|
|
|
ASN1_OBJECT_free(obj);
|
|
|
|
if (!ec)
|
|
|
|
{
|
|
|
|
ec = EC_KEY_new();
|
|
|
|
if (!EVP_PKEY_assign(pkey,NID_id_GostR3410_2001,ec)) return 0;
|
|
|
|
}
|
|
|
|
if (!fill_GOST2001_params(ec, nid)) return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-09-17 21:00:18 +08:00
|
|
|
/* ----------------------------------------------------------------------*/
|
2006-09-21 21:04:43 +08:00
|
|
|
int register_ameth_gost (int nid, EVP_PKEY_ASN1_METHOD **ameth, const char* pemstr, const char* info)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
*ameth = EVP_PKEY_asn1_new(nid,
|
2006-09-21 21:04:43 +08:00
|
|
|
ASN1_PKEY_SIGPARAM_NULL, pemstr, info);
|
2006-09-17 21:00:18 +08:00
|
|
|
if (!*ameth) return 0;
|
2006-09-21 21:04:43 +08:00
|
|
|
switch (nid)
|
|
|
|
{
|
2006-09-17 21:00:18 +08:00
|
|
|
case NID_id_GostR3410_94:
|
|
|
|
EVP_PKEY_asn1_set_free (*ameth, pkey_free_gost94);
|
|
|
|
EVP_PKEY_asn1_set_private (*ameth,
|
|
|
|
priv_decode_gost, priv_encode_gost,
|
2007-11-21 20:39:12 +08:00
|
|
|
priv_print_gost94);
|
2006-09-17 21:00:18 +08:00
|
|
|
|
2009-03-17 23:38:34 +08:00
|
|
|
EVP_PKEY_asn1_set_param (*ameth,
|
|
|
|
gost94_param_decode, gost94_param_encode,
|
2006-09-17 21:00:18 +08:00
|
|
|
param_missing_gost94, param_copy_gost94,
|
2007-11-21 20:39:12 +08:00
|
|
|
param_cmp_gost94,param_print_gost94 );
|
2006-09-17 21:00:18 +08:00
|
|
|
EVP_PKEY_asn1_set_public (*ameth,
|
|
|
|
pub_decode_gost94, pub_encode_gost94,
|
|
|
|
pub_cmp_gost94, pub_print_gost94,
|
|
|
|
pkey_size_gost, pkey_bits_gost);
|
|
|
|
|
|
|
|
EVP_PKEY_asn1_set_ctrl (*ameth, pkey_ctrl_gost);
|
|
|
|
break;
|
|
|
|
case NID_id_GostR3410_2001:
|
|
|
|
EVP_PKEY_asn1_set_free (*ameth, pkey_free_gost01);
|
|
|
|
EVP_PKEY_asn1_set_private (*ameth,
|
|
|
|
priv_decode_gost, priv_encode_gost,
|
2007-11-21 20:39:12 +08:00
|
|
|
priv_print_gost01);
|
2006-09-17 21:00:18 +08:00
|
|
|
|
2009-03-17 23:38:34 +08:00
|
|
|
EVP_PKEY_asn1_set_param (*ameth,
|
|
|
|
gost2001_param_decode, gost2001_param_encode,
|
2006-09-17 21:00:18 +08:00
|
|
|
param_missing_gost01, param_copy_gost01,
|
2007-11-21 20:39:12 +08:00
|
|
|
param_cmp_gost01, param_print_gost01);
|
2006-09-17 21:00:18 +08:00
|
|
|
EVP_PKEY_asn1_set_public (*ameth,
|
|
|
|
pub_decode_gost01, pub_encode_gost01,
|
|
|
|
pub_cmp_gost01, pub_print_gost01,
|
|
|
|
pkey_size_gost, pkey_bits_gost);
|
|
|
|
|
|
|
|
EVP_PKEY_asn1_set_ctrl (*ameth, pkey_ctrl_gost);
|
|
|
|
break;
|
2007-05-18 01:44:09 +08:00
|
|
|
case NID_id_Gost28147_89_MAC:
|
|
|
|
EVP_PKEY_asn1_set_free(*ameth, mackey_free_gost);
|
|
|
|
EVP_PKEY_asn1_set_ctrl(*ameth,mac_ctrl_gost);
|
|
|
|
break;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|
2006-09-17 21:00:18 +08:00
|
|
|
return 1;
|
2006-09-21 21:04:43 +08:00
|
|
|
}
|