summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-01-20 19:10:37 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-01-20 19:10:37 +0100
commitdb963c4220c6de5a4632800b2e66aa1dc1138c18 (patch)
tree68b25d462b9aadbbd4ee4c9bda66daa5b7b7c16a
parent7d2faa4d5df2468d14c8bc8b9b0876824e1a2ac0 (diff)
Patch amalgamation so that it is compatible with openssl 1.1
-rw-r--r--amalgamation/sqlite3.c31
1 files changed, 28 insertions, 3 deletions
diff --git a/amalgamation/sqlite3.c b/amalgamation/sqlite3.c
index fd39ec6..9ca1d0f 100644
--- a/amalgamation/sqlite3.c
+++ b/amalgamation/sqlite3.c
@@ -18280,6 +18280,7 @@ int sqlcipher_ltc_setup(sqlcipher_provider *p) {
#include <openssl/rand.h>
#include <openssl/evp.h>
#include <openssl/hmac.h>
+#include <openssl/opensslv.h>
typedef struct {
EVP_CIPHER *evp_cipher;
@@ -18398,14 +18399,24 @@ static int sqlcipher_openssl_random (void *ctx, void *buffer, int length) {
}
static int sqlcipher_openssl_hmac(void *ctx, unsigned char *hmac_key, int key_sz, unsigned char *in, int in_sz, unsigned char *in2, int in2_sz, unsigned char *out) {
- HMAC_CTX hctx;
unsigned int outlen;
+#if OPENSSL_VERSION_NUMBER >= 0x10100001L
+ HMAC_CTX *hctx;
+ hctx = HMAC_CTX_new();
+ HMAC_Init_ex(hctx, hmac_key, key_sz, EVP_sha1(), NULL);
+ HMAC_Update(hctx, in, in_sz);
+ HMAC_Update(hctx, in2, in2_sz);
+ HMAC_Final(hctx, out, &outlen);
+ HMAC_CTX_free(hctx);
+#else
+ HMAC_CTX hctx;
HMAC_CTX_init(&hctx);
HMAC_Init_ex(&hctx, hmac_key, key_sz, EVP_sha1(), NULL);
HMAC_Update(&hctx, in, in_sz);
HMAC_Update(&hctx, in2, in2_sz);
HMAC_Final(&hctx, out, &outlen);
HMAC_CTX_cleanup(&hctx);
+#endif
return SQLITE_OK;
}
@@ -18415,9 +18426,21 @@ static int sqlcipher_openssl_kdf(void *ctx, const unsigned char *pass, int pass_
}
static int sqlcipher_openssl_cipher(void *ctx, int mode, unsigned char *key, int key_sz, unsigned char *iv, unsigned char *in, int in_sz, unsigned char *out) {
- EVP_CIPHER_CTX ectx;
int tmp_csz, csz;
-
+#if OPENSSL_VERSION_NUMBER >= 0x10100001L
+ EVP_CIPHER_CTX *ectx;
+ ectx = EVP_CIPHER_CTX_new();
+ EVP_CipherInit_ex(ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, NULL, mode);
+ EVP_CIPHER_CTX_set_padding(ectx, 0); // no padding
+ EVP_CipherInit_ex(ectx, NULL, NULL, key, iv, mode);
+ EVP_CipherUpdate(ectx, out, &tmp_csz, in, in_sz);
+ csz = tmp_csz;
+ out += tmp_csz;
+ EVP_CipherFinal(ectx, out, &tmp_csz);
+ csz += tmp_csz;
+ EVP_CIPHER_CTX_free(ectx);
+#else
+ EVP_CIPHER_CTX ectx;
EVP_CipherInit(&ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, mode);
EVP_CIPHER_CTX_set_padding(&ectx, 0); // no padding
EVP_CipherInit(&ectx, NULL, key, iv, mode);
@@ -18427,7 +18450,9 @@ static int sqlcipher_openssl_cipher(void *ctx, int mode, unsigned char *key, int
EVP_CipherFinal(&ectx, out, &tmp_csz);
csz += tmp_csz;
EVP_CIPHER_CTX_cleanup(&ectx);
+#endif
assert(in_sz == csz);
+
return SQLITE_OK;
}