Polish changes for ecdhe/dhe

This commit is contained in:
Bernhard Amann 2014-04-27 00:09:00 -07:00
parent fb56b22cff
commit ef5b021e77
5 changed files with 24 additions and 25 deletions

View file

@ -62,7 +62,7 @@ enum SSLExtensions {
};
enum ECCurveType {
EXPLICIT_PRIME = 1,
EXPLICIT_PRIME = 1,
EXPLICIT_CHAR = 2,
NAMED_CURVE = 3
};

View file

@ -566,7 +566,7 @@ type ServerKeyExchange(rec: SSLRecord) = case $context.connection.chosen_cipher(
# We also do not parse the actual signature data following the named curve.
type EcServerKeyExchange(rec: SSLRecord) = record {
curve_type: uint8;
curve: uint16; # only if curve_type = 3
curve: uint16; # only if curve_type = 3 (NAMED_CURVE)
data: bytestring &restofdata &transient;
};
@ -739,7 +739,7 @@ refine connection SSL_Conn += {
function chosen_cipher() : int %{ return chosen_cipher_; %}
function set_cipher(cipher: int64) : bool
function set_cipher(cipher: uint32) : bool
%{
chosen_cipher_ = cipher;
return true;