Merge remote-tracking branch 'origin/master'

src/crypto.h

@@ -4,15 +4,18 @@
  */
 #pragma once
 
+// standard includes
 #include <array>
+
+// lib includes
 #include <list>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/sha.h>
 #include <openssl/x509.h>
-
 #include <boost/property_tree/ptree.hpp>
 
+// local includes
 #include "utility.h"
 
 namespace crypto {
@@ -21,8 +24,7 @@ namespace crypto {
     std::string pkey;
   };
 
-  void
-  md_ctx_destroy(EVP_MD_CTX *);
+  void md_ctx_destroy(EVP_MD_CTX *);
 
   using sha256_t = std::array<std::uint8_t, SHA256_DIGEST_LENGTH>;
 
@@ -110,50 +112,33 @@ namespace crypto {
    * @param plaintext
    * @return The SHA-256 hash of the plaintext.
    */
-  sha256_t
-  hash(const std::string_view &plaintext);
+  sha256_t hash(const std::string_view &plaintext);
 
-  aes_t
-  gen_aes_key(const std::array<uint8_t, 16> &salt, const std::string_view &pin);
+  aes_t gen_aes_key(const std::array<uint8_t, 16> &salt, const std::string_view &pin);
+  x509_t x509(const std::string_view &x);
+  pkey_t pkey(const std::string_view &k);
+  std::string pem(x509_t &x509);
+  std::string pem(pkey_t &pkey);
 
-  x509_t
-  x509(const std::string_view &x);
-  pkey_t
-  pkey(const std::string_view &k);
-  std::string
-  pem(x509_t &x509);
-  std::string
-  pem(pkey_t &pkey);
+  std::vector<uint8_t> sign256(const pkey_t &pkey, const std::string_view &data);
+  bool verify256(const x509_t &x509, const std::string_view &data, const std::string_view &signature);
 
-  std::vector<uint8_t>
-  sign256(const pkey_t &pkey, const std::string_view &data);
-  bool
-  verify256(const x509_t &x509, const std::string_view &data, const std::string_view &signature);
+  creds_t gen_creds(const std::string_view &cn, std::uint32_t key_bits);
 
-  creds_t
-  gen_creds(const std::string_view &cn, std::uint32_t key_bits);
+  std::string_view signature(const x509_t &x);
 
-  std::string_view
-  signature(const x509_t &x);
-
-  std::string
-  rand(std::size_t bytes);
-  std::string
-  rand_alphabet(std::size_t bytes,
-    const std::string_view &alphabet = std::string_view { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!%&()=-" });
+  std::string rand(std::size_t bytes);
+  std::string rand_alphabet(std::size_t bytes, const std::string_view &alphabet = std::string_view {"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!%&()=-"});
 
   class cert_chain_t {
   public:
     KITTY_DECL_CONSTR(cert_chain_t)
 
-    void
-    add(p_named_cert_t& named_cert_p);
+    void add(p_named_cert_t& named_cert_p);
 
-    void
-    clear();
+    void clear();
 
-    const char *
-    verify(x509_t::element_type *cert, p_named_cert_t& named_cert_out);
+    const char *verify(x509_t::element_type *cert, p_named_cert_t& named_cert_out);
 
   private:
     std::vector<std::pair<p_named_cert_t, x509_store_t>> _certs;
@@ -162,8 +147,8 @@ namespace crypto {
 
   namespace cipher {
     constexpr std::size_t tag_size = 16;
-    constexpr std::size_t
-    round_to_pkcs7_padded(std::size_t size) {
+
+    constexpr std::size_t round_to_pkcs7_padded(std::size_t size) {
       return ((size + 15) / 16) * 16;
     }
 
@@ -181,23 +166,19 @@ namespace crypto {
     public:
       ecb_t() = default;
       ecb_t(ecb_t &&) noexcept = default;
-      ecb_t &
-      operator=(ecb_t &&) noexcept = default;
+      ecb_t &operator=(ecb_t &&) noexcept = default;
 
       ecb_t(const aes_t &key, bool padding = true);
 
-      int
-      encrypt(const std::string_view &plaintext, std::vector<std::uint8_t> &cipher);
-      int
-      decrypt(const std::string_view &cipher, std::vector<std::uint8_t> &plaintext);
+      int encrypt(const std::string_view &plaintext, std::vector<std::uint8_t> &cipher);
+      int decrypt(const std::string_view &cipher, std::vector<std::uint8_t> &plaintext);
     };
 
     class gcm_t: public cipher_t {
     public:
       gcm_t() = default;
       gcm_t(gcm_t &&) noexcept = default;
-      gcm_t &
-      operator=(gcm_t &&) noexcept = default;
+      gcm_t &operator=(gcm_t &&) noexcept = default;
 
       gcm_t(const crypto::aes_t &key, bool padding = true);
 
@@ -209,8 +190,7 @@ namespace crypto {
        * @param iv The initialization vector to be used for the encryption.
        * @return The total length of the ciphertext and GCM tag. Returns -1 in case of an error.
        */
-      int
-      encrypt(const std::string_view &plaintext, std::uint8_t *tag, std::uint8_t *ciphertext, aes_t *iv);
+      int encrypt(const std::string_view &plaintext, std::uint8_t *tag, std::uint8_t *ciphertext, aes_t *iv);
 
       /**
        * @brief Encrypts the plaintext using AES GCM mode.
@@ -220,19 +200,16 @@ namespace crypto {
        * @param iv The initialization vector to be used for the encryption.
        * @return The total length of the ciphertext and GCM tag written into tagged_cipher. Returns -1 in case of an error.
        */
-      int
-      encrypt(const std::string_view &plaintext, std::uint8_t *tagged_cipher, aes_t *iv);
+      int encrypt(const std::string_view &plaintext, std::uint8_t *tagged_cipher, aes_t *iv);
 
-      int
-      decrypt(const std::string_view &cipher, std::vector<std::uint8_t> &plaintext, aes_t *iv);
+      int decrypt(const std::string_view &cipher, std::vector<std::uint8_t> &plaintext, aes_t *iv);
     };
 
     class cbc_t: public cipher_t {
     public:
       cbc_t() = default;
       cbc_t(cbc_t &&) noexcept = default;
-      cbc_t &
-      operator=(cbc_t &&) noexcept = default;
+      cbc_t &operator=(cbc_t &&) noexcept = default;
 
       cbc_t(const crypto::aes_t &key, bool padding = true);
 
@@ -244,8 +221,7 @@ namespace crypto {
        * @param iv The initialization vector to be used for the encryption.
        * @return The total length of the ciphertext written into cipher. Returns -1 in case of an error.
        */
-      int
-      encrypt(const std::string_view &plaintext, std::uint8_t *cipher, aes_t *iv);
+      int encrypt(const std::string_view &plaintext, std::uint8_t *cipher, aes_t *iv);
     };
   }  // namespace cipher
 }  // namespace crypto