Compare commits

...

9 Commits

15 changed files with 694 additions and 221 deletions

510
LICENSE
View File

@ -1,201 +1,373 @@
Apache License Mozilla Public License Version 2.0
Version 2.0, January 2004 ==================================
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions
--------------
1. Definitions. 1.1. "Contributor"
means each individual or legal entity that creates, contributes to
the creation of, or owns Covered Software.
"License" shall mean the terms and conditions for use, reproduction, 1.2. "Contributor Version"
and distribution as defined by Sections 1 through 9 of this document. means the combination of the Contributions of others (if any) used
by a Contributor and that particular Contributor's Contribution.
"Licensor" shall mean the copyright owner or entity authorized by 1.3. "Contribution"
the copyright owner that is granting the License. means Covered Software of a particular Contributor.
"Legal Entity" shall mean the union of the acting entity and all 1.4. "Covered Software"
other entities that control, are controlled by, or are under common means Source Code Form to which the initial Contributor has attached
control with that entity. For the purposes of this definition, the notice in Exhibit A, the Executable Form of such Source Code
"control" means (i) the power, direct or indirect, to cause the Form, and Modifications of such Source Code Form, in each case
direction or management of such entity, whether by contract or including portions thereof.
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 1.5. "Incompatible With Secondary Licenses"
exercising permissions granted by this License. means
"Source" form shall mean the preferred form for making modifications, (a) that the initial Contributor has attached the notice described
including but not limited to software source code, documentation in Exhibit B to the Covered Software; or
source, and configuration files.
"Object" form shall mean any form resulting from mechanical (b) that the Covered Software was made available under the terms of
transformation or translation of a Source form, including but version 1.1 or earlier of the License, but not also under the
not limited to compiled object code, generated documentation, terms of a Secondary License.
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or 1.6. "Executable Form"
Object form, made available under the License, as indicated by a means any form of the work other than Source Code Form.
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 1.7. "Larger Work"
form, that is based on (or derived from) the Work and for which the means a work that combines Covered Software with other material, in
editorial revisions, annotations, elaborations, or other modifications a separate file or files, that is not Covered Software.
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 1.8. "License"
the original version of the Work and any modifications or additions means this document.
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 1.9. "Licensable"
on behalf of whom a Contribution has been received by Licensor and means having the right to grant, to the maximum extent possible,
subsequently incorporated within the Work. whether at the time of the initial grant or subsequently, any and
all of the rights conveyed by this License.
2. Grant of Copyright License. Subject to the terms and conditions of 1.10. "Modifications"
this License, each Contributor hereby grants to You a perpetual, means any of the following:
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 (a) any file in Source Code Form that results from an addition to,
this License, each Contributor hereby grants to You a perpetual, deletion from, or modification of the contents of Covered
worldwide, non-exclusive, no-charge, royalty-free, irrevocable Software; or
(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 (b) any new file in Source Code Form that contains any Covered
Work or Derivative Works thereof in any medium, with or without Software.
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 1.11. "Patent Claims" of a Contributor
Derivative Works a copy of this License; and means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
Contributor that would be infringed, but for the grant of the
License, by the making, using, selling, offering for sale, having
made, import, or transfer of either its Contributions or its
Contributor Version.
(b) You must cause any modified files to carry prominent notices 1.12. "Secondary License"
stating that You changed the files; and means either the GNU General Public License, Version 2.0, the GNU
Lesser General Public License, Version 2.1, the GNU Affero General
Public License, Version 3.0, or any later versions of those
licenses.
(c) You must retain, in the Source form of any Derivative Works 1.13. "Source Code Form"
that You distribute, all copyright, patent, trademark, and means the form of the work preferred for making modifications.
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 1.14. "You" (or "Your")
distribution, then any Derivative Works that You distribute must means an individual or a legal entity exercising rights under this
include a readable copy of the attribution notices contained License. For legal entities, "You" includes any entity that
within such NOTICE file, excluding those notices that do not controls, is controlled by, or is under common control with You. For
pertain to any part of the Derivative Works, in at least one purposes of this definition, "control" means (a) the power, direct
of the following places: within a NOTICE text file distributed or indirect, to cause the direction or management of such entity,
as part of the Derivative Works; within the Source form or whether by contract or otherwise, or (b) ownership of more than
documentation, if provided along with the Derivative Works; or, fifty percent (50%) of the outstanding shares or beneficial
within a display generated by the Derivative Works, if and ownership of such entity.
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 2. License Grants and Conditions
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, 2.1. Grants
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 Each Contributor hereby grants You a world-wide, royalty-free,
names, trademarks, service marks, or product names of the Licensor, non-exclusive license:
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 (a) under intellectual property rights (other than patent or trademark)
agreed to in writing, Licensor provides the Work (and each Licensable by such Contributor to use, reproduce, make available,
Contributor provides its Contributions) on an "AS IS" BASIS, modify, display, perform, distribute, and otherwise exploit its
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or Contributions, either on an unmodified basis, with Modifications, or
implied, including, without limitation, any warranties or conditions as part of a Larger Work; and
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, (b) under Patent Claims of such Contributor to make, use, sell, offer
whether in tort (including negligence), contract, or otherwise, for sale, have made, import, and otherwise transfer either its
unless required by applicable law (such as deliberate and grossly Contributions or its Contributor Version.
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 2.2. Effective Date
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 The licenses granted in Section 2.1 with respect to any Contribution
become effective for each Contribution on the date the Contributor first
distributes such Contribution.
APPENDIX: How to apply the Apache License to your work. 2.3. Limitations on Grant Scope
To apply the Apache License to your work, attach the following The licenses granted in this Section 2 are the only rights granted under
boilerplate notice, with the fields enclosed by brackets "{}" this License. No additional rights or licenses will be implied from the
replaced with your own identifying information. (Don't include distribution or licensing of Covered Software under this License.
the brackets!) The text should be enclosed in the appropriate Notwithstanding Section 2.1(b) above, no patent license is granted by a
comment syntax for the file format. We also recommend that a Contributor:
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} (a) for any code that a Contributor has removed from Covered Software;
or
Licensed under the Apache License, Version 2.0 (the "License"); (b) for infringements caused by: (i) Your and any other third party's
you may not use this file except in compliance with the License. modifications of Covered Software, or (ii) the combination of its
You may obtain a copy of the License at Contributions with other software (except as part of its Contributor
Version); or
http://www.apache.org/licenses/LICENSE-2.0 (c) under Patent Claims infringed by Covered Software in the absence of
its Contributions.
Unless required by applicable law or agreed to in writing, software This License does not grant any rights in the trademarks, service marks,
distributed under the License is distributed on an "AS IS" BASIS, or logos of any Contributor (except as may be necessary to comply with
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. the notice requirements in Section 3.4).
See the License for the specific language governing permissions and
limitations under the License. 2.4. Subsequent Licenses
No Contributor makes additional grants as a result of Your choice to
distribute the Covered Software under a subsequent version of this
License (see Section 10.2) or under the terms of a Secondary License (if
permitted under the terms of Section 3.3).
2.5. Representation
Each Contributor represents that the Contributor believes its
Contributions are its original creation(s) or it has sufficient rights
to grant the rights to its Contributions conveyed by this License.
2.6. Fair Use
This License is not intended to limit any rights You have under
applicable copyright doctrines of fair use, fair dealing, or other
equivalents.
2.7. Conditions
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
in Section 2.1.
3. Responsibilities
-------------------
3.1. Distribution of Source Form
All distribution of Covered Software in Source Code Form, including any
Modifications that You create or to which You contribute, must be under
the terms of this License. You must inform recipients that the Source
Code Form of the Covered Software is governed by the terms of this
License, and how they can obtain a copy of this License. You may not
attempt to alter or restrict the recipients' rights in the Source Code
Form.
3.2. Distribution of Executable Form
If You distribute Covered Software in Executable Form then:
(a) such Covered Software must also be made available in Source Code
Form, as described in Section 3.1, and You must inform recipients of
the Executable Form how they can obtain a copy of such Source Code
Form by reasonable means in a timely manner, at a charge no more
than the cost of distribution to the recipient; and
(b) You may distribute such Executable Form under the terms of this
License, or sublicense it under different terms, provided that the
license for the Executable Form does not attempt to limit or alter
the recipients' rights in the Source Code Form under this License.
3.3. Distribution of a Larger Work
You may create and distribute a Larger Work under terms of Your choice,
provided that You also comply with the requirements of this License for
the Covered Software. If the Larger Work is a combination of Covered
Software with a work governed by one or more Secondary Licenses, and the
Covered Software is not Incompatible With Secondary Licenses, this
License permits You to additionally distribute such Covered Software
under the terms of such Secondary License(s), so that the recipient of
the Larger Work may, at their option, further distribute the Covered
Software under the terms of either this License or such Secondary
License(s).
3.4. Notices
You may not remove or alter the substance of any license notices
(including copyright notices, patent notices, disclaimers of warranty,
or limitations of liability) contained within the Source Code Form of
the Covered Software, except that You may alter any license notices to
the extent required to remedy known factual inaccuracies.
3.5. Application of Additional Terms
You may choose to offer, and to charge a fee for, warranty, support,
indemnity or liability obligations to one or more recipients of Covered
Software. However, You may do so only on Your own behalf, and not on
behalf of any Contributor. You must make it absolutely clear that any
such warranty, support, indemnity, or liability obligation is offered by
You alone, and You hereby agree to indemnify every Contributor for any
liability incurred by such Contributor as a result of warranty, support,
indemnity or liability terms You offer. You may include additional
disclaimers of warranty and limitations of liability specific to any
jurisdiction.
4. Inability to Comply Due to Statute or Regulation
---------------------------------------------------
If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Software due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description must
be placed in a text file included with all distributions of the Covered
Software under this License. Except to the extent prohibited by statute
or regulation, such description must be sufficiently detailed for a
recipient of ordinary skill to be able to understand it.
5. Termination
--------------
5.1. The rights granted under this License will terminate automatically
if You fail to comply with any of its terms. However, if You become
compliant, then the rights granted under this License from a particular
Contributor are reinstated (a) provisionally, unless and until such
Contributor explicitly and finally terminates Your grants, and (b) on an
ongoing basis, if such Contributor fails to notify You of the
non-compliance by some reasonable means prior to 60 days after You have
come back into compliance. Moreover, Your grants from a particular
Contributor are reinstated on an ongoing basis if such Contributor
notifies You of the non-compliance by some reasonable means, this is the
first time You have received notice of non-compliance with this License
from such Contributor, and You become compliant prior to 30 days after
Your receipt of the notice.
5.2. If You initiate litigation against any entity by asserting a patent
infringement claim (excluding declaratory judgment actions,
counter-claims, and cross-claims) alleging that a Contributor Version
directly or indirectly infringes any patent, then the rights granted to
You by any and all Contributors for the Covered Software under Section
2.1 of this License shall terminate.
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
end user license agreements (excluding distributors and resellers) which
have been validly granted by You or Your distributors under this License
prior to termination shall survive termination.
************************************************************************
* *
* 6. Disclaimer of Warranty *
* ------------------------- *
* *
* Covered Software is provided under this License on an "as is" *
* basis, without warranty of any kind, either expressed, implied, or *
* statutory, including, without limitation, warranties that the *
* Covered Software is free of defects, merchantable, fit for a *
* particular purpose or non-infringing. The entire risk as to the *
* quality and performance of the Covered Software is with You. *
* Should any Covered Software prove defective in any respect, You *
* (not any Contributor) assume the cost of any necessary servicing, *
* repair, or correction. This disclaimer of warranty constitutes an *
* essential part of this License. No use of any Covered Software is *
* authorized under this License except under this disclaimer. *
* *
************************************************************************
************************************************************************
* *
* 7. Limitation of Liability *
* -------------------------- *
* *
* Under no circumstances and under no legal theory, whether tort *
* (including negligence), contract, or otherwise, shall any *
* Contributor, or anyone who distributes Covered Software as *
* permitted above, be liable to You for any direct, indirect, *
* special, incidental, or consequential damages of any character *
* including, without limitation, damages for lost profits, loss of *
* goodwill, work stoppage, computer failure or malfunction, or any *
* and all other commercial damages or losses, even if such party *
* shall have been informed of the possibility of such damages. This *
* limitation of liability shall not apply to liability for death or *
* personal injury resulting from such party's negligence to the *
* extent applicable law prohibits such limitation. Some *
* jurisdictions do not allow the exclusion or limitation of *
* incidental or consequential damages, so this exclusion and *
* limitation may not apply to You. *
* *
************************************************************************
8. Litigation
-------------
Any litigation relating to this License may be brought only in the
courts of a jurisdiction where the defendant maintains its principal
place of business and such litigation shall be governed by laws of that
jurisdiction, without reference to its conflict-of-law provisions.
Nothing in this Section shall prevent a party's ability to bring
cross-claims or counter-claims.
9. Miscellaneous
----------------
This License represents the complete agreement concerning the subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. Any law or regulation which provides
that the language of a contract shall be construed against the drafter
shall not be used to construe this License against a Contributor.
10. Versions of the License
---------------------------
10.1. New Versions
Mozilla Foundation is the license steward. Except as provided in Section
10.3, no one other than the license steward has the right to modify or
publish new versions of this License. Each version will be given a
distinguishing version number.
10.2. Effect of New Versions
You may distribute the Covered Software under the terms of the version
of the License under which You originally received the Covered Software,
or under the terms of any subsequent version published by the license
steward.
10.3. Modified Versions
If you create software not governed by this License, and you want to
create a new license for such software, you may create and use a
modified version of this License if you rename the license and remove
any references to the name of the license steward (except to note that
such modified license differs from this License).
10.4. Distributing Source Code Form that is Incompatible With Secondary
Licenses
If You choose to distribute Source Code Form that is Incompatible With
Secondary Licenses under the terms of this version of the License, the
notice described in Exhibit B of this License must be attached.
Exhibit A - Source Code Form License Notice
-------------------------------------------
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
file in a relevant directory) where a recipient would be likely to look
for such a notice.
You may add additional accurate notices of copyright ownership.
Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.

