lkn
/
pcloudcc-lneely
mirror of https://github.com/lneely/pcloudcc-lneely.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcryptofolder missed a rename

This commit is contained in:
Levi Neely 2025-03-01 15:29:06 +01:00
parent c56dcb8315
commit fe309bab20
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pclsync/pcryptofolder.c
View File

@ -96,7 +96,7 @@ typedef struct {
void sha1_hex_null_term(const void *data, size_t len, char *out);
void pcryptofolder_clean_cache() {
void pcryptofolder_cache_clean() {
const char *prefixes[] = {"DKEY", "FKEY", "FLDE", "FLDD", "SEEN"};
pcache_clean_oneof(prefixes, ARRAY_SIZE(prefixes));
}
@ -686,7 +686,7 @@ int pcryptofolder_lock() {
crypto_privkey = PSYNC_INVALID_RSA;
pthread_rwlock_unlock(&crypto_lock);
debug(D_NOTICE, "stopped crypto");
pcryptofolder_clean_cache();
pcryptofolder_cache_clean();
psync_fs_refresh_crypto_folders();
return PSYNC_CRYPTO_STOP_SUCCESS;
}

2
pclsync/pcryptofolder.h
View File

@ -50,10 +50,10 @@
#define PSYNC_CRYPTO_FAILED_SECTOR_ENCODER \
((psync_crypto_aes256_sector_encoder_decoder_t)(PSYNC_CRYPTO_MAX_ERROR + 3))
void pcryptofolder_cache_clean();
void pcryptofolder_cache_cleanf();
int pcryptofolder_change_pass(const char *oldpassphrase, const char *newpassphrase, uint32_t flags, char **privenc, char **sign);
int pcryptofolder_change_pass_unlocked(const char *newpassphrase, uint32_t flags, char **privenc, char **sign);
void pcryptofolder_clean_cache();
psync_crypto_aes256_sector_encoder_decoder_t pcryptofolder_filencoder_from_binresult(psync_fileid_t fileid, binresult *res);
psync_crypto_aes256_sector_encoder_decoder_t pcryptofolder_filencoder_get(psync_fsfileid_t fileid, uint64_t hash, int nonetwork);
char *pcryptofolder_filencoder_key_get(psync_fsfileid_t fileid, uint64_t hash, size_t *keylen);

4
pclsync/pmemlock.c
View File

@ -123,7 +123,7 @@ retry:
tryn++;
pthread_mutex_unlock(&page_mutex);
debug(D_NOTICE, "mlock failed, trying to clean cache");
pcryptofolder_clean_cache();
pcryptofolder_cache_clean();
goto retry;
} else {
debug(D_WARNING, "mlock for page %lx failed even after cache clean",
@ -248,7 +248,7 @@ void *pmemlock_malloc(size_t size) {
bestsize = ~((size_t)0);
brange = NULL;
boffset = 0; // just to make compilers happy
// psync_mem_lock may call pcryptofolder_clean_cache(), which in turn can
// psync_mem_lock may call pcryptofolder_cache_clean(), which in turn can
// call pmemlock_free() on few pointers, therefore allocator_mutex is
// recursive
pthread_mutex_lock(&allocator_mutex);

2
pclsync/psynclib.c
View File

@ -3238,7 +3238,7 @@ void psync_delete_cached_crypto_keys() {
"'crypto_private_salt', 'crypto_private_sha1', 'crypto_public_sha1')");
if (psync_sql_affected_rows()) {
debug(D_NOTICE, "deleted cached crypto keys");
pcryptofolder_clean_cache();
pcryptofolder_cache_clean();
}
psync_sql_statement("DELETE FROM cryptofolderkey");
psync_sql_statement("DELETE FROM cryptofilekey");