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

Move more comments that confuse indent

Browse Source 
Conflicts:
	crypto/dsa/dsa.h
	demos/engines/ibmca/hw_ibmca.c
	ssl/ssl_locl.h

Conflicts:
	crypto/bn/rsaz_exp.c
	crypto/evp/e_aes_cbc_hmac_sha1.c
	crypto/evp/e_aes_cbc_hmac_sha256.c
	ssl/ssl_locl.h

Conflicts:
	crypto/ec/ec2_oct.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	crypto/ec/ecp_nistputil.c
	crypto/ec/ecp_oct.c
	crypto/modes/gcm128.c
	ssl/ssl_locl.h

Conflicts:
	apps/apps.c
	crypto/crypto.h
	crypto/rand/md_rand.c
	ssl/d1_pkt.c
	ssl/ssl.h
	ssl/ssl_locl.h
	ssl/ssltest.c
	ssl/t1_enc.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell
2015-01-21 19:18:47 +00:00
parent 3600d5a744
commit 13270477f4
21 changed files with 148 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/ca.c
View File

@@ -1464,7 +1464,8 @@ bad:
} }
if (crlnumberfile != NULL) /* we have a CRL number that need updating */ /* we have a CRL number that need updating */
if (crlnumberfile != NULL)
if (!save_serial(crlnumberfile,"new",crlnumber,NULL)) goto err; if (!save_serial(crlnumberfile,"new",crlnumber,NULL)) goto err;
if (!X509_CRL_sign(crl,pkey,dgst)) goto err; if (!X509_CRL_sign(crl,pkey,dgst)) goto err;

3
apps/passwd.c
View File

@@ -310,7 +310,8 @@ err:
*/ */
static char *md5crypt(const char *passwd, const char *magic, const char *salt) static char *md5crypt(const char *passwd, const char *magic, const char *salt)
{ {
static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */ /* "$apr1$..salt..$.......md5hash..........\0" */
static char out_buf[6 + 9 + 24 + 2];
unsigned char buf[MD5_DIGEST_LENGTH]; unsigned char buf[MD5_DIGEST_LENGTH];
char *salt_out; char *salt_out;
int n; int n;

3
apps/s_apps.h
View File

@@ -108,7 +108,8 @@
* Hudson (tjh@cryptsoft.com). * Hudson (tjh@cryptsoft.com).
* *
*/ */
#if !defined(OPENSSL_SYS_NETWARE) /* conflicts with winsock2 stuff on netware */ /* conflicts with winsock2 stuff on netware */
#if !defined(OPENSSL_SYS_NETWARE)
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>

3
apps/s_server.c
View File

@@ -131,7 +131,8 @@
#define APPS_WIN16 #define APPS_WIN16
#endif #endif
#if !defined(OPENSSL_SYS_NETWARE) /* conflicts with winsock2 stuff on netware */ /* conflicts with winsock2 stuff on netware */
#if !defined(OPENSSL_SYS_NETWARE)
#include <sys/types.h> #include <sys/types.h>
#endif #endif

3
crypto/bio/bss_bio.c
View File

@@ -151,7 +151,8 @@ static int bio_new(BIO *bio)
return 0; return 0;
b->peer = NULL; b->peer = NULL;
b->size = 17*1024; /* enough for one TLS record (just a default) */ /* enough for one TLS record (just a default) */
b->size = 17*1024;
b->buf = NULL; b->buf = NULL;
bio->ptr = b; bio->ptr = b;

15
crypto/bio/bss_rtcp.c
View File

@@ -76,11 +76,16 @@ typedef unsigned short io_channel;
/*************************************************************************/ /*************************************************************************/
struct io_status { short status, count; long flags; }; struct io_status { short status, count; long flags; };
struct rpc_msg { /* Should have member alignment inhibited */ /* Should have member alignment inhibited */
char channel; /* 'A'-app data. 'R'-remote client 'G'-global */ struct rpc_msg {
char function; /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */ /* 'A'-app data. 'R'-remote client 'G'-global */
unsigned short int length; /* Amount of data returned or max to return */ char channel;
char data[4092]; /* variable data */ /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */
char function;
/* Amount of data returned or max to return */
unsigned short int length;
/* variable data */
char data[4092];
}; };
#define RPC_HDR_SIZE (sizeof(struct rpc_msg) - 4092) #define RPC_HDR_SIZE (sizeof(struct rpc_msg) - 4092)

13
crypto/bn/bn_lib.c
View File

@@ -350,6 +350,11 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words)
a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3]; a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3];
A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3; A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3;
} }
/*
* workaround for ultrix cc: without 'case 0', the optimizer does
* the switch table by doing a=top&3; a--; goto jump_table[a];
* which fails for top== 0
*/
switch (b->top&3) switch (b->top&3)
{ {
case 3: A[2]=B[2]; case 3: A[2]=B[2];
@@ -357,11 +362,6 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words)
case 1: A[0]=B[0]; case 1: A[0]=B[0];
case 0: case 0:
; ;
/*
* workaround for ultrix cc: without 'case 0', the optimizer does
* the switch table by doing a=top&3; a--; goto jump_table[a];
* which fails for top== 0
*/
} }
} }
@@ -508,12 +508,13 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b)
a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3]; a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3];
A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3; A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3;
} }
/* ultrix cc workaround, see comments in bn_expand_internal */
switch (b->top&3) switch (b->top&3)
{ {
case 3: A[2]=B[2]; case 3: A[2]=B[2];
case 2: A[1]=B[1]; case 2: A[1]=B[1];
case 1: A[0]=B[0]; case 1: A[0]=B[0];
case 0: ; /* ultrix cc workaround, see comments in bn_expand_internal */ case 0: ;
} }
#else #else
memcpy(a->d,b->d,sizeof(b->d[0])*b->top); memcpy(a->d,b->d,sizeof(b->d[0])*b->top);

