diff options
author | William Ahern <william@server.local> | 2013-03-14 18:58:23 -0700 |
---|---|---|
committer | William Ahern <william@server.local> | 2013-03-14 18:58:23 -0700 |
commit | 709e7fde568d3808089d92114632e4f273ba924b (patch) | |
tree | b3362cc93051bf0e4bd2ea74264e58be71850424 | |
parent | 9297c48c238eeea1aab59c00001d2f8af75a4b29 (diff) | |
download | luaossl-709e7fde568d3808089d92114632e4f273ba924b.tar.gz luaossl-709e7fde568d3808089d92114632e4f273ba924b.tar.bz2 luaossl-709e7fde568d3808089d92114632e4f273ba924b.zip |
-n
fix luaL_argcheck usage, and don't try to use unsupported %u format specifier
-rw-r--r-- | openssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3598,11 +3598,11 @@ static int cipher_init(lua_State *L, _Bool encrypt) { | |||
3598 | 3598 | ||
3599 | key = luaL_checklstring(L, 2, &n); | 3599 | key = luaL_checklstring(L, 2, &n); |
3600 | m = (size_t)EVP_CIPHER_CTX_key_length(ctx); | 3600 | m = (size_t)EVP_CIPHER_CTX_key_length(ctx); |
3601 | luaL_argcheck(L, 2, n == m, lua_pushfstring(L, "%u: invalid key length (should be %u)", (unsigned)n, (unsigned)m)); | 3601 | luaL_argcheck(L, n == m, 2, lua_pushfstring(L, "%d: invalid key length (should be %d)", (int)n, (int)m)); |
3602 | 3602 | ||
3603 | iv = luaL_optlstring(L, 3, NULL, &n); | 3603 | iv = luaL_optlstring(L, 3, NULL, &n); |
3604 | m = (size_t)EVP_CIPHER_CTX_iv_length(ctx); | 3604 | m = (size_t)EVP_CIPHER_CTX_iv_length(ctx); |
3605 | luaL_argcheck(L, 3, n == m, lua_pushfstring(L, "%u: invalid IV length (should be %u)", (unsigned)n, (unsigned)m)); | 3605 | luaL_argcheck(L, n == m, 3, lua_pushfstring(L, "%d: invalid IV length (should be %d)", (int)n, (int)m)); |
3606 | 3606 | ||
3607 | if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, encrypt)) | 3607 | if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, encrypt)) |
3608 | goto sslerr; | 3608 | goto sslerr; |
@@ -3640,7 +3640,7 @@ static _Bool cipher_update_(lua_State *L, EVP_CIPHER_CTX *ctx, luaL_Buffer *B, i | |||
3640 | block = EVP_CIPHER_CTX_block_size(ctx); | 3640 | block = EVP_CIPHER_CTX_block_size(ctx); |
3641 | 3641 | ||
3642 | if (LUAL_BUFFERSIZE < block * 2) | 3642 | if (LUAL_BUFFERSIZE < block * 2) |
3643 | luaL_error(L, "cipher:update: LUAL_BUFFERSIZE(%u) < 2 * EVP_CIPHER_CTX_block_size(%u)", (unsigned)LUAL_BUFFERSIZE, (unsigned)block); | 3643 | luaL_error(L, "cipher:update: LUAL_BUFFERSIZE(%d) < 2 * EVP_CIPHER_CTX_block_size(%d)", (int)LUAL_BUFFERSIZE, (int)block); |
3644 | 3644 | ||
3645 | step = LUAL_BUFFERSIZE - block; | 3645 | step = LUAL_BUFFERSIZE - block; |
3646 | 3646 | ||
@@ -3697,7 +3697,7 @@ static int cipher_final(lua_State *L) { | |||
3697 | block = EVP_CIPHER_CTX_block_size(ctx); | 3697 | block = EVP_CIPHER_CTX_block_size(ctx); |
3698 | 3698 | ||
3699 | if (LUAL_BUFFERSIZE < block) | 3699 | if (LUAL_BUFFERSIZE < block) |
3700 | return luaL_error(L, "cipher:update: LUAL_BUFFERSIZE(%u) < EVP_CIPHER_CTX_block_size(%u)", (unsigned)LUAL_BUFFERSIZE, (unsigned)block); | 3700 | return luaL_error(L, "cipher:update: LUAL_BUFFERSIZE(%d) < EVP_CIPHER_CTX_block_size(%d)", (int)LUAL_BUFFERSIZE, (int)block); |
3701 | 3701 | ||
3702 | if (!EVP_CipherFinal(ctx, (void *)luaL_prepbuffer(&B), &out)) | 3702 | if (!EVP_CipherFinal(ctx, (void *)luaL_prepbuffer(&B), &out)) |
3703 | goto sslerr; | 3703 | goto sslerr; |