Skip to content

Commit 1a2534c

Browse files
xdgDivjot Arora
authored andcommitted
GODRIVER-1935 Update scram/stringprep dependencies (#624)
1 parent 6ea353a commit 1a2534c

File tree

39 files changed

+8253
-145
lines changed

39 files changed

+8253
-145
lines changed

THIRD-PARTY-NOTICES

Lines changed: 182 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
752752
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
753753

754754
----------------------------------------------------------------------
755-
License notice for github.com/xdg/scram
755+
License notice for github.com/xdg-go/pbkdf2
756756
----------------------------------------------------------------------
757757

758758

@@ -932,7 +932,187 @@ License notice for github.com/xdg/scram
932932
of your accepting any such warranty or additional liability.
933933

934934
----------------------------------------------------------------------
935-
License notice for github.com/xdg/stringprep
935+
License notice for github.com/xdg-go/scram
936+
----------------------------------------------------------------------
937+
938+
939+
Apache License
940+
Version 2.0, January 2004
941+
http://www.apache.org/licenses/
942+
943+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
944+
945+
1. Definitions.
946+
947+
"License" shall mean the terms and conditions for use, reproduction,
948+
and distribution as defined by Sections 1 through 9 of this document.
949+
950+
"Licensor" shall mean the copyright owner or entity authorized by
951+
the copyright owner that is granting the License.
952+
953+
"Legal Entity" shall mean the union of the acting entity and all
954+
other entities that control, are controlled by, or are under common
955+
control with that entity. For the purposes of this definition,
956+
"control" means (i) the power, direct or indirect, to cause the
957+
direction or management of such entity, whether by contract or
958+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
959+
outstanding shares, or (iii) beneficial ownership of such entity.
960+
961+
"You" (or "Your") shall mean an individual or Legal Entity
962+
exercising permissions granted by this License.
963+
964+
"Source" form shall mean the preferred form for making modifications,
965+
including but not limited to software source code, documentation
966+
source, and configuration files.
967+
968+
"Object" form shall mean any form resulting from mechanical
969+
transformation or translation of a Source form, including but
970+
not limited to compiled object code, generated documentation,
971+
and conversions to other media types.
972+
973+
"Work" shall mean the work of authorship, whether in Source or
974+
Object form, made available under the License, as indicated by a
975+
copyright notice that is included in or attached to the work
976+
(an example is provided in the Appendix below).
977+
978+
"Derivative Works" shall mean any work, whether in Source or Object
979+
form, that is based on (or derived from) the Work and for which the
980+
editorial revisions, annotations, elaborations, or other modifications
981+
represent, as a whole, an original work of authorship. For the purposes
982+
of this License, Derivative Works shall not include works that remain
983+
separable from, or merely link (or bind by name) to the interfaces of,
984+
the Work and Derivative Works thereof.
985+
986+
"Contribution" shall mean any work of authorship, including
987+
the original version of the Work and any modifications or additions
988+
to that Work or Derivative Works thereof, that is intentionally
989+
submitted to Licensor for inclusion in the Work by the copyright owner
990+
or by an individual or Legal Entity authorized to submit on behalf of
991+
the copyright owner. For the purposes of this definition, "submitted"
992+
means any form of electronic, verbal, or written communication sent
993+
to the Licensor or its representatives, including but not limited to
994+
communication on electronic mailing lists, source code control systems,
995+
and issue tracking systems that are managed by, or on behalf of, the
996+
Licensor for the purpose of discussing and improving the Work, but
997+
excluding communication that is conspicuously marked or otherwise
998+
designated in writing by the copyright owner as "Not a Contribution."
999+
1000+
"Contributor" shall mean Licensor and any individual or Legal Entity
1001+
on behalf of whom a Contribution has been received by Licensor and
1002+
subsequently incorporated within the Work.
1003+
1004+
2. Grant of Copyright License. Subject to the terms and conditions of
1005+
this License, each Contributor hereby grants to You a perpetual,
1006+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1007+
copyright license to reproduce, prepare Derivative Works of,
1008+
publicly display, publicly perform, sublicense, and distribute the
1009+
Work and such Derivative Works in Source or Object form.
1010+
1011+
3. Grant of Patent License. Subject to the terms and conditions of
1012+
this License, each Contributor hereby grants to You a perpetual,
1013+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1014+
(except as stated in this section) patent license to make, have made,
1015+
use, offer to sell, sell, import, and otherwise transfer the Work,
1016+
where such license applies only to those patent claims licensable
1017+
by such Contributor that are necessarily infringed by their
1018+
Contribution(s) alone or by combination of their Contribution(s)
1019+
with the Work to which such Contribution(s) was submitted. If You
1020+
institute patent litigation against any entity (including a
1021+
cross-claim or counterclaim in a lawsuit) alleging that the Work
1022+
or a Contribution incorporated within the Work constitutes direct
1023+
or contributory patent infringement, then any patent licenses
1024+
granted to You under this License for that Work shall terminate
1025+
as of the date such litigation is filed.
1026+
1027+
4. Redistribution. You may reproduce and distribute copies of the
1028+
Work or Derivative Works thereof in any medium, with or without
1029+
modifications, and in Source or Object form, provided that You
1030+
meet the following conditions:
1031+
1032+
(a) You must give any other recipients of the Work or
1033+
Derivative Works a copy of this License; and
1034+
1035+
(b) You must cause any modified files to carry prominent notices
1036+
stating that You changed the files; and
1037+
1038+
(c) You must retain, in the Source form of any Derivative Works
1039+
that You distribute, all copyright, patent, trademark, and
1040+
attribution notices from the Source form of the Work,
1041+
excluding those notices that do not pertain to any part of
1042+
the Derivative Works; and
1043+
1044+
(d) If the Work includes a "NOTICE" text file as part of its
1045+
distribution, then any Derivative Works that You distribute must
1046+
include a readable copy of the attribution notices contained
1047+
within such NOTICE file, excluding those notices that do not
1048+
pertain to any part of the Derivative Works, in at least one
1049+
of the following places: within a NOTICE text file distributed
1050+
as part of the Derivative Works; within the Source form or
1051+
documentation, if provided along with the Derivative Works; or,
1052+
within a display generated by the Derivative Works, if and
1053+
wherever such third-party notices normally appear. The contents
1054+
of the NOTICE file are for informational purposes only and
1055+
do not modify the License. You may add Your own attribution
1056+
notices within Derivative Works that You distribute, alongside
1057+
or as an addendum to the NOTICE text from the Work, provided
1058+
that such additional attribution notices cannot be construed
1059+
as modifying the License.
1060+
1061+
You may add Your own copyright statement to Your modifications and
1062+
may provide additional or different license terms and conditions
1063+
for use, reproduction, or distribution of Your modifications, or
1064+
for any such Derivative Works as a whole, provided Your use,
1065+
reproduction, and distribution of the Work otherwise complies with
1066+
the conditions stated in this License.
1067+
1068+
5. Submission of Contributions. Unless You explicitly state otherwise,
1069+
any Contribution intentionally submitted for inclusion in the Work
1070+
by You to the Licensor shall be under the terms and conditions of
1071+
this License, without any additional terms or conditions.
1072+
Notwithstanding the above, nothing herein shall supersede or modify
1073+
the terms of any separate license agreement you may have executed
1074+
with Licensor regarding such Contributions.
1075+
1076+
6. Trademarks. This License does not grant permission to use the trade
1077+
names, trademarks, service marks, or product names of the Licensor,
1078+
except as required for reasonable and customary use in describing the
1079+
origin of the Work and reproducing the content of the NOTICE file.
1080+
1081+
7. Disclaimer of Warranty. Unless required by applicable law or
1082+
agreed to in writing, Licensor provides the Work (and each
1083+
Contributor provides its Contributions) on an "AS IS" BASIS,
1084+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
1085+
implied, including, without limitation, any warranties or conditions
1086+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
1087+
PARTICULAR PURPOSE. You are solely responsible for determining the
1088+
appropriateness of using or redistributing the Work and assume any
1089+
risks associated with Your exercise of permissions under this License.
1090+
1091+
8. Limitation of Liability. In no event and under no legal theory,
1092+
whether in tort (including negligence), contract, or otherwise,
1093+
unless required by applicable law (such as deliberate and grossly
1094+
negligent acts) or agreed to in writing, shall any Contributor be
1095+
liable to You for damages, including any direct, indirect, special,
1096+
incidental, or consequential damages of any character arising as a
1097+
result of this License or out of the use or inability to use the
1098+
Work (including but not limited to damages for loss of goodwill,
1099+
work stoppage, computer failure or malfunction, or any and all
1100+
other commercial damages or losses), even if such Contributor
1101+
has been advised of the possibility of such damages.
1102+
1103+
9. Accepting Warranty or Additional Liability. While redistributing
1104+
the Work or Derivative Works thereof, You may choose to offer,
1105+
and charge a fee for, acceptance of support, warranty, indemnity,
1106+
or other liability obligations and/or rights consistent with this
1107+
License. However, in accepting such obligations, You may act only
1108+
on Your own behalf and on Your sole responsibility, not on behalf
1109+
of any other Contributor, and only if You agree to indemnify,
1110+
defend, and hold each Contributor harmless for any liability
1111+
incurred by, or claims asserted against, such Contributor by reason
1112+
of your accepting any such warranty or additional liability.
1113+
1114+
----------------------------------------------------------------------
1115+
License notice for github.com/xdg-go/stringprep
9361116
----------------------------------------------------------------------
9371117

9381118

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ require (
1919
github.com/sirupsen/logrus v1.4.2 // indirect
2020
github.com/stretchr/testify v1.6.1
2121
github.com/tidwall/pretty v1.0.0
22-
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
23-
github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc
22+
github.com/xdg-go/scram v1.0.2
23+
github.com/xdg-go/stringprep v1.0.2
2424
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d
2525
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
2626
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
2727
golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2 // indirect
28-
golang.org/x/text v0.3.3 // indirect
2928
golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d
3029
)

go.sum

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,17 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
9999
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
100100
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
101101
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
102-
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
103-
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
104-
github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc h1:n+nNi93yXLkJvKwXNP9d55HC7lGK4H/SRcwB5IaUZLo=
105-
github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
102+
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
103+
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
104+
github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
105+
github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
106+
github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
107+
github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
106108
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
107109
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
108-
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
109-
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
110110
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
111111
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
112112
golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
113-
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc=
114-
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
115113
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
116114
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
117115
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -133,8 +131,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
133131
golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2 h1:T5DasATyLQfmbTpfEXx/IOL9vfjzW6up+ZDkmHvIf2s=
134132
golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
135133
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
136-
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
137-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
134+
golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
135+
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
138136
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
139137
golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
140138
golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

vendor/github.com/xdg-go/pbkdf2/.gitignore

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/xdg-go/pbkdf2/go.mod

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/xdg-go/pbkdf2/pbkdf2.go

Lines changed: 76 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)