Comparison

util-src/hashes.c @ 6620:50eaefeec013

util-src/*.c: Per convention call luaL_error() as argument to return
author Florian Zeitz <florob@babelmonkeys.de>
date Fri, 03 Apr 2015 20:30:14 +0200
parent 6615:8e4572a642cb
child 6789:6b180e77c97a
comparison
equal deleted inserted replaced
6619:78d1706982b2 6620:50eaefeec013
168 desc.ctxo = &ctxo; 168 desc.ctxo = &ctxo;
169 169
170 salt2 = malloc(salt_len + 4); 170 salt2 = malloc(salt_len + 4);
171 171
172 if(salt2 == NULL) { 172 if(salt2 == NULL) {
173 luaL_error(L, "Out of memory in scramHi"); 173 return luaL_error(L, "Out of memory in scramHi");
174 } 174 }
175 175
176 memcpy(salt2, salt, salt_len); 176 memcpy(salt2, salt, salt_len);
177 memcpy(salt2 + salt_len, "\0\0\0\1", 4); 177 memcpy(salt2 + salt_len, "\0\0\0\1", 4);
178 hmac(&desc, str, str_len, salt2, salt_len + 4, Ust); 178 hmac(&desc, str, str_len, salt2, salt_len + 4, Ust);