diff options
| author | relyea%netscape.com <devnull@localhost> | 2000-09-15 21:01:53 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2000-09-15 21:01:53 +0000 |
| commit | 83bc256f456a09a3f6cee7d1088d1395f222058a (patch) | |
| tree | 0133fc56008022022407dcf917e4a227d609e6f5 /security/nss/cmd/certutil | |
| parent | fe20c7886bf98851eee5d85c9bba62b670192cb4 (diff) | |
| download | nss-hg-83bc256f456a09a3f6cee7d1088d1395f222058a.tar.gz | |
Fix merge problems from CVS. This version should now compile and work.
Diffstat (limited to 'security/nss/cmd/certutil')
| -rw-r--r-- | security/nss/cmd/certutil/certutil.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c index 6631a081b..1416a9c06 100644 --- a/security/nss/cmd/certutil/certutil.c +++ b/security/nss/cmd/certutil/certutil.c @@ -1919,7 +1919,6 @@ CreateCert( int serialNumber, int warpmonths, int validitylength, - void *pwarg, PRBool selfsign, PRBool keyUsage, PRBool extKeyUsage, @@ -2586,15 +2585,10 @@ main(int argc, char **argv) /* Create a certificate (-C or -S). */ if (certutil.commands[cmd_CreateAndAddCert].activated || certutil.commands[cmd_CreateNewCert].activated) { - if ( certutil.options[opt_PasswordFile].arg) { - pwdata.source = PW_FROMFILE; - pwdata.data = certutil.options[opt_PasswordFile].arg; - } rv = CreateCert(certHandle, certutil.options[opt_IssuerName].arg, inFile, outFile, privkey, &pwdata, serialNumber, warpmonths, validitylength, - &pwdata, certutil.options[opt_SelfSign].activated, certutil.options[opt_AddKeyUsageExt].activated, certutil.options[opt_AddExtKeyUsageExt].activated, |