projects
/
platform
/
upstream
/
cryptsetup.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c040b48
)
Do not include pbkdf2 prototype in header if code is not compiled in.
author
Milan Broz
<gmazyland@gmail.com>
Thu, 10 Jan 2013 15:48:47 +0000
(16:48 +0100)
committer
Milan Broz
<gmazyland@gmail.com>
Thu, 10 Jan 2013 15:48:47 +0000
(16:48 +0100)
lib/crypto_backend/crypto_backend.h
patch
|
blob
|
history
diff --git
a/lib/crypto_backend/crypto_backend.h
b/lib/crypto_backend/crypto_backend.h
index
d6f8677
..
32a5976
100644
(file)
--- a/
lib/crypto_backend/crypto_backend.h
+++ b/
lib/crypto_backend/crypto_backend.h
@@
-67,12
+67,14
@@
int crypt_pbkdf(const char *kdf, const char *hash,
char *key, size_t key_length,
unsigned int iterations);
+#if USE_INTERNAL_PBKDF2
/* internal PBKDF2 implementation */
int pkcs5_pbkdf2(const char *hash,
const char *P, size_t Plen,
const char *S, size_t Slen,
unsigned int c,
unsigned int dkLen,char *DK);
+#endif
/* CRC32 */
uint32_t crypt_crc32(uint32_t seed, const unsigned char *buf, size_t len);