diff options
| author |   daurnimator <quae@daurnimator.com>
| 2017-08-31 00:59:11 +1000 |
|---|---|---|
| committer | daurnimator <quae@daurnimator.com>
| 2017-08-31 01:09:55 +1000 |
| commit | 2f09a2946403782c5b2418103deb4c964810ca1e (patch) | |
| tree | 73eb27319eb503b82da72537c9465f63bbe4f296 /src | |
| parent | 2b86d68fd92a387dcbc3c9c62fa380c8d2a2e4aa (diff) | |
| download | luaossl-2f09a2946403782c5b2418103deb4c964810ca1e.tar.gz luaossl-2f09a2946403782c5b2418103deb4c964810ca1e.tar.bz2 luaossl-2f09a2946403782c5b2418103deb4c964810ca1e.zip | |
Use 'generator' parameter for picking generator for DH keys (rather than 'exp'). Change default value to 2.
2 is the default generator for openssl; the number is a mostly arbitrary choice, and smaller values are faster.
Diffstat (limited to 'src')
| -rw-r--r-- | src/openssl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/openssl.c b/src/openssl.c index 0760c35..0354666 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -3212,6 +3212,7 @@ static int pk_new(lua_State *L) { int type = EVP_PKEY_RSA; unsigned bits = 1024; unsigned exp = 65537; + int generator = 2; int curve = NID_X9_62_prime192v1; const char *id; const char *dhparam = NULL; @@ -3264,9 +3265,10 @@ static int pk_new(lua_State *L) { bits = (unsigned)n; } - if (loadfield(L, 1, "exp", LUA_TNUMBER, &n)) { - luaL_argcheck(L, n > 0 && n < UINT_MAX, 1, lua_pushfstring(L, "%f: `exp' invalid", n)); - exp = (unsigned)n; + /* compat: DH used to use the 'exp' field for the generator */ + if (loadfield(L, 1, "generator", LUA_TNUMBER, &n) || loadfield(L, 1, "exp", LUA_TNUMBER, &n)) { + luaL_argcheck(L, n > 0 && n <= INT_MAX, 1, lua_pushfstring(L, "%f: `exp' invalid", n)); + generator = (int)n; } break; case EVP_PKEY_EC: @@ -3327,7 +3329,7 @@ creat: BIO_free(bio); if (!dh) return auxL_error(L, auxL_EOPENSSL, "pkey.new"); - } else if (!(dh = DH_generate_parameters(bits, exp, 0, 0))) + } else if (!(dh = DH_generate_parameters(bits, generator, 0, 0))) return auxL_error(L, auxL_EOPENSSL, "pkey.new"); |