← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/pkcs7/pkcs7t.h

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2011-11-30 11:16:39 UTC
  • mfrom: (1.1.16) (2.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20111130111639-5mt2nwo12iyvznhz
Tags: 3.13.1.with.ckbi.1.88-1ubuntu1
https://launchpad.net/bugs/855424
https://launchpad.net/bugs/613477
https://launchpad.net/bugs/315096
* Merge from Debian testing. Remaining changes:
  - Ship the main SO files in an unversioned binary, as we don't have
    versioned SO's in Ubuntu. Maintain a transitional versioned binary
    package containing the versioned symlinks, to maintain compatibility
    with Debian
    * update control, rules
    * mass rename libnss3-1d* => libnss3*
  - Fix postinst-must-call-ldconfig - dh_makeshlibs doesn't seem to add
    the maintainer script hooks with the unversioned SO files, so add
    them manually
    * add libnss3.postinst, libnss3.postrm
  - rules: Add support for mozilla-devscripts.
  - control: Change Vcs-* to XS-Debian-Vcs-*.
* control: Fix typo (LP: #855424)
* Bugs fixed by the merge:
  - Using dh now (LP: #613477)
  - Adds 85_security_load.patch (LP: #315096)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/pkcs7/pkcs7t.h
37
37
/*
38
38
 * Header for pkcs7 types.
39
39
 *
40
 
 * $Id: pkcs7t.h,v 1.6 2008/06/14 14:20:24 wtc%google.com Exp $
 
40
 * $Id: pkcs7t.h,v 1.7 2011/08/21 01:14:17 wtc%google.com Exp $
41
41
 */
42
42
 
43
43
#ifndef _PKCS7T_H_
98
98
typedef struct SEC_PKCS7RecipientInfoStr SEC_PKCS7RecipientInfo;
99
99
typedef struct SEC_PKCS7DigestedDataStr SEC_PKCS7DigestedData;
100
100
typedef struct SEC_PKCS7EncryptedDataStr SEC_PKCS7EncryptedData;
101
 
typedef struct SEC_PKCS7SMIMEKEAParametersStr SEC_PKCS7SMIMEKEAParameters;
102
101
/*
103
102
 * The following is not actually a PKCS7 type, but for now it is only
104
103
 * used by PKCS7, so we have adopted it.  If someone else *ever* needs
223
222
    PRBool encoded;     /* when true, values are encoded */
224
223
};
225
224
 
226
 
/* An enumerated type used to select templates based on the encryption
227
 
   scenario and data specifics. */
228
 
typedef enum
229
 
{
230
 
        SECKEAInvalid = -1,
231
 
        SECKEAUsesSkipjack = 0,
232
 
        SECKEAUsesNonSkipjack = 1,
233
 
        SECKEAUsesNonSkipjackWithPaddedEncKey = 2
234
 
} SECKEATemplateSelector;
235
 
 
236
 
/* ### mwelch - S/MIME KEA parameters. These don't really fit here,
237
 
                but I cannot think of a more appropriate place at this time. */
238
 
struct SEC_PKCS7SMIMEKEAParametersStr {
239
 
        SECItem originatorKEAKey;       /* sender KEA key (encrypted?) */
240
 
        SECItem originatorRA;           /* random number generated by sender */
241
 
        SECItem nonSkipjackIV;          /* init'n vector for SkipjackCBC64
242
 
                                           decryption of KEA key if Skipjack
243
 
                                           is not the bulk algorithm used on
244
 
                                           the message */
245
 
        SECItem bulkKeySize;            /* if Skipjack is not the bulk
246
 
                                           algorithm used on the message,
247
 
                                           and the size of the bulk encryption
248
 
                                           key is not the same as that of
249
 
                                           originatorKEAKey (due to padding
250
 
                                           perhaps), this field will contain
251
 
                                           the real size of the bulk encryption
252
 
                                           key. */
253
 
};
254
 
 
255
225
/*
256
226
 * Type of function passed to SEC_PKCS7Decode or SEC_PKCS7DecoderStart.
257
227
 * If specified, this is where the content bytes (only) will be "sent"