feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add --enable-pwdbased and build, opensslextra needs

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@ -537,6 +537,27 @@ fi
AM_CONDITIONAL([BUILD_DSA], [test "x$ENABLED_DSA" = "xyes"]) AM_CONDITIONAL([BUILD_DSA], [test "x$ENABLED_DSA" = "xyes"])
# PWDBASED
AC_ARG_ENABLE([pwdbased],
[ --enable-pwdbased Enable PWDBASED (default: disabled)],
[ ENABLED_PWDBASED=$enableval ],
[ ENABLED_PWDBASED=no ]
)
if test "$ENABLED_PWDBASED" = "no"
then
if test "$ENABLED_OPENSSLEXTRA" = "yes"
then
# opensslextra needs pwdbased
ENABLED_PWDBASED=yes
else
AM_CFLAGS="$AM_CFLAGS -DNO_PWDBASED"
fi
fi
AM_CONDITIONAL([BUILD_PWDBASED], [test "x$ENABLED_PWDBASED" = "xyes"])
# HC128 # HC128
AC_ARG_ENABLE([hc128], AC_ARG_ENABLE([hc128],
[ --enable-hc128 Enable HC-128 (default: disabled)], [ --enable-hc128 Enable HC-128 (default: disabled)],
@ -924,6 +945,7 @@ echo " * keygen: $ENABLED_KEYGEN"
echo " * certgen: $ENABLED_CERTGEN" echo " * certgen: $ENABLED_CERTGEN"
echo " * HC-128: $ENABLED_HC128" echo " * HC-128: $ENABLED_HC128"
echo " * RABBIT: $ENABLED_RABBIT" echo " * RABBIT: $ENABLED_RABBIT"
echo " * PWDBASED: $ENABLED_PWDBASED"
echo " * MD4: $ENABLED_MD4" echo " * MD4: $ENABLED_MD4"
echo " * DSA: $ENABLED_DSA" echo " * DSA: $ENABLED_DSA"
echo " * PSK: $ENABLED_PSK" echo " * PSK: $ENABLED_PSK"

2
ctaocrypt/src/integer.c
View File

@ -3736,7 +3736,7 @@ int mp_sqrmod (mp_int * a, mp_int * b, mp_int * c)
#endif #endif
#if defined(CYASSL_KEY_GEN) || defined(HAVE_ECC) || !defined(NO_PWDBASED) #if defined(CYASSL_KEY_GEN) || defined(HAVE_ECC) || defined(OPENSSL_EXTRA)
/* single digit addition */ /* single digit addition */
int mp_add_d (mp_int* a, mp_digit b, mp_int* c) int mp_add_d (mp_int* a, mp_digit b, mp_int* c)

2
cyassl/ctaocrypt/integer.h
View File

@ -313,7 +313,7 @@ int mp_init_multi(mp_int* a, mp_int* b, mp_int* c, mp_int* d, mp_int* e,
int mp_lcm (mp_int * a, mp_int * b, mp_int * c); int mp_lcm (mp_int * a, mp_int * b, mp_int * c);
#endif #endif
#if defined(CYASSL_KEY_GEN) || defined(HAVE_ECC) || !defined(NO_PWDBASED) #if defined(CYASSL_KEY_GEN) || defined(HAVE_ECC) || defined(OPENSSL_EXTRA)
int mp_sub_d (mp_int * a, mp_digit b, mp_int * c); int mp_sub_d (mp_int * a, mp_digit b, mp_int * c);
#endif #endif

5
src/include.am
View File

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

2
src/ssl.c
View File

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