2 commits

Author	SHA1	Message	Date
Johannes Bauer	402f26e6ee	Fix building without scrypt ... Building without the scrypt KDF is now possible, the OPENSSL_NO_SCRYPT define is honored in code. Previous this lead to undefined references. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Stephen Henson <steve@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4116)	2017-08-08 20:50:44 +01:00
Johannes Bauer	cefa762ee5	Add interface to the scrypt KDF by means of PKEY_METHOD ... Add an interface that allows accessing the scrypt KDF as a PKEY_METHOD. This fixes #4021 (at least for the scrypt portion of the issue). Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Stephen Henson <steve@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4026)	2017-08-08 15:44:49 +01:00