Commit 957901ad authored by garciay's avatar garciay
Browse files

Bug fixed in certificates_loader::fill_public_key_vectors methods

parent 55679e72

ccsrc/Protocols/Security/certificates_loader.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -376,7 +376,7 @@ void certificates_loader::fill_public_key_vectors(const ec_elliptic_curves p_ell 
    p_public_key_y = ecc.public_key_y();

    p_public_key_y = ecc.public_key_y();

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP256CurvePoint::ALT_uncompressedP256)) {

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP256CurvePoint::ALT_uncompressedP256)) {

    p_public_key_x = p_ecc_point.uncompressedP256().x();

    p_public_key_x = p_ecc_point.uncompressedP256().x();

    p_public_key_x = p_ecc_point.uncompressedP256().y();

    p_public_key_y = p_ecc_point.uncompressedP256().y();

    p_public_comp_key = int2oct(0, 33);

    p_public_comp_key = int2oct(0, 33);

  } else {

  } else {

    p_public_key_x = int2oct(0, 32);

    p_public_key_x = int2oct(0, 32);
@@ -399,7 +399,7 @@ void certificates_loader::fill_public_key_vectors(const ec_elliptic_curves p_ell 
    p_public_key_y = ecc.public_key_y();

    p_public_key_y = ecc.public_key_y();

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP384CurvePoint::ALT_uncompressedP384)) {

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP384CurvePoint::ALT_uncompressedP384)) {

    p_public_key_x = p_ecc_point.uncompressedP384().x();

    p_public_key_x = p_ecc_point.uncompressedP384().x();

    p_public_key_x = p_ecc_point.uncompressedP384().y();

    p_public_key_y = p_ecc_point.uncompressedP384().y();

    p_public_comp_key = int2oct(0, 49);

    p_public_comp_key = int2oct(0, 49);

  } else {

  } else {

    p_public_key_x = int2oct(0, 48);

    p_public_key_x = int2oct(0, 48);

scripts/run_tshark.bash

+4 −2
Original line number Original line Diff line number Diff line
@@ -2,6 +2,8 @@ 




# Debug mode

# Debug mode

#set -vx

#set -vx

set -e

#set -e





~/frameworks/wireshark-build/run/tshark -ieth1 -V -f"ether proto 0x8947 or udp src port 12345 or udp dst port 12345" -Tfields -eframe.time -eeth.dst -eeth.src -eeth.type -edata
 
PCAP_SAVE_PATH=~/tmp

rm $PCAP_SAVE_PATH/capture_*.pcap*

~/frameworks/wireshark-build/run/tshark -ieth1 -V -f"ether proto 0x8947 or udp src port 12345 or udp dst port 12345" -Tfields -eframe.time -eeth.dst -eeth.src -eeth.type -edata -g -w $PCAP_SAVE_PATH/capture_`date +'%Y%m%d'`.pcap -F pcap

LibIts @ f91443ce

Compare debeafe4 to f91443ce
Original line number Original line Diff line number Diff line 
Subproject commit debeafe4827781b396ee613b01eedea5ea18f991
 
Subproject commit f91443ce56c8a83ad689ddcf97e2f122c3b85ed8