Rollback legacy VPN support in core handshake

psiphon/notice.go

@@ -35,7 +35,6 @@ const (
 	NOTICE_HOMEPAGE         = "HOMEPAGE"
 	NOTICE_PAGE_VIEW_REGEX  = "PAGE-VIEW-REGEX"
 	NOTICE_HTTPS_REGEX      = "HTTPS-REGEX"
-	NOTICE_VPN_PSK          = "VPN-PSK"
 )
 
 func Notice(prefix, format string, args ...interface{}) {

psiphon/serverApi.go

@@ -166,7 +166,6 @@ func (session *Session) doHandshakeRequest() error {
 		PageViewRegexes      []map[string]string `json:"page_view_regexes"`
 		HttpsRequestRegexes  []map[string]string `json:"https_request_regexes"`
 		EncodedServerList    []string            `json:"encoded_server_list"`
-		VpnPsk               string              `json:"l2tp_ipsec_psk"`
 	}
 	err = json.Unmarshal(configLine, &handshakeConfig)
 	if err != nil {
@@ -193,9 +192,6 @@ func (session *Session) doHandshakeRequest() error {
 	if handshakeConfig.UpgradeClientVersion != "" {
 		Notice(NOTICE_UPGRADE, "%s", handshakeConfig.UpgradeClientVersion)
 	}
-	if handshakeConfig.VpnPsk != "" {
-		Notice(NOTICE_VPN_PSK, "%s", handshakeConfig.VpnPsk)
-	}
 
 	session.statsRegexps = MakeRegexps(
 		handshakeConfig.PageViewRegexes,