From c51e2d283e8eeb9a3325c580f3cc1626f8d3a513 Mon Sep 17 00:00:00 2001 From: Majid Date: Tue, 26 Sep 2017 15:11:42 +1000 Subject: [PATCH 1/4] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 419b191..540495e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -﷽ +

+ ﷽ +

![banner] From 4067e14871b0fe0541173d2e866ab452a097e157 Mon Sep 17 00:00:00 2001 From: mkhan Date: Tue, 26 Sep 2017 15:29:41 +1000 Subject: [PATCH 2/4] update --- doxygen/README_DOXYGEN.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doxygen/README_DOXYGEN.md b/doxygen/README_DOXYGEN.md index 189c6e7..0b5d365 100644 --- a/doxygen/README_DOXYGEN.md +++ b/doxygen/README_DOXYGEN.md @@ -1,4 +1,6 @@ - ‫بسم الله الرَّحْمَنِ الرَّحِيمِ +

+ ﷽ +

![banner] From 7d64977b17cbe8f33b164558f763b51898a87f9c Mon Sep 17 00:00:00 2001 From: Majid Khan Date: Tue, 2 Jan 2018 13:29:40 +1100 Subject: [PATCH 3/4] update copyright to include 2018 --- LICENSE | 210 +++------------------------------------------ README.md | 2 +- build.php | 4 +- cli/mine.cc | 2 +- package/mine.cc | 2 +- package/mine.h | 2 +- src/aes.cc | 2 +- src/aes.h | 2 +- src/base16.cc | 2 +- src/base16.h | 2 +- src/base64.cc | 2 +- src/base64.h | 2 +- src/big-integer.cc | 2 +- src/big-integer.h | 2 +- src/mine-common.cc | 2 +- src/mine-common.h | 2 +- src/rsa.cc | 2 +- src/rsa.h | 2 +- src/zlib.cc | 2 +- src/zlib.h | 2 +- 20 files changed, 33 insertions(+), 217 deletions(-) diff --git a/LICENSE b/LICENSE index 8dada3e..63603a7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,17 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Copyright (c) 2017-2018 Muflihun Labs - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +https://github.com/muflihun/ +https://muflihun.github.io +https://muflihun.com - 1. Definitions. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. + http://www.apache.org/licenses/LICENSE-2.0 - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 540495e..5aa2a06 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ You can contribute to the project by testing on various platforms (e.g, Windows, # License ``` -Copyright 2017 Muflihun Labs +Copyright (c) 2017-2018 Muflihun Labs https://github.com/muflihun/ https://muflihun.github.io diff --git a/build.php b/build.php index ac37f20..1f7446f 100644 --- a/build.php +++ b/build.php @@ -15,7 +15,7 @@ // Mine ({{version}}) // Single header minimal cryptography library // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE @@ -43,7 +43,7 @@ // Mine ({{version}}) // Single header minimal cryptography library // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/cli/mine.cc b/cli/mine.cc index 738c7e6..29e8ea1 100644 --- a/cli/mine.cc +++ b/cli/mine.cc @@ -5,7 +5,7 @@ // // Mine is single header minimal cryptography library // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/package/mine.cc b/package/mine.cc index 77abe84..3d3e145 100644 --- a/package/mine.cc +++ b/package/mine.cc @@ -4,7 +4,7 @@ // Mine (1.1.0) // Single header minimal cryptography library // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/package/mine.h b/package/mine.h index 234b06a..24cf6b7 100644 --- a/package/mine.h +++ b/package/mine.h @@ -4,7 +4,7 @@ // Mine (1.1.0) // Single header minimal cryptography library // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/aes.cc b/src/aes.cc index 926b55f..c5e08c3 100644 --- a/src/aes.cc +++ b/src/aes.cc @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/aes.h b/src/aes.h index 5956e7c..2f13b6b 100644 --- a/src/aes.h +++ b/src/aes.h @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/base16.cc b/src/base16.cc index caf34bb..18c3d56 100644 --- a/src/base16.cc +++ b/src/base16.cc @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/base16.h b/src/base16.h index be20af4..3dd2648 100644 --- a/src/base16.h +++ b/src/base16.h @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/base64.cc b/src/base64.cc index d8d1e5f..b06bdde 100644 --- a/src/base64.cc +++ b/src/base64.cc @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/base64.h b/src/base64.h index 2366967..1782c23 100644 --- a/src/base64.h +++ b/src/base64.h @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/big-integer.cc b/src/big-integer.cc index eccfda0..90f6760 100644 --- a/src/big-integer.cc +++ b/src/big-integer.cc @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/big-integer.h b/src/big-integer.h index 68c272e..dbd9fba 100644 --- a/src/big-integer.h +++ b/src/big-integer.h @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/mine-common.cc b/src/mine-common.cc index 7734f98..f6ed083 100644 --- a/src/mine-common.cc +++ b/src/mine-common.cc @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/mine-common.h b/src/mine-common.h index 3b41ef0..02cdf0e 100644 --- a/src/mine-common.h +++ b/src/mine-common.h @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/rsa.cc b/src/rsa.cc index 9fdd8be..d4ebeda 100644 --- a/src/rsa.cc +++ b/src/rsa.cc @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/rsa.h b/src/rsa.h index b6cb7fe..a93b5e7 100644 --- a/src/rsa.h +++ b/src/rsa.h @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/zlib.cc b/src/zlib.cc index 21498f0..0ae43c2 100644 --- a/src/zlib.cc +++ b/src/zlib.cc @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE diff --git a/src/zlib.h b/src/zlib.h index bfa7442..1ce75f2 100644 --- a/src/zlib.h +++ b/src/zlib.h @@ -6,7 +6,7 @@ // instead which is automatically generated and includes this file // This is seperated to aid the development // -// Copyright (c) 2017 Muflihun Labs +// Copyright (c) 2017-2018 Muflihun Labs // // This library is released under the Apache 2.0 license // https://github.com/muflihun/mine/blob/master/LICENSE From c42395487df4a102cefeb3166aa64c80a72888bb Mon Sep 17 00:00:00 2001 From: Majid Khan Date: Tue, 2 Jan 2018 13:31:03 +1100 Subject: [PATCH 4/4] updated to release 1.1.1 --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 4 ++-- build.php | 2 +- package/mine.cc | 4 ++-- package/mine.h | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f378d..3b6702a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## [1.1.1] - 02-01-2018 +### Updates +- Updated copyright year + ## [1.1.0] - 26-09-2017 ### Updates - Moved `Base16::toRawString` to `MineCommon::byteArrayToRawString` diff --git a/CMakeLists.txt b/CMakeLists.txt index 576056d..505d484 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ option (test_main_header "Test main header (mine.h)" OFF) option (test_wstring_conversions "Test std::wstring (wchar_t*) conversions for encodings" ON) -set (MINE_VERSION "1.1.0") ## Also update build.php -set (MINE_SOVERSION "1.1.0") +set (MINE_VERSION "1.1.1") ## Also update build.php +set (MINE_SOVERSION "1.1.1") add_definitions (-DMINE_VERSION="${MINE_VERSION}") diff --git a/build.php b/build.php index 1f7446f..bd9dead 100644 --- a/build.php +++ b/build.php @@ -6,7 +6,7 @@ /// modules for ease of development /// -$lib_version = "1.1.0"; +$lib_version = "1.1.1"; $header_template = <<