From 2c2d86105577aaf3591cc19ca5df6ce85f029903 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 23 Aug 2017 09:14:09 +0100 Subject: [PATCH] fix typos (Josh Soref) certwatch --keydbprefix argument renamed from --keydbprexix --- certext.c | 2 +- certwatch.c | 4 ++-- crypto-utils.spec | 8 ++++++-- genkey.pl | 14 +++++++------- keyutil.c | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/certext.c b/certext.c index 09864e4..6e2bffc 100644 --- a/certext.c +++ b/certext.c @@ -86,7 +86,7 @@ #define GEN_BREAK(e) rv=e; break; -/* CERT_EncodeSubjectKeyID is a private function decleared in */ +/* CERT_EncodeSubjectKeyID is a private function declared in */ /* Begin From NSS's xconst.c */ static const SEC_ASN1Template CERTSubjectKeyIDTemplate[] = { diff --git a/certwatch.c b/certwatch.c index 477e85f..2f37711 100644 --- a/certwatch.c +++ b/certwatch.c @@ -152,7 +152,7 @@ char *pr_ctime(PRTime time, char *buf, int size) /* Computes the day difference among two PRTime's */ static int diff_time_days(PRTime aT, PRTime bT) { - /* Dividing before substracting to support the desired granularity */ + /* Dividing before subtracting to support the desired granularity */ PRInt64 secs = (aT/PR_USEC_PER_SEC - bT/PR_USEC_PER_SEC); return secs / 86400L; } @@ -315,7 +315,7 @@ int main(int argc, char **argv) { "configdir", required_argument, NULL, 'd' }, { "passwordfile", required_argument, NULL, 'w' }, { "certdbprefix", required_argument, NULL, 'c' }, - { "keydbprexix", required_argument, NULL, 'k' }, + { "keydbprefix", required_argument, NULL, 'k' }, { NULL } }; char *certDBPrefix = ""; diff --git a/crypto-utils.spec b/crypto-utils.spec index fca9f2e..739d538 100644 --- a/crypto-utils.spec +++ b/crypto-utils.spec @@ -3,8 +3,8 @@ Summary: SSL certificate and key management utilities Name: crypto-utils -Version: 2.4.1 -Release: 69%{?dist} +Version: 2.5 +Release: 1%{?dist} Group: Applications/System # certwatch.c is GPLv2 # pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+) @@ -136,6 +136,10 @@ chmod -R u+w $RPM_BUILD_ROOT %{perl_vendorarch}/auto/Crypt %changelog +* Wed Aug 23 2017 Joe Orton - 2.5-1 +- fix typos (Josh Soref) +- certwatch --keydbprefix argument renamed from --keydbprexix + * Wed Aug 02 2017 Fedora Release Engineering - 2.4.1-69 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/genkey.pl b/genkey.pl index 4d38f0d..ba2a104 100644 --- a/genkey.pl +++ b/genkey.pl @@ -210,7 +210,7 @@ if (!$nss) { if (!$genreq_mode && keyInDatabase($nssNickname,$modNssDbDir) && !$renew && !$overwrite_key) { Newt::newtWinMessage("Error", "Close", - "You already have a key file for this host in the datatabase:\n\n" . + "You already have a key file for this host in the database:\n\n" . "$modNssDbDir" ." with nickname ". "$nssNickname" . "\n\n" . "This script will not overwrite an existing key.\n" . "You will need to remove or rename the database in order to" . @@ -763,7 +763,7 @@ sub savePassword } # Prompts for a module or key access password. -# The argument indicates wheter the password is to +# The argument indicates whether the password is to # access the nss module access or for access to the key # to be loaded from a pem file into a PEM module token. sub moduleAccesPasswordWindow @@ -772,7 +772,7 @@ sub moduleAccesPasswordWindow # either "module" or "key" my $message = <Add(0, 0, Newt::Textbox(70, 5, 0, $message)); @@ -1399,7 +1399,7 @@ sub renewCert my $tempDbDir = "/tmp/nss.".$$; - # Get a comfirmation + # Get a confirmation my $msg = "You are about to issue a certificate renewal"; my $panel = Newt::Panel(1, 2, "Certificate Renewal"); $panel->Add(0, 0, @@ -1486,7 +1486,7 @@ sub genReqWindow print <