| Index: third_party/tlslite/patches/srp_cert.patch
|
| diff --git a/sync/protocol/managed_user_setting_specifics.proto b/third_party/tlslite/patches/srp_cert.patch
|
| similarity index 10%
|
| copy from sync/protocol/managed_user_setting_specifics.proto
|
| copy to third_party/tlslite/patches/srp_cert.patch
|
| index fcd1d964267beb42d04cd2cc67d7d9dc70191b41..8ea579caf5f4c559a38e2a51cd59ab60f13b2152 100644
|
| --- a/sync/protocol/managed_user_setting_specifics.proto
|
| +++ b/third_party/tlslite/patches/srp_cert.patch
|
| @@ -1,21 +1,13 @@
|
| -// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -//
|
| -// Sync protocol datatype extension for managed user settings.
|
| -
|
| -// Update proto_value_conversions{.h,.cc,_unittest.cc} if you change
|
| -// any fields in this file.
|
| -
|
| -syntax = "proto2";
|
| -
|
| -option optimize_for = LITE_RUNTIME;
|
| -option retain_unknown_fields = true;
|
| -
|
| -package sync_pb;
|
| -
|
| -// Properties of managed user setting sync objects.
|
| -message ManagedUserSettingSpecifics {
|
| - optional string name = 1;
|
| - optional string value = 2;
|
| -}
|
| +diff --git a/third_party/tlslite/tlslite/constants.py b/third_party/tlslite/tlslite/constants.py
|
| +index ceaa903..52c20ac 100644
|
| +--- a/third_party/tlslite/tlslite/constants.py
|
| ++++ b/third_party/tlslite/tlslite/constants.py
|
| +@@ -224,7 +224,7 @@ class CipherSuite:
|
| + def getSrpCertSuites(settings):
|
| + return CipherSuite._filterSuites(CipherSuite.srpCertSuites, settings)
|
| +
|
| +- srpAllSuites = srpSuites + srpCertSuites
|
| ++ srpAllSuites = srpCertSuites + srpSuites
|
| +
|
| + @staticmethod
|
| + def getSrpAllSuites(settings):
|
|
|