Commit 82ae5713 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Some no-ec fixes (not complete yet).

parent 30baeaae

crypto/dh/dh_pmeth.c

+0 −1
Changes for crypto/dh/dh_pmeth.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
#include "cryptlib.h"

#include <openssl/asn1t.h>

#include <openssl/x509.h>

#include <openssl/rsa.h>

#include <openssl/evp.h>

#include <openssl/dh.h>

#include <openssl/bn.h>

ssl/s3_lib.c

+2 −4
Changes for ssl/s3_lib.c: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -2821,13 +2821,11 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, 
	SSL_CIPHER *c,*ret=NULL;

	STACK_OF(SSL_CIPHER) *prio, *allow;

	int i,ii,ok;

#ifndef OPENSSL_NO_TLSEXT

#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_EC)

	unsigned int j;

#ifndef OPENSSL_NO_EC

	int ec_ok, ec_nid;

	unsigned char ec_search1 = 0, ec_search2 = 0;

#endif /* OPENSSL_NO_EC */

#endif /* OPENSSL_NO_TLSEXT */

#endif

	CERT *cert;

	unsigned long alg_k,alg_a,mask_k,mask_a,emask_k,emask_a;

ssl/ssl_lib.c

+4 −0
Changes for ssl/ssl_lib.c: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1966,6 +1966,8 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) 
#define ku_reject(x, usage) \

	(((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))



#ifndef OPENSSL_NO_EC



int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)

	{

	unsigned long alg_k, alg_a;
@@ -2037,6 +2039,8 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs) 
	return 1;  /* all checks are ok */

	}



#endif



/* THIS NEEDS CLEANING UP */

X509 *ssl_get_server_send_cert(SSL *s)

	{