View File

@ -1,2 +1,20 @@
# elgo algue
[APACHE-2] Algorithm interface base64, sha1, md5 =====
`algue` is a simple <algorith> implementation interface for: base64, sha1, sha512, md5
License (MPL v2.0)
=====================
Copyright gale Edouard DUPIN
Licensed under the Mozilla Public 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
https://www.mozilla.org/MPL/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.

View File

@ -1,15 +1,15 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#include <etk/types.hpp> #include <etk/types.hpp>
#include <algue/base64.hpp> #include <algue/base64.hpp>
static const std::string base64Elements = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static const etk::String base64Elements = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
const std::vector<uint8_t>& getReverseTable() { const etk::Vector<uint8_t>& getReverseTable() {
static std::vector<uint8_t> table; static etk::Vector<uint8_t> table;
if (table.size() == 0) { if (table.size() == 0) {
table.resize(256,0); table.resize(256,0);
for (size_t iii=0; iii<base64Elements.size(); ++iii) { for (size_t iii=0; iii<base64Elements.size(); ++iii) {
@ -22,13 +22,15 @@ const std::vector<uint8_t>& getReverseTable() {
static bool isBase64(char _ccc) { static bool isBase64(char _ccc) {
return isalnum(_ccc) return (_ccc >= '0' && _ccc <= '9')
|| (_ccc >= 'a' && _ccc <= 'z')
|| (_ccc >= 'A' && _ccc <= 'Z')
|| _ccc == '+' || _ccc == '+'
|| _ccc == '/'; || _ccc == '/';
} }
std::string algue::base64::encode(const uint8_t* _data, int32_t _len) { etk::String algue::base64::encode(const uint8_t* _data, int32_t _len) {
std::string out; etk::String out;
int32_t iii = 0; int32_t iii = 0;
int32_t jjj = 0; int32_t jjj = 0;
uint8_t bit3[3]; uint8_t bit3[3];
@ -66,14 +68,14 @@ std::string algue::base64::encode(const uint8_t* _data, int32_t _len) {
return out; return out;
} }
std::vector<uint8_t> algue::base64::decode(const std::string& _data) { etk::Vector<uint8_t> algue::base64::decode(const etk::String& _data) {
int32_t len = _data.size(); int32_t len = _data.size();
int32_t iii = 0; int32_t iii = 0;
int32_t id = 0; int32_t id = 0;
uint8_t bit4[4]; uint8_t bit4[4];
uint8_t bit3[3]; uint8_t bit3[3];
std::vector<uint8_t> out; etk::Vector<uint8_t> out;
const std::vector<uint8_t>& base64ElementsReverse = getReverseTable(); const etk::Vector<uint8_t>& base64ElementsReverse = getReverseTable();
while ( len-- while ( len--
&& _data[id] != '=' && _data[id] != '='
&& isBase64(_data[id]) == true) { && isBase64(_data[id]) == true) {
@ -88,7 +90,7 @@ std::vector<uint8_t> algue::base64::decode(const std::string& _data) {
bit3[1] = ((bit4[1] & 0xf) << 4) + ((bit4[2] & 0x3c) >> 2); bit3[1] = ((bit4[1] & 0xf) << 4) + ((bit4[2] & 0x3c) >> 2);
bit3[2] = ((bit4[2] & 0x3) << 6) + bit4[3]; bit3[2] = ((bit4[2] & 0x3) << 6) + bit4[3];
for (int32_t jjj=0; jjj<3; ++jjj) { for (int32_t jjj=0; jjj<3; ++jjj) {
out.push_back(bit3[jjj]); out.pushBack(bit3[jjj]);
} }
} }
} }
@ -103,7 +105,7 @@ std::vector<uint8_t> algue::base64::decode(const std::string& _data) {
bit3[1] = ((bit4[1] & 0xf) << 4) + ((bit4[2] & 0x3c) >> 2); bit3[1] = ((bit4[1] & 0xf) << 4) + ((bit4[2] & 0x3c) >> 2);
bit3[2] = ((bit4[2] & 0x3) << 6) + bit4[3]; bit3[2] = ((bit4[2] & 0x3) << 6) + bit4[3];
for (int32_t jjj=0; jjj<iii-1; ++jjj) { for (int32_t jjj=0; jjj<iii-1; ++jjj) {
out.push_back(bit3[jjj]); out.pushBack(bit3[jjj]);
} }
} }
return out; return out;

View File

@ -1,21 +1,23 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/types.hpp>
#include <etk/String.hpp>
namespace algue { namespace algue {
namespace base64 { namespace base64 {
std::string encode(const uint8_t* _data, int32_t _len); etk::String encode(const uint8_t* _data, int32_t _len);
inline std::string encode(const std::vector<uint8_t>& _data) { inline etk::String encode(const etk::Vector<uint8_t>& _data) {
return algue::base64::encode(&_data[0], _data.size()); return algue::base64::encode(&_data[0], _data.size());
} }
inline std::string encode(const std::string& _data) { inline etk::String encode(const etk::String& _data) {
return algue::base64::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size()); return algue::base64::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size());
} }
std::vector<uint8_t> decode(const std::string& _data); etk::Vector<uint8_t> decode(const etk::String& _data);
} }
} }

View File

@ -1,7 +1,7 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#include <algue/debug.hpp> #include <algue/debug.hpp>

View File

@ -1,7 +1,7 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#pragma once #pragma once

View File

@ -1,14 +1,14 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#include <etk/types.hpp> #include <etk/types.hpp>
#include <algue/md5.hpp> #include <algue/md5.hpp>
#include <openssl/md5.h> #include <openssl/md5.h>
std::vector<uint8_t> algue::md5::encode(const uint8_t* _data, int32_t _len) { etk::Vector<uint8_t> algue::md5::encode(const uint8_t* _data, int32_t _len) {
std::vector<uint8_t> out; etk::Vector<uint8_t> out;
out.resize(MD5_DIGEST_LENGTH); out.resize(MD5_DIGEST_LENGTH);
MD5(_data, _len, &out[0]); MD5(_data, _len, &out[0]);
return out; return out;

View File

@ -1,22 +1,24 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/Vector.hpp>
#include <etk/String.hpp>
/** /**
* @brief Basic Algue library namespace * @brief Basic Algue library namespace
*/ */
namespace algue { namespace algue {
namespace md5 { namespace md5 {
std::vector<uint8_t> encode(const uint8_t* _data, int32_t _len); etk::Vector<uint8_t> encode(const uint8_t* _data, int32_t _len);
inline std::vector<uint8_t> encode(const std::vector<uint8_t>& _data) { inline etk::Vector<uint8_t> encode(const etk::Vector<uint8_t>& _data) {
return algue::md5::encode(&_data[0], _data.size()); return algue::md5::encode(&_data[0], _data.size());
} }
inline std::vector<uint8_t> encode(const std::string& _data) { inline etk::Vector<uint8_t> encode(const etk::String& _data) {
return algue::md5::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size()); return algue::md5::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size());
} }
} }

View File

@ -1,14 +1,14 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#include <etk/types.hpp> #include <etk/types.hpp>
#include <algue/sha1.hpp> #include <algue/sha1.hpp>
#include <openssl/sha.h> #include <openssl/sha.h>
std::vector<uint8_t> algue::sha1::encode(const uint8_t* _data, int32_t _len) { etk::Vector<uint8_t> algue::sha1::encode(const uint8_t* _data, int32_t _len) {
std::vector<uint8_t> out; etk::Vector<uint8_t> out;
out.resize(SHA_DIGEST_LENGTH); out.resize(SHA_DIGEST_LENGTH);
SHA1(_data, _len, &out[0]); SHA1(_data, _len, &out[0]);
return out; return out;

View File

@ -1,19 +1,21 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/Vector.hpp>
#include <etk/String.hpp>
namespace algue { namespace algue {
namespace sha1 { namespace sha1 {
std::vector<uint8_t> encode(const uint8_t* _data, int32_t _len); etk::Vector<uint8_t> encode(const uint8_t* _data, int32_t _len);
inline std::vector<uint8_t> encode(const std::vector<uint8_t>& _data) { inline etk::Vector<uint8_t> encode(const etk::Vector<uint8_t>& _data) {
return algue::sha1::encode(&_data[0], _data.size()); return algue::sha1::encode(&_data[0], _data.size());
} }
inline std::vector<uint8_t> encode(const std::string& _data) { inline etk::Vector<uint8_t> encode(const etk::String& _data) {
return algue::sha1::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size()); return algue::sha1::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size());
} }
} }

View File

@ -1,17 +1,266 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*
* @license-origin BSD (original license)
* @source http://www.zedwood.com/article/cpp-sha512-function
* @license
* Updated to C++, zedwood.com 2012
* Based on Olivier Gay's version
* See Modified BSD License below:
*
* FIPS 180-2 SHA-224/256/384/512 implementation
* Issue date: 04/30/2005
* http://www.ouah.org/ogay/sha2/
*
* Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. 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.
* 3. Neither the name of the project 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 PROJECT 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 PROJECT 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.
*/ */
#include <etk/types.hpp> #include <etk/types.hpp>
#include <algue/sha512.hpp> #include <algue/sha512.hpp>
#include <openssl/sha.h> #include <algue/debug.hpp>
#include <etk/path/Path.hpp>
#include <etk/uri/provider/provider.hpp>
std::vector<uint8_t> algue::sha512::encode(const uint8_t* _data, int32_t _len) { static const uint32_t ALGUE_SHA384_512_BLOCK_SIZE = (1024/8);
std::vector<uint8_t> out; static const uint32_t ALGUE_DIGEST_SIZE = ( 512 / 8);
out.resize(SHA512_DIGEST_LENGTH);
SHA512(_data, _len, &out[0]); algue::Sha512::Sha512() {
return out; m_block.resize(2 * ALGUE_SHA384_512_BLOCK_SIZE, 0);
m_h[0] = 0x6a09e667f3bcc908ULL;
m_h[1] = 0xbb67ae8584caa73bULL;
m_h[2] = 0x3c6ef372fe94f82bULL;
m_h[3] = 0xa54ff53a5f1d36f1ULL;
m_h[4] = 0x510e527fade682d1ULL;
m_h[5] = 0x9b05688c2b3e6c1fULL;
m_h[6] = 0x1f83d9abfb41bd6bULL;
m_h[7] = 0x5be0cd19137e2179ULL;
m_len = 0;
m_totLen = 0;
}
#define SHA2_SHFR(x, n) (x >> n)
#define SHA2_ROTR(x, n) ((x >> n) | (x << ((sizeof(x) << 3) - n)))
#define SHA2_ROTL(x, n) ((x << n) | (x >> ((sizeof(x) << 3) - n)))
#define SHA2_CH(x, y, z) ((x & y) ^ (~x & z))
#define SHA2_MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
#define SHA512_F1(x) (SHA2_ROTR(x, 28) ^ SHA2_ROTR(x, 34) ^ SHA2_ROTR(x, 39))
#define SHA512_F2(x) (SHA2_ROTR(x, 14) ^ SHA2_ROTR(x, 18) ^ SHA2_ROTR(x, 41))
#define SHA512_F3(x) (SHA2_ROTR(x, 1) ^ SHA2_ROTR(x, 8) ^ SHA2_SHFR(x, 7))
#define SHA512_F4(x) (SHA2_ROTR(x, 19) ^ SHA2_ROTR(x, 61) ^ SHA2_SHFR(x, 6))
#define SHA2_UNPACK32(x, str) { \
*((str) + 3) = (uint8_t) ((x) ); \
*((str) + 2) = (uint8_t) ((x) >> 8); \
*((str) + 1) = (uint8_t) ((x) >> 16); \
*((str) + 0) = (uint8_t) ((x) >> 24); \
}
#define SHA2_UNPACK64(x, str) { \
*((str) + 7) = (uint8_t) ((x) ); \
*((str) + 6) = (uint8_t) ((x) >> 8); \
*((str) + 5) = (uint8_t) ((x) >> 16); \
*((str) + 4) = (uint8_t) ((x) >> 24); \
*((str) + 3) = (uint8_t) ((x) >> 32); \
*((str) + 2) = (uint8_t) ((x) >> 40); \
*((str) + 1) = (uint8_t) ((x) >> 48); \
*((str) + 0) = (uint8_t) ((x) >> 56); \
}
#define SHA2_PACK64(str, x) { \
*(x) = ((uint64_t) *((str) + 7) ) \
| ((uint64_t) *((str) + 6) << 8) \
| ((uint64_t) *((str) + 5) << 16) \
| ((uint64_t) *((str) + 4) << 24) \
| ((uint64_t) *((str) + 3) << 32) \
| ((uint64_t) *((str) + 2) << 40) \
| ((uint64_t) *((str) + 1) << 48) \
| ((uint64_t) *((str) + 0) << 56); \
} }
const uint64_t sha512_k[80] =
{0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL};
void algue::Sha512::transform(const uint8_t* _data, uint32_t _blockNumber) {
uint64_t w[80];
uint64_t wv[8];
uint64_t t1, t2;
const uint8_t *sub_block;
int i, j;
for (i = 0; i < (int) _blockNumber; i++) {
sub_block = _data + (i << 7);
for (j = 0; j < 16; j++) {
SHA2_PACK64(&sub_block[j << 3], &w[j]);
}
for (j = 16; j < 80; j++) {
w[j] = SHA512_F4(w[j - 2]) + w[j - 7] + SHA512_F3(w[j - 15]) + w[j - 16];
}
for (j = 0; j < 8; j++) {
wv[j] = m_h[j];
}
for (j = 0; j < 80; j++) {
t1 = wv[7] + SHA512_F2(wv[4]) + SHA2_CH(wv[4], wv[5], wv[6])
+ sha512_k[j] + w[j];
t2 = SHA512_F1(wv[0]) + SHA2_MAJ(wv[0], wv[1], wv[2]);
wv[7] = wv[6];
wv[6] = wv[5];
wv[5] = wv[4];
wv[4] = wv[3] + t1;
wv[3] = wv[2];
wv[2] = wv[1];
wv[1] = wv[0];
wv[0] = t1 + t2;
}
for (j = 0; j < 8; j++) {
m_h[j] += wv[j];
}
}
}
void algue::Sha512::update(const uint8_t *_data, uint32_t _length) {
if ( _data == null
|| _length == 0) {
return;
}
uint32_t block_nb;
uint32_t new_len, rem_len, tmp_len;
const uint8_t *shifted_message;
tmp_len = ALGUE_SHA384_512_BLOCK_SIZE - m_len;
rem_len = _length < tmp_len ? _length : tmp_len;
memcpy(&m_block[m_len], _data, rem_len);
if (m_len + _length < ALGUE_SHA384_512_BLOCK_SIZE) {
m_len += _length;
return;
}
new_len = _length - rem_len;
block_nb = new_len / ALGUE_SHA384_512_BLOCK_SIZE;
shifted_message = _data + rem_len;
transform(&m_block[0], 1);
transform(shifted_message, block_nb);
rem_len = new_len % ALGUE_SHA384_512_BLOCK_SIZE;
memcpy(&m_block[0], &shifted_message[block_nb << 7], rem_len);
m_len = rem_len;
m_totLen += (block_nb + 1) << 7;
}
etk::Vector<uint8_t> algue::Sha512::finalize() {
uint32_t block_nb;
uint32_t pm_len;
uint32_t len_b;
int i;
etk::Vector<uint8_t> out;
out.resize(ALGUE_DIGEST_SIZE, 0);
block_nb = 1 + ((ALGUE_SHA384_512_BLOCK_SIZE - 17) < (m_len % ALGUE_SHA384_512_BLOCK_SIZE));
len_b = (m_totLen + m_len) << 3;
pm_len = block_nb << 7;
memset(&m_block[m_len], 0, pm_len - m_len);
m_block[m_len] = 0x80;
SHA2_UNPACK32(len_b, &m_block[pm_len - 4]);
transform(&m_block[0], block_nb);
for (i = 0 ; i < 8; i++) {
SHA2_UNPACK64(m_h[i], &out[i << 3]);
}
return out;
}
etk::Vector<uint8_t> algue::sha512::encode(const uint8_t* _data, int32_t _len) {
algue::Sha512 ctx;
ctx.update(_data, _len);
return ctx.finalize();
}
etk::String algue::stringConvert(etk::Vector<uint8_t> _data) {
char buf[2*_data.size()+1];
buf[2*_data.size()] = 0;
for (size_t iii=0; iii<_data.size(); ++iii) {
sprintf(buf+iii*2, "%02x", _data[iii]);
}
return etk::String(buf);
}
etk::Vector<uint8_t> algue::sha512::encodeFromFile(const etk::Uri& _uri) {
algue::Sha512 ctx;
auto fileIo = etk::uri::get(_uri);
if (fileIo == null) {
ALGUE_ERROR("File Does not exist : " << _uri);
etk::Vector<uint8_t> out;
out.resize(ALGUE_DIGEST_SIZE, 0);
}
if (fileIo->open(etk::io::OpenMode::Read) == false) {
ALGUE_ERROR("Can not open (r) the file : " << _uri);
etk::Vector<uint8_t> out;
out.resize(ALGUE_DIGEST_SIZE, 0);
}
uint32_t bufferSize = 4096;
uint8_t buffer[bufferSize];
while (bufferSize == 4096) {
bufferSize = fileIo->read(buffer, 1, bufferSize);
if (bufferSize != 0) {
ctx.update(buffer, bufferSize);
}
}
fileIo->close();
return ctx.finalize();
}

View File

@ -1,20 +1,46 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/Vector.hpp>
#include <etk/String.hpp>
#include <etk/uri/Uri.hpp>
namespace algue { namespace algue {
class Sha512 {
public:
Sha512();
/**
* @brief Add data to the sha512 calculation
* @param[in] _data Pointer on the data
* @param[in] _len Lenght of the data to add
*/
void update(const uint8_t* _data, uint32_t _len);
/**
* @brief get digest value
* @return the digest sha512 value
*/
etk::Vector<uint8_t> finalize();
protected:
void transform(const uint8_t* _data, uint32_t _blockNb);
uint32_t m_totLen;
uint32_t m_len;
etk::Vector<uint8_t> m_block;
uint64_t m_h[8];
};
namespace sha512 { namespace sha512 {
std::vector<uint8_t> encode(const uint8_t* _data, int32_t _len); etk::Vector<uint8_t> encode(const uint8_t* _data, int32_t _len);
inline std::vector<uint8_t> encode(const std::vector<uint8_t>& _data) { inline etk::Vector<uint8_t> encode(const etk::Vector<uint8_t>& _data) {
return algue::sha512::encode(&_data[0], _data.size()); return algue::sha512::encode(&_data[0], _data.size());
} }
inline std::vector<uint8_t> encode(const std::string& _data) { inline etk::Vector<uint8_t> encode(const etk::String& _data) {
return algue::sha512::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size()); return algue::sha512::encode(reinterpret_cast<const uint8_t*>(&_data[0]), _data.size());
} }
etk::Vector<uint8_t> encodeFromFile(const etk::Uri& _uri);
} }
etk::String stringConvert(etk::Vector<uint8_t> _data);
} }

View File

@ -20,16 +20,16 @@ Are there any licensing restrictions? {#algue_mainpage_license_restricti
ALGUE is **FREE software** and _all sub-library are FREE and staticly linkable !!!_ ALGUE is **FREE software** and _all sub-library are FREE and staticly linkable !!!_
License (APACHE-2.0) {#algue_mainpage_license} License (MPL v2.0) {#algue_mainpage_license}
==================== ==================
Copyright algue Edouard DUPIN Copyright algue Edouard DUPIN
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Mozilla Public License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
<http://www.apache.org/licenses/LICENSE-2.0> <https://www.mozilla.org/MPL/2.0>
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,

View File

@ -10,7 +10,7 @@ def get_desc():
return "Algorithm generic" return "Algorithm generic"
def get_licence(): def get_licence():
return "APACHE-2" return "MPL-2"
def get_compagny_type(): def get_compagny_type():
return "com" return "com"

View File

@ -1 +1 @@
0.3.0 0.4.0