feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

writing curves in the right order. (reverse)

Browse Source 
improved curve validation.
This commit is contained in:
Moisés Guimarães
2014-01-28 16:53:59 -03:00
parent 9490c0dbaf
commit 30e2b4aa11
1 changed files with 81 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
src/tls.c
View File

@ -1222,21 +1222,27 @@ static word16 TLSX_EllipticCurve_GetSize(EllipticCurve* list)
return length; return length;
} }
static word16 TLSX_EllipticCurve_WriteR(EllipticCurve* curve, byte* output);
static word16 TLSX_EllipticCurve_WriteR(EllipticCurve* curve, byte* output)
{
word16 offset = 0;
if (!curve)
return offset;
offset = TLSX_EllipticCurve_WriteR(curve->next, output);
c16toa(curve->name, output + offset);
return OPAQUE16_LEN + offset;
}
static word16 TLSX_EllipticCurve_Write(EllipticCurve* list, byte* output) static word16 TLSX_EllipticCurve_Write(EllipticCurve* list, byte* output)
{ {
EllipticCurve* curve; word16 length = TLSX_EllipticCurve_WriteR(list, output + OPAQUE16_LEN);
word16 offset = OPAQUE16_LEN; /* list length offset */
while ((curve = list)) { c16toa(length, output); /* writing list length */
list = curve->next;
c16toa(curve->name, output + offset); /* curve name */ return OPAQUE16_LEN + length;
offset += OPAQUE16_LEN;
}
c16toa(offset - OPAQUE16_LEN, output); /* writing list length */
return offset;
} }
#endif /* NO_CYASSL_CLIENT */ #endif /* NO_CYASSL_CLIENT */
@ -1279,11 +1285,14 @@ int TLSX_ValidateEllipticCurves(CYASSL* ssl, byte first, byte second) {
EllipticCurve* curve = NULL; EllipticCurve* curve = NULL;
word32 oid = 0; word32 oid = 0;
word16 octets = 0; /* acording to 'ecc_set_type ecc_sets[];' */ word16 octets = 0; /* acording to 'ecc_set_type ecc_sets[];' */
int sig = 0; /* valitade signature */
int key = 0; /* validate key */
if (!extension) if (!extension)
return 1; /* no suite restriction */ return 1; /* no suite restriction */
for (curve = extension->data; curve; curve = curve->next) { for (curve = extension->data; curve && !(sig && key); curve = curve->next) {
switch (curve->name) { switch (curve->name) {
case CYASSL_ECC_SECP160R1: oid = ECC_160R1; octets = 20; break; case CYASSL_ECC_SECP160R1: oid = ECC_160R1; octets = 20; break;
case CYASSL_ECC_SECP192R1: oid = ECC_192R1; octets = 24; break; case CYASSL_ECC_SECP192R1: oid = ECC_192R1; octets = 24; break;
@ -1292,51 +1301,72 @@ int TLSX_ValidateEllipticCurves(CYASSL* ssl, byte first, byte second) {
case CYASSL_ECC_SECP384R1: oid = ECC_384R1; octets = 48; break; case CYASSL_ECC_SECP384R1: oid = ECC_384R1; octets = 48; break;
case CYASSL_ECC_SECP521R1: oid = ECC_521R1; octets = 66; break; case CYASSL_ECC_SECP521R1: oid = ECC_521R1; octets = 66; break;
} }
}
/* ECDSA */ switch (second) {
switch (second) { #ifndef NO_DSA
case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: /* ECDHE_ECDSA */
case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA: case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256: case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384: case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
case TLS_ECDH_ECDSA_WITH_RC4_128_SHA: case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256: case TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384: sig |= ssl->pkCurveOID == oid;
if (ssl->pkCurveOID != oid) key |= ssl->eccTempKeySz == octets;
return 0; break;
}
switch (second) { /* ECDH_ECDSA */
/* ECDHE */ case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
#ifndef NO_RSA case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA: case TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA: case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
case TLS_ECDHE_RSA_WITH_RC4_128_SHA: case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA: case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256: case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384: case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
sig |= ssl->pkCurveOID == oid;
key |= ssl->pkCurveOID == oid;
break;
#endif #endif
case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: #ifndef NO_RSA
case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: /* ECDHE_RSA */
case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA: case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA: case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256: case TLS_ECDHE_RSA_WITH_RC4_128_SHA:
case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384: case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
if (ssl->eccTempKeySz != octets) case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
return 0; case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
sig = 1;
key |= ssl->eccTempKeySz == octets;
break;
/* ECDH */ /* ECDH_RSA */
default: case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
; /* not sure how to check yet... */ case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
case TLS_ECDH_RSA_WITH_RC4_128_SHA:
case TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
sig = 1;
key |= ssl->pkCurveOID == oid;
break;
#endif
default:
sig = 1;
key = 1;
break;
}
} }
return 1; return sig && key;
} }
#endif /* NO_CYASSL_SERVER */ #endif /* NO_CYASSL_SERVER */