|
@@ -1151,14 +1151,17 @@ UINT OvsParseKeyMethod2(OPENVPN_KEY_METHOD_2 *ret, UCHAR *data, UINT size, bool
|
|
|
// Random2
|
|
|
if (ReadBuf(b, ret->Random2, sizeof(ret->Random2)) == sizeof(ret->Random2))
|
|
|
{
|
|
|
- // String
|
|
|
- if (OvsReadStringFromBuf(b, ret->OptionString, sizeof(ret->OptionString)) &&
|
|
|
- OvsReadStringFromBuf(b, ret->Username, sizeof(ret->Username)) &&
|
|
|
- OvsReadStringFromBuf(b, ret->Password, sizeof(ret->Password)) &&
|
|
|
- OvsReadStringFromBuf(b, ret->PeerInfo, sizeof(ret->PeerInfo)))
|
|
|
- {
|
|
|
- read_size = b->Current;
|
|
|
- }
|
|
|
+ // String
|
|
|
+ if (OvsReadStringFromBuf(b, ret->OptionString, sizeof(ret->OptionString)) &&
|
|
|
+ OvsReadStringFromBuf(b, ret->Username, sizeof(ret->Username)) &&
|
|
|
+ OvsReadStringFromBuf(b, ret->Password, sizeof(ret->Password)))
|
|
|
+ {
|
|
|
+ if (!OvsReadStringFromBuf(b, ret->PeerInfo, sizeof(ret->PeerInfo)))
|
|
|
+ {
|
|
|
+ Zero(ret->PeerInfo, sizeof(ret->PeerInfo));
|
|
|
+ }
|
|
|
+ read_size = b->Current;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|