← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnupg2/natty-security

« back to all changes in this revision

Viewing changes to sm/gpgsm.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Urlichs
  • Date: 2005-12-08 22:13:21 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20051208221321-4rvs2vu835iam5wv
Tags: 1.9.19-2
http://bugs.debian.org/335066
http://bugs.debian.org/312717
http://bugs.debian.org/308516
http://bugs.debian.org/336480
http://bugs.debian.org/299842
http://bugs.debian.org/304355
* Convert debian/changelog to UTF-8.
* Put gnupg-agent and gpgsm lintian overrides in the respectively
  right package.  Closes: #335066
* Added debhelper tokens to maintainer scripts.
* xsession fixes:
  o Added host name to gpg-agent PID file name.  Closes: #312717
  o Fixed xsession script to be able to run under zsh.  Closes: #308516
  o Don't run gpg-agent if one is already running.  Closes: #336480
* debian/control:
  o Fixed package description of gpgsm package.  Closes: #299842
  o Added mention of gpg-agent to description of gnupg-agent package.
    Closes: #304355
* Thanks to Peter Eisentraut <petere@debian.org> for all of the above.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sm/gpgsm.c
99
99
  oDebug,
100
100
  oDebugLevel,
101
101
  oDebugAll,
 
102
  oDebugNone,
102
103
  oDebugWait,
103
104
  oDebugAllowCoreDump,
104
105
  oDebugNoChainValidation,
105
106
  oDebugIgnoreExpiration,
106
107
  oFixedPassphrase,
107
108
  oLogFile,
 
109
  oNoLogFile,
108
110
 
109
111
  oEnableSpecialFilenames,
110
112
 
130
132
 
131
133
  oDisableCRLChecks,
132
134
  oEnableCRLChecks,
 
135
  oDisableTrustedCertCRLCheck,
 
136
  oEnableTrustedCertCRLCheck,
133
137
  oForceCRLRefresh,
134
138
 
135
139
  oDisableOCSP,
285
289
      N_("use system's dirmngr if available")},
286
290
    { oDisableCRLChecks, "disable-crl-checks", 0, N_("never consult a CRL")},
287
291
    { oEnableCRLChecks, "enable-crl-checks", 0, "@"},
 
292
    { oDisableTrustedCertCRLCheck, "disable-trusted-cert-crl-check", 0, "@"},
 
293
    { oEnableTrustedCertCRLCheck, "enable-trusted-cert-crl-check", 0, "@"},
288
294
    { oForceCRLRefresh, "force-crl-refresh", 0, "@"},
289
295
 
290
296
    { oDisableOCSP, "disable-ocsp", 0, "@" },
326
332
    { oQuiet,   "quiet",   0, N_("be somewhat more quiet") },
327
333
    { oNoTTY, "no-tty", 0, N_("don't use the terminal at all") },
328
334
    { oLogFile, "log-file"   ,2, N_("use a log file for the server")},
 
335
    { oNoLogFile, "no-log-file" ,0, "@"},
329
336
#if 0
330
337
    { oForceV3Sigs, "force-v3-sigs", 0, N_("force v3 signatures") },
331
338
    { oForceMDC, "force-mdc", 0, N_("always use a MDC for encryption") },
347
354
    { oDebug, "debug"     ,4|16, "@"},
348
355
    { oDebugLevel, "debug-level" ,2, N_("|LEVEL|set the debugging level to LEVEL")},
349
356
    { oDebugAll, "debug-all" ,0, "@"},
 
357
    { oDebugNone, "debug-none" ,0, "@"},
350
358
    { oDebugWait, "debug-wait" ,1, "@"},
351
359
    { oDebugAllowCoreDump, "debug-allow-core-dump", 0, "@" },
352
360
    { oDebugNoChainValidation, "debug-no-chain-validation", 0, "@"},
973
981
        case oEnableCRLChecks:
974
982
          opt.no_crl_check = 0;
975
983
          break;
 
984
        case oDisableTrustedCertCRLCheck:
 
985
          opt.no_trusted_cert_crl_check = 1;
 
986
          break;
 
987
        case oEnableTrustedCertCRLCheck:
 
988
          opt.no_trusted_cert_crl_check = 0;
 
989
          break;
976
990
        case oForceCRLRefresh:
977
991
          opt.force_crl_refresh = 1;
978
992
          break;
1022
1036
          break;
1023
1037
 
1024
1038
        case oLogFile: logfile = pargs.r.ret_str; break;
1025
 
          
 
1039
        case oNoLogFile: logfile = NULL; break;          
 
1040
 
1026
1041
        case oBatch: 
1027
1042
          opt.batch = 1;
1028
1043
          greeting = 0;
1036
1051
 
1037
1052
        case oDebug: debug_value |= pargs.r.ret_ulong; break;
1038
1053
        case oDebugAll: debug_value = ~0; break;
 
1054
        case oDebugNone: debug_value = 0; break;
1039
1055
        case oDebugLevel: debug_level = pargs.r.ret_str; break;
1040
1056
        case oDebugWait: debug_wait = pargs.r.ret_int; break;
1041
1057
        case oDebugAllowCoreDump:
1352
1368
                GC_OPT_FLAG_NONE );
1353
1369
        printf ("disable-crl-checks:%lu:\n",
1354
1370
                GC_OPT_FLAG_NONE );
 
1371
        printf ("disable-trusted-cert-crl-check:%lu:\n",
 
1372
                GC_OPT_FLAG_NONE );
1355
1373
        printf ("enable-ocsp:%lu:\n",
1356
1374
                GC_OPT_FLAG_NONE );
1357
1375
        printf ("include-certs:%lu:1:\n",
1566
1584
          ksba_cert_t cert = NULL;
1567
1585
          char *grip = NULL;
1568
1586
 
1569
 
          rc = gpgsm_find_cert (*argv, &cert);
 
1587
          rc = gpgsm_find_cert (*argv, NULL, &cert);
1570
1588
          if (rc)
1571
1589
            ;
1572
1590
          else if (!(grip = gpgsm_get_keygrip_hexstring (cert)))