Skip to content

Commit

Permalink
Update base64url license
Browse files Browse the repository at this point in the history
  • Loading branch information
chenBright committed Aug 3, 2023
1 parent ddf159e commit 8076846
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 6 deletions.
1 change: 1 addition & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ header:
- 'src/butil/atomic*'
- 'src/butil/auto_reset.h'
- 'src/butil/base64.*'
- 'src/butil/base64url.*'
- 'src/butil/base_export.h'
- 'src/butil/base_paths.cc'
- 'src/butil/basictypes.h'
Expand Down
38 changes: 36 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,6 @@ src/butil/at_exit.*
src/butil/atomic*
src/butil/auto_reset.h
src/butil/base64.*
src/butil/base64url.*
src/butil/base_export.h
src/butil/base_paths.cc
src/butil/basictypes.h
Expand Down Expand Up @@ -898,7 +897,7 @@ Some portions of these files are derived from code in the Chromium project,
copyright (c) Google inc and (c) The Chromium Authors and licensed under the
3-clause BSD license:

Copyright (c) 2000 - 2015 The Chromium Authors. All rights reserved.
Copyright (c) 2000 - 2014 The Chromium Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand All @@ -925,3 +924,38 @@ copyright (c) Google inc and (c) The Chromium Authors and licensed under the
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


src/butil/base64url.*
test/base64url_unittest.cc

Some portions of these files are derived from code in the Chromium project,
copyright The Chromium Authors and licensed under the 3-clause BSD license:

Copyright 2015 The Chromium Authors

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google LLC nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion src/butil/base64url.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2015 The Chromium Authors. All rights reserved.
// Copyright 2015 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.

Expand Down
4 changes: 2 additions & 2 deletions src/butil/base64url.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2015 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
// found in the LICENSE file.

#ifndef BASE_BASE64URL_H_
#define BASE_BASE64URL_H_
Expand Down
2 changes: 1 addition & 1 deletion test/base64url_unittest.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2015 The Chromium Authors. All rights reserved.
// Copyright 2015 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.

Expand Down

0 comments on commit 8076846

Please sign in to comment.