Skip to content

Commit 75ee3b0

Browse files
committed
Remove BSD license comments and fix copyright attribution.
1 parent d5ec4c4 commit 75ee3b0

File tree

3 files changed

+2
-59
lines changed

3 files changed

+2
-59
lines changed

LICENSE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Taylor Hornby and Scott Arciszewski
3+
Copyright (c) 2016 Taylor Hornby <https://defuse.ca> and Paragon Initiative
4+
Enterprises <https://paragonie.com>.
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy of
67
this software and associated documentation files (the "Software"), to deal in

src/Crypto.php

-27
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,6 @@
99
use \Defuse\Crypto\RuntimeTests;
1010
use \Defuse\Crypto\Config;
1111

12-
/*
13-
* PHP Encryption Library
14-
* Copyright (c) 2014-2015, Taylor Hornby <https://defuse.ca>
15-
* All rights reserved.
16-
*
17-
* Redistribution and use in source and binary forms, with or without
18-
* modification, are permitted provided that the following conditions are met:
19-
*
20-
* 1. Redistributions of source code must retain the above copyright notice,
21-
* this list of conditions and the following disclaimer.
22-
*
23-
* 2. Redistributions in binary form must reproduce the above copyright notice,
24-
* this list of conditions and the following disclaimer in the documentation
25-
* and/or other materials provided with the distribution.
26-
*
27-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
28-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
29-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
30-
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
31-
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
33-
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
34-
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
35-
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
36-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
37-
* POSSIBILITY OF SUCH DAMAGE.
38-
*/
3912
class Crypto
4013
{
4114
// Ciphertext format: [____VERSION____][____HMAC____][____SALT____][____IV____][____CIPHERTEXT____].

src/File.php

-31
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,6 @@
66
use \Defuse\Crypto\Core;
77
use \Defuse\Crypto\FileConfig;
88

9-
/*
10-
* PHP Encryption Library
11-
* Copyright (c) 2014-2015, Taylor Hornby <https://defuse.ca>
12-
* All rights reserved.
13-
*
14-
* Streaming File Encryption Class
15-
* Copyright (c) 2015 Paragon Initiative Enterprises <https://paragonie.com>
16-
* All rights reserved.
17-
*
18-
* Redistribution and use in source and binary forms, with or without
19-
* modification, are permitted provided that the following conditions are met:
20-
*
21-
* 1. Redistributions of source code must retain the above copyright notice,
22-
* this list of conditions and the following disclaimer.
23-
*
24-
* 2. Redistributions in binary form must reproduce the above copyright notice,
25-
* this list of conditions and the following disclaimer in the documentation
26-
* and/or other materials provided with the distribution.
27-
*
28-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
29-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
30-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
31-
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
32-
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
33-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
34-
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
35-
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
36-
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
37-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
38-
* POSSIBILITY OF SUCH DAMAGE.
39-
*/
409
final class File implements StreamInterface
4110
{
4211
// File ciphertext format: [____VERSION____][____SALT____][____IV____][____CIPHERTEXT____][____HMAC____].

0 commit comments

Comments
 (0)