← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnupg/precise

« back to all changes in this revision

Viewing changes to g10/options.h

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2006-12-12 15:56:56 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20061212155656-rlb7g2bxqtu2q2ys
Tags: 1.4.6-1ubuntu1
* Merge from debian unstable, remaining changes:
  - config.h.in: Disable mlock() test since it fails with ulimit 0 (on
    buildds).
  - debian/rules:
    + Do not install gpg as suid root, since that is not necessary with
      kernels 2.6.8+.
    + Make the build fail if the test suite fails.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/options.h
120
120
  int s2k_mode;
121
121
  int s2k_digest_algo;
122
122
  int s2k_cipher_algo;
123
 
  int simple_sk_checksum; /* create the deprecated rfc2440 secret
124
 
                             key protection*/
 
123
  unsigned char s2k_count; /* This is the encoded form, not the raw
 
124
                              count */
 
125
  int simple_sk_checksum; /* create the deprecated rfc2440 secret key
 
126
                             protection */
125
127
  int not_dash_escaped;
126
128
  int escape_from;
127
129
  int lock_once;
237
239
 
238
240
  /* True if multiple concatenated signatures may be verified. */
239
241
  int allow_multisig_verification; 
240
 
 
 
242
  int passwd_repeat;
241
243
} opt;
242
244
 
243
245
/* CTRL is used to keep some global variables we currently can't