diff options
| -rw-r--r-- | libsylph/account.c | 2 | ||||
| -rw-r--r-- | libsylph/prefs_account.c | 2 | ||||
| -rw-r--r-- | libsylph/prefs_account.h | 2 | ||||
| -rw-r--r-- | libsylph/prefs_common.c | 2 | ||||
| -rw-r--r-- | libsylph/ssl.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libsylph/account.c b/libsylph/account.c index de0d6f0..775e2f4 100644 --- a/libsylph/account.c +++ b/libsylph/account.c | |||
| @@ -84,7 +84,7 @@ void account_read_config_all(void) | |||
| 84 | ac_prefs = prefs_account_new(); | 84 | ac_prefs = prefs_account_new(); |
| 85 | prefs_account_read_config(ac_prefs, (gchar *)cur->data); | 85 | prefs_account_read_config(ac_prefs, (gchar *)cur->data); |
| 86 | #if USE_SSL | 86 | #if USE_SSL |
| 87 | ac_prefs->master_password = master_password; | 87 | ac_prefs->master_password = master_password; |
| 88 | #endif | 88 | #endif |
| 89 | account_list = g_list_append(account_list, ac_prefs); | 89 | account_list = g_list_append(account_list, ac_prefs); |
| 90 | if (ac_prefs->is_default) | 90 | if (ac_prefs->is_default) |
diff --git a/libsylph/prefs_account.c b/libsylph/prefs_account.c index a16ba3d..07605fb 100644 --- a/libsylph/prefs_account.c +++ b/libsylph/prefs_account.c | |||
| @@ -218,7 +218,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label) | |||
| 218 | g_free(rcpath); | 218 | g_free(rcpath); |
| 219 | 219 | ||
| 220 | *ac_prefs = tmp_ac_prefs; | 220 | *ac_prefs = tmp_ac_prefs; |
| 221 | ac_prefs->master_password = NULL; | 221 | ac_prefs->master_password = NULL; |
| 222 | while (*p && !g_ascii_isdigit(*p)) p++; | 222 | while (*p && !g_ascii_isdigit(*p)) p++; |
| 223 | id = atoi(p); | 223 | id = atoi(p); |
| 224 | if (id < 0) g_warning("wrong account id: %d\n", id); | 224 | if (id < 0) g_warning("wrong account id: %d\n", id); |
diff --git a/libsylph/prefs_account.h b/libsylph/prefs_account.h index 5239034..68badd8 100644 --- a/libsylph/prefs_account.h +++ b/libsylph/prefs_account.h | |||
| @@ -188,7 +188,7 @@ struct _PrefsAccount | |||
| 188 | gchar *sig_names[10]; | 188 | gchar *sig_names[10]; |
| 189 | gchar *sig_texts[10]; | 189 | gchar *sig_texts[10]; |
| 190 | 190 | ||
| 191 | gchar *master_password; | 191 | gchar *master_password; |
| 192 | }; | 192 | }; |
| 193 | 193 | ||
| 194 | PrefsAccount *prefs_account_new (void); | 194 | PrefsAccount *prefs_account_new (void); |
diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c index 68f72fa..1f1d3e2 100644 --- a/libsylph/prefs_common.c +++ b/libsylph/prefs_common.c | |||
| @@ -415,7 +415,7 @@ static PrefParam param[] = { | |||
| 415 | #ifdef G_OS_WIN32 | 415 | #ifdef G_OS_WIN32 |
| 416 | {"show_gpg_warning", "FALSE", &prefs_common.gpg_warning, P_BOOL}, | 416 | {"show_gpg_warning", "FALSE", &prefs_common.gpg_warning, P_BOOL}, |
| 417 | #else | 417 | #else |
| 418 | {"show_gpg_warning", "TRUE", &prefs_common.gpg_warning, P_BOOL}, | 418 | {"show_gpg_warning", "TRUE", &prefs_common.gpg_warning, P_BOOL}, |
| 419 | #endif | 419 | #endif |
| 420 | 420 | ||
| 421 | /* Master password */ | 421 | /* Master password */ |
diff --git a/libsylph/ssl.c b/libsylph/ssl.c index 5a76b8b..82b77b4 100644 --- a/libsylph/ssl.c +++ b/libsylph/ssl.c | |||
| @@ -534,7 +534,7 @@ gint encrypt_data(gchar **encrypted, | |||
| 534 | EVP_DigestFinal_ex(mdctx, hash_buffer, NULL); | 534 | EVP_DigestFinal_ex(mdctx, hash_buffer, NULL); |
| 535 | 535 | ||
| 536 | length_cleartext = length_hash + length_data_payload; | 536 | length_cleartext = length_hash + length_data_payload; |
| 537 | 537 | ||
| 538 | cleartext_buffer = OPENSSL_malloc(length_cleartext); | 538 | cleartext_buffer = OPENSSL_malloc(length_cleartext); |
| 539 | OPENSSL_cleanse(cleartext_buffer, length_cleartext); | 539 | OPENSSL_cleanse(cleartext_buffer, length_cleartext); |
| 540 | 540 | ||
