| Index: net/socket/ssl_host_info.cc
|
| ===================================================================
|
| --- net/socket/ssl_host_info.cc (revision 86506)
|
| +++ net/socket/ssl_host_info.cc (working copy)
|
| @@ -94,16 +94,20 @@
|
| state->certs.push_back(der_cert);
|
| }
|
|
|
| + // Ignore obsolete members of the State structure.
|
| std::string throwaway_string;
|
| bool throwaway_bool;
|
| + // This was state->server_hello.
|
| if (!p.ReadString(&iter, &throwaway_string))
|
| return false;
|
|
|
| + // This was state->npn_valid.
|
| if (!p.ReadBool(&iter, &throwaway_bool))
|
| return false;
|
|
|
| if (throwaway_bool) {
|
| int throwaway_int;
|
| + // These were state->npn_status and state->npn_protocol.
|
| if (!p.ReadInt(&iter, &throwaway_int) ||
|
| !p.ReadString(&iter, &throwaway_string)) {
|
| return false;
|
| @@ -161,6 +165,8 @@
|
| return "";
|
| }
|
|
|
| + // Write dummy values for obsolete members of the State structure:
|
| + // state->server_hello and state->npn_valid.
|
| if (!p.WriteString("") ||
|
| !p.WriteBool(false)) {
|
| return "";
|
|
|