← Back to branch summary

~ubuntu-branches/ubuntu/hardy/nss/hardy-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/cmd/lib/secutil.h

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-08-01 16:57:40 UTC
  • mfrom: (1.1.8 upstream) (7.1.1 hardy-security)
  • Revision ID: james.westby@ubuntu.com-20090801165740-4edm78cga2bcxxub
Tags: 3.12.3.1-0ubuntu0.8.04.1
https://launchpad.net/bugs/407549
https://launchpad.net/bugs/388350
* new upstream release 3.12.3.1 RTM (NSS_3_12_3_1_RTM) (LP: #407549)
  - see USN-810-1
* requires nspr >= 4.7.4
  - update debian/control
* drop (ubuntu-)useless kbsd patch
  - delete debian/patches/38_kbsd.patch
* drop obsolete patches fixed upstream
  - delete debian/patches/80_security_tools.patch
  - delete debian/patches/bz471715_attachment_357235-backport.patch
* adjust patches to new upstream codebase
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/81_sonames.patch
* LP: #388350 - nss 3.12.3-0ubuntu2 ftbfs in karmic - shlibsign crashes; we add
  debian/libnss3-1d/usr/lib/nss to LD_LIBRARY_PATH for the shlibsign invocation
  used to sign libs in debian/rules
  - update debian/rules
* update .symbols files for new upstream api
  - update debian/libnss3-1d.symbols
* bump shlibs version to >= 3.12.3
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/cmd/lib/secutil.h
62
62
#define NS_CRL_HEADER  "-----BEGIN CRL-----"
63
63
#define NS_CRL_TRAILER "-----END CRL-----"
64
64
 
65
 
/* From libsec/pcertdb.c --- it's not declared in sec.h */
66
 
extern SECStatus SEC_AddPermCertificate(CERTCertDBHandle *handle,
67
 
                SECItem *derCert, char *nickname, CERTCertTrust *trust);
68
 
 
69
 
 
70
65
#ifdef SECUTIL_NEW
71
66
typedef int (*SECU_PPFunc)(PRFileDesc *out, SECItem *item, 
72
67
                           char *msg, int level);
291
286
extern SECStatus SECU_PKCS11Init(PRBool readOnly);
292
287
 
293
288
/* Dump contents of signed data */
294
 
extern int SECU_PrintSignedData(FILE *out, SECItem *der, char *m, int level,
295
 
                                SECU_PPFunc inner);
 
289
extern int SECU_PrintSignedData(FILE *out, SECItem *der, const char *m, 
 
290
                                int level, SECU_PPFunc inner);
296
291
 
297
292
/* Print cert data and its trust flags */
298
293
extern SECStatus SEC_PrintCertificateAndTrust(CERTCertificate *cert,
315
310
                                 char *msg, int level);
316
311
 
317
312
extern void SECU_PrintName(FILE *out, CERTName *name, char *msg, int level);
 
313
extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level);
318
314
 
319
315
#ifdef SECU_GetPassword
320
316
/* Convert a High public Key to a Low public Key */
454
450
 
455
451
void printflags(char *trusts, unsigned int flags);
456
452
 
457
 
#ifndef XP_UNIX
 
453
#if !defined(XP_UNIX) && !defined(XP_OS2)
458
454
extern int ffs(unsigned int i);
459
455
#endif
460
456