Merge pull request #2753 from xmcclure/checked-build-updates

[mono.git] / mono / metadata / security-manager.h

diff --git a/mono/metadata/security-manager.h b/mono/metadata/security-manager.h
index af8ae8d51383f265681ad3f9613387db05eeddb7..98fbbfd652169b5931dfcab650b008671f5c00f2 100644 (file)
--- a/mono/metadata/security-manager.h
+++ b/mono/metadata/security-manager.h
@@ -14,6 +14,7 @@
 
 #include "object.h"
 #include "metadata-internals.h"
+#include "domain-internals.h"
 #include "tokentype.h"
 #include "threads.h"
 #include "marshal.h"
@@ -25,6 +26,11 @@
 /* Definitions */
 
 #define MONO_ECMA_KEY_LENGTH                   16
+#define MONO_PUBLIC_KEY_HEADER_LENGTH          32
+#define MONO_MINIMUM_PUBLIC_KEY_LENGTH         48
+#define MONO_DEFAULT_PUBLIC_KEY_LENGTH         128
+
+#define MONO_PUBLIC_KEY_BIT_SIZE(x)            ((x - MONO_PUBLIC_KEY_HEADER_LENGTH) << 3)
 
 enum {
        MONO_METADATA_SECURITY_OK               = 0x00,
@@ -32,42 +38,34 @@ enum {
        MONO_METADATA_INHERITANCEDEMAND_METHOD  = 0x02
 };
 
+typedef enum {
+       MONO_SECURITY_MODE_NONE,
+       MONO_SECURITY_MODE_CORE_CLR,
+} MonoSecurityMode;
 
 /* Structures */
 
 typedef struct {
        MonoClass *securitymanager;             /* System.Security.SecurityManager */
-       MonoMethod *demand;                     /* SecurityManager.InternalDemand */
-       MonoMethod *demandchoice;               /* SecurityManager.InternalDemandChoice */
-       MonoMethod *demandunmanaged;            /* SecurityManager.DemandUnmanaged */
-       MonoMethod *inheritancedemand;          /* SecurityManager.InheritanceDemand */
-       MonoMethod *inheritsecurityexception;   /* SecurityManager.InheritanceDemandSecurityException */
-       MonoMethod *linkdemand;                 /* SecurityManager.LinkDemand */
-       MonoMethod *linkdemandfulltrust;        /* SecurityManager.LinkDemandFullTrust */
-       MonoMethod *linkdemandunmanaged;        /* SecurityManager.LinkDemandUnmanaged */
-       MonoMethod *linkdemandsecurityexception;/* SecurityManager.LinkDemandSecurityException */
-
-       MonoClass *allowpartiallytrustedcallers;        /* System.Security.AllowPartiallyTrustedCallersAttribute */
-       MonoClass *suppressunmanagedcodesecurity;       /* System.Security.SuppressUnmanagedCodeSecurityAttribute */
 } MonoSecurityManager;
 
-
-/* Initialization/utility functions */
-void mono_activate_security_manager (void);
-gboolean mono_is_security_manager_active (void);
-MonoSecurityManager* mono_security_manager_get_methods (void);
 gboolean mono_is_ecma_key (const char *publickey, int size);
+MonoMethod* mono_get_context_capture_method (void);
 
-void mono_secman_inheritancedemand_class (MonoClass *klass, MonoClass *parent);
-void mono_secman_inheritancedemand_method (MonoMethod *override, MonoMethod *base);
+MonoSecurityManager* mono_security_manager_get_methods (void);
 
+/* Security mode */
+void mono_security_set_mode (MonoSecurityMode mode);
+MonoSecurityMode mono_security_get_mode (void);
 
 /* internal calls */
 MonoBoolean ves_icall_System_Security_SecurityManager_get_SecurityEnabled (void);
 void ves_icall_System_Security_SecurityManager_set_SecurityEnabled (MonoBoolean value);
-MonoBoolean ves_icall_System_Security_SecurityManager_get_CheckExecutionRights (void);
-void ves_icall_System_Security_SecurityManager_set_CheckExecutionRights (MonoBoolean value);
-MonoBoolean ves_icall_System_Security_SecurityManager_GetLinkDemandSecurity (MonoReflectionMethod *m, MonoDeclSecurityActions *kactions, MonoDeclSecurityActions *mactions);
 
+#ifndef DISABLE_SECURITY
+#define mono_security_core_clr_enabled() (mono_security_get_mode () == MONO_SECURITY_MODE_CORE_CLR)
+#else
+#define mono_security_core_clr_enabled() (FALSE)
+#endif
 
 #endif /* _MONO_METADATA_SECURITY_MANAGER_H_ */