gitea-mirror/git-crypt
1
0
Fork 0
mirror of https://github.com/AGWA/git-crypt.git synced 2025-12-23 07:28:18 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add utility functions for big-endian int storage

Browse Source 
Use instead of htonl().
This commit is contained in:
Andrew Ayer
2014-03-22 11:41:18 -07:00
parent 73bf395b3b
commit 2f02161042
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crypto.cpp
View File

@@ -28,8 +28,8 @@
* as that of the covered work.
*/
#define _BSD_SOURCE
#include "crypto.hpp"
#include "util.hpp"
#include <openssl/aes.h>
#include <openssl/sha.h>
#include <openssl/hmac.h>
@@ -38,7 +38,6 @@
#include <iostream>
#include <cstring>
#include <cstdlib>
#include <arpa/inet.h>
void load_keys (const char* filepath, keys_t* keys)
{
@@ -82,9 +81,9 @@ void aes_ctr_state::process (const AES_KEY* key, const uint8_t* in, uint8_t* out
// first 12 bytes - nonce
// last 4 bytes - block number (sequentially increasing with each block)
uint8_t ctr[16];
uint32_t blockno = htonl(byte_counter / 16);
uint32_t blockno = byte_counter / 16;
memcpy(ctr, nonce, 12);
memcpy(ctr + 12, &blockno, 4);
store_be32(ctr + 12, blockno);
AES_encrypt(ctr, otp, key);
}

34
util.cpp
View File

@@ -126,3 +126,37 @@ std::string escape_shell_arg (const std::string& str)
return new_str;
}
uint32_t load_be32 (const unsigned char* p)
{
return (static_cast<uint32_t>(p[3]) << 0) |
(static_cast<uint32_t>(p[2]) << 8) |
(static_cast<uint32_t>(p[1]) << 16) |
(static_cast<uint32_t>(p[0]) << 24);
}
void store_be32 (unsigned char* p, uint32_t i)
{
p[3] = i; i >>= 8;
p[2] = i; i >>= 8;
p[1] = i; i >>= 8;
p[0] = i;
}
bool read_be32 (std::istream& in, uint32_t& i)
{
unsigned char buffer[4];
in.read(reinterpret_cast<char*>(buffer), 4);
if (in.gcount() != 4) {
return false;
}
i = load_be32(buffer);
return true;
}
void write_be32 (std::ostream& out, uint32_t i)
{
unsigned char buffer[4];
store_be32(buffer, i);
out.write(reinterpret_cast<const char*>(buffer), 4);
}

5
util.hpp
View File

@@ -34,11 +34,16 @@
#include <string>
#include <ios>
#include <iosfwd>
#include <stdint.h>
int exec_command (const char* command, std::ostream& output);
std::string resolve_path (const char* path);
void open_tempfile (std::fstream&, std::ios_base::openmode);
std::string escape_shell_arg (const std::string&);
uint32_t load_be32 (const unsigned char*);
void store_be32 (unsigned char*, uint32_t);
bool read_be32 (std::istream& in, uint32_t&);
void write_be32 (std::ostream& out, uint32_t);
#endif