Diffstat (limited to 'pwmanager/pwmanager/libgcryptif.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | pwmanager/pwmanager/libgcryptif.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pwmanager/pwmanager/libgcryptif.h b/pwmanager/pwmanager/libgcryptif.h index 1a7b658..9a987a2 100644 --- a/pwmanager/pwmanager/libgcryptif.h +++ b/pwmanager/pwmanager/libgcryptif.h | |||
@@ -73,7 +73,9 @@ public: | |||
73 | size_t inBufLen, | 73 | size_t inBufLen, |
74 | const unsigned char *key, | 74 | const unsigned char *key, |
75 | size_t keylen, | 75 | size_t keylen, |
76 | char _algo); | 76 | char _algo, |
77 | char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase | ||
78 | ); | ||
77 | /** decrypt data. _algo is the PWM_CRYPT_* ID | 79 | /** decrypt data. _algo is the PWM_CRYPT_* ID |
78 | * of the algorithm. | 80 | * of the algorithm. |
79 | */ | 81 | */ |
@@ -83,7 +85,9 @@ public: | |||
83 | size_t inBufLen, | 85 | size_t inBufLen, |
84 | const unsigned char *key, | 86 | const unsigned char *key, |
85 | size_t keylen, | 87 | size_t keylen, |
86 | char _algo); | 88 | char _algo, |
89 | char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase | ||
90 | ); | ||
87 | /** hash data. _algo is the PWM_HASH_* ID of the hash */ | 91 | /** hash data. _algo is the PWM_HASH_* ID of the hash */ |
88 | PwMerror hash(unsigned char **outBuf, | 92 | PwMerror hash(unsigned char **outBuf, |
89 | size_t *outBufLen, | 93 | size_t *outBufLen, |
@@ -124,7 +128,9 @@ protected: | |||
124 | unsigned char *salt, | 128 | unsigned char *salt, |
125 | unsigned char *key, | 129 | unsigned char *key, |
126 | size_t keylen, | 130 | size_t keylen, |
127 | bool create); | 131 | bool create, |
132 | char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase | ||
133 | ); | ||
128 | /** hash a passphrase to a cipher key */ | 134 | /** hash a passphrase to a cipher key */ |
129 | bool doHashPassphrase(DEK *dek, | 135 | bool doHashPassphrase(DEK *dek, |
130 | const unsigned char *pw, | 136 | const unsigned char *pw, |