From a4483243ac2f99dc458eeb7ea80b849de424d2f8 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 7 Apr 2015 17:02:49 +0200 Subject: fixing license headers - encryption code related --- .../exceptions/decryptionfailedexception.php | 7 +++--- .../exceptions/emptyencryptiondataexception.php | 7 +++--- .../exceptions/encryptionfailedexception.php | 7 +++--- .../encryptionheaderkeyexistsexception.php | 27 ++++++++++----------- .../encryptionheadertolargeexception.php | 7 +++--- .../exceptions/modulealreadyexistsexception.php | 27 ++++++++++----------- .../exceptions/moduledoesnotexistsexception.php | 27 ++++++++++----------- .../exceptions/unknowncipherexception.php | 7 +++--- lib/private/encryption/file.php | 27 ++++++++++----------- lib/private/encryption/keys/factory.php | 26 ++++++++++---------- lib/private/encryption/keys/storage.php | 27 ++++++++++----------- lib/private/encryption/manager.php | 27 ++++++++++----------- lib/private/encryption/update.php | 27 ++++++++++----------- lib/private/encryption/util.php | 27 ++++++++++----------- lib/private/files/storage/wrapper/encryption.php | 27 ++++++++++----------- lib/private/files/stream/encryption.php | 28 +++++++++++----------- .../exceptions/genericencryptionexception.php | 7 +++--- lib/public/encryption/iencryptionmodule.php | 26 ++++++++++---------- lib/public/encryption/ifile.php | 27 ++++++++++----------- lib/public/encryption/imanager.php | 26 ++++++++++---------- lib/public/encryption/keys/istorage.php | 27 ++++++++++----------- lib/public/iservercontainer.php | 1 + 22 files changed, 218 insertions(+), 228 deletions(-) (limited to 'lib') diff --git a/lib/private/encryption/exceptions/decryptionfailedexception.php b/lib/private/encryption/exceptions/decryptionfailedexception.php index f8b4fdf07fa..406ae12968e 100644 --- a/lib/private/encryption/exceptions/decryptionfailedexception.php +++ b/lib/private/encryption/exceptions/decryptionfailedexception.php @@ -1,7 +1,8 @@ - * @since 2/25/15, 9:38 AM +/** + * @author Clark Tomlinson + * @author Thomas Müller + * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 * diff --git a/lib/private/encryption/exceptions/emptyencryptiondataexception.php b/lib/private/encryption/exceptions/emptyencryptiondataexception.php index d3dc9230047..739614b3ec2 100644 --- a/lib/private/encryption/exceptions/emptyencryptiondataexception.php +++ b/lib/private/encryption/exceptions/emptyencryptiondataexception.php @@ -1,7 +1,8 @@ - * @since 2/25/15, 9:38 AM +/** + * @author Clark Tomlinson + * @author Thomas Müller + * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 * diff --git a/lib/private/encryption/exceptions/encryptionfailedexception.php b/lib/private/encryption/exceptions/encryptionfailedexception.php index ac489c73254..4195ca0a5a8 100644 --- a/lib/private/encryption/exceptions/encryptionfailedexception.php +++ b/lib/private/encryption/exceptions/encryptionfailedexception.php @@ -1,7 +1,8 @@ - * @since 2/25/15, 9:37 AM +/** + * @author Clark Tomlinson + * @author Thomas Müller + * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 * diff --git a/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php b/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php index 5e8e48efd78..d927939484f 100644 --- a/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php +++ b/lib/private/encryption/exceptions/encryptionheaderkeyexistsexception.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption\Exceptions; diff --git a/lib/private/encryption/exceptions/encryptionheadertolargeexception.php b/lib/private/encryption/exceptions/encryptionheadertolargeexception.php index cdb5f940800..40c51782a32 100644 --- a/lib/private/encryption/exceptions/encryptionheadertolargeexception.php +++ b/lib/private/encryption/exceptions/encryptionheadertolargeexception.php @@ -1,7 +1,8 @@ - * @since 2/25/15, 9:35 AM +/** + * @author Clark Tomlinson + * @author Thomas Müller + * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 * diff --git a/lib/private/encryption/exceptions/modulealreadyexistsexception.php b/lib/private/encryption/exceptions/modulealreadyexistsexception.php index fa1e70a5c36..c72ad7b7ab2 100644 --- a/lib/private/encryption/exceptions/modulealreadyexistsexception.php +++ b/lib/private/encryption/exceptions/modulealreadyexistsexception.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption\Exceptions; diff --git a/lib/private/encryption/exceptions/moduledoesnotexistsexception.php b/lib/private/encryption/exceptions/moduledoesnotexistsexception.php index 2c699e8dc2d..d6fbb2b6e51 100644 --- a/lib/private/encryption/exceptions/moduledoesnotexistsexception.php +++ b/lib/private/encryption/exceptions/moduledoesnotexistsexception.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption\Exceptions; diff --git a/lib/private/encryption/exceptions/unknowncipherexception.php b/lib/private/encryption/exceptions/unknowncipherexception.php index 188f7403848..91535183169 100644 --- a/lib/private/encryption/exceptions/unknowncipherexception.php +++ b/lib/private/encryption/exceptions/unknowncipherexception.php @@ -1,7 +1,8 @@ - * @since 2/25/15, 9:36 AM +/** + * @author Clark Tomlinson + * @author Thomas Müller + * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 * diff --git a/lib/private/encryption/file.php b/lib/private/encryption/file.php index 3600936ed0e..48cd0d1187b 100644 --- a/lib/private/encryption/file.php +++ b/lib/private/encryption/file.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption; diff --git a/lib/private/encryption/keys/factory.php b/lib/private/encryption/keys/factory.php index a214b238615..0e2b0292a68 100644 --- a/lib/private/encryption/keys/factory.php +++ b/lib/private/encryption/keys/factory.php @@ -1,24 +1,22 @@ * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption\Keys; diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php index 42610bd0b41..40bd3056b1a 100644 --- a/lib/private/encryption/keys/storage.php +++ b/lib/private/encryption/keys/storage.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption\Keys; diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index 484e0f540b2..74cad0a75bb 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption; diff --git a/lib/private/encryption/update.php b/lib/private/encryption/update.php index 1cfe935e584..7a170a03adc 100644 --- a/lib/private/encryption/update.php +++ b/lib/private/encryption/update.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption; diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php index 6312d8813e3..e7cf607c7b1 100644 --- a/lib/private/encryption/util.php +++ b/lib/private/encryption/util.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Encryption; diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 5245fe4cc45..e4f9781b382 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Files\Storage\Wrapper; diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php index b4e06c99943..9ba98e61d3e 100644 --- a/lib/private/files/stream/encryption.php +++ b/lib/private/files/stream/encryption.php @@ -1,24 +1,24 @@ + * @author jknockaert + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OC\Files\Stream; diff --git a/lib/public/encryption/exceptions/genericencryptionexception.php b/lib/public/encryption/exceptions/genericencryptionexception.php index b7addd3b0c1..59ab25fd61d 100644 --- a/lib/public/encryption/exceptions/genericencryptionexception.php +++ b/lib/public/encryption/exceptions/genericencryptionexception.php @@ -1,7 +1,8 @@ - * @since 2/25/15, 9:30 AM +/** + * @author Clark Tomlinson + * @author Thomas Müller + * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 * diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php index 7265fee1259..2f5f5e8a807 100644 --- a/lib/public/encryption/iencryptionmodule.php +++ b/lib/public/encryption/iencryptionmodule.php @@ -1,24 +1,22 @@ * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OCP\Encryption; diff --git a/lib/public/encryption/ifile.php b/lib/public/encryption/ifile.php index 464f41509d2..cc1e8f426b2 100644 --- a/lib/public/encryption/ifile.php +++ b/lib/public/encryption/ifile.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OCP\Encryption; diff --git a/lib/public/encryption/imanager.php b/lib/public/encryption/imanager.php index 2691604ac37..ec91e3580e5 100644 --- a/lib/public/encryption/imanager.php +++ b/lib/public/encryption/imanager.php @@ -1,24 +1,22 @@ * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OCP\Encryption; diff --git a/lib/public/encryption/keys/istorage.php b/lib/public/encryption/keys/istorage.php index 2d1672face5..898ab81c373 100644 --- a/lib/public/encryption/keys/istorage.php +++ b/lib/public/encryption/keys/istorage.php @@ -1,24 +1,23 @@ + * @author Thomas Müller * - * @author Bjoern Schiessle + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . */ namespace OCP\Encryption\Keys; diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 509e5894d47..16a680ec170 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -2,6 +2,7 @@ /** * @author Bart Visscher * @author Bernhard Posselt + * @author Björn Schießle * @author Christopher Schäpers * @author Jörn Friedrich Dreyer * @author Lukas Reschke -- cgit v1.2.3