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

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
parent 11d01d37

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 0.9.8g and 0.9.9  [xx XXX xxxx]



  *) Implement remaining functionality needed to support GOST ciphersuites.

     Interop testing has been performed using CryptoPro implementations.

     [Victor B. Wagner <vitus@cryptocom.ru>]



  *) s390x assembler pack.

     [Andy Polyakov]

apps/s_client.c

+8 −2
Original line number Diff line number Diff line
@@ -1278,6 +1278,7 @@ SSL_set_tlsext_status_ids(con, ids); 
				if (cbuf_len != 0)

					{

					BIO_printf(bio_c_out,"shutdown\n");

					ret = 0;

					goto shut;

					}

				else
@@ -1320,6 +1321,7 @@ SSL_set_tlsext_status_ids(con, ids); 
			if (i <= 0)

				{

				BIO_printf(bio_c_out,"DONE\n");

				ret = 0;

				goto shut;

				/* goto end; */

				}
@@ -1374,10 +1376,12 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240 
				BIO_printf(bio_c_out,"read X BLOCK\n");

				break;

			case SSL_ERROR_SYSCALL:

				BIO_printf(bio_err,"read:errno=%d\n",get_last_socket_error());

				ret=get_last_socket_error();

				BIO_printf(bio_err,"read:errno=%d\n",ret);

				goto shut;

			case SSL_ERROR_ZERO_RETURN:

				BIO_printf(bio_c_out,"closed\n");

				ret=0;

				goto shut;

			case SSL_ERROR_SSL:

				ERR_print_errors(bio_err);
@@ -1428,6 +1432,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240 
			if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q')))

				{

				BIO_printf(bio_err,"DONE\n");

				ret=0;

				goto shut;

				}
@@ -1450,12 +1455,13 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240 
			read_tty=0;

			}

		}



	ret=0;

shut:

	if (in_init)

		print_stuff(bio_c_out,con,full_log);

	SSL_shutdown(con);

	SHUTDOWN(SSL_get_fd(con));

	ret=0;

end:

	if (con != NULL)

		{

crypto/dsa/dsa_pmeth.c

+5 −1
Original line number Diff line number Diff line
@@ -197,6 +197,10 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
		case EVP_PKEY_CTRL_PKCS7_SIGN:

		return 1;

		

		case EVP_PKEY_CTRL_PEER_KEY:

			DSAerr(DSA_F_PKEY_DSA_CTRL,

			EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);

			return -2;	

		default:

		return -2;

crypto/evp/evp.h

+6 −0
Original line number Diff line number Diff line
@@ -1016,8 +1016,12 @@ void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, 


#define EVP_PKEY_CTRL_DIGESTINIT	7



/* Used by GOST key encryption in TLS */

#define EVP_PKEY_CTRL_SET_IV 		8



#define EVP_PKEY_ALG_CTRL		0x1000





#define EVP_PKEY_FLAG_AUTOARGLEN	2



const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
@@ -1045,6 +1049,8 @@ void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data); 
void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);

EVP_PKEY *EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx);



EVP_PKEY *EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx);



void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data);

void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx);

crypto/evp/pmeth_fn.c

+2 −2
Original line number Diff line number Diff line
@@ -285,13 +285,13 @@ int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx) 
int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)

	{

	int ret;

	if (!ctx || !ctx->pmeth || !ctx->pmeth->derive || !ctx->pmeth->ctrl)

	if (!ctx || !ctx->pmeth || !(ctx->pmeth->derive||ctx->pmeth->encrypt) || !ctx->pmeth->ctrl)

		{

		EVPerr(EVP_F_EVP_PKEY_DERIVE_SET_PEER,

			EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);

		return -2;

		}

	if (ctx->operation != EVP_PKEY_OP_DERIVE)

	if (ctx->operation != EVP_PKEY_OP_DERIVE && ctx->operation != EVP_PKEY_OP_ENCRYPT)

		{

		EVPerr(EVP_F_EVP_PKEY_DERIVE_SET_PEER,

					EVP_R_OPERATON_NOT_INITIALIZED);