PKCS#5 module added. Moved PBKDF2 functionality inside and deprecated

old PBKDF2 module.
(cherry picked from commit 19bd297dc896410e0d859729f9e8d4b1e107e6c8)

Conflicts:
	include/polarssl/error.h
	scripts/generate_errors.pl
This commit is contained in:
Paul Bakker 2013-06-24 19:26:38 +02:00
parent fc4f46fa9a
commit b0c19a4b3d
14 changed files with 388 additions and 165 deletions

View file

@ -47,7 +47,7 @@ OBJS= aes.o arc4.o asn1parse.o \
md4.o md5.o net.o \
oid.o \
padlock.o pbkdf2.o pem.o \
pkcs11.o pkcs12.o \
pkcs5.o pkcs11.o pkcs12.o \
rsa.o sha1.o sha2.o \
sha4.o ssl_cache.o ssl_cli.o \
ssl_srv.o ssl_ciphersuites.o \