Merge pull request #10 from QuasarApp/update_copyright

update copyright to 2025

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2025 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.

CONTRIBUTING.md

@@ -1,15 +1,15 @@
-# Contributing in to EeasySSL 
+# Contributing in to EasySSL
 
 This is a wrap library for the Qt developers. So if you think that is a good library, and you use it in your projects - you can add new improvements and create a pull request with new features.
 
 ## What can you do for this Library ?
 
-1. You can add a support of new encryption algorithms 
+1. You can add a support of new encryption algorithms.
 2. You can implement new certificate generator.
 
 ## Adding new implementation of crypto algorithms
 
-All Algorithms must be pass simple test. Encrypt, decrypt short and long data arrays. This simple test already implemented, and you just need to add it into main test file. 
+All algorithms must pass simple test. Encrypt, decrypt short and long data arrays. This simple test is already implemented, and you just need to add it into the main test file.
 
 ### Example
 
@@ -43,8 +43,7 @@ Full implementation of the RSA you can see [here](https://github.com/QuasarApp/e
 2. Add your class to the tests Using The Template class [CryptoTest](https://github.com/QuasarApp/easyssl/blob/main/tests/units/cryptotest.h). See The [tstMain.cpp](https://github.com/QuasarApp/easyssl/blob/main/tests/tstMain.cpp) file
 
 ```cpp
-
-    TestCase(cryptoTestRSA, CryptoTest<EasySSL::RSASSL>)
+TestCase(cryptoTestRSA, CryptoTest<EasySSL::RSASSL>)
 ```
 
 ## Adding new implementation of Certificate generator.
@@ -52,18 +51,18 @@ Full implementation of the RSA you can see [here](https://github.com/QuasarApp/e
 1. Create implementation of the iCrypto interface. And override the create method.
 
 ```cpp
-  /**
-   * @brief The X509 class This is wrapper of the ssl objects.
-   */
-  class EASYSSL_EXPORT X509: public  EasySSL::ICertificate
-  {
-  public:
-      X509(const QSharedPointer<ICrypto>& generator);
+/**
+ * @brief The X509 class This is wrapper of the ssl objects.
+ */
+class EASYSSL_EXPORT X509: public  EasySSL::ICertificate
+{
+public:
+    X509(const QSharedPointer<ICrypto>& generator);
 
-      // ICertificate interface
-  public:
-      SelfSignedSertificate create(const SslSrtData& certificateData) const override;
-  };
+    // ICertificate interface
+public:
+    SelfSignedSertificate create(const SslSrtData& certificateData) const override;
+};
 ```
 
 Full implementation of x509 certificate format you can see [here](https://github.com/QuasarApp/easyssl/blob/main/src/lib/src/public/easyssl/x509.h).
@@ -71,17 +70,16 @@ Full implementation of x509 certificate format you can see [here](https://github
 2. Add your class to the tests Using The Template class [CrtTest](https://github.com/QuasarApp/easyssl/blob/main/tests/units/crttest.h). See The [tstMain.cpp](https://github.com/QuasarApp/easyssl/blob/main/tests/tstMain.cpp) file
 
 ```cpp
-  #include "crttest.h"
-
-  using CrtTestX509ECDSA = CrtTest<EasySSL::X509, EasySSL::ECDSASSL>;
-  TestCase(crtTestX509ECDSA, CrtTestX509ECDSA)
+#include "crttest.h"
 
+using CrtTestX509ECDSA = CrtTest<EasySSL::X509, EasySSL::ECDSASSL>;
+TestCase(crtTestX509ECDSA, CrtTestX509ECDSA)
 ```
 
 ## Extra rools
 
 1. All shared tools or useful functions located on the [EasySSLUtils](https://github.com/QuasarApp/easyssl/blob/main/src/lib/src/private/easysslutils.h) class.
-2. All implementation must contains goxygen xml comments (documentation)
+2. All implementation must contain doxygen xml comments (documentation)
 3. All implementation must be inner EasySSL name space.
 
 # Thank you

README.md

@@ -1,40 +1,50 @@
 # EasySSL
 This is wrapper library that make using OpenSSL library more simple.
-This library contains interfaces for the signing and encription data.
+This library contains interfaces for the signing and encryption data.
 
-### Supported encription alhorithms:
+### Supported encryption algorithms:
 * ECDSA
 * RSA
 
 ### Supported features
-* encription 
+* encryption
 * signing
 * keys creating
-* asyn auth bse on the asyn encriptions methods
+* asyn auth bse on the asyn encryptions methods
 
 
 ## Build and Include
+### CMake
 
  * cd yourRepo
- * git submodule add https://github.com/QuasarApp/easyssl.git # add the repository of Heart into your repo like submodule
+ * git submodule add https://github.com/QuasarApp/easyssl.git # add the repository of EasySSL into your repo like submodule
  * git submodule update --init --recursive
- * Include in your CMakeLists.txt file the main CMakeLists.txt file of Heart library
+ * Include in your CMakeLists.txt file the main CMakeLists.txt file of EasySSL library
 
      ```cmake
      add_subdirectory(easyssl)
      ```
 
- * link the Heart library to your target
+ * link the EasySSL library to your target
      ```cmake
      target_link_libraries(yourLib PUBLIC easyssl)
      ```
  * rebuild yuor project
 
+### Independet of SSL build
+Dependency on the ssl library greatly complicates the deployment of the final product. For fix this issue, you can build EasySSL library with static SSL library. In this case, SSL library code will be saved in your EasySell binary, and deploy of your application will be easily. The ssl code will not available for your application or other libraries, so you will not get conflicts between different major versions ssl libraries if your distribution kit has it.  
 
+Just set the **EASYSSL_STATIC_SSL** option to true. 
+
+``` bash
+cmake .. -DEASYSSL_STATIC_SSL=1 
+```
+
+The described case may be useful for the Qt 5.15.x, because the QNetwork 5.15 depends on the SSL v1.1 and EasySsl works with the SSL >= 3.0. 
 
 ## Usage
 
-### Encription
+### Encryption
 
 ```cpp
 #include "easyssl/rsassl.h"
@@ -48,8 +58,8 @@ int main() {
     auto siganture = crypto.signMessage(message, priv);
     crypto.checkSign(message, siganture, pub);
 
-    auto encriptedMsg = crypto.encrypt(message, pub);
-    auto decryptedMsg = crypto.decrypt(encriptedMsg, priv);
+    auto encryptedMsg = crypto.encrypt(message, pub);
+    auto decryptedMsg = crypto.decrypt(encryptedMsg, priv);
 }
 
 

src/lib/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2025 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -42,7 +42,7 @@ if (EASYSSL_STATIC_SSL)
 else()
 
     message("Use shared ssl ")
-    target_link_libraries(${CURRENT_PROJECT} PUBLIC OpenSSL::Crypto OpenSSL::SSL)
+    target_link_libraries(${CURRENT_PROJECT} PRIVATE OpenSSL::Crypto OpenSSL::SSL)
 
     if (ANDROID)
         set(OPENSSL_ROOT_PATH "$ENV{OPENSSL_ROOT_DIR}")

src/lib/src/private/easysslutils.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/private/easysslutils.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/asynckeysauth.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 QuasarApp.
+ * Copyright (C) 2021-2025 QuasarApp.
  * Distributed under the GPLv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -18,8 +18,8 @@ namespace EasySSL {
 
 /**
  * @brief The AsyncKeysAuth class is temaplate class for works with authorization of a pair of asynchronous keys
- *  This class contains base implementation for the authentication using async encription. The base encription alhorithm defined on the template argument **CryptoImplementation**.
- *  You can use any crypto alhorithm.
+ *  This class contains base implementation for the authentication using async encryption. The base encryption algorithm defined on the template argument **CryptoImplementation**.
+ *  You can use any crypto algorithm.
  *
  *  ## Exampel of use:
  *
@@ -60,7 +60,7 @@ namespace EasySSL {
  * * After accept server create new user with ID = sha256(PUB) or
  * if user alredy exits make them as a logined user.
  *
- * @tparam CryptoImplementation This is internal implementaion of base encription functions.
+ * @tparam CryptoImplementation This is internal implementaion of base encryption functions.
  * @see iCrypto class.
  *
  */

src/lib/src/public/easyssl/authecdsa.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/ecdsassl.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/ecdsassl.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/global.h.in

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/icertificate.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 QuasarApp.
+ * Copyright (C) 2021-2025 QuasarApp.
  * Distributed under the GPLv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/icertificate.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 QuasarApp.
+ * Copyright (C) 2021-2025 QuasarApp.
  * Distributed under the GPLv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/icrypto.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 QuasarApp.
+ * Copyright (C) 2021-2025 QuasarApp.
  * Distributed under the GPLv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/icrypto.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 QuasarApp.
+ * Copyright (C) 2021-2025 QuasarApp.
  * Distributed under the GPLv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -29,8 +29,8 @@ public:
     enum Features {
         /// Signin and check sign of the data.
         Signing = 0x01,
-        /// Encription and decription data
-        Encription = 0x02
+        /// Encryption and decryption data
+        Encryption = 0x02
     };
 
     /**
@@ -48,34 +48,34 @@ public:
     virtual QSsl::KeyAlgorithm keyAlgorithm() const = 0;
 
     /**
-     * @brief supportedFeatures This method should return supported featurs of the current encription alhorithm
+     * @brief supportedFeatures This method should return supported featurs of the current encryption algorithm
      * @return Features list.
      * @see Features
      */
     virtual Features supportedFeatures() const = 0;
 
     /**
-     * @brief decrypt This method decript @a message using @a key.
-     * @param message This is encripted message that should be decripted.
-     * @param key This is key that will be used for decription for the @a message.
-     * @return decripted message or empty string if method not supported or decripted failed.
-     * @see IAsyncEncription::encript
+     * @brief decrypt This method decrypt @a message using @a key.
+     * @param message This is encrypted message that should be decrypted.
+     * @param key This is key that will be used for decryption for the @a message.
+     * @return decrypted message or empty string if method not supported or decrypted failed.
+     * @see IAsyncEncryption::encrypt
      */
     virtual QByteArray decrypt(const QByteArray& message, const QByteArray& key) = 0;
 
     /**
-     * @brief encrypt This method encript @a message using @a key.
-     * @param message This is a message that should be decripted.
-     * @param key This is key that will be used for encription for the @a message.
-     * @return decripted message or empty string if method not supported or decripted failed.
-     * @see IAsyncEncription::encript
+     * @brief encrypt This method encrypt @a message using @a key.
+     * @param message This is a message that should be decrypted.
+     * @param key This is key that will be used for encryption for the @a message.
+     * @return decrypted message or empty string if method not supported or decrypted failed.
+     * @see IAsyncEncryption::encrypt
      */
     virtual QByteArray encrypt(const QByteArray& message, const QByteArray& key) = 0;
 
     /**
      * @brief signMessage This method should be sign the @a message using the @a key.
      * @param message This is input data that should be signed.
-     * @param key This is a privete key for encription the @a message.
+     * @param key This is a privete key for encryption the @a message.
      * @return signature data array.
      * @see AsyncKeysAuth::descrupt
      */
@@ -83,10 +83,10 @@ public:
 
     /**
      * @brief checkSign This method should be check signature of the @a message using the @a key.
-     * @param message This is input data that should be decripted.
+     * @param message This is input data that should be decrypted.
      * @param signature This is signature that will be checked for the @a message.
-     * @param key This is a public key for encription the @a inpputData.
-     * @return decripted data array.
+     * @param key This is a public key for encryption the @a inpputData.
+     * @return decrypted data array.
      * @see AsyncKeysAuth::encrypt
      */
     virtual bool checkSign(const QByteArray& message,

src/lib/src/public/easyssl/rsassl.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.
@@ -38,7 +38,7 @@ void *RSASSL::makeRawKeys() const {
 }
 
 ICrypto::Features RSASSL::supportedFeatures() const {
-    return static_cast<ICrypto::Features>(Features::Encription | Features::Signing);
+    return static_cast<ICrypto::Features>(Features::Encryption | Features::Signing);
 }
 
 QSsl::KeyAlgorithm RSASSL::keyAlgorithm() const {
@@ -147,7 +147,7 @@ QByteArray RSASSL::decrypt(const QByteArray &message, const QByteArray &key) {
 
     const long long maxDencryptedSize = EVP_PKEY_size(rsaPrivateKey);
     if (message.length() % maxDencryptedSize) {
-        qCritical() << "Error wrong encripted data size.";
+        qCritical() << "Error wrong encrypted data size.";
         qCritical() << "Your key requir size multiple " << maxDencryptedSize;
 
         return {};

src/lib/src/public/easyssl/rsassl.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.
@@ -67,12 +67,12 @@ public:
 
     /**
      * @brief padding This is mode of pending data before icnription.
-     * @return encription pending mode.
+     * @return encryption pending mode.
      */
     RSAPadding padding() const;
 
     /**
-     * @brief setPadding This method sets new mode for encription pendong.
+     * @brief setPadding This method sets new mode for encryption pendong.
      * @param newPadding This is new new mode.
      * @note You must change padding mode for both side (encryption and decryption)
     */

src/lib/src/public/easyssl/x509.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/lib/src/public/easyssl/x509.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

submodules/CMake

@@ -1 +1 @@
-Subproject commit 8365c74d6298bca83824bf407896418f3494301b
+Subproject commit 8114b9b678baed739652a398bab1485a35dbfdcd

tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2025 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.

tests/tstMain.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

tests/units/authtest.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

tests/units/authtest.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

tests/units/crttest.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

tests/units/cryptotest.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.
@@ -50,10 +50,10 @@ public:
             QVERIFY2(crypto.checkSign(message, siganture, pub), "failed to check message");
         }
 
-        if (crypto.supportedFeatures() & EasySSL::ICrypto::Features::Encription) {
-            auto encriptedMsg = crypto.encrypt(message, pub);
-            QVERIFY2(encriptedMsg.size(), "Encripted message should not be empty");
-            auto decryptedMsg = crypto.decrypt(encriptedMsg, priv);
+        if (crypto.supportedFeatures() & EasySSL::ICrypto::Features::Encryption) {
+            auto encryptedMsg = crypto.encrypt(message, pub);
+            QVERIFY2(encryptedMsg.size(), "Encrypted message should not be empty");
+            auto decryptedMsg = crypto.decrypt(encryptedMsg, priv);
             QVERIFY2(decryptedMsg == message, "Failed to check message after decryption");
         }
     }

tests/units/test.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

tests/units/test.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

tests/units/testutils.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

tests/units/testutils.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2020-2023 QuasarApp.
+//# Copyright (C) 2020-2025 QuasarApp.
 //# Distributed under the GPLv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.