diff options
| author | jbj <devnull@localhost> | 1999-03-21 19:11:29 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1999-03-21 19:11:29 +0000 |
| commit | 2f5f89f2a3a974ce54f4670edc91c2b56e0b2551 (patch) | |
| tree | d793c14f1561b37036ee3670c4dfcb76e4136701 /lib | |
| parent | 89e64b9785efb334ab62dd0f982585a012c9f630 (diff) | |
| download | rpm-2f5f89f2a3a974ce54f4670edc91c2b56e0b2551.tar.gz rpm-2f5f89f2a3a974ce54f4670edc91c2b56e0b2551.tar.bz2 rpm-2f5f89f2a3a974ce54f4670edc91c2b56e0b2551.zip | |
Typos.
CVS patchset: 2907
CVS date: 1999/03/21 19:11:29
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/signature.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/signature.c b/lib/signature.c index ccddc8a5a..2b99b1c17 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -34,7 +34,7 @@ static int verifyPGPSignature(const char *datafile, void *sig, int count, char *result, int sigTag); static int verifyGPGSignature(const char *datafile, void *sig, int count, char *result); -static int checkPassPhrase(const char *passPhrase, const int sigType); +static int checkPassPhrase(const char *passPhrase, const int sigTag); int rpmLookupSignatureType(void) { @@ -61,7 +61,7 @@ int rpmLookupSignatureType(void) /* rpmDetectPGPVersion() returns the absolute path to the "pgp" */ /* executable of the requested version, or NULL when none found. */ -const char * rpmDetectPGPVersion(int sigType) +const char * rpmDetectPGPVersion(int sigTag) { /* Actually this should support having more then one pgp version. */ /* At the moment only one version is possible since we only */ @@ -92,7 +92,7 @@ const char * rpmDetectPGPVersion(int sigType) free(pgpvbin); } - switch (sigType) + switch (sigTag) { case RPMSIGTAG_PGP: if (pgp_version == 26) @@ -268,7 +268,7 @@ static int makePGPSignature(const char *file, void **sig, int_32 *size, /* dosetenv("PGPPASS", passPhrase, 1); */ - if ((path = rpmDetectPGPVersion(sigTag)) != NULL { + if ((path = rpmDetectPGPVersion(sigTag)) != NULL) { switch(sigTag) { case RPMSIGTAG_PGP: execlp(path, "pgp", "+batchmode=on", "+verbose=0", "+armor=off", @@ -442,7 +442,7 @@ int rpmVerifySignature(const char *file, int_32 sigTag, void *sig, int count, } break; case RPMSIGTAG_PGP: - case RPMSIGTAG_PGP%: + case RPMSIGTAG_PGP5: return verifyPGPSignature(file, sig, count, result, sigTag); break; case RPMSIGTAG_GPG: @@ -727,7 +727,7 @@ char *rpmGetPassPhrase(const char *prompt, const int sigTag) return pass; } -static int checkPassPhrase(const char *passPhrase, const int sigType) +static int checkPassPhrase(const char *passPhrase, const int sigTag) { int passPhrasePipe[2]; int pid, status; @@ -751,7 +751,7 @@ static int checkPassPhrase(const char *passPhrase, const int sigType) } dup2(passPhrasePipe[0], 3); - switch (sigType) { + switch (sigTag) { case RPMSIGTAG_GPG: { const char *gpg_path = rpmExpand("%{_gpg_path}", NULL); const char *name = rpmExpand("%{_gpg_name}", NULL); @@ -774,7 +774,7 @@ static int checkPassPhrase(const char *passPhrase, const int sigType) if (pgp_path && *pgp_path != '%') dosetenv("PGPPATH", pgp_path, 1); - if ((path = rpmDetectPGPVersion(sigTag)) != NULL { + if ((path = rpmDetectPGPVersion(sigTag)) != NULL) { switch(sigTag) { case RPMSIGTAG_PGP: execlp(path, "pgp", "+batchmode=on", "+verbose=0", @@ -782,7 +782,7 @@ static int checkPassPhrase(const char *passPhrase, const int sigType) break; case RPMSIGTAG_PGP5: execlp(path,"pgps", "+batchmode=on", "+verbose=0", - name, "-f", file, NULL); + name, "-f", NULL); break; } } |