Skip to content

Commit

Permalink
i18n(mail): improve generic error message for signed/encrypted messages
Browse files Browse the repository at this point in the history
Fixes #5204
  • Loading branch information
cgx committed Nov 26, 2020
1 parent 0d81195 commit e2e5e6f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions UI/MailPartViewers/UIxMailPartEncryptedViewer.m
Expand Up @@ -175,15 +175,15 @@ - (NSData *) _processMessageWith: (NSData *) signedData
ERR_load_crypto_strings();
SSL_load_error_strings();
sslError = ERR_reason_error_string(err);
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain];
#elif OPENSSL_VERSION_NUMBER < 0x10100000L
const char* sslError;
ERR_load_crypto_strings();
SSL_load_error_strings();
sslError = ERR_reason_error_string(err);
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain];
#else
validationMessage = [[self labelForKey: @"No error information available"] retain];
validationMessage = [[self labelForKey: @"Digital signature is not valid"] retain];
#endif /* HAVE_GNUTLS */

BUF_MEM *bptr; //DEL
Expand Down
6 changes: 3 additions & 3 deletions UI/MailPartViewers/UIxMailPartSignedViewer.m
Expand Up @@ -173,15 +173,15 @@ - (void) _processMessage
ERR_load_crypto_strings();
SSL_load_error_strings();
sslError = ERR_reason_error_string(err);
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain];
#elif OPENSSL_VERSION_NUMBER < 0x10100000L
const char* sslError;
ERR_load_crypto_strings();
SSL_load_error_strings();
sslError = ERR_reason_error_string(err);
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain];
#else
validationMessage = [[self labelForKey: @"No error information available"] retain];
validationMessage = [[self labelForKey: @"Digital signature is not valid"] retain];
#endif /* HAVE_GNUTLS */
}
}
Expand Down
2 changes: 1 addition & 1 deletion UI/MailerUI/English.lproj/Localizable.strings
Expand Up @@ -276,7 +276,7 @@
"Message is signed" = "Message is signed";

/* Unknown error while validating message signature */
"No error information available" = "No error information available";
"Digital signature is not valid" = "Digital signature is not valid";

"This Folder" = "This Folder";

Expand Down

0 comments on commit e2e5e6f

Please sign in to comment.