generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some no-ec fixes (not complete yet).

Browse Source
This commit is contained in:
Dr. Stephen Henson
2009-04-23 15:24:27 +00:00
parent 30baeaaeab
commit 82ae57136b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/dh/dh_pmeth.c
View File

@@ -59,7 +59,6 @@
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/rsa.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>

6
ssl/s3_lib.c
View File

@@ -2821,13 +2821,11 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
SSL_CIPHER *c,*ret=NULL; SSL_CIPHER *c,*ret=NULL;
STACK_OF(SSL_CIPHER) *prio, *allow; STACK_OF(SSL_CIPHER) *prio, *allow;
int i,ii,ok; int i,ii,ok;
#ifndef OPENSSL_NO_TLSEXT #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_EC)
unsigned int j; unsigned int j;
#ifndef OPENSSL_NO_EC
int ec_ok, ec_nid; int ec_ok, ec_nid;
unsigned char ec_search1 = 0, ec_search2 = 0; unsigned char ec_search1 = 0, ec_search2 = 0;
#endif /* OPENSSL_NO_EC */ #endif
#endif /* OPENSSL_NO_TLSEXT */
CERT *cert; CERT *cert;
unsigned long alg_k,alg_a,mask_k,mask_a,emask_k,emask_a; unsigned long alg_k,alg_a,mask_k,mask_a,emask_k,emask_a;

4
ssl/ssl_lib.c
View File

@@ -1966,6 +1966,8 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
#define ku_reject(x, usage) \ #define ku_reject(x, usage) \
(((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (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) int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
{ {
unsigned long alg_k, alg_a; 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 */ return 1; /* all checks are ok */
} }
#endif
/* THIS NEEDS CLEANING UP */ /* THIS NEEDS CLEANING UP */
X509 *ssl_get_server_send_cert(SSL *s) X509 *ssl_get_server_send_cert(SSL *s)
{ {