add --enable-pwdbased and build, opensslextra needs

This commit is contained in:
toddouska
2013-03-11 17:01:05 -07:00
parent 7719cd9faa
commit f232ff84b4
5 changed files with 29 additions and 4 deletions

View File

@@ -27,7 +27,6 @@ src_libcyassl_la_SOURCES += ctaocrypt/src/des3.c \
ctaocrypt/src/md5.c \
ctaocrypt/src/asn.c \
ctaocrypt/src/dh.c \
ctaocrypt/src/pwdbased.c \
ctaocrypt/src/aes.c \
ctaocrypt/src/memory.c
endif
@@ -40,6 +39,10 @@ if BUILD_MD4
src_libcyassl_la_SOURCES += ctaocrypt/src/md4.c
endif
if BUILD_PWDBASED
src_libcyassl_la_SOURCES += ctaocrypt/src/pwdbased.c
endif
if BUILD_DSA
src_libcyassl_la_SOURCES += ctaocrypt/src/dsa.c
endif

View File

@@ -1143,7 +1143,7 @@ int CyaSSL_Init(void)
if (pkcs8)
return ToTraditional(der->buffer, der->length);
#ifdef OPENSSL_EXTRA
#if defined(OPENSSL_EXTRA) && !defined(NO_PWDBASED)
if (pkcs8Enc) {
int passwordSz;
char password[80];