Merge pull request #1841 from BrzVlad/fix-managed-alloc

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

diff --git a/mono/metadata/security-manager.h b/mono/metadata/security-manager.h
index 747f61723b397f08a6c23d58e32335e7bcfe1bc5..98fbbfd652169b5931dfcab650b008671f5c00f2 100644 (file)
--- a/mono/metadata/security-manager.h
+++ b/mono/metadata/security-manager.h
@@ -41,60 +41,31 @@ enum {
 typedef enum {
        MONO_SECURITY_MODE_NONE,
        MONO_SECURITY_MODE_CORE_CLR,
-       MONO_SECURITY_MODE_CAS,
-       MONO_SECURITY_MODE_SMCS_HACK
 } 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;
 
-gboolean mono_is_ecma_key (const char *publickey, int size) MONO_INTERNAL;
-MonoMethod* mono_get_context_capture_method (void) MONO_INTERNAL;
+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) MONO_INTERNAL;
-void mono_secman_inheritancedemand_method (MonoMethod *override, MonoMethod *base) MONO_INTERNAL;
-
-/* Initialization/utility functions */
-void mono_activate_security_manager (void) MONO_INTERNAL;
-MonoSecurityManager* mono_security_manager_get_methods (void) MONO_INTERNAL;
+MonoSecurityManager* mono_security_manager_get_methods (void);
 
 /* Security mode */
-gboolean mono_is_security_manager_active (void) MONO_INTERNAL;
-void mono_security_set_mode (MonoSecurityMode mode) MONO_INTERNAL;
-MonoSecurityMode mono_security_get_mode (void) MONO_INTERNAL;
+void mono_security_set_mode (MonoSecurityMode mode);
+MonoSecurityMode mono_security_get_mode (void);
 
 /* internal calls */
-MonoBoolean ves_icall_System_Security_SecurityManager_get_SecurityEnabled (void) MONO_INTERNAL;
-void ves_icall_System_Security_SecurityManager_set_SecurityEnabled (MonoBoolean value) MONO_INTERNAL;
-MonoBoolean ves_icall_System_Security_SecurityManager_get_CheckExecutionRights (void) MONO_INTERNAL;
-void ves_icall_System_Security_SecurityManager_set_CheckExecutionRights (MonoBoolean value) MONO_INTERNAL;
-MonoBoolean ves_icall_System_Security_SecurityManager_GetLinkDemandSecurity (MonoReflectionMethod *m, MonoDeclSecurityActions *kactions, MonoDeclSecurityActions *mactions) MONO_INTERNAL;
+MonoBoolean ves_icall_System_Security_SecurityManager_get_SecurityEnabled (void);
+void ves_icall_System_Security_SecurityManager_set_SecurityEnabled (MonoBoolean value);
 
 #ifndef DISABLE_SECURITY
-#define mono_security_enabled() (mono_is_security_manager_active ())
-#define mono_security_cas_enabled() (mono_security_get_mode () == MONO_SECURITY_MODE_CAS)
 #define mono_security_core_clr_enabled() (mono_security_get_mode () == MONO_SECURITY_MODE_CORE_CLR)
-#define mono_security_smcs_hack_enabled() (mono_security_get_mode () == MONO_SECURITY_MODE_SMCS_HACK)
 #else
-#define mono_security_enabled() (FALSE)
-#define mono_security_cas_enabled() (FALSE)
 #define mono_security_core_clr_enabled() (FALSE)
-#define mono_security_smcs_hack_enabled() (FALSE)
 #endif
 
 #endif /* _MONO_METADATA_SECURITY_MANAGER_H_ */