3
crypto/crypto.h
View File

@@ -289,7 +289,8 @@ typedef struct bio_st BIO_dummy;
struct crypto_ex_data_st struct crypto_ex_data_st
{ {
STACK *sk; STACK *sk;
int dummy; /* gcc is screwing up this data structure :-( */ /* gcc is screwing up this data structure :-( */
int dummy;
}; };
/* This stuff is basically class callback functions /* This stuff is basically class callback functions

6
crypto/des/des_ver.h
View File

@@ -67,5 +67,7 @@
#define DES_version OSSL_DES_version #define DES_version OSSL_DES_version
#define libdes_version OSSL_libdes_version #define libdes_version OSSL_libdes_version
OPENSSL_EXTERN const char OSSL_DES_version[]; /* SSLeay version string */ /* SSLeay version string */
OPENSSL_EXTERN const char OSSL_libdes_version[]; /* old libdes version string */ OPENSSL_EXTERN const char OSSL_DES_version[];
/* old libdes version string */
OPENSSL_EXTERN const char OSSL_libdes_version[];

19
crypto/dsa/dsa.h
View File

@@ -91,13 +91,20 @@
#define OPENSSL_DSA_FIPS_MIN_MODULUS_BITS 1024 #define OPENSSL_DSA_FIPS_MIN_MODULUS_BITS 1024
#define DSA_FLAG_CACHE_MONT_P 0x01 #define DSA_FLAG_CACHE_MONT_P 0x01
#define DSA_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DSA /* new with 0.9.7h; the
* implementation now uses constant time * built-in DSA
* modular exponentiation for secret exponents * implementation now
* by default. This flag causes the * uses constant time
* faster variable sliding window method to * modular exponentiation
* be used for all exponents. * for secret exponents
* by default. This flag
* causes the faster
* variable sliding
* window method to be
* used for all
* exponents.
*/ */
#define DSA_FLAG_NO_EXP_CONSTTIME 0x02
/* If this flag is set the DSA method is FIPS compliant and can be used /* If this flag is set the DSA method is FIPS compliant and can be used
* in FIPS mode. This is set in the validated module method. If an * in FIPS mode. This is set in the validated module method. If an

6
crypto/rand/md_rand.c
View File

@@ -149,7 +149,8 @@ static unsigned int crypto_lock_rand = 0; /* may be set only when a thread
* holds CRYPTO_LOCK_RAND * holds CRYPTO_LOCK_RAND
* (to prevent double locking) */ * (to prevent double locking) */
/* access to lockin_thread is synchronized by CRYPTO_LOCK_RAND2 */ /* access to lockin_thread is synchronized by CRYPTO_LOCK_RAND2 */
static unsigned long locking_thread = 0; /* valid iff crypto_lock_rand is set */ /* valid iff crypto_lock_rand is set */
static unsigned long locking_thread = 0;
#ifdef PREDICT #ifdef PREDICT
@@ -491,7 +492,8 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
for (i=0; i<MD_DIGEST_LENGTH/2; i++) for (i=0; i<MD_DIGEST_LENGTH/2; i++)
{ {
state[st_idx++]^=local_md[i]; /* may compete with other threads */ /* may compete with other threads */
state[st_idx++]^=local_md[i];
if (st_idx >= st_num) if (st_idx >= st_num)
st_idx=0; st_idx=0;
if (i < j) if (i < j)

3
crypto/seed/seed.h
View File

@@ -87,7 +87,8 @@
#error SEED is disabled. #error SEED is disabled.
#endif #endif
#ifdef AES_LONG /* look whether we need 'long' to get 32 bits */ /* look whether we need 'long' to get 32 bits */
#ifdef AES_LONG
# ifndef SEED_LONG # ifndef SEED_LONG
# define SEED_LONG 1 # define SEED_LONG 1
# endif # endif

9
crypto/x509/x509.h
View File

@@ -544,7 +544,8 @@ X509_ALGOR *encryption;
} PBE2PARAM; } PBE2PARAM;
typedef struct PBKDF2PARAM_st { typedef struct PBKDF2PARAM_st {
ASN1_TYPE *salt; /* Usually OCTET STRING but could be anything */ /* Usually OCTET STRING but could be anything */
ASN1_TYPE *salt;
ASN1_INTEGER *iter; ASN1_INTEGER *iter;
ASN1_INTEGER *keylength; ASN1_INTEGER *keylength;
X509_ALGOR *prf; X509_ALGOR *prf;
@@ -555,14 +556,16 @@ X509_ALGOR *prf;
typedef struct pkcs8_priv_key_info_st typedef struct pkcs8_priv_key_info_st
{ {
int broken; /* Flag for various broken formats */ /* Flag for various broken formats */
int broken;
#define PKCS8_OK 0 #define PKCS8_OK 0
#define PKCS8_NO_OCTET 1 #define PKCS8_NO_OCTET 1
#define PKCS8_EMBEDDED_PARAM 2 #define PKCS8_EMBEDDED_PARAM 2
#define PKCS8_NS_DB 3 #define PKCS8_NS_DB 3
ASN1_INTEGER *version; ASN1_INTEGER *version;
X509_ALGOR *pkeyalg; X509_ALGOR *pkeyalg;
ASN1_TYPE *pkey; /* Should be OCTET STRING but some are broken */ /* Should be OCTET STRING but some are broken */
ASN1_TYPE *pkey;
STACK_OF(X509_ATTRIBUTE) *attributes; STACK_OF(X509_ATTRIBUTE) *attributes;
} PKCS8_PRIV_KEY_INFO; } PKCS8_PRIV_KEY_INFO;

3
engines/e_chil.c
View File

@@ -420,7 +420,8 @@ void ENGINE_load_chil(void)
static DSO *hwcrhk_dso = NULL; static DSO *hwcrhk_dso = NULL;
static HWCryptoHook_ContextHandle hwcrhk_context = 0; static HWCryptoHook_ContextHandle hwcrhk_context = 0;
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
static int hndidx_rsa = -1; /* Index for KM handle. Not really used yet. */ /* Index for KM handle. Not really used yet. */
static int hndidx_rsa = -1;
#endif #endif
/* These are the function pointers that are (un)set when the library has /* These are the function pointers that are (un)set when the library has

6
engines/e_sureware.c
View File

@@ -337,10 +337,12 @@ void ENGINE_load_sureware(void)
* implicitly. */ * implicitly. */
static DSO *surewarehk_dso = NULL; static DSO *surewarehk_dso = NULL;
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
static int rsaHndidx = -1; /* Index for KM handle. Not really used yet. */ /* Index for KM handle. Not really used yet. */
static int rsaHndidx = -1;
#endif #endif
#ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_DSA
static int dsaHndidx = -1; /* Index for KM handle. Not really used yet. */ /* Index for KM handle. Not really used yet. */
static int dsaHndidx = -1;
#endif #endif
/* These are the function pointers that are (un)set when the library has /* These are the function pointers that are (un)set when the library has

8
engines/e_ubsec.c
View File

@@ -781,9 +781,13 @@ static DSA_SIG *ubsec_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
goto err; goto err;
} }
if (p_UBSEC_dsa_sign_ioctl(fd, 0, /* compute hash before signing */ if (p_UBSEC_dsa_sign_ioctl(fd,
/* compute hash before signing */
0,
(unsigned char *)dgst, d_len, (unsigned char *)dgst, d_len,
NULL, 0, /* compute random value */ NULL,
/* compute random value */
0,
(unsigned char *)dsa->p->d, BN_num_bits(dsa->p), (unsigned char *)dsa->p->d, BN_num_bits(dsa->p),
(unsigned char *)dsa->q->d, BN_num_bits(dsa->q), (unsigned char *)dsa->q->d, BN_num_bits(dsa->q),
(unsigned char *)dsa->g->d, BN_num_bits(dsa->g), (unsigned char *)dsa->g->d, BN_num_bits(dsa->g),

9
ssl/kssl.c
View File

@@ -1812,8 +1812,10 @@ kssl_ctx_show(KSSL_CTX *kssl_ctx)
krb5rc = krb5_kt_get_entry(krb5context, krb5keytab, krb5rc = krb5_kt_get_entry(krb5context, krb5keytab,
princ, princ,
0 /* IGNORE_VNO */, /* IGNORE_VNO */
0 /* IGNORE_ENCTYPE */, 0,
/* IGNORE_ENCTYPE */
0,
&entry); &entry);
if ( krb5rc == KRB5_KT_NOTFOUND ) { if ( krb5rc == KRB5_KT_NOTFOUND ) {
rc = 1; rc = 1;
@@ -1897,7 +1899,8 @@ void kssl_krb5_free_data_contents(krb5_context context, krb5_data *data)
krb5_free_data_contents(NULL, data); krb5_free_data_contents(NULL, data);
#endif #endif
} }
#endif /* !OPENSSL_SYS_WINDOWS && !OPENSSL_SYS_WIN32 */ #endif
/* !OPENSSL_SYS_WINDOWS && !OPENSSL_SYS_WIN32 */
/* Given pointers to KerberosTime and struct tm structs, convert the /* Given pointers to KerberosTime and struct tm structs, convert the

51
ssl/ssl.h
View File

@@ -505,7 +505,8 @@ typedef struct ssl_session_st
* the workaround is not needed. Unfortunately some broken SSL/TLS * the workaround is not needed. Unfortunately some broken SSL/TLS
* implementations cannot handle it at all, which is why we include * implementations cannot handle it at all, which is why we include
* it in SSL_OP_ALL. */ * it in SSL_OP_ALL. */
#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L /* added in 0.9.6e */ /* added in 0.9.6e */
#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L
/* SSL_OP_ALL: various bug workarounds that should be rather harmless. /* SSL_OP_ALL: various bug workarounds that should be rather harmless.
* This used to be 0x000FFFFFL before 0.9.7. */ * This used to be 0x000FFFFFL before 0.9.7. */
@@ -1219,27 +1220,40 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
#define SSL_AD_REASON_OFFSET 1000 #define SSL_AD_REASON_OFFSET 1000
/* These alert types are for SSLv3 and TLSv1 */ /* These alert types are for SSLv3 and TLSv1 */
#define SSL_AD_CLOSE_NOTIFY SSL3_AD_CLOSE_NOTIFY #define SSL_AD_CLOSE_NOTIFY SSL3_AD_CLOSE_NOTIFY
#define SSL_AD_UNEXPECTED_MESSAGE SSL3_AD_UNEXPECTED_MESSAGE /* fatal */ /* fatal */
#define SSL_AD_BAD_RECORD_MAC SSL3_AD_BAD_RECORD_MAC /* fatal */ #define SSL_AD_UNEXPECTED_MESSAGE SSL3_AD_UNEXPECTED_MESSAGE
/* fatal */
#define SSL_AD_BAD_RECORD_MAC SSL3_AD_BAD_RECORD_MAC
#define SSL_AD_DECRYPTION_FAILED TLS1_AD_DECRYPTION_FAILED #define SSL_AD_DECRYPTION_FAILED TLS1_AD_DECRYPTION_FAILED
#define SSL_AD_RECORD_OVERFLOW TLS1_AD_RECORD_OVERFLOW #define SSL_AD_RECORD_OVERFLOW TLS1_AD_RECORD_OVERFLOW
#define SSL_AD_DECOMPRESSION_FAILURE SSL3_AD_DECOMPRESSION_FAILURE/* fatal */ /* fatal */
#define SSL_AD_HANDSHAKE_FAILURE SSL3_AD_HANDSHAKE_FAILURE/* fatal */ #define SSL_AD_DECOMPRESSION_FAILURE SSL3_AD_DECOMPRESSION_FAILURE
#define SSL_AD_NO_CERTIFICATE SSL3_AD_NO_CERTIFICATE /* Not for TLS */ /* fatal */
#define SSL_AD_HANDSHAKE_FAILURE SSL3_AD_HANDSHAKE_FAILURE
/* Not for TLS */
#define SSL_AD_NO_CERTIFICATE SSL3_AD_NO_CERTIFICATE
#define SSL_AD_BAD_CERTIFICATE SSL3_AD_BAD_CERTIFICATE #define SSL_AD_BAD_CERTIFICATE SSL3_AD_BAD_CERTIFICATE
#define SSL_AD_UNSUPPORTED_CERTIFICATE SSL3_AD_UNSUPPORTED_CERTIFICATE #define SSL_AD_UNSUPPORTED_CERTIFICATE SSL3_AD_UNSUPPORTED_CERTIFICATE
#define SSL_AD_CERTIFICATE_REVOKED SSL3_AD_CERTIFICATE_REVOKED #define SSL_AD_CERTIFICATE_REVOKED SSL3_AD_CERTIFICATE_REVOKED
#define SSL_AD_CERTIFICATE_EXPIRED SSL3_AD_CERTIFICATE_EXPIRED #define SSL_AD_CERTIFICATE_EXPIRED SSL3_AD_CERTIFICATE_EXPIRED
#define SSL_AD_CERTIFICATE_UNKNOWN SSL3_AD_CERTIFICATE_UNKNOWN #define SSL_AD_CERTIFICATE_UNKNOWN SSL3_AD_CERTIFICATE_UNKNOWN
#define SSL_AD_ILLEGAL_PARAMETER SSL3_AD_ILLEGAL_PARAMETER /* fatal */ /* fatal */
#define SSL_AD_UNKNOWN_CA TLS1_AD_UNKNOWN_CA /* fatal */ #define SSL_AD_ILLEGAL_PARAMETER SSL3_AD_ILLEGAL_PARAMETER
#define SSL_AD_ACCESS_DENIED TLS1_AD_ACCESS_DENIED /* fatal */ /* fatal */
#define SSL_AD_DECODE_ERROR TLS1_AD_DECODE_ERROR /* fatal */ #define SSL_AD_UNKNOWN_CA TLS1_AD_UNKNOWN_CA
/* fatal */
#define SSL_AD_ACCESS_DENIED TLS1_AD_ACCESS_DENIED
/* fatal */
#define SSL_AD_DECODE_ERROR TLS1_AD_DECODE_ERROR
#define SSL_AD_DECRYPT_ERROR TLS1_AD_DECRYPT_ERROR #define SSL_AD_DECRYPT_ERROR TLS1_AD_DECRYPT_ERROR
#define SSL_AD_EXPORT_RESTRICTION TLS1_AD_EXPORT_RESTRICTION/* fatal */ /* fatal */
#define SSL_AD_PROTOCOL_VERSION TLS1_AD_PROTOCOL_VERSION /* fatal */ #define SSL_AD_EXPORT_RESTRICTION TLS1_AD_EXPORT_RESTRICTION
#define SSL_AD_INSUFFICIENT_SECURITY TLS1_AD_INSUFFICIENT_SECURITY/* fatal */ /* fatal */
#define SSL_AD_INTERNAL_ERROR TLS1_AD_INTERNAL_ERROR /* fatal */ #define SSL_AD_PROTOCOL_VERSION TLS1_AD_PROTOCOL_VERSION
/* fatal */
#define SSL_AD_INSUFFICIENT_SECURITY TLS1_AD_INSUFFICIENT_SECURITY
/* fatal */
#define SSL_AD_INTERNAL_ERROR TLS1_AD_INTERNAL_ERROR
#define SSL_AD_USER_CANCELLED TLS1_AD_USER_CANCELLED #define SSL_AD_USER_CANCELLED TLS1_AD_USER_CANCELLED
#define SSL_AD_NO_RENEGOTIATION TLS1_AD_NO_RENEGOTIATION #define SSL_AD_NO_RENEGOTIATION TLS1_AD_NO_RENEGOTIATION
#define SSL_AD_UNSUPPORTED_EXTENSION TLS1_AD_UNSUPPORTED_EXTENSION #define SSL_AD_UNSUPPORTED_EXTENSION TLS1_AD_UNSUPPORTED_EXTENSION
@@ -1247,8 +1261,10 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
#define SSL_AD_UNRECOGNIZED_NAME TLS1_AD_UNRECOGNIZED_NAME #define SSL_AD_UNRECOGNIZED_NAME TLS1_AD_UNRECOGNIZED_NAME
#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE #define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE #define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
#define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */ /* fatal */
#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */ #define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY
/* fatal */
#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK
#define SSL_ERROR_NONE 0 #define SSL_ERROR_NONE 0
#define SSL_ERROR_SSL 1 #define SSL_ERROR_SSL 1
@@ -1445,7 +1461,8 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type); int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type); int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type); int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */ /* PEM type */
int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file); STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs, int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
const char *file); const char *file);

