From 88c03b081bc712335ce6df83c044a1903fb2e812 Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Sat, 13 May 2017 17:34:35 +0100 Subject: [PATCH] drop obsolete forget option The rest of the code for this obsolete option was dropped a while ago. --- ncrypt/crypt_gpgme.c | 2 -- ncrypt/pgp.c | 2 -- ncrypt/smime.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index 0bf4b83a7..6f6f822b7 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -4699,12 +4699,10 @@ static int gpgme_send_menu(struct Header *msg, int is_smime) crypt_opportunistic_encrypt(msg); break; - case 'f': /* (f)orget it: kept for backward compatibility. */ case 'c': /* (c)lear */ msg->security &= ~(ENCRYPT | SIGN); break; - case 'F': /* (f)orget it or (c)lear in oppenc mode */ case 'C': msg->security &= ~SIGN; break; diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c index b513f6fcd..b69ab6153 100644 --- a/ncrypt/pgp.c +++ b/ncrypt/pgp.c @@ -1770,12 +1770,10 @@ int pgp_send_menu(struct Header *msg) msg->security |= (ENCRYPT | SIGN); break; - case 'f': /* (f)orget it: kept for backward compatibility. */ case 'c': /* (c)lear */ msg->security &= ~(ENCRYPT | SIGN); break; - case 'F': /* (f)orget it or (c)lear in oppenc mode */ case 'C': msg->security &= ~SIGN; break; diff --git a/ncrypt/smime.c b/ncrypt/smime.c index dcdbb0e68..eeb950b61 100644 --- a/ncrypt/smime.c +++ b/ncrypt/smime.c @@ -2128,12 +2128,10 @@ int smime_send_menu(struct Header *msg) msg->security |= (ENCRYPT | SIGN); break; - case 'f': /* (f)orget it: kept for backward compatibility. */ case 'c': /* (c)lear */ msg->security &= ~(ENCRYPT | SIGN); break; - case 'F': /* (f)orget it or (c)lear in oppenc mode */ case 'C': msg->security &= ~SIGN; break; -- 2.40.0