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

More tweaks for comments due indent issues

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-21 23:54:59 +00:00
parent 2e4d15fd04
commit e498b83fed
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssl/s2_srvr.c
View File

@ -975,9 +975,13 @@ static int request_certificate(SSL *s)
if (s->state == SSL2_ST_SEND_REQUEST_CERTIFICATE_C)
{
p=(unsigned char *)s->init_buf->data;
i=ssl2_read(s,(char *)&(p[s->init_num]),6-s->init_num); /* try to read 6 octets ... */
if (i < 3-s->init_num) /* ... but don't call ssl2_part_read now if we got at least 3
* (probably NO-CERTIFICATE-ERROR) */
/* try to read 6 octets ... */
i=ssl2_read(s,(char *)&(p[s->init_num]),6-s->init_num);
/*
* ... but don't call ssl2_part_read now if we got at least 3
* (probably NO-CERTIFICATE-ERROR)
*/
if (i < 3-s->init_num)
{
ret=ssl2_part_read(s,SSL_F_REQUEST_CERTIFICATE,i);
goto end;

3
ssl/ssl.h
View File

@ -1813,7 +1813,8 @@ 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,
const char *file);
#ifndef OPENSSL_SYS_VMS
#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
/* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC
int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
const char *dir);
#endif

12
ssl/ssl_ciph.c
View File

@ -238,9 +238,12 @@ static const SSL_CIPHER cipher_aliases[]={
* e.g. kEDH combines DHE_DSS and DHE_RSA) */
{0,SSL_TXT_kRSA,0, SSL_kRSA, 0,0,0,0,0,0,0,0},
{0,SSL_TXT_kDHr,0, SSL_kDHr, 0,0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
{0,SSL_TXT_kDHd,0, SSL_kDHd, 0,0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
{0,SSL_TXT_kDH,0, SSL_kDHr|SSL_kDHd,0,0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
/* no such ciphersuites supported! */
{0,SSL_TXT_kDHr,0, SSL_kDHr, 0,0,0,0,0,0,0,0},
/* no such ciphersuites supported! */
{0,SSL_TXT_kDHd,0, SSL_kDHd, 0,0,0,0,0,0,0,0},
/* no such ciphersuites supported! */
{0,SSL_TXT_kDH,0, SSL_kDHr|SSL_kDHd,0,0,0,0,0,0,0,0},/
{0,SSL_TXT_kEDH,0, SSL_kEDH, 0,0,0,0,0,0,0,0},
{0,SSL_TXT_DH,0, SSL_kDHr|SSL_kDHd|SSL_kEDH,0,0,0,0,0,0,0,0},
@ -262,7 +265,8 @@ static const SSL_CIPHER cipher_aliases[]={
{0,SSL_TXT_DSS,0, 0,SSL_aDSS, 0,0,0,0,0,0,0},
{0,SSL_TXT_aKRB5,0, 0,SSL_aKRB5, 0,0,0,0,0,0,0},
{0,SSL_TXT_aNULL,0, 0,SSL_aNULL, 0,0,0,0,0,0,0},
{0,SSL_TXT_aDH,0, 0,SSL_aDH, 0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
/* no such ciphersuites supported! */
{0,SSL_TXT_aDH,0, 0,SSL_aDH, 0,0,0,0,0,0,0},
{0,SSL_TXT_aECDH,0, 0,SSL_aECDH, 0,0,0,0,0,0,0},
{0,SSL_TXT_aECDSA,0, 0,SSL_aECDSA,0,0,0,0,0,0,0},
{0,SSL_TXT_ECDSA,0, 0,SSL_aECDSA, 0,0,0,0,0,0,0},

3
ssl/ssl_locl.h
View File

@ -320,7 +320,8 @@
#define SSL_aDSS 0x00000002L
/* no auth (i.e. use ADH or AECDH) */
#define SSL_aNULL 0x00000004L
/* Fixed DH auth (kDHd or kDHr) */ /* no such ciphersuites supported! */
/* Fixed DH auth (kDHd or kDHr) */
/* no such ciphersuites supported! */
#define SSL_aDH 0x00000008L
/* Fixed ECDH auth (kECDHe or kECDHr) */
#define SSL_aECDH 0x00000010L