39
ssl/ssl_locl.h
View File

@@ -261,25 +261,38 @@
* ONLY ONE BIT PER MASK CAN BE SET AT A TIME. * ONLY ONE BIT PER MASK CAN BE SET AT A TIME.
*/ */
#define SSL_MKEY_MASK 0x000000FFL #define SSL_MKEY_MASK 0x000000FFL
#define SSL_kRSA 0x00000001L /* RSA key exchange */ /* RSA key exchange */
#define SSL_kDHr 0x00000002L /* DH cert RSA CA cert */ #define SSL_kRSA 0x00000001L
#define SSL_kDHd 0x00000004L /* DH cert DSA CA cert */ /* DH cert RSA CA cert */
#define SSL_kDHr 0x00000002L
/* DH cert DSA CA cert */
#define SSL_kDHd 0x00000004L
#define SSL_kFZA 0x00000008L #define SSL_kFZA 0x00000008L
#define SSL_kEDH 0x00000010L /* tmp DH key no DH cert */ /* tmp DH key no DH cert */
#define SSL_kKRB5 0x00000020L /* Kerberos5 key exchange */ #define SSL_kEDH 0x00000010L
#define SSL_kECDH 0x00000040L /* ECDH w/ long-term keys */ /* Kerberos5 key exchange */
#define SSL_kECDHE 0x00000080L /* ephemeral ECDH */ #define SSL_kKRB5 0x00000020L
/* ECDH w/ long-term keys */
#define SSL_kECDH 0x00000040L
/* ephemeral ECDH */
#define SSL_kECDHE 0x00000080L
#define SSL_EDH (SSL_kEDH|(SSL_AUTH_MASK^SSL_aNULL)) #define SSL_EDH (SSL_kEDH|(SSL_AUTH_MASK^SSL_aNULL))
#define SSL_AUTH_MASK 0x00007F00L #define SSL_AUTH_MASK 0x00007F00L
#define SSL_aRSA 0x00000100L /* Authenticate with RSA */ /* Authenticate with RSA */
#define SSL_aDSS 0x00000200L /* Authenticate with DSS */ #define SSL_aRSA 0x00000100L
/* Authenticate with DSS */
#define SSL_aDSS 0x00000200L
#define SSL_DSS SSL_aDSS #define SSL_DSS SSL_aDSS
#define SSL_aFZA 0x00000400L #define SSL_aFZA 0x00000400L
#define SSL_aNULL 0x00000800L /* no Authenticate, ADH */ /* no Authenticate, ADH */
#define SSL_aDH 0x00001000L /* no Authenticate, ADH */ #define SSL_aNULL 0x00000800L
#define SSL_aKRB5 0x00002000L /* Authenticate with KRB5 */ /* no Authenticate, ADH */
#define SSL_aECDSA 0x00004000L /* Authenticate with ECDSA */ #define SSL_aDH 0x00001000L
/* Authenticate with KRB5 */
#define SSL_aKRB5 0x00002000L
/* Authenticate with ECDSA */
#define SSL_aECDSA 0x00004000L
#define SSL_NULL (SSL_eNULL) #define SSL_NULL (SSL_eNULL)
#define SSL_ADH (SSL_kEDH|SSL_aNULL) #define SSL_ADH (SSL_kEDH|SSL_aNULL)

15
ssl/ssl_task.c
View File

@@ -144,11 +144,16 @@ static int s_nbio=0;
#endif #endif
#define TEST_SERVER_CERT "SSL_SERVER_CERTIFICATE" #define TEST_SERVER_CERT "SSL_SERVER_CERTIFICATE"
/*************************************************************************/ /*************************************************************************/
struct rpc_msg { /* Should have member alignment inhibited */ /* Should have member alignment inhibited */
char channel; /* 'A'-app data. 'R'-remote client 'G'-global */ struct rpc_msg {
char function; /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */ /* 'A'-app data. 'R'-remote client 'G'-global */
unsigned short int length; /* Amount of data returned or max to return */ char channel;
char data[4092]; /* variable data */ /* 'G'-get, 'P'-put, 'C'-confirm, 'X'-close */
char function;
/* Amount of data returned or max to return */
unsigned short int length;
/* variable data */
char data[4092];
}; };
#define RPC_HDR_SIZE (sizeof(struct rpc_msg) - 4092) #define RPC_HDR_SIZE (sizeof(struct rpc_msg) - 4092)