prosody
865631ebb9f2
util-src/hashes.c

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

util-src/hashes.c @ 12559:865631ebb9f2

util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698) MD5() is deprecated, but EVP_md5() is not. Functions in macros like this make it awkward to apply static analysis and code formatting.
author Kim Alvefur <zash@zash.se>
date Thu, 10 Sep 2020 21:58:23 +0200
parent 11562:0becc168f4f9
child 12560:1e41dd0f8353
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2923
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
1 /* Prosody IM
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
2 -- Copyright (C) 2009-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
3 -- Copyright (C) 2009-2010 Waqas Hussain
6615
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
4 --
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
5 -- This project is MIT/X11 licensed. Please see the
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
6 -- COPYING file in the source package for more information.
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
7 --
520
e96ac4bb6dd8 and the C files too
Matthew Wild <mwild1@gmail.com>
parents: 441
diff changeset
8 */
e96ac4bb6dd8 and the C files too
Matthew Wild <mwild1@gmail.com>
parents: 441
diff changeset
9
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
10 /*
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
11 * hashes.c
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
12 * Lua library for sha1, sha256 and md5 hashes
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
13 */
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
14
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
15 #include <string.h>
5538
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
16 #include <stdlib.h>
5576
7656b9f06bb5 util.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32 instead.
Waqas Hussain <waqas20@gmail.com>
parents: 5538
diff changeset
17
7656b9f06bb5 util.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32 instead.
Waqas Hussain <waqas20@gmail.com>
parents: 5538
diff changeset
18 #ifdef _MSC_VER
7656b9f06bb5 util.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32 instead.
Waqas Hussain <waqas20@gmail.com>
parents: 5538
diff changeset
19 typedef unsigned __int32 uint32_t;
7656b9f06bb5 util.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32 instead.
Waqas Hussain <waqas20@gmail.com>
parents: 5538
diff changeset
20 #else
5538
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
21 #include <inttypes.h>
5576
7656b9f06bb5 util.hashes: inttypes.h not available with MS Windows SDK, use MS specific __int32 instead.
Waqas Hussain <waqas20@gmail.com>
parents: 5538
diff changeset
22 #endif
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
23
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
24 #include "lua.h"
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
25 #include "lauxlib.h"
11541
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
26 #include <openssl/crypto.h>
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
27 #include <openssl/sha.h>
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
28 #include <openssl/md5.h>
9962
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
29 #include <openssl/hmac.h>
9965
d8e645b4d195 util.hashes: Use PBKDF2 from libcrypto
Kim Alvefur <zash@zash.se>
parents: 9963
diff changeset
30 #include <openssl/evp.h>
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
31
6789
6b180e77c97a util-src/*.c: Invert Lua 5.2 compat to be 5.2+ by default and a macro to support 5.1
Kim Alvefur <zash@zash.se>
parents: 6620
diff changeset
32 #if (LUA_VERSION_NUM == 501)
6b180e77c97a util-src/*.c: Invert Lua 5.2 compat to be 5.2+ by default and a macro to support 5.1
Kim Alvefur <zash@zash.se>
parents: 6620
diff changeset
33 #define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
6413
a552f4170aed util-src/*.c: Add macro for compiling with Lua 5.2
Kim Alvefur <zash@zash.se>
parents: 6412
diff changeset
34 #endif
a552f4170aed util-src/*.c: Add macro for compiling with Lua 5.2
Kim Alvefur <zash@zash.se>
parents: 6412
diff changeset
35
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
36 #define HMAC_IPAD 0x36363636
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
37 #define HMAC_OPAD 0x5c5c5c5c
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
38
10480
94cacf9fd0ae util.*.c: Add static qualifiers everywhere
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents: 9970
diff changeset
39 static const char *hex_tab = "0123456789abcdef";
94cacf9fd0ae util.*.c: Add static qualifiers everywhere
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents: 9970
diff changeset
40 static void toHex(const unsigned char *in, int length, unsigned char *out) {
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
41 int i;
6615
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
42
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
43 for(i = 0; i < length; i++) {
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
44 out[i * 2] = hex_tab[(in[i] >> 4) & 0xF];
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
45 out[i * 2 + 1] = hex_tab[(in[i]) & 0xF];
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
46 }
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
47 }
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
48
12559
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
49 static int Levp_hash(lua_State *L, const EVP_MD *evp) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
50 size_t len;
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
51 unsigned int size = EVP_MAX_MD_SIZE;
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
52 const char *s = luaL_checklstring(L, 1, &len);
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
53 int hex_out = lua_toboolean(L, 2);
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
54
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
55 unsigned char hash[EVP_MAX_MD_SIZE], result[EVP_MAX_MD_SIZE * 2];
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
56
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
57 EVP_MD_CTX *ctx = EVP_MD_CTX_new();
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
58
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
59 if(ctx == NULL) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
60 goto fail;
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
61 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
62
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
63 if(!EVP_DigestInit_ex(ctx, evp, NULL)) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
64 goto fail;
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
65 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
66
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
67 if(!EVP_DigestUpdate(ctx, s, len)) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
68 goto fail;
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
69 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
70
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
71 if(!EVP_DigestFinal_ex(ctx, hash, &size)) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
72 goto fail;
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
73 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
74
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
75 EVP_MD_CTX_free(ctx);
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
76
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
77 if(hex_out) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
78 toHex(hash, size, result);
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
79 lua_pushlstring(L, (char *)result, size * 2);
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
80 } else {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
81 lua_pushlstring(L, (char *)hash, size);
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
82 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
83
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
84 return 1;
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
85
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
86 fail:
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
87 EVP_MD_CTX_free(ctx);
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
88 return luaL_error(L, "hash function failed");
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
89 }
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
90
12559
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
91 static int Lsha1(lua_State *L) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
92 return Levp_hash(L, EVP_sha1());
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
93 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
94
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
95 static int Lsha224(lua_State *L) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
96 return Levp_hash(L, EVP_sha224());
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
97 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
98
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
99 static int Lsha256(lua_State *L) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
100 return Levp_hash(L, EVP_sha256());
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
101 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
102
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
103 static int Lsha384(lua_State *L) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
104 return Levp_hash(L, EVP_sha384());
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
105 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
106
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
107 static int Lsha512(lua_State *L) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
108 return Levp_hash(L, EVP_sha512());
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
109 }
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
110
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
111 static int Lmd5(lua_State *L) {
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
112 return Levp_hash(L, EVP_md5());
865631ebb9f2 util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)
Kim Alvefur <zash@zash.se>
parents: 11562
diff changeset
113 }
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
114
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
115 struct hash_desc {
7889
b8d694646597 util-src/*.c: Attach pointer * to name instead of type
Kim Alvefur <zash@zash.se>
parents: 7835
diff changeset
116 int (*Init)(void *);
b8d694646597 util-src/*.c: Attach pointer * to name instead of type
Kim Alvefur <zash@zash.se>
parents: 7835
diff changeset
117 int (*Update)(void *, const void *, size_t);
b8d694646597 util-src/*.c: Attach pointer * to name instead of type
Kim Alvefur <zash@zash.se>
parents: 7835
diff changeset
118 int (*Final)(unsigned char *, void *);
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
119 size_t digestLength;
7889
b8d694646597 util-src/*.c: Attach pointer * to name instead of type
Kim Alvefur <zash@zash.se>
parents: 7835
diff changeset
120 void *ctx, *ctxo;
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
121 };
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
122
9962
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
123 #define MAKE_HMAC_FUNCTION(myFunc, evp, size, type) \
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
124 static int myFunc(lua_State *L) { \
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
125 unsigned char hash[size], result[2*size]; \
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
126 size_t key_len, msg_len; \
9962
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
127 unsigned int out_len; \
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
128 const char *key = luaL_checklstring(L, 1, &key_len); \
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
129 const char *msg = luaL_checklstring(L, 2, &msg_len); \
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
130 const int hex_out = lua_toboolean(L, 3); \
9962
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
131 HMAC(evp(), key, key_len, (const unsigned char*)msg, msg_len, (unsigned char*)hash, &out_len); \
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
132 if (hex_out) { \
9962
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
133 toHex(hash, out_len, result); \
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
134 lua_pushlstring(L, (char*)result, out_len*2); \
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
135 } else { \
9962
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
136 lua_pushlstring(L, (char*)hash, out_len); \
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
137 } \
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
138 return 1; \
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
139 }
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
140
9962
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
141 MAKE_HMAC_FUNCTION(Lhmac_sha1, EVP_sha1, SHA_DIGEST_LENGTH, SHA_CTX)
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
142 MAKE_HMAC_FUNCTION(Lhmac_sha256, EVP_sha256, SHA256_DIGEST_LENGTH, SHA256_CTX)
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
143 MAKE_HMAC_FUNCTION(Lhmac_sha512, EVP_sha512, SHA512_DIGEST_LENGTH, SHA512_CTX)
29bc3dff3419 util.hashes: Use HMAC function provided by OpenSSL (fixes #1345)
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
144 MAKE_HMAC_FUNCTION(Lhmac_md5, EVP_md5, MD5_DIGEST_LENGTH, MD5_CTX)
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
145
9967
dc9bb31cbffe util.hashes: Rename PBKDF2 function
Kim Alvefur <zash@zash.se>
parents: 9966
diff changeset
146 static int Lpbkdf2_sha1(lua_State *L) {
9970
4a43feb9ab15 Backed out changeset 61bc5c52c941
Kim Alvefur <zash@zash.se>
parents: 9969
diff changeset
147 unsigned char out[SHA_DIGEST_LENGTH];
4a43feb9ab15 Backed out changeset 61bc5c52c941
Kim Alvefur <zash@zash.se>
parents: 9969
diff changeset
148
9965
d8e645b4d195 util.hashes: Use PBKDF2 from libcrypto
Kim Alvefur <zash@zash.se>
parents: 9963
diff changeset
149 size_t pass_len, salt_len;
d8e645b4d195 util.hashes: Use PBKDF2 from libcrypto
Kim Alvefur <zash@zash.se>
parents: 9963
diff changeset
150 const char *pass = luaL_checklstring(L, 1, &pass_len);
d8e645b4d195 util.hashes: Use PBKDF2 from libcrypto
Kim Alvefur <zash@zash.se>
parents: 9963
diff changeset
151 const unsigned char *salt = (unsigned char *)luaL_checklstring(L, 2, &salt_len);
5538
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
152 const int iter = luaL_checkinteger(L, 3);
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
153
9970
4a43feb9ab15 Backed out changeset 61bc5c52c941
Kim Alvefur <zash@zash.se>
parents: 9969
diff changeset
154 if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, EVP_sha1(), SHA_DIGEST_LENGTH, out) == 0) {
9965
d8e645b4d195 util.hashes: Use PBKDF2 from libcrypto
Kim Alvefur <zash@zash.se>
parents: 9963
diff changeset
155 return luaL_error(L, "PKCS5_PBKDF2_HMAC() failed");
6615
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
156 }
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
157
9970
4a43feb9ab15 Backed out changeset 61bc5c52c941
Kim Alvefur <zash@zash.se>
parents: 9969
diff changeset
158 lua_pushlstring(L, (char *)out, SHA_DIGEST_LENGTH);
5538
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
159
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
160 return 1;
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
161 }
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
162
6615
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
163
9968
d536796a305f util.hashes: Add PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 9967
diff changeset
164 static int Lpbkdf2_sha256(lua_State *L) {
9970
4a43feb9ab15 Backed out changeset 61bc5c52c941
Kim Alvefur <zash@zash.se>
parents: 9969
diff changeset
165 unsigned char out[SHA256_DIGEST_LENGTH];
6615
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
166
9968
d536796a305f util.hashes: Add PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 9967
diff changeset
167 size_t pass_len, salt_len;
d536796a305f util.hashes: Add PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 9967
diff changeset
168 const char *pass = luaL_checklstring(L, 1, &pass_len);
d536796a305f util.hashes: Add PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 9967
diff changeset
169 const unsigned char *salt = (unsigned char *)luaL_checklstring(L, 2, &salt_len);
d536796a305f util.hashes: Add PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 9967
diff changeset
170 const int iter = luaL_checkinteger(L, 3);
6615
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
171
9970
4a43feb9ab15 Backed out changeset 61bc5c52c941
Kim Alvefur <zash@zash.se>
parents: 9969
diff changeset
172 if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, EVP_sha256(), SHA256_DIGEST_LENGTH, out) == 0) {
9968
d536796a305f util.hashes: Add PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 9967
diff changeset
173 return luaL_error(L, "PKCS5_PBKDF2_HMAC() failed");
5538
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
174 }
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
175
10748
93293891709b util.hashes: Fix output length of PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 10480
diff changeset
176 lua_pushlstring(L, (char *)out, SHA256_DIGEST_LENGTH);
5538
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
177 return 1;
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
178 }
62089c9c142d util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Florian Zeitz <florob@babelmonkeys.de>
parents: 5537
diff changeset
179
11541
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
180 static int Lhash_equals(lua_State *L) {
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
181 size_t len1, len2;
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
182 const char *s1 = luaL_checklstring(L, 1, &len1);
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
183 const char *s2 = luaL_checklstring(L, 2, &len2);
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
184 if(len1 == len2) {
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
185 lua_pushboolean(L, CRYPTO_memcmp(s1, s2, len1) == 0);
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
186 } else {
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
187 lua_pushboolean(L, 0);
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
188 }
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
189 return 1;
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
190 }
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
191
6615
8e4572a642cb util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur <zash@zash.se>
parents: 6413
diff changeset
192 static const luaL_Reg Reg[] = {
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
193 { "sha1", Lsha1 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
194 { "sha224", Lsha224 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
195 { "sha256", Lsha256 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
196 { "sha384", Lsha384 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
197 { "sha512", Lsha512 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
198 { "md5", Lmd5 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
199 { "hmac_sha1", Lhmac_sha1 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
200 { "hmac_sha256", Lhmac_sha256 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
201 { "hmac_sha512", Lhmac_sha512 },
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
202 { "hmac_md5", Lhmac_md5 },
9967
dc9bb31cbffe util.hashes: Rename PBKDF2 function
Kim Alvefur <zash@zash.se>
parents: 9966
diff changeset
203 { "scram_Hi_sha1", Lpbkdf2_sha1 }, /* COMPAT */
dc9bb31cbffe util.hashes: Rename PBKDF2 function
Kim Alvefur <zash@zash.se>
parents: 9966
diff changeset
204 { "pbkdf2_hmac_sha1", Lpbkdf2_sha1 },
9968
d536796a305f util.hashes: Add PBKDF2-HMAC-SHA256
Kim Alvefur <zash@zash.se>
parents: 9967
diff changeset
205 { "pbkdf2_hmac_sha256", Lpbkdf2_sha256 },
11541
13b84682518e util.hashes: Add constant-time string comparison (binding to CRYPTO_memcmp)
Matthew Wild <mwild1@gmail.com>
parents: 9962
diff changeset
206 { "equals", Lhash_equals },
5537
15464633d8fb util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Florian Zeitz <florob@babelmonkeys.de>
parents: 4829
diff changeset
207 { NULL, NULL }
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
208 };
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
209
7889
b8d694646597 util-src/*.c: Attach pointer * to name instead of type
Kim Alvefur <zash@zash.se>
parents: 7835
diff changeset
210 LUALIB_API int luaopen_util_hashes(lua_State *L) {
7818
54669df178c2 util-src: Make C modules assert that the Lua runtime matches what it was compiled for
Kim Alvefur <zash@zash.se>
parents: 6789
diff changeset
211 #if (LUA_VERSION_NUM > 501)
54669df178c2 util-src: Make C modules assert that the Lua runtime matches what it was compiled for
Kim Alvefur <zash@zash.se>
parents: 6789
diff changeset
212 luaL_checkversion(L);
54669df178c2 util-src: Make C modules assert that the Lua runtime matches what it was compiled for
Kim Alvefur <zash@zash.se>
parents: 6789
diff changeset
213 #endif
6411
6c8f6364bc48 util-src/*.c: Don't create globals when loaded
Kim Alvefur <zash@zash.se>
parents: 5774
diff changeset
214 lua_newtable(L);
9957
c8cfd2a5845c util.hashes: Remove redundant semicolon
Kim Alvefur <zash@zash.se>
parents: 7889
diff changeset
215 luaL_setfuncs(L, Reg, 0);
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
216 lua_pushliteral(L, "-3.14");
6412
0e94f89d0e62 util-src/*.c: Use the more concise lua_setfield
Kim Alvefur <zash@zash.se>
parents: 6411
diff changeset
217 lua_setfield(L, -2, "version");
11562
0becc168f4f9 util.hashes: Expose OpenSSL version
Kim Alvefur <zash@zash.se>
parents: 11560
diff changeset
218 #ifdef OPENSSL_VERSION
0becc168f4f9 util.hashes: Expose OpenSSL version
Kim Alvefur <zash@zash.se>
parents: 11560
diff changeset
219 lua_pushstring(L, OpenSSL_version(OPENSSL_VERSION));
0becc168f4f9 util.hashes: Expose OpenSSL version
Kim Alvefur <zash@zash.se>
parents: 11560
diff changeset
220 lua_setfield(L, -2, "_LIBCRYPTO_VERSION");
0becc168f4f9 util.hashes: Expose OpenSSL version
Kim Alvefur <zash@zash.se>
parents: 11560
diff changeset
221 #endif
766
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
222 return 1;
433a5226267f Licensing/version updates for some files (forgot to commit, doh...)
Matthew Wild <mwild1@gmail.com>
parents: 520
diff changeset
223 }