← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/cryptohi/keyhi.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/lib/cryptohi/keyhi.h
35
35
 * the terms of any one of the MPL, the GPL or the LGPL.
36
36
 *
37
37
 * ***** END LICENSE BLOCK ***** */
38
 
/* $Id: keyhi.h,v 1.16 2006/05/31 23:54:51 wtchang%redhat.com Exp $ */
 
38
/* $Id: keyhi.h,v 1.17 2008/06/14 14:20:00 wtc%google.com Exp $ */
39
39
 
40
40
#ifndef _KEYHI_H_
41
41
#define _KEYHI_H_
61
61
** Copy subject-public-key-info "src" to "dst". "dst" is filled in
62
62
** appropriately (memory is allocated for each of the sub objects).
63
63
*/
64
 
extern SECStatus SECKEY_CopySubjectPublicKeyInfo(PRArenaPool *arena,
 
64
extern SECStatus SECKEY_CopySubjectPublicKeyInfo(PLArenaPool *arena,
65
65
                                             CERTSubjectPublicKeyInfo *dst,
66
66
                                             CERTSubjectPublicKeyInfo *src);
67
67
 
222
222
 * returned.  otherwise, SECSuccess is returned.
223
223
 */
224
224
extern SECStatus
225
 
SECKEY_CopyPrivateKeyInfo(PRArenaPool *poolp,
 
225
SECKEY_CopyPrivateKeyInfo(PLArenaPool *poolp,
226
226
                          SECKEYPrivateKeyInfo *to,
227
227
                          SECKEYPrivateKeyInfo *from);
228
228
 
238
238
 * returned.  otherwise, SECSuccess is returned.
239
239
 */
240
240
extern SECStatus
241
 
SECKEY_CopyEncryptedPrivateKeyInfo(PRArenaPool *poolp,
 
241
SECKEY_CopyEncryptedPrivateKeyInfo(PLArenaPool *poolp,
242
242
                                   SECKEYEncryptedPrivateKeyInfo *to,
243
243
                                   SECKEYEncryptedPrivateKeyInfo *from);
244
244
/*