fix typos (Josh Soref)
certwatch --keydbprefix argument renamed from --keydbprexix
This commit is contained in:
Joe Orton
parent
a658e0d513
commit
2c2d861055
|
|
@ -86,7 +86,7 @@
|
|||
|
||||
#define GEN_BREAK(e) rv=e; break;
|
||||
|
||||
/* CERT_EncodeSubjectKeyID is a private function decleared in <xconst.h> */
|
||||
/* CERT_EncodeSubjectKeyID is a private function declared in <xconst.h> */
|
||||
|
||||
/* Begin From NSS's xconst.c */
|
||||
static const SEC_ASN1Template CERTSubjectKeyIDTemplate[] = {
|
||||
|
|
|
|||
|
|
@ -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 = "";
|
||||
|
|
|
|||
|
|
@ -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 <jorton@redhat.com> - 2.5-1
|
||||
- fix typos (Josh Soref)
|
||||
- certwatch --keydbprefix argument renamed from --keydbprexix
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-69
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
14
genkey.pl
14
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 = <<EOT;
|
||||
At this stage you can provide the $what acess passphrase.
|
||||
At this stage you can provide the $what access passphrase.
|
||||
EOT
|
||||
$panel = Newt::Panel(1, 3, $what." access");
|
||||
$panel->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 <<EOT;
|
||||
You now need to connect to the VeriSign site and submit your CSR. The
|
||||
page at https://digitalid.verisign.com/server/help/hlpEnrollServer.htm
|
||||
explains how to do this, and what additional documention will be
|
||||
explains how to do this, and what additional documentation will be
|
||||
required before VeriSign can sign your certificate.
|
||||
|
||||
Your CSR is given below. To submit it to VeriSign, go through the
|
||||
|
|
@ -1502,7 +1502,7 @@ EOT
|
|||
print <<EOT;
|
||||
You now need to connect to the Thawte site and submit your CSR. The
|
||||
page at https://www.thawte.com/certs/server/request.html explains how
|
||||
to do this, and what additional documention will be required before
|
||||
to do this, and what additional documentation will be required before
|
||||
Thawte can sign your certificate.
|
||||
|
||||
Your CSR is given below. To submit it to Thawte, go to
|
||||
|
|
@ -1518,7 +1518,7 @@ EOT
|
|||
print <<EOT;
|
||||
You now need to connect to the Equifax site and submit your CSR. The
|
||||
page at http://www.equifaxsecure.com/ebusinessid/c2net/ explains how
|
||||
to do this, and what additional documention will be required before
|
||||
to do this, and what additional documentation will be required before
|
||||
Equifax can sign your certificate.
|
||||
|
||||
Your CSR is given below. To submit it to Equifax, go to
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ Usage(char *progName)
|
|||
{
|
||||
fprintf(stderr, "Usage: %s [options] arguments\n", progName);
|
||||
fprintf(stderr, "{-c|--command} command, one of [genreq|makecert]\n");
|
||||
fprintf(stderr, "{-r|--renew} cert-to-renew the file with the certifificast to renew\n");
|
||||
fprintf(stderr, "{-r|--renew} cert-to-renew the file with the certificates to renew\n");
|
||||
fprintf(stderr, "{-s|--subject} subject subject distinguished name");
|
||||
fprintf(stderr, "{-g|--gsize} key_size size in bitsof the rsa key to generate\n");
|
||||
fprintf(stderr, "{-v|--validity} months cert validity in months");
|
||||
|
|
|
|||
Loading…
Reference in New Issue