1.1 --- a/epoc32/include/securitydefs.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/securitydefs.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -17,11 +17,10 @@
1.4 */
1.5
1.6
1.7 -
1.8 -
1.9 /**
1.10 @file
1.11 - @internalAll
1.12 + @publishedAll
1.13 + @released
1.14 */
1.15
1.16 #ifndef __SECURITYDEFS_H__
1.17 @@ -30,6 +29,10 @@
1.18 #include <e32std.h>
1.19 #include <e32base.h>
1.20
1.21 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.22 +#include <securitydefsconst.h>
1.23 +#endif
1.24 +
1.25 /** General Security Definitions */
1.26
1.27 // Old keystore interface, deprecated //////////////////////////////////////////
1.28 @@ -38,7 +41,6 @@
1.29 * What a key can be used for.
1.30 * The values this can take are defined in TKeyUsageVals.
1.31 *
1.32 - * @publishedAll
1.33 * @deprecated
1.34 */
1.35 typedef TInt TKeyUsage;
1.36 @@ -50,7 +52,6 @@
1.37 * is used when searching for all keys, rather than ones with a particular
1.38 * usage. As these can be combined, TKeyUsage is used to store them.
1.39 *
1.40 - * @publishedAll
1.41 * @deprecated
1.42 */
1.43 enum TKeyUsageVals
1.44 @@ -72,8 +73,6 @@
1.45 /**
1.46 * What a key can be used for - PKCS#15 scheme.
1.47 *
1.48 - * @publishedAll
1.49 - * @released
1.50 */
1.51 enum TKeyUsagePKCS15
1.52 {
1.53 @@ -107,8 +106,6 @@
1.54 /**
1.55 * What a key can be used for - X.509 scheme.
1.56 *
1.57 - * @publishedAll
1.58 - * @released
1.59 */
1.60 enum TKeyUsageX509
1.61 {
1.62 @@ -163,8 +160,6 @@
1.63 * Supported types of certificate format. Note these must be only 1 byte long as
1.64 * the file cert store only seralises them as 1 byte.
1.65 *
1.66 - * @publishedAll
1.67 - * @released
1.68 */
1.69 enum TCertificateFormat
1.70 {
1.71 @@ -180,8 +175,6 @@
1.72 /**
1.73 * The owner of a certificate.
1.74 *
1.75 - * @publishedAll
1.76 - * @released
1.77 */
1.78 enum TCertificateOwnerType
1.79 {
1.80 @@ -192,16 +185,12 @@
1.81
1.82 /** The length of a SHA-1 hash
1.83 *
1.84 - * @publishedAll
1.85 - * @released
1.86 */
1.87 const TInt KSHA1HashLengthBytes = 20;
1.88
1.89 /**
1.90 * A SHA-1 hash.
1.91 *
1.92 - * @publishedAll
1.93 - * @released
1.94 */
1.95 typedef TBuf8<KSHA1HashLengthBytes> TSHA1Hash;
1.96
1.97 @@ -211,8 +200,6 @@
1.98 /**
1.99 * A SHA-1 hash is also used as a key identifier.
1.100 *
1.101 - * @publishedAll
1.102 - * @released
1.103 */
1.104 typedef TSHA1Hash TKeyIdentifier;
1.105
1.106 @@ -221,8 +208,6 @@
1.107 *
1.108 * Except EValidatedOK, all these are fatal errors unless specified.
1.109 *
1.110 - * @publishedAll
1.111 - * @released
1.112 */
1.113 enum TValidationError
1.114 {
1.115 @@ -308,139 +293,6 @@
1.116 ECriticalCapabilities
1.117 };
1.118
1.119 -// Certificate Applicability UIDs
1.120 -
1.121 -/**
1.122 - * This UID is associated with certificates which are trusted for
1.123 - * software installation of native applications.
1.124 - *
1.125 - * @see MCertStore::Applications
1.126 - * @see MCTWritableCertStore::SetApplicability
1.127 - *
1.128 - * @publishedPartner
1.129 - * @released
1.130 - */
1.131 -const TUid KSwiApplicabilityUid = {0x100042AB};
1.132 -
1.133 -/**
1.134 - * This UID is associated with certificates which are trusted for
1.135 - * OCSP checks.
1.136 - *
1.137 - * @see MCertStore::Applications
1.138 - * @see MCTWritableCertStore::SetApplicability
1.139 - *
1.140 - * @publishedPartner
1.141 - * @released
1.142 - */
1.143 -const TUid KSwiOcspApplicabilityUid = {0x1000A8B6};
1.144 -
1.145 -/**
1.146 - * This UID is associated with certificates which are trusted for
1.147 - * Java midlet installation.
1.148 - *
1.149 - * @see MCertStore::Applications
1.150 - * @see MCTWritableCertStore::SetApplicability
1.151 - *
1.152 - * @publishedPartner
1.153 - * @released
1.154 - */
1.155 -const TUid KMidletInstallApplicabilityUid = {0x101F9B28};
1.156 -
1.157 -/**
1.158 - * This UID is associated with certificates which are trusted for
1.159 - * SSL/TLS connectivity.
1.160 - *
1.161 - * @see MCertStore::Applications
1.162 - * @see MCTWritableCertStore::SetApplicability
1.163 - *
1.164 - * @publishedPartner
1.165 - * @released
1.166 - */
1.167 -const TUid KTlsApplicabilityUid = {0x1000183D};
1.168 -
1.169 -/**
1.170 - * This OID is associated with X.509 certificates
1.171 - * trusted for TLS WWW server authentication.
1.172 - *
1.173 - * @publishedPartner
1.174 - * @released
1.175 - */
1.176 -_LIT(KServerAuthOID,"1.3.6.1.5.5.7.3.1");
1.177 -
1.178 -/**
1.179 - * This OID is associated with X.509 certificates
1.180 - * trusted for TLS WWW client authentication.
1.181 - *
1.182 - * @publishedPartner
1.183 - * @released
1.184 - */
1.185 - // SSL Client
1.186 - _LIT(KClientAuthOID,"1.3.6.1.5.5.7.3.2");
1.187 -
1.188 -/**
1.189 - * This OID is associated with X.509 certificates
1.190 - * trusted for signing of downloadable executable code.
1.191 - *
1.192 - * @publishedPartner
1.193 - * @released
1.194 - */
1.195 -_LIT(KCodeSigningOID,"1.3.6.1.5.5.7.3.3");
1.196 -
1.197 -/**
1.198 - * This OID is associated with X.509 certificates
1.199 - * trusted for email protection .
1.200 - *
1.201 - * @publishedPartner
1.202 - * @released
1.203 - */
1.204 -_LIT(KEmailProtectionOID,"1.3.6.1.5.5.7.3.4");
1.205 -
1.206 -/**
1.207 - * This OID is associated with X.509 certificates
1.208 - * trusted for Ipsec end system.
1.209 - *
1.210 - * @publishedPartner
1.211 - * @released
1.212 - */
1.213 -_LIT(KIpsecEndSystemOID,"1.3.6.1.5.5.7.3.5");
1.214 -
1.215 -/**
1.216 - * This OID is associated with X.509 certificates
1.217 - * trusted for Ipsec tunnel.
1.218 - *
1.219 - * @publishedPartner
1.220 - * @released
1.221 - */
1.222 -_LIT(KIpsecTunnelOID,"1.3.6.1.5.5.7.3.6");
1.223 -
1.224 -/**
1.225 - * This OID is associated with X.509 certificates
1.226 - * trusted for Ipsec user.
1.227 - *
1.228 - * @publishedPartner
1.229 - * @released
1.230 - */
1.231 -_LIT(KIpsecUserOID, "1.3.6.1.5.5.7.3.7");
1.232 -
1.233 -/**
1.234 - * This OID is associated with X.509 certificates
1.235 - * trusted for binding the hash of an object to a time.
1.236 - *
1.237 - * @publishedPartner
1.238 - * @released
1.239 - */
1.240 -_LIT(KTimeStampingOID,"1.3.6.1.5.5.7.3.8");
1.241 -
1.242 -/**
1.243 - * This OID is associated with X.509 certificates
1.244 - * trusted for signing OCSP responses.
1.245 - *
1.246 - * @publishedPartner
1.247 - * @released
1.248 - */
1.249 -_LIT(KOCSPSigningOID,"1.3.6.1.5.5.7.3.9");
1.250 -
1.251 -
1.252
1.253 #include "securitydefs.inl"
1.254