diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2020-01-18 13:08:35 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2020-01-18 13:08:35 -0700 |
| commit | e328ab4a9dd90b53a4ae71cd97b699b1dd13e9a2 (patch) | |
| tree | 87db9679cc4df09495c1d1bf7bf1bc69cacb3844 /pith | |
| parent | 29c656f7929ef43462c7f737a363ceecc16e3f11 (diff) | |
| download | alpine-e328ab4a9dd90b53a4ae71cd97b699b1dd13e9a2.tar.xz | |
* A few more changes in copyright notices and removal of phone-home code that
counts users of Alpine. This eliminates any information sent to the
developers of Alpine by Alpine users. Based on work by Geoffrey Thomas.
Diffstat (limited to 'pith')
| -rw-r--r-- | pith/filter.c | 2 | ||||
| -rw-r--r-- | pith/pine.hlp | 7 | ||||
| -rw-r--r-- | pith/send.c | 49 | ||||
| -rw-r--r-- | pith/send.h | 2 | ||||
| -rw-r--r-- | pith/state.h | 1 |
5 files changed, 6 insertions, 55 deletions
diff --git a/pith/filter.c b/pith/filter.c index 66abe420..fb8e5a89 100644 --- a/pith/filter.c +++ b/pith/filter.c @@ -7590,8 +7590,6 @@ html_element_comment(FILTER_S *f, char *s) HD(f)->bitbucket = 0; else if(!strucmp(s, "running")) HD(f)->bitbucket = 0; - else if(!strucmp(s, "PHONE_HOME") && ps_global->phone_home) - HD(f)->bitbucket = 0; #ifdef _WINDOWS else if(!strucmp(s, "os_windows")) HD(f)->bitbucket = 0; diff --git a/pith/pine.hlp b/pith/pine.hlp index 27dadcf7..8618aeab 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 391 2020-01-18 02:21:08 +Alpine Commit 392 2020-01-18 13:08:29 ============= h_news ================= <HTML> <HEAD> @@ -190,6 +190,11 @@ Based on code provided by Maciej W. Rozycki. <LI> Add /tls1_3 flag for servers that support it. Read more information in the secure protocols <A HREF="h_network_encryption_security">help</A>. +<LI> To increase user's privacy, remove phone-home code that would prompt +users to send an email message upon starting Alpine for the first time for +purposes of counting. Your use of Alpine does not disclose information about +you or your use of Alpine to the developers of Alpine. + <LI> New variable <A HREF="h_config_encryption_range"><!--#echo var="VAR_encryption-protocol-range"--></A> that allows users to configure versions of the SSL/TLS protocol that Alpine is diff --git a/pith/send.c b/pith/send.c index 1be50e14..c5993c67 100644 --- a/pith/send.c +++ b/pith/send.c @@ -210,13 +210,6 @@ static NETDRIVER piped_io = { /* - * Phone home hash controls - */ -#define PH_HASHBITS 24 -#define PH_MAXHASH (1<<(PH_HASHBITS)) - - -/* * postponed_stream - return stream associated with postponed messages * in argument. */ @@ -1673,48 +1666,6 @@ update_answered_flags(REPLY_S *reply) } -/* - * phone_home_from - make phone home request's from address IMpersonal. - * Doesn't include user's personal name. - */ -ADDRESS * -phone_home_from(void) -{ - ADDRESS *addr = mail_newaddr(); - char tmp[64]; - - /* garble up mailbox name */ - snprintf(tmp, sizeof(tmp), "hash_%08u", phone_home_hash(ps_global->VAR_USER_ID)); - tmp[sizeof(tmp)-1] = '\0'; - addr->mailbox = cpystr(tmp); - addr->host = cpystr(ps_global->maildomain); - return(addr); -} - - -/* - * one-way-hash a username into an 8-digit decimal number - * - * Corey Satten, corey@cac.washington.edu, 7/15/98 - */ -unsigned int -phone_home_hash(char *s) -{ - unsigned int h; - - for (h=0; *s; ++s) { - if (h & 1) - h = (h>>1) | (PH_MAXHASH/2); - else - h = (h>>1); - - h = ((h+1) * ((unsigned char) *s)) & (PH_MAXHASH - 1); - } - - return (h); -} - - /*---------------------------------------------------------------------- Call the mailer, SMTP, sendmail or whatever diff --git a/pith/send.h b/pith/send.h index 46b87713..12252826 100644 --- a/pith/send.h +++ b/pith/send.h @@ -225,8 +225,6 @@ METAENV *pine_new_env(ENVELOPE *, char **, char ***, PINEFIELD *); void pine_free_env(METAENV **); int check_addresses(METAENV *); void update_answered_flags(REPLY_S *); -unsigned int phone_home_hash(char *); -ADDRESS *phone_home_from(void); int call_mailer(METAENV *, BODY *, char **, int, void (*)(char *, int), void (*)(PIPE_S *, int, void *)); int write_postponed(METAENV *, BODY *); diff --git a/pith/state.h b/pith/state.h index c5f58407..b74a60c2 100644 --- a/pith/state.h +++ b/pith/state.h @@ -196,7 +196,6 @@ struct pine { unsigned force_no_prefer_plain:1; unsigned painted_body_on_startup:1; - unsigned phone_home:1; unsigned painted_footer_on_startup:1; unsigned open_readonly_on_startup:1; unsigned exit_if_no_pinerc:1; |