From 587d04c22289dd5454591124f4ce6b27a7716034 Mon Sep 17 00:00:00 2001 From: "arielb%netscape.com" Date: Fri, 16 Jul 1999 20:31:18 +0000 Subject: [PATCH] idled principals interfaces and some fixes to caps manager... --- caps/idl/MANIFEST | 6 + caps/idl/Makefile.in | 3 + caps/idl/makefile.win | 5 +- caps/idl/nsICertificatePrincipal.idl | 30 +++++ .../nsICodeSourcePrincipal.idl} | 36 ++---- caps/idl/nsICodebasePrincipal.idl | 23 ++++ caps/idl/nsIPrincipal.idl | 2 +- caps/include/MANIFEST | 4 +- caps/include/Makefile.in | 24 +++- caps/include/makefile.win | 26 ++++- caps/include/nsCCodeSourcePrincipal.h | 34 ++---- ...rtPrincipal.h => nsCertificatePrincipal.h} | 49 +++----- ...ebasePrincipal.h => nsCodebasePrincipal.h} | 14 +-- caps/macbuild/Caps.mcp | Bin 116029 -> 117153 bytes caps/macbuild/CapsIDL.mcp | Bin 54017 -> 54017 bytes caps/public/MANIFEST | 3 - caps/public/Makefile.in | 3 - caps/public/makefile.win | 3 - caps/public/nsICertPrincipal.h | 103 ---------------- caps/public/nsICodeSourcePrincipal.h | 110 ------------------ caps/src/Makefile.in | 4 +- caps/src/makefile.win | 4 +- caps/src/nsCCapsManager.cpp | 44 +++---- caps/src/nsCCodeSourcePrincipal.cpp | 59 +++------- ...incipal.cpp => nsCertificatePrincipal.cpp} | 79 ++++--------- ...ePrincipal.cpp => nsCodebasePrincipal.cpp} | 24 ++-- 26 files changed, 229 insertions(+), 463 deletions(-) create mode 100644 caps/idl/MANIFEST create mode 100644 caps/idl/nsICertificatePrincipal.idl rename caps/{public/nsICodebasePrincipal.h => idl/nsICodeSourcePrincipal.idl} (51%) create mode 100644 caps/idl/nsICodebasePrincipal.idl rename caps/include/{nsCCertPrincipal.h => nsCertificatePrincipal.h} (63%) rename caps/include/{nsCCodebasePrincipal.h => nsCodebasePrincipal.h} (83%) delete mode 100644 caps/public/nsICertPrincipal.h delete mode 100644 caps/public/nsICodeSourcePrincipal.h rename caps/src/{nsCCertPrincipal.cpp => nsCertificatePrincipal.cpp} (66%) rename caps/src/{nsCCodebasePrincipal.cpp => nsCodebasePrincipal.cpp} (77%) diff --git a/caps/idl/MANIFEST b/caps/idl/MANIFEST new file mode 100644 index 000000000000..29cdacc6a731 --- /dev/null +++ b/caps/idl/MANIFEST @@ -0,0 +1,6 @@ +nsIPrincipal.idl +nsICodebasePrincipal.idl +nsICertificatePrincipal.idl +nsICodeSourcePrincipal.idl +nsIScriptSecurityManager.idl +nsICapsSecurityCallbacks.idl \ No newline at end of file diff --git a/caps/idl/Makefile.in b/caps/idl/Makefile.in index 681f27aff4a2..a6556d72e201 100644 --- a/caps/idl/Makefile.in +++ b/caps/idl/Makefile.in @@ -28,6 +28,9 @@ XPIDLSRCS = \ nsIScriptSecurityManager.idl \ nsICapsSecurityCallbacks.idl \ nsIPrincipal.idl \ + nsICodebasePrincipal.idl \ + nsICertificatePrincipal.idl \ + nsICodeSourcePrincipal.idl \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/caps/idl/makefile.win b/caps/idl/makefile.win index 9f76126548dc..8a898912186d 100644 --- a/caps/idl/makefile.win +++ b/caps/idl/makefile.win @@ -23,8 +23,9 @@ XPIDLSRCS= \ .\nsIScriptSecurityManager.idl \ .\nsICapsSecurityCallbacks.idl \ .\nsIPrincipal.idl \ -# .\nsICertificatePrincipal.idl \ -# .\nsICodebasePrincipal.idl \ + .\nsICertificatePrincipal.idl \ + .\nsICodebasePrincipal.idl \ + .\nsICodeSourcePrincipal.idl \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/caps/idl/nsICertificatePrincipal.idl b/caps/idl/nsICertificatePrincipal.idl new file mode 100644 index 000000000000..c25a9f1c4376 --- /dev/null +++ b/caps/idl/nsICertificatePrincipal.idl @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1999 Netscape Communications Corporation. All Rights + * Reserved. + */ +#include "nsIPrincipal.idl" + +[uuid(ebfefcd0-25e1-11d2-8160-006008119d7a)] +interface nsICertificatePrincipal : nsIPrincipal { +void GetPublicKey(out string publicKey, out unsigned long publicKeySize); +void GetCompanyName(out string ppCompanyName); +void GetCertificateAuthority(out string ppCertAuthority); +void GetSerialNumber(out string ppSerialNumber); +void GetExpirationDate(out string ppExpDate); +void GetFingerPrint(out string ppFingerPrint); + +}; + diff --git a/caps/public/nsICodebasePrincipal.h b/caps/idl/nsICodeSourcePrincipal.idl similarity index 51% rename from caps/public/nsICodebasePrincipal.h rename to caps/idl/nsICodeSourcePrincipal.idl index 4750b9beffd8..82e416ddf2be 100644 --- a/caps/public/nsICodebasePrincipal.h +++ b/caps/idl/nsICodeSourcePrincipal.idl @@ -16,30 +16,14 @@ * Reserved. */ -#ifndef nsICodebasePrincipal_h___ -#define nsICodebasePrincipal_h___ - -#include "nsIPrincipal.h" - -class nsICodebasePrincipal : public nsIPrincipal { -public: - - /** - * Returns the codebase URL of the principal. - * - * @param result - the resulting codebase URL - */ - NS_IMETHOD - GetURL(const char **ppCodeBaseURL) = 0; - +#include "nsIPrincipal.idl" +[uuid(68cb0890-436a-11d2-b940-00805f52351a)] +interface nsICodeSourcePrincipal : nsIPrincipal { +void GetPublicKey(out string publicKey, out unsigned long publicKeySize); +void GetCompanyName(out string ppCompanyName); +void GetCertificateAuthority(out string ppCertAuthority); +void GetSerialNumber(out string ppSerialNumber); +void GetExpirationDate(out string ppExpDate); +void GetFingerPrint(out string ppFingerPrint); +void GetURL(out string ppCodeBaseURL); }; - -#define NS_ICODEBASEPRINCIPAL_IID \ -{ /* c29fe440-25e1-11d2-8160-006008119d7a */ \ - 0xc29fe440, \ - 0x25e1, \ - 0x11d2, \ - {0x81, 0x60, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - -#endif // nsICodebasePrincipal_h___ diff --git a/caps/idl/nsICodebasePrincipal.idl b/caps/idl/nsICodebasePrincipal.idl new file mode 100644 index 000000000000..d6e87a50edec --- /dev/null +++ b/caps/idl/nsICodebasePrincipal.idl @@ -0,0 +1,23 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1999 Netscape Communications Corporation. All Rights + * Reserved. + */ + +#include "nsIPrincipal.idl" +[uuid(c29fe440-25e1-11d2-8160-006008119d7a)] +interface nsICodebasePrincipal : nsIPrincipal { +void GetURL(out string ppCodeBaseURL); +}; diff --git a/caps/idl/nsIPrincipal.idl b/caps/idl/nsIPrincipal.idl index 0056caf7e419..248ba799c34b 100644 --- a/caps/idl/nsIPrincipal.idl +++ b/caps/idl/nsIPrincipal.idl @@ -19,6 +19,6 @@ #include "nsISupports.idl" [uuid(ff9313d0-25e1-11d2-8160-006008119d7a)] interface nsIPrincipal : nsISupports { -void IsTrusted(in string scope, out boolean pbIsTrusted); +void IsTrusted([const] in string scope, out boolean pbIsTrusted); }; diff --git a/caps/include/MANIFEST b/caps/include/MANIFEST index 40392e7f30e6..2925333dab52 100644 --- a/caps/include/MANIFEST +++ b/caps/include/MANIFEST @@ -15,6 +15,6 @@ nsCaps.h nsCapsEnums.h nsCCapsManager.h nsCCapsManagerFactory.h -nsCCertPrincipal.h -nsCCodebasePrincipal.h +nsCertificatePrincipal.h +nsCodebasePrincipal.h nsCCodeSourcePrincipal.h diff --git a/caps/include/Makefile.in b/caps/include/Makefile.in index 63bf0696f133..b1459617c25a 100644 --- a/caps/include/Makefile.in +++ b/caps/include/Makefile.in @@ -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)) diff --git a/caps/include/makefile.win b/caps/include/makefile.win index eec456b132cc..5c526fbe50c2 100755 --- a/caps/include/makefile.win +++ b/caps/include/makefile.win @@ -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> diff --git a/caps/include/nsCCodeSourcePrincipal.h b/caps/include/nsCCodeSourcePrincipal.h index 4331a1aacf42..5ab06bcb9e09 100644 --- a/caps/include/nsCCodeSourcePrincipal.h +++ b/caps/include/nsCCodeSourcePrincipal.h @@ -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; }; diff --git a/caps/include/nsCCertPrincipal.h b/caps/include/nsCertificatePrincipal.h similarity index 63% rename from caps/include/nsCCertPrincipal.h rename to caps/include/nsCertificatePrincipal.h index 0d7dc5a14a61..a549f6d30cde 100644 --- a/caps/include/nsCCertPrincipal.h +++ b/caps/include/nsCertificatePrincipal.h @@ -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___ diff --git a/caps/include/nsCCodebasePrincipal.h b/caps/include/nsCodebasePrincipal.h similarity index 83% rename from caps/include/nsCCodebasePrincipal.h rename to caps/include/nsCodebasePrincipal.h index fbfb885456d8..ff2ffed28d57 100644 --- a/caps/include/nsCCodebasePrincipal.h +++ b/caps/include/nsCodebasePrincipal.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: diff --git a/caps/macbuild/Caps.mcp b/caps/macbuild/Caps.mcp index 8df779f69f5ec417745b4e704447059354a98159..d7f58d6d4c62dcb3315355843dc74037ec8ebe9d 100644 GIT binary patch delta 1782 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 delta 385 zcmZo%#@x7!c|#S)M0dlGx}ftU%z1`2`Yn1Bo* zX5JjanZ!8xtB}gXfB-=mkS?I&76t|uAd^96qNC{Kf}^aHt=$C}nJ4@4h|4hluSbI* zg+Kr_eDVh&&4~fNJV0|9ftU$o{^Z#l5tErYH70rp2uTB#DFEe)p~g!yOfF~_nXD8b zzxe~t9mdTv{E19JXKbz&oWaHla;41V#-j?G6E^j-Y(6fdZ_2azejo#b?n|Hy(6WPp z5|jT4Ndu)fGH=$fyvw-xaCj^e`{w&*|NnoN-mJ*~n{l#Ij2K9OfkD!H^TQdpnKu8c zyCJ#xQ^hSG6!W`SCRd;O%E+_1@U##!8@E5uc!$ZI=c42|U4Tr1+>(M!APw{m4Dj#+ LSv-pw&$9pkWisCodebase()) { - pNSIPrincipal = (nsIPrincipal*)new nsCCodebasePrincipal(pNSPrincipal); + pNSIPrincipal = (nsIPrincipal*)new nsCodebasePrincipal(pNSPrincipal); } else { - pNSIPrincipal = (nsIPrincipal*)new nsCCertPrincipal(pNSPrincipal); + pNSIPrincipal = (nsIPrincipal*)new nsCertificatePrincipal(pNSPrincipal); } *ret_val = pNSIPrincipal; return NS_OK; @@ -642,9 +642,9 @@ nsCCapsManager::GetPrincipalArrayElement(void *prinArrayArg, PRUint32 index, nsI nsIPrincipal* pNSIPrincipal; nsPrincipal *pNSPrincipal = (nsPrincipal *)nsCapsGetPrincipalArrayElement(prinArrayArg, index); if (pNSPrincipal->isCodebase()) { - pNSIPrincipal = (nsIPrincipal*)new nsCCodebasePrincipal(pNSPrincipal); + pNSIPrincipal = (nsIPrincipal*)new nsCodebasePrincipal(pNSPrincipal); } else { - pNSIPrincipal = (nsIPrincipal*)new nsCCertPrincipal(pNSPrincipal); + pNSIPrincipal = (nsIPrincipal*)new nsCertificatePrincipal(pNSPrincipal); } *ret_val = pNSIPrincipal; return NS_OK; @@ -729,9 +729,9 @@ nsCCapsManager::CreateNSPrincipalArray(nsPrincipalArray* prinArray, for (PRUint32 index = 0; index < count; index++) { pNSPrincipal = (nsPrincipal *)prinArray->Get(index); if (pNSPrincipal->isCodebase()) { - pNSIPrincipal = (nsIPrincipal*)new nsCCodebasePrincipal(pNSPrincipal); + pNSIPrincipal = (nsIPrincipal*)new nsCodebasePrincipal(pNSPrincipal); } else { - pNSIPrincipal = (nsIPrincipal*)new nsCCertPrincipal(pNSPrincipal); + pNSIPrincipal = (nsIPrincipal*)new nsCertificatePrincipal(pNSPrincipal); } newPrinArray->Set(index, pNSIPrincipal); } @@ -779,7 +779,7 @@ nsCCapsManager::GetNSPrincipal(nsIPrincipal* pNSIPrincipal, return NS_ERROR_NULL_POINTER; } - NS_DEFINE_IID(kICertPrincipalIID, NS_ICERTPRINCIPAL_IID); + NS_DEFINE_IID(kICertificatePrincipalIID, NS_ICERTIFICATEPRINCIPAL_IID); NS_DEFINE_IID(kICodebasePrincipalIID, NS_ICODEBASEPRINCIPAL_IID); NS_DEFINE_IID(kICodeSourcePrincipalIID, NS_ICODESOURCEPRINCIPAL_IID); @@ -787,7 +787,7 @@ nsCCapsManager::GetNSPrincipal(nsIPrincipal* pNSIPrincipal, (void**)&pNSISupports) == NS_OK) { nsCCodeSourcePrincipal *pNSCCodeSourcePrincipal = (nsCCodeSourcePrincipal *)pNSIPrincipal; - nsICertPrincipal *pNSICertPrincipal = pNSCCodeSourcePrincipal->GetCertPrincipal(); + nsICertificatePrincipal *pNSICertPrincipal = pNSCCodeSourcePrincipal->GetCertPrincipal(); nsICodebasePrincipal *pNSICodebasePrincipal = pNSCCodeSourcePrincipal->GetCodebasePrincipal(); PRBool bIsTrusted = PR_FALSE; if(pNSICertPrincipal != NULL ) @@ -796,14 +796,14 @@ nsCCapsManager::GetNSPrincipal(nsIPrincipal* pNSIPrincipal, } if (bIsTrusted) { - nsCCertPrincipal *pNSCCertPrincipal = (nsCCertPrincipal *)pNSICertPrincipal; + nsCertificatePrincipal *pNSCCertPrincipal = (nsCertificatePrincipal *)pNSICertPrincipal; pNSPrincipal = pNSCCertPrincipal->GetPeer(); pNSCCertPrincipal->Release(); } else if(pNSICodebasePrincipal != NULL ) { - nsCCodebasePrincipal *pNSCCodebasePrincipal = (nsCCodebasePrincipal *)pNSICodebasePrincipal; + nsCodebasePrincipal *pNSCCodebasePrincipal = (nsCodebasePrincipal *)pNSICodebasePrincipal; pNSPrincipal = pNSCCodebasePrincipal->GetPeer(); pNSCCodebasePrincipal->Release(); } @@ -813,10 +813,10 @@ nsCCapsManager::GetNSPrincipal(nsIPrincipal* pNSIPrincipal, } } else - if (pNSIPrincipal->QueryInterface(kICertPrincipalIID, + if (pNSIPrincipal->QueryInterface(kICertificatePrincipalIID, (void**)&pNSISupports) == NS_OK) { - nsCCertPrincipal *pNSCCertPrincipal = (nsCCertPrincipal *)pNSIPrincipal; + nsCertificatePrincipal *pNSCCertPrincipal = (nsCertificatePrincipal *)pNSIPrincipal; pNSPrincipal = pNSCCertPrincipal->GetPeer(); pNSCCertPrincipal->Release(); } @@ -824,8 +824,8 @@ nsCCapsManager::GetNSPrincipal(nsIPrincipal* pNSIPrincipal, if (pNSIPrincipal->QueryInterface(kICodebasePrincipalIID, (void**)&pNSISupports) == NS_OK) { - nsCCodebasePrincipal *pNSCCodebasePrincipal = - (nsCCodebasePrincipal *)pNSIPrincipal; + nsCodebasePrincipal *pNSCCodebasePrincipal = + (nsCodebasePrincipal *)pNSIPrincipal; pNSPrincipal = pNSCCodebasePrincipal->GetPeer(); pNSCCodebasePrincipal->Release(); } diff --git a/caps/src/nsCCodeSourcePrincipal.cpp b/caps/src/nsCCodeSourcePrincipal.cpp index 7b3c36d8b8ac..082007df9e79 100644 --- a/caps/src/nsCCodeSourcePrincipal.cpp +++ b/caps/src/nsCCodeSourcePrincipal.cpp @@ -17,8 +17,8 @@ */ #include "nsCCodeSourcePrincipal.h" -#include "nsCCodebasePrincipal.h" -#include "nsCCertPrincipal.h" +#include "nsCodebasePrincipal.h" +#include "nsCertificatePrincipal.h" #include "nsPrincipal.h" NS_DEFINE_IID(kICodeSourcePrincipalIID, NS_ICODESOURCEPRINCIPAL_IID); @@ -29,9 +29,7 @@ NS_DEFINE_IID(kICodeSourcePrincipalIID, NS_ICODESOURCEPRINCIPAL_IID); // These macros produce simple version of QueryInterface and AddRef. // See the nsISupports.h header file for DETAILS. -NS_IMPL_ADDREF(nsCCodeSourcePrincipal) -NS_IMPL_RELEASE(nsCCodeSourcePrincipal) -NS_IMPL_QUERY_INTERFACE(nsCCodeSourcePrincipal, kICodeSourcePrincipalIID); +NS_IMPL_ISUPPORTS(nsCCodeSourcePrincipal,kICodeSourcePrincipalIID); //////////////////////////////////////////////////////////////////////////// // from nsIPrincipal: @@ -57,28 +55,6 @@ nsCCodeSourcePrincipal::IsTrusted(const char* scope, PRBool *pbIsTrusted) //////////////////////////////////////////////////////////////////////////// // from nsICodeSourcePrincipal: -/** - * returns the certificate's data that is passes in via Initialize method. - * - * @param certByteData - The ceritificate's byte array data including the chain. - * @param certByteDataSize - the length of certificate byte array. - */ -NS_METHOD -nsCCodeSourcePrincipal::GetCertData(const unsigned char ***certChain, - PRUint32 **certChainLengths, - PRUint32 *noOfCerts) -{ - *certChain = NULL; - *certChainLengths = 0; - *noOfCerts = 0; - if(m_pNSICertPrincipal == NULL) - { - return NS_ERROR_ILLEGAL_VALUE; - } - /* XXX: Raman fix it. Return the correct data */ - return NS_OK; -} - /** * Returns the public key of the certificate. * @@ -87,7 +63,7 @@ nsCCodeSourcePrincipal::GetCertData(const unsigned char ***certChain, * parameter. */ NS_METHOD -nsCCodeSourcePrincipal::GetPublicKey(unsigned char **publicKey, +nsCCodeSourcePrincipal::GetPublicKey(char **publicKey, PRUint32 *publicKeySize) { if(m_pNSICertPrincipal == NULL) @@ -105,7 +81,7 @@ nsCCodeSourcePrincipal::GetPublicKey(unsigned char **publicKey, * @param result - the certificate details about the signer. */ NS_METHOD -nsCCodeSourcePrincipal::GetCompanyName(const char **ppCompanyName) +nsCCodeSourcePrincipal::GetCompanyName(char **ppCompanyName) { if(m_pNSICertPrincipal == NULL) { @@ -121,7 +97,7 @@ nsCCodeSourcePrincipal::GetCompanyName(const char **ppCompanyName) * @param result - the details about the issuer */ NS_METHOD -nsCCodeSourcePrincipal::GetCertificateAuthority(const char **ppCertAuthority) +nsCCodeSourcePrincipal::GetCertificateAuthority(char **ppCertAuthority) { if(m_pNSICertPrincipal == NULL) { @@ -137,7 +113,7 @@ nsCCodeSourcePrincipal::GetCertificateAuthority(const char **ppCertAuthority) * @param result - Returns the serial number of certificate */ NS_METHOD -nsCCodeSourcePrincipal::GetSerialNumber(const char **ppSerialNumber) +nsCCodeSourcePrincipal::GetSerialNumber(char **ppSerialNumber) { if(m_pNSICertPrincipal == NULL) { @@ -153,7 +129,7 @@ nsCCodeSourcePrincipal::GetSerialNumber(const char **ppSerialNumber) * @param result - Returns the expiration date of certificate */ NS_METHOD -nsCCodeSourcePrincipal::GetExpirationDate(const char **ppExpDate) +nsCCodeSourcePrincipal::GetExpirationDate(char **ppExpDate) { if(m_pNSICertPrincipal == NULL) { @@ -169,7 +145,7 @@ nsCCodeSourcePrincipal::GetExpirationDate(const char **ppExpDate) * @param result - Returns the finger print of certificate */ NS_METHOD -nsCCodeSourcePrincipal::GetFingerPrint(const char **ppFingerPrint) +nsCCodeSourcePrincipal::GetFingerPrint(char **ppFingerPrint) { if(m_pNSICertPrincipal == NULL) { @@ -186,7 +162,7 @@ nsCCodeSourcePrincipal::GetFingerPrint(const char **ppFingerPrint) * @param result - the resulting codebase URL */ NS_METHOD -nsCCodeSourcePrincipal::GetURL(const char **ppCodeBaseURL) +nsCCodeSourcePrincipal::GetURL(char **ppCodeBaseURL) { if(m_pNSICodebasePrincipal == NULL) { @@ -207,18 +183,18 @@ nsCCodeSourcePrincipal::nsCCodeSourcePrincipal(const unsigned char **certChain, nsresult *result) { *result = NS_OK; - nsCCertPrincipal *pNSCCertPrincipal = - new nsCCertPrincipal(certChain, certChainLengths, noOfCerts, result); + nsCertificatePrincipal *pNSCCertPrincipal = + new nsCertificatePrincipal(certChain, certChainLengths, noOfCerts, result); if (pNSCCertPrincipal == NULL) { return; } - m_pNSICertPrincipal = (nsICertPrincipal *)pNSCCertPrincipal; + m_pNSICertPrincipal = (nsICertificatePrincipal *)pNSCCertPrincipal; m_pNSICertPrincipal->AddRef(); - nsCCodebasePrincipal *pNSCCodebasePrincipal = - new nsCCodebasePrincipal(codebaseURL, result); + nsCodebasePrincipal *pNSCCodebasePrincipal = + new nsCodebasePrincipal(codebaseURL, result); if (pNSCCodebasePrincipal == NULL) { return; @@ -232,7 +208,4 @@ nsCCodeSourcePrincipal::~nsCCodeSourcePrincipal(void) { m_pNSICertPrincipal->Release(); m_pNSICodebasePrincipal->Release(); -} - - - +} \ No newline at end of file diff --git a/caps/src/nsCCertPrincipal.cpp b/caps/src/nsCertificatePrincipal.cpp similarity index 66% rename from caps/src/nsCCertPrincipal.cpp rename to caps/src/nsCertificatePrincipal.cpp index 11729c4fea7b..55c0c0259e60 100644 --- a/caps/src/nsCCertPrincipal.cpp +++ b/caps/src/nsCertificatePrincipal.cpp @@ -16,10 +16,10 @@ * Reserved. */ -#include "nsCCertPrincipal.h" +#include "nsCertificatePrincipal.h" #include "nsPrincipal.h" -NS_DEFINE_IID(kICertPrincipalIID, NS_ICERTPRINCIPAL_IID); +static NS_DEFINE_IID(kICertificatePrincipalIID, NS_ICERTIFICATEPRINCIPAL_IID); //////////////////////////////////////////////////////////////////////////// // from nsISupports: @@ -27,15 +27,13 @@ NS_DEFINE_IID(kICertPrincipalIID, NS_ICERTPRINCIPAL_IID); // These macros produce simple version of QueryInterface and AddRef. // See the nsISupports.h header file for DETAILS. -NS_IMPL_ADDREF(nsCCertPrincipal) -NS_IMPL_RELEASE(nsCCertPrincipal) -NS_IMPL_QUERY_INTERFACE(nsCCertPrincipal, kICertPrincipalIID); +NS_IMPL_ISUPPORTS(nsCertificatePrincipal,kICertificatePrincipalIID); //////////////////////////////////////////////////////////////////////////// // from nsIPrincipal: -NS_METHOD -nsCCertPrincipal::IsTrusted(const char* scope, PRBool *pbIsTrusted) +NS_IMETHODIMP +nsCertificatePrincipal::IsTrusted(const char* scope, PRBool *pbIsTrusted) { if(m_pNSPrincipal == NULL) { @@ -47,34 +45,7 @@ nsCCertPrincipal::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_METHOD -nsCCertPrincipal::GetCertData(const unsigned char ***certChain, - PRUint32 **certChainLengths, - PRUint32 *noOfCerts) -{ - *certChain = NULL; - *certChainLengths = 0; - *noOfCerts = 0; - if (m_pNSPrincipal == NULL) - { - return NS_ERROR_ILLEGAL_VALUE; - } - /* XXX: Raman fix it. Return the correct data */ - return NS_OK; -} - +// from nsICertificatePrincipal: /** * Returns the public key of the certificate. * @@ -82,8 +53,8 @@ nsCCertPrincipal::GetCertData(const unsigned char ***certChain, * @param publicKeySize - the length of public key data is returned in this * parameter. */ -NS_METHOD -nsCCertPrincipal::GetPublicKey(unsigned char **publicKey, PRUint32 *publicKeySize) +NS_IMETHODIMP +nsCertificatePrincipal::GetPublicKey(char **publicKey, PRUint32 *publicKeySize) { // XXX raman: fix it. PR_ASSERT(PR_FALSE); @@ -95,8 +66,8 @@ nsCCertPrincipal::GetPublicKey(unsigned char **publicKey, PRUint32 *publicKeySiz * * @param result - the certificate details about the signer. */ -NS_METHOD -nsCCertPrincipal::GetCompanyName(const char **ppCompanyName) +NS_IMETHODIMP +nsCertificatePrincipal::GetCompanyName(char **ppCompanyName) { if(m_pNSPrincipal == NULL) { @@ -112,8 +83,8 @@ nsCCertPrincipal::GetCompanyName(const char **ppCompanyName) * * @param result - the details about the issuer */ -NS_METHOD -nsCCertPrincipal::GetCertificateAuthority(const char **ppCertAuthority) +NS_IMETHODIMP +nsCertificatePrincipal::GetCertificateAuthority(char **ppCertAuthority) { if(m_pNSPrincipal == NULL) { @@ -129,8 +100,8 @@ nsCCertPrincipal::GetCertificateAuthority(const char **ppCertAuthority) * * @param result - Returns the serial number of certificate */ -NS_METHOD -nsCCertPrincipal::GetSerialNumber(const char **ppSerialNumber) +NS_IMETHODIMP +nsCertificatePrincipal::GetSerialNumber(char **ppSerialNumber) { if(m_pNSPrincipal == NULL) { @@ -146,8 +117,8 @@ nsCCertPrincipal::GetSerialNumber(const char **ppSerialNumber) * * @param result - Returns the expiration date of certificate */ -NS_METHOD -nsCCertPrincipal::GetExpirationDate(const char **ppExpDate) +NS_IMETHODIMP +nsCertificatePrincipal::GetExpirationDate(char **ppExpDate) { if(m_pNSPrincipal == NULL) { @@ -163,8 +134,8 @@ nsCCertPrincipal::GetExpirationDate(const char **ppExpDate) * * @param result - Returns the finger print of certificate */ -NS_METHOD -nsCCertPrincipal::GetFingerPrint(const char **ppFingerPrint) +NS_IMETHODIMP +nsCertificatePrincipal::GetFingerPrint(char **ppFingerPrint) { if(m_pNSPrincipal == NULL) { @@ -176,9 +147,9 @@ nsCCertPrincipal::GetFingerPrint(const char **ppFingerPrint) } //////////////////////////////////////////////////////////////////////////// -// from nsCCertPrincipal: +// from nsCertificatePrincipal: -nsCCertPrincipal::nsCCertPrincipal(const unsigned char **certChain, +nsCertificatePrincipal::nsCertificatePrincipal(const unsigned char **certChain, PRUint32 *certChainLengths, PRUint32 noOfCerts, nsresult *result) @@ -193,20 +164,18 @@ nsCCertPrincipal::nsCCertPrincipal(const unsigned char **certChain, *result = NS_OK; } -nsCCertPrincipal::nsCCertPrincipal(nsPrincipal *pNSPrincipal) +nsCertificatePrincipal::nsCertificatePrincipal(nsPrincipal *pNSPrincipal) { m_pNSPrincipal = pNSPrincipal; } -nsCCertPrincipal::~nsCCertPrincipal(void) +nsCertificatePrincipal::~nsCertificatePrincipal(void) { delete m_pNSPrincipal; } nsPrincipal* -nsCCertPrincipal::GetPeer(void) +nsCertificatePrincipal::GetPeer(void) { return m_pNSPrincipal; -} - - +} \ No newline at end of file diff --git a/caps/src/nsCCodebasePrincipal.cpp b/caps/src/nsCodebasePrincipal.cpp similarity index 77% rename from caps/src/nsCCodebasePrincipal.cpp rename to caps/src/nsCodebasePrincipal.cpp index 1ac9ec9a063e..9f329951ca93 100644 --- a/caps/src/nsCCodebasePrincipal.cpp +++ b/caps/src/nsCodebasePrincipal.cpp @@ -16,26 +16,24 @@ * Reserved. */ -#include "nsCCodebasePrincipal.h" +#include "nsCodebasePrincipal.h" #include "nsPrincipal.h" #include "xp.h" -NS_DEFINE_IID(kICodebasePrincipalIID, NS_ICODEBASEPRINCIPAL_IID); +static NS_DEFINE_IID(kICodebasePrincipalIID, NS_ICODEBASEPRINCIPAL_IID); //////////////////////////////////////////////////////////////////////////// // from nsISupports: // These macros produce simple version of QueryInterface and AddRef. // See the nsISupports.h header file for DETAILS. -NS_IMPL_ADDREF(nsCCodebasePrincipal) -NS_IMPL_RELEASE(nsCCodebasePrincipal) -NS_IMPL_QUERY_INTERFACE(nsCCodebasePrincipal, kICodebasePrincipalIID); +NS_IMPL_ISUPPORTS(nsCodebasePrincipal, kICodebasePrincipalIID); //////////////////////////////////////////////////////////////////////////// // from nsIPrincipal: -NS_METHOD -nsCCodebasePrincipal::IsTrusted(const char* scope, PRBool *pbIsTrusted) +NS_IMETHODIMP +nsCodebasePrincipal::IsTrusted(const char* scope, PRBool *pbIsTrusted) { if(m_pNSPrincipal == NULL) { @@ -53,8 +51,8 @@ nsCCodebasePrincipal::IsTrusted(const char* scope, PRBool *pbIsTrusted) * * @param result - the resulting codebase URL */ -NS_METHOD -nsCCodebasePrincipal::GetURL(const char **ppCodeBaseURL) +NS_IMETHODIMP +nsCodebasePrincipal::GetURL(char **ppCodeBaseURL) { if(m_pNSPrincipal == NULL) { @@ -68,7 +66,7 @@ nsCCodebasePrincipal::GetURL(const char **ppCodeBaseURL) //////////////////////////////////////////////////////////////////////////// // from nsCCodebasePrincipal: -nsCCodebasePrincipal::nsCCodebasePrincipal(const char *codebaseURL, +nsCodebasePrincipal::nsCodebasePrincipal(const char *codebaseURL, nsresult *result) { m_pNSPrincipal = new nsPrincipal(nsPrincipalType_CodebaseExact, @@ -82,18 +80,18 @@ nsCCodebasePrincipal::nsCCodebasePrincipal(const char *codebaseURL, *result = NS_OK; } -nsCCodebasePrincipal::nsCCodebasePrincipal(nsPrincipal *pNSPrincipal) +nsCodebasePrincipal::nsCodebasePrincipal(nsPrincipal *pNSPrincipal) { m_pNSPrincipal = pNSPrincipal; } -nsCCodebasePrincipal::~nsCCodebasePrincipal(void) +nsCodebasePrincipal::~nsCodebasePrincipal(void) { delete m_pNSPrincipal; } nsPrincipal* -nsCCodebasePrincipal::GetPeer(void) +nsCodebasePrincipal::GetPeer(void) { return m_pNSPrincipal; }