mirror of
https://github.com/openssl/openssl.git
synced 2024-12-23 08:54:02 +08:00
0e1dba934f
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
88 lines
2.3 KiB
C
88 lines
2.3 KiB
C
/**********************************************************************
|
|
* gost_ctl.c *
|
|
* Copyright (c) 2005-2006 Cryptocom LTD *
|
|
* This file is distributed under the same license as OpenSSL *
|
|
* *
|
|
* Implementation of control commands for GOST engine *
|
|
* OpenSSL 0.9.9 libraries required *
|
|
**********************************************************************/
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <openssl/engine.h>
|
|
#include <openssl/buffer.h>
|
|
#include "gost_lcl.h"
|
|
|
|
static char *gost_params[GOST_PARAM_MAX+1]={NULL};
|
|
static const char *gost_envnames[]={"CRYPT_PARAMS"};
|
|
const ENGINE_CMD_DEFN gost_cmds[]=
|
|
{
|
|
/* { GOST_CTRL_RNG,
|
|
"RNG",
|
|
"Type of random number generator to use",
|
|
ENGINE_CMD_FLAG_STRING
|
|
},
|
|
{ GOST_CTRL_RNG_PARAMS,
|
|
"RNG_PARAMS",
|
|
"Parameter for random number generator",
|
|
ENGINE_CMD_FLAG_STRING
|
|
},
|
|
*/ { GOST_CTRL_CRYPT_PARAMS,
|
|
"CRYPT_PARAMS",
|
|
"OID of default GOST 28147-89 parameters",
|
|
ENGINE_CMD_FLAG_STRING
|
|
},
|
|
{0,NULL,NULL,0}
|
|
};
|
|
|
|
void gost_param_free()
|
|
{
|
|
int i;
|
|
for (i=0;i<=GOST_PARAM_MAX;i++)
|
|
if (gost_params[i]!=NULL)
|
|
{
|
|
OPENSSL_free(gost_params[i]);
|
|
gost_params[i]=NULL;
|
|
}
|
|
|
|
}
|
|
|
|
int gost_control_func(ENGINE *e,int cmd,long i, void *p, void (*f)(void))
|
|
{
|
|
int param = cmd-ENGINE_CMD_BASE;
|
|
int ret=0;
|
|
if (param <0 || param >GOST_PARAM_MAX) return -1;
|
|
ret=gost_set_default_param(param,p);
|
|
return ret;
|
|
}
|
|
|
|
const char *get_gost_engine_param(int param)
|
|
{
|
|
char *tmp;
|
|
if (param <0 || param >GOST_PARAM_MAX) return NULL;
|
|
if (gost_params[param]!=NULL)
|
|
{
|
|
return gost_params[param];
|
|
}
|
|
tmp = getenv(gost_envnames[param]);
|
|
if (tmp)
|
|
{
|
|
if (gost_params[param]) OPENSSL_free(gost_params[param]);
|
|
gost_params[param] = BUF_strdup(tmp);
|
|
return gost_params[param];
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
int gost_set_default_param(int param, const char *value)
|
|
{
|
|
const char *tmp;
|
|
if (param <0 || param >GOST_PARAM_MAX) return 0;
|
|
tmp = getenv(gost_envnames[param]);
|
|
/* if there is value in the environment, use it, else -passed string * */
|
|
if (!tmp) tmp=value;
|
|
if (gost_params[param]) OPENSSL_free(gost_params[param]);
|
|
gost_params[param] = BUF_strdup(tmp);
|
|
|
|
return 1;
|
|
}
|