Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #123 from mpeck12/master
Updates to Android schemas and supporting materials
  • Loading branch information
djhaynes committed Apr 24, 2014
2 parents f2b3ca0 + c6a02c8 commit 4a57586
Show file tree
Hide file tree
Showing 19 changed files with 15,503 additions and 7,412 deletions.
Expand Up @@ -2,11 +2,11 @@
<classpath>
<classpathentry exported="true" kind="lib" path="xbean22.jar"/>
<classpathentry exported="true" kind="lib" path="jsr173-2.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="lib" path="androidsc.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="lib" path="androidsc.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
Expand Up @@ -4,7 +4,7 @@
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk android:minSdkVersion="8" />
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="18"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/>
Expand All @@ -17,7 +17,8 @@

<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
android:label="@string/app_name"
android:allowBackup="true" >
<activity
android:label="@string/app_name"
android:name=".AndroidSCActivity" >
Expand Down
Binary file not shown.
@@ -1,7 +1,7 @@
//
//
//****************************************************************************************//
// Copyright (c) 2002-2013, The MITRE Corporation
// Copyright (c) 2002-2014, The MITRE Corporation
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down
@@ -1,7 +1,7 @@
//
//
//****************************************************************************************//
// Copyright (c) 2002-2013, The MITRE Corporation
// Copyright (c) 2002-2014, The MITRE Corporation
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down Expand Up @@ -30,12 +30,11 @@

package org.mitre.oval.androidsc;

import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.CameraItemDocument.CameraItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.DeviceAccessItemDocument.DeviceAccessItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.DeviceSettingsItemDocument.DeviceSettingsItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.EncryptionItemDocument.EncryptionItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.PasswordItemDocument.PasswordItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.SystemDetailsItemDocument.SystemDetailsItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.CameraItemDocument.CameraItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.DeviceSettingsItemDocument.DeviceSettingsItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.EncryptionItemDocument.EncryptionItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.PasswordItemDocument.PasswordItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.SystemDetailsItemDocument.SystemDetailsItem;

import android.app.admin.DevicePolicyManager;
import android.content.Context;
Expand All @@ -53,10 +52,6 @@ void password(PasswordItem pi, DevicePolicyManager dpm) {
void encryption(EncryptionItem ei, DevicePolicyManager dpm) {
}

void device_access(DeviceAccessItem dai, DevicePolicyManager dpm) {

}

void systemDetails(SystemDetailsItem sdi) {

}
Expand Down

Large diffs are not rendered by default.

@@ -1,7 +1,7 @@
//
//
//****************************************************************************************//
// Copyright (c) 2002-2013, The MITRE Corporation
// Copyright (c) 2002-2014, The MITRE Corporation
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down Expand Up @@ -32,18 +32,18 @@

import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.EntityItemBoolType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.EntityItemIntType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.EntityItemStringType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.CameraItemDocument.CameraItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.DeviceSettingsItemDocument.DeviceSettingsItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.EncryptionItemDocument.EncryptionItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.EntityItemEncryptionStatusType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.PasswordItemDocument.PasswordItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.SystemDetailsItemDocument.SystemDetailsItem;

import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.CameraItemDocument.CameraItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.DeviceSettingsItemDocument.DeviceSettingsItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.EncryptionItemDocument.EncryptionItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.EntityItemEncryptionStatusType;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.PasswordItemDocument.PasswordItem;
import android.annotation.TargetApi;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.os.Build;
import android.provider.Settings;

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public class HoneycombGatherer extends Gatherer {
void deviceSettings(DeviceSettingsItem dsi, Context c)
{
Expand Down
@@ -1,7 +1,7 @@
//
//
//****************************************************************************************//
// Copyright (c) 2002-2013, The MITRE Corporation
// Copyright (c) 2002-2014, The MITRE Corporation
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down Expand Up @@ -30,21 +30,15 @@

package org.mitre.oval.androidsc;

import java.math.BigInteger;

import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.CollectedObjectsType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.EntityItemBoolType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.FlagEnumeration;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.ItemType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.ObjectType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.ReferenceType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.SystemDataType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.CameraItemDocument;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.CameraItemDocument.CameraItem;

import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.CameraItemDocument.CameraItem;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.os.Build;

@SuppressLint("NewApi")
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
public class ICSGatherer extends HoneycombGatherer {
public void camera(CameraItem ci, DevicePolicyManager dpm) {

Expand Down
@@ -1,7 +1,7 @@
//
//
//****************************************************************************************//
// Copyright (c) 2002-2013, The MITRE Corporation
// Copyright (c) 2002-2014, The MITRE Corporation
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
Expand Down Expand Up @@ -30,13 +30,15 @@

package org.mitre.oval.androidsc;

import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.DeviceAccessItemDocument.DeviceAccessItem;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.EntityItemKeyguardDisabledFeaturesType;

import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.PasswordItemDocument.PasswordItem;
import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.EntityItemKeyguardDisabledFeaturesType;
import android.annotation.TargetApi;
import android.app.admin.DevicePolicyManager;
import android.os.Build;

@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public class JellyBeanMR1Gatherer extends ICSGatherer {
void device_access(DeviceAccessItem dai, DevicePolicyManager dpm) {
void password(PasswordItem dai, DevicePolicyManager dpm) {
int keyguard = dpm.getKeyguardDisabledFeatures(null);
EntityItemKeyguardDisabledFeaturesType ei1 = EntityItemKeyguardDisabledFeaturesType.Factory.newInstance();
if(keyguard == DevicePolicyManager.KEYGUARD_DISABLE_FEATURES_ALL) {
Expand Down
@@ -1,10 +1,42 @@
//
//
//****************************************************************************************//
// Copyright (c) 2002-2014, The MITRE Corporation
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice, this list
// of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice, this
// list of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution.
// * Neither the name of The MITRE Corporation nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific
// prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
// SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
// OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
// TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
//****************************************************************************************//

package org.mitre.oval.androidsc;

import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5.EntityItemBoolType;
import org.mitre.oval.xmlSchema.ovalSystemCharacteristics5Android.SystemDetailsItemDocument.SystemDetailsItem;

import org.mitre.oval.xmlSchema.xAndroidSystemCharacteristics.SystemDetailsItemDocument.SystemDetailsItem;
import android.annotation.TargetApi;
import android.os.Build;
import android.security.KeyChain;

@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
public class JellyBeanMR2Gatherer extends JellyBeanMR1Gatherer {
void systemDetails(SystemDetailsItem sdi)
{
Expand Down
Binary file modified resources/x-android-schema/code/android-oval-sc.apk
Binary file not shown.

0 comments on commit 4a57586

Please sign in to comment.