idled principals interfaces and some fixes to caps manager...
git-svn-id: svn://10.0.0.236/trunk@39741 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -15,6 +15,6 @@ nsCaps.h
|
||||
nsCapsEnums.h
|
||||
nsCCapsManager.h
|
||||
nsCCapsManagerFactory.h
|
||||
nsCCertPrincipal.h
|
||||
nsCCodebasePrincipal.h
|
||||
nsCertificatePrincipal.h
|
||||
nsCodebasePrincipal.h
|
||||
nsCCodeSourcePrincipal.h
|
||||
|
||||
@@ -23,10 +23,26 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORTS = nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h nsCCapsManagerFactory.h nsCCapsManager.h \
|
||||
nsCCertPrincipal.h \
|
||||
nsCCodebasePrincipal.h \
|
||||
nsCCodeSourcePrincipal.h
|
||||
EXPORTS = nsZip.h \
|
||||
nsZig.h \
|
||||
nsLoadZig.h \
|
||||
nsPrincipal.h \
|
||||
nsPrivilege.h \
|
||||
nsPrivilegeManager.h \
|
||||
nsPrivilegeTable.h \
|
||||
nsSystemPrivilegeTable.h \
|
||||
nsTarget.h \
|
||||
nsUserTarget.h \
|
||||
jpermission.h \
|
||||
nsUserDialogHelper.h \
|
||||
admin.h \
|
||||
nsCaps.h \
|
||||
nsCapsEnums.h \
|
||||
nsCCapsManagerFactory.h \
|
||||
nsCCapsManager.h \
|
||||
nsCertificatePrincipal.h \
|
||||
nsCodebasePrincipal.h \
|
||||
nsCCodeSourcePrincipal.h
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
|
||||
@@ -28,12 +28,26 @@ IGNORE_MANIFEST=1
|
||||
|
||||
MODULE=caps
|
||||
DEPTH=..\..
|
||||
EXPORTS=nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h \
|
||||
nsCCapsManager.h \
|
||||
nsCCertPrincipal.h \
|
||||
nsCCodebasePrincipal.h \
|
||||
nsCCapsManagerFactory.h \
|
||||
nsCCodeSourcePrincipal.h
|
||||
EXPORTS=nsZip.h \
|
||||
nsZig.h \
|
||||
nsLoadZig.h \
|
||||
nsPrincipal.h \
|
||||
nsPrivilege.h \
|
||||
nsPrivilegeManager.h \
|
||||
nsPrivilegeTable.h \
|
||||
nsSystemPrivilegeTable.h \
|
||||
nsTarget.h \
|
||||
nsUserTarget.h \
|
||||
jpermission.h \
|
||||
nsUserDialogHelper.h \
|
||||
admin.h \
|
||||
nsCaps.h \
|
||||
nsCapsEnums.h \
|
||||
nsCCapsManager.h \
|
||||
nsCertificatePrincipal.h \
|
||||
nsCodebasePrincipal.h \
|
||||
nsCCapsManagerFactory.h \
|
||||
nsCCodeSourcePrincipal.h
|
||||
|
||||
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
@@ -18,7 +18,8 @@
|
||||
|
||||
#ifndef nsCCodeSourcePrincipal_h___
|
||||
#define nsCCodeSourcePrincipal_h___
|
||||
|
||||
#include "nsICodebasePrincipal.h"
|
||||
#include "nsICertificatePrincipal.h"
|
||||
#include "nsICodeSourcePrincipal.h"
|
||||
#include "nsPrincipal.h"
|
||||
|
||||
@@ -39,19 +40,6 @@ public:
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsICodeSourcePrincipal:
|
||||
|
||||
/**
|
||||
* returns the certificate's data that is passes in via Initialize method.
|
||||
*
|
||||
* @param certChain - An array of pointers, with each pointer
|
||||
* pointing to a certificate data.
|
||||
* @param certChainLengths - An array of intergers. Each integer indicates
|
||||
* the length of the cert that is in CertChain
|
||||
* parametr.
|
||||
* @param noOfCerts - the number of certifcates that are in the certChain array
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetCertData(const unsigned char ***certChain, PRUint32 **certChainLengths, PRUint32 *noOfCerts);
|
||||
|
||||
/**
|
||||
* Returns the public key of the certificate.
|
||||
*
|
||||
@@ -60,7 +48,7 @@ public:
|
||||
* parameter.
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetPublicKey(unsigned char **publicKey, PRUint32 *publicKeySize);
|
||||
GetPublicKey(char **publicKey, PRUint32 *publicKeySize);
|
||||
|
||||
/**
|
||||
* Returns the company name of the ceritificate (OU etc parameters of certificate)
|
||||
@@ -68,7 +56,7 @@ public:
|
||||
* @param result - the certificate details about the signer.
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetCompanyName(const char **ppCompanyName);
|
||||
GetCompanyName(char **ppCompanyName);
|
||||
|
||||
/**
|
||||
* Returns the certificate issuer's data (OU etc parameters of certificate)
|
||||
@@ -76,7 +64,7 @@ public:
|
||||
* @param result - the details about the issuer
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetCertificateAuthority(const char **ppCertAuthority);
|
||||
GetCertificateAuthority(char **ppCertAuthority);
|
||||
|
||||
/**
|
||||
* Returns the serial number of certificate
|
||||
@@ -84,7 +72,7 @@ public:
|
||||
* @param result - Returns the serial number of certificate
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetSerialNumber(const char **ppSerialNumber);
|
||||
GetSerialNumber(char **ppSerialNumber);
|
||||
|
||||
/**
|
||||
* Returns the expiration date of certificate
|
||||
@@ -92,7 +80,7 @@ public:
|
||||
* @param result - Returns the expiration date of certificate
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetExpirationDate(const char **ppExpDate);
|
||||
GetExpirationDate(char **ppExpDate);
|
||||
|
||||
/**
|
||||
* Returns the finger print of certificate
|
||||
@@ -100,7 +88,7 @@ public:
|
||||
* @param result - Returns the finger print of certificate
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetFingerPrint(const char **ppFingerPrint);
|
||||
GetFingerPrint(char **ppFingerPrint);
|
||||
|
||||
/**
|
||||
* Returns the codebase URL of the principal.
|
||||
@@ -108,17 +96,17 @@ public:
|
||||
* @param result - the resulting codebase URL
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetURL(const char **ppCodeBaseURL);
|
||||
GetURL(char **ppCodeBaseURL);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsCCodeSourcePrincipal:
|
||||
nsCCodeSourcePrincipal(const unsigned char **certChain, PRUint32 *certChainLengths, PRUint32 noOfCerts, const char *codebaseURL, nsresult *result);
|
||||
virtual ~nsCCodeSourcePrincipal(void);
|
||||
nsICertPrincipal *GetCertPrincipal() { return m_pNSICertPrincipal;}
|
||||
nsICertificatePrincipal *GetCertPrincipal() { return m_pNSICertPrincipal;}
|
||||
nsICodebasePrincipal *GetCodebasePrincipal() { return m_pNSICodebasePrincipal; }
|
||||
|
||||
protected:
|
||||
nsICertPrincipal *m_pNSICertPrincipal;
|
||||
nsICertificatePrincipal *m_pNSICertPrincipal;
|
||||
nsICodebasePrincipal *m_pNSICodebasePrincipal;
|
||||
};
|
||||
|
||||
|
||||
@@ -16,20 +16,17 @@
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#ifndef nsCCertPrincipal_h___
|
||||
#define nsCCertPrincipal_h___
|
||||
#ifndef nsCertificatePrincipal_h___
|
||||
#define nsCertificatePrincipal_h___
|
||||
|
||||
#include "nsICertPrincipal.h"
|
||||
#include "nsICertificatePrincipal.h"
|
||||
#include "nsPrincipal.h"
|
||||
|
||||
class nsCCertPrincipal : public nsICertPrincipal {
|
||||
class nsCertificatePrincipal : public nsICertificatePrincipal {
|
||||
public:
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsISupports:
|
||||
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsIPrincipal:
|
||||
|
||||
@@ -37,21 +34,7 @@ public:
|
||||
IsTrusted(const char* scope, PRBool *pbIsTrusted);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsICertPrincipal:
|
||||
|
||||
/**
|
||||
* returns the certificate's data that is passes in via Initialize method.
|
||||
*
|
||||
* @param certChain - An array of pointers, with each pointer
|
||||
* pointing to a certificate data.
|
||||
* @param certChainLengths - An array of intergers. Each integer indicates
|
||||
* the length of the cert that is in CertChain
|
||||
* parametr.
|
||||
* @param noOfCerts - the number of certifcates that are in the certChain array
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetCertData(const unsigned char ***certChain, PRUint32 **certChainLengths, PRUint32 *noOfCerts);
|
||||
|
||||
// from nsICertificatePrincipal:
|
||||
/**
|
||||
* Returns the public key of the certificate.
|
||||
*
|
||||
@@ -60,7 +43,7 @@ public:
|
||||
* parameter.
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetPublicKey(unsigned char **publicKey, PRUint32 *publicKeySize);
|
||||
GetPublicKey(char **publicKey, PRUint32 *publicKeySize);
|
||||
|
||||
/**
|
||||
* Returns the company name of the ceritificate (OU etc parameters of certificate)
|
||||
@@ -68,7 +51,7 @@ public:
|
||||
* @param result - the certificate details about the signer.
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetCompanyName(const char **ppCompanyName);
|
||||
GetCompanyName(char **ppCompanyName);
|
||||
|
||||
/**
|
||||
* Returns the certificate issuer's data (OU etc parameters of certificate)
|
||||
@@ -76,7 +59,7 @@ public:
|
||||
* @param result - the details about the issuer
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetCertificateAuthority(const char **ppCertAuthority);
|
||||
GetCertificateAuthority(char **ppCertAuthority);
|
||||
|
||||
/**
|
||||
* Returns the serial number of certificate
|
||||
@@ -84,7 +67,7 @@ public:
|
||||
* @param result - Returns the serial number of certificate
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetSerialNumber(const char **ppSerialNumber);
|
||||
GetSerialNumber(char **ppSerialNumber);
|
||||
|
||||
/**
|
||||
* Returns the expiration date of certificate
|
||||
@@ -92,7 +75,7 @@ public:
|
||||
* @param result - Returns the expiration date of certificate
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetExpirationDate(const char **ppExpDate);
|
||||
GetExpirationDate(char **ppExpDate);
|
||||
|
||||
/**
|
||||
* Returns the finger print of certificate
|
||||
@@ -100,18 +83,18 @@ public:
|
||||
* @param result - Returns the finger print of certificate
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetFingerPrint(const char **ppFingerPrint);
|
||||
GetFingerPrint(char **ppFingerPrint);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsCCertPrincipal:
|
||||
nsCCertPrincipal(const unsigned char **certChain, PRUint32 *certChainLengths, PRUint32 noOfCerts, nsresult *result);
|
||||
nsCCertPrincipal(nsPrincipal *pNSPrincipal);
|
||||
// from nsCertificatePrincipal:
|
||||
nsCertificatePrincipal(const unsigned char **certChain, PRUint32 *certChainLengths, PRUint32 noOfCerts, nsresult *result);
|
||||
nsCertificatePrincipal(nsPrincipal *pNSPrincipal);
|
||||
|
||||
virtual ~nsCCertPrincipal(void);
|
||||
virtual ~nsCertificatePrincipal(void);
|
||||
nsPrincipal *GetPeer(void);
|
||||
|
||||
protected:
|
||||
nsPrincipal *m_pNSPrincipal;
|
||||
};
|
||||
|
||||
#endif // nsCCertPrincipal_h___
|
||||
#endif // nsCCertificatePrincipal_h___
|
||||
@@ -16,13 +16,13 @@
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#ifndef nsCCodebasePrincipal_h___
|
||||
#define nsCCodebasePrincipal_h___
|
||||
#ifndef nsCodebasePrincipal_h___
|
||||
#define nsCodebasePrincipal_h___
|
||||
|
||||
#include "nsICodebasePrincipal.h"
|
||||
#include "nsPrincipal.h"
|
||||
|
||||
class nsCCodebasePrincipal : public nsICodebasePrincipal {
|
||||
class nsCodebasePrincipal : public nsICodebasePrincipal {
|
||||
public:
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsISupports:
|
||||
@@ -45,15 +45,15 @@ public:
|
||||
* @param result - the resulting codebase URL
|
||||
*/
|
||||
NS_IMETHOD
|
||||
GetURL(const char **ppCodeBaseURL);
|
||||
GetURL(char **ppCodeBaseURL);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// from nsCCodebasePrincipal:
|
||||
|
||||
nsCCodebasePrincipal(const char *codebaseURL, nsresult *result);
|
||||
nsCCodebasePrincipal(nsPrincipal *pNSPrincipal);
|
||||
nsCodebasePrincipal(const char *codebaseURL, nsresult *result);
|
||||
nsCodebasePrincipal(nsPrincipal *pNSPrincipal);
|
||||
|
||||
virtual ~nsCCodebasePrincipal(void);
|
||||
virtual ~nsCodebasePrincipal(void);
|
||||
nsPrincipal *GetPeer(void);
|
||||
|
||||
protected:
|
||||
Reference in New Issue
Block a user