Update expected leaks

projects/Aliasing/StrongUpdate1/app/src/main/java/de/ecspride/MainActivity.java

@@ -19,8 +19,8 @@
  * 
  * @description Sensitive data is assigned to a heap object, but then overwritten
  * 		before it is leaked
- * @dataflow source -> heap object -> alias -> leak
- * @number_of_leaks 1
+ * @dataflow source -> heap object -> alias -> no leak
+ * @number_of_leaks 0
  * @challenges The alias analysis must support strong updates for not causing a
  * 		false positive.
  */
@@ -58,7 +58,7 @@ private void aliasFlowTest() {
         A f = e.attr;
 
 		SmsManager sms = SmsManager.getDefault();
-        sms.sendTextMessage("+49 1234", null, f.b, null, null); // sink, leak
+        sms.sendTextMessage("+49 1234", null, f.b, null, null); // sink, no leak
 	}
 
 }

projects/Aliasing/StrongUpdate1/expected-info-flows.json

@@ -1,15 +1,5 @@
 {
   "expected-info-flows":
   [
-    {
-      "Sink": "android.telephony.SmsManager: void sendTextMessage(java.lang.String,java.lang.String,java.lang.String,android.app.PendingIntent,android.app.PendingIntent)",
-      "Method": "de.ecspride.MainActivity: void aliasFlowTest()",
-      "Line": 61
-    },
-    {
-      "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",
-      "Method": "de.ecspride.MainActivity: void aliasFlowTest()",
-      "Line": 47
-    }
   ]
 }

projects/AndroidSpecific/PrivateDataLeak2/expected-info-flows.json

@@ -7,12 +7,9 @@
       "Line": 26
     },
     {
-      "Source": "android.app.Activity: android.view.View findViewById(int)",
+      "Source": "de.ecspride.PrivateDataLeak2: android.view.View findViewById(int)",
       "Method": "de.ecspride.PrivateDataLeak2: void onCreate(android.os.Bundle)",
       "Line": 25
     }
   ]
 }
-
-
-

projects/AndroidSpecific/PublicAPIField2/expected-info-flows.json

@@ -10,7 +10,16 @@
       "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",
       "Method": "edu.mit.icc_intent_class_modeling.MainActivity: void onCreate(android.os.Bundle)",
       "Line": 26
-    }
-
+    },
+    {
+      "Sink": "android.content.Intent: android.content.Intent setAction(java.lang.String)",
+      "Method": "edu.mit.icc_intent_class_modeling.MainActivity: void onCreate(android.os.Bundle)",
+      "Line": 29
+    },
+    {
+      "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",
+      "Method": "edu.mit.icc_intent_class_modeling.MainActivity: void onCreate(android.os.Bundle)",
+      "Line": 26
+    }   
   ]
 }

projects/Callbacks/AnonymousClass1/expected-info-flows.json

@@ -8,14 +8,13 @@
     },
     {
       "Source": "android.location.Location: double getLatitude()",
-      "Method": "de.ecspride.AnonymousClass1: void onLocationChanged(android.location.Location)",
+      "Method": "de.ecspride.AnonymousClass1$1: void onLocationChanged(android.location.Location)",
       "Line": 45
     },
     {
       "Source": "android.location.Location: double getLongitude()",
-      "Method": "de.ecspride.AnonymousClass1: void onLocationChanged(android.location.Location)",
+      "Method": "de.ecspride.AnonymousClass1$1: void onLocationChanged(android.location.Location)",
       "Line": 46
     }
-
   ]
 }

projects/Callbacks/Ordering1/app/src/main/java/de/ecspride/MainActivity.java

@@ -20,7 +20,7 @@
  * @description This example leaks variable contents before the handler initializing them is
  * 	even registered
  * @dataflow onLocationChanged: source -> latitude, longtitude; onCreate: latitude -> sink, longtitude -> sink 
- * @number_of_leaks 2
+ * @number_of_leaks 0
  * @challenges The analysis must take the order of callback registration and sink call
  * 	into account.
  */
@@ -34,8 +34,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
 
-		Log.d("Latitude", "Latitude: " + latitude); //sink, leak
-    	Log.d("Longtitude", "Longtitude: " + longtitude); //sink, leak
+		Log.d("Latitude", "Latitude: " + latitude); //sink, no leak
+    	Log.d("Longtitude", "Longtitude: " + longtitude); //sink, no leak
 	}
 
 	@Override

projects/Callbacks/Ordering1/expected-info-flows.json

@@ -1,25 +1,5 @@
 {
   "expected-info-flows":
   [
-    {
-      "Sink": "android.util.Log: int d(java.lang.String,java.lang.String)",
-      "Method": "de.ecspride.MainActivity: void onCreate(android.os.Bundle)",
-      "Line": 37
-    },
-    {
-      "Source": "android.location.Location: double getLatitude()",
-      "Method": "de.ecspride.MainActivity$3: void onLocationChanged(android.location.Location)",
-      "Line": 72
-    },
-    {
-      "Sink": "android.util.Log: int d(java.lang.String,java.lang.String)",
-      "Method": "de.ecspride.MainActivity: void onCreate(android.os.Bundle)",
-      "Line": 38
-    },
-    {
-      "Source": "android.location.Location: double getLongitude()",
-      "Method": "de.ecspride.MainActivity$3: void onLocationChanged(android.location.Location)",
-      "Line": 73
-    }
   ]
 }

projects/EmulatorDetection/Battery1/app/src/main/java/com/example/newedtester/MainActivity.java

@@ -56,7 +56,7 @@ public void onReceive(Context context, Intent intent) {
 
         			SmsManager sm = SmsManager.getDefault();
         	    	String number = "+49 1234";
-        	    	sm.sendTextMessage(number, null, imei, null, null); //sink, potential leak
+        	    	sm.sendTextMessage(number, null, imei, null, null); //sink, leak
         	    	txtStatus.setText("Battery Status: Device");
                 }
             }

projects/EmulatorDetection/Battery1/expected-info-flows.json

@@ -3,12 +3,12 @@
   [
     {
       "Sink": "android.telephony.SmsManager: void sendTextMessage(java.lang.String,java.lang.String,java.lang.String,android.app.PendingIntent,android.app.PendingIntent)",
-      "Method": "com.example.newedtester.MainActivity$2: void onReceive(android.content.Context,android.content.Intent)",
+      "Method": "com.example.newedtester.MainActivity$1: void onReceive(android.content.Context,android.content.Intent)",
       "Line": 59
     },
     {
       "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",
-      "Method": "com.example.newedtester.MainActivity$2: void onReceive(android.content.Context,android.content.Intent)",
+      "Method": "com.example.newedtester.MainActivity$1: void onReceive(android.content.Context,android.content.Intent)",
       "Line": 55
     }
   ]

projects/GeneralJava/Exceptions3/app/src/main/java/de/ecspride/Exceptions3.java

@@ -34,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		}
 		catch (RuntimeException ex) {
 			SmsManager sm = SmsManager.getDefault();
-			sm.sendTextMessage("+49 1234", null, imei, null, null); //sink, leak
+			sm.sendTextMessage("+49 1234", null, imei, null, null); //sink, no leak
 		}
 	}
 

projects/GeneralJava/Exceptions3/expected-info-flows.json

@@ -1,15 +1,5 @@
 {
   "expected-info-flows":
   [
-    {
-      "Sink": "android.telephony.SmsManager: void sendTextMessage(java.lang.String,java.lang.String,java.lang.String,android.app.PendingIntent,android.app.PendingIntent)",
-      "Method": "de.ecspride.Exceptions3: void onCreate(android.os.Bundle)",
-      "Line": 37
-    },
-    {
-      "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",
-      "Method": "de.ecspride.Exceptions3: void onCreate(android.os.Bundle)",
-      "Line": 30
-    }
   ]
 }

projects/GeneralJava/Exceptions7/expected-info-flows.json

@@ -1,15 +1,5 @@
 {
   "expected-info-flows":
   [
-    {
-      "Sink": "android.telephony.SmsManager: void sendTextMessage(java.lang.String,java.lang.String,java.lang.String,android.app.PendingIntent,android.app.PendingIntent)",
-      "Method": "de.ecspride.Exceptions7: void onCreate(android.os.Bundle)",
-      "Line": 35
-    },
-    {
-      "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",
-      "Method": "de.ecspride.Exceptions7: void callMe()",
-      "Line": 41
-    }
   ]
 }

projects/GeneralJava/StaticInitialization2/expected-info-flows.json

@@ -8,7 +8,7 @@
     },
     {
       "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",
-      "Method": "de.ecspride.MainActivity$StaticInitClass1: void <clinit>leak",
+      "Method": "de.ecspride.MainActivity$StaticInitClass1: void <clinit>",
       "Line": 37
     }
   ]

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_Broadcast1/app/src/main/java/com/example/deviceid_broadcast/MainActivity.java

@@ -34,6 +34,6 @@ protected void onCreate(Bundle savedInstanceState)
        // im.setImageURI(uri);
 
         Intent in = new Intent("com.example.deviceid_broadcast.broadcast_deviceid");
-        sendBroadcast(in); // sink
+        sendBroadcast(in);
     }  
 }

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_Broadcast1/expected-info-flows.json

@@ -2,7 +2,7 @@
   "expected-info-flows":
   [
     {
-      "Sink": "android.app.Activity: void startActivity(android.content.Intent)",
+      "Sink": "android.content.Context: void startActivity(android.content.Intent)",
       "Method": "com.example.deviceid_broadcast.broadcast_deviceid: void onReceive(android.content.Context,android.content.Intent)",
       "Line": 31
     },

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_OrderedIntent1/app/src/main/java/com/example/deviceid_orderedintent/MainActivity.java

@@ -44,7 +44,7 @@ public void onClick(View arg0)
 			{
 				Intent in = new Intent("com.example.deviceid_orderedintent");
 		        in.putExtra("data", s);
-		        sendOrderedBroadcast(in, null); //sink
+		        sendOrderedBroadcast(in, null); 
 			}
 
         });

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_OrderedIntent1/app/src/main/java/com/example/deviceid_orderedintent/Receiver2.java

@@ -14,7 +14,7 @@ public void onReceive(Context context, Intent intent) {
         in.setType("text/plain");
         in.putExtra(Intent.EXTRA_TEXT,res);
         in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(in);
+        context.startActivity(in); //sink
         Toast.makeText(context, "RCVR 2.." + res, Toast.LENGTH_LONG).show();
         //setResultData(res);
     }

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_OrderedIntent1/expected-info-flows.json

@@ -2,9 +2,9 @@
   "expected-info-flows":
   [
     {
-      "Sink": "android.app.Activity: void sendOrderedBroadcast(android.content.Intent,java.lang.String)",
-      "Method": "com.example.deviceid_orderedintent.MainActivity$1: void onClick(android.view.View)",
-      "Line": 47
+      "Sink": "android.content.Context: void startActivity(android.content.Intent)",
+      "Method": "com.example.deviceid_orderedintent.Receiver2: void onReceive(android.content.Context,android.content.Intent)",
+      "Line": 17
     },
     {
       "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_Service1/expected-info-flows.json

@@ -2,7 +2,7 @@
   "expected-info-flows":
   [
     {
-      "Sink": "android.app.Activity: void startActivity(android.content.Intent)",
+      "Sink": "android.content.ContextWrapper: void startActivity(android.content.Intent)",
       "Method": "com.example.deviceid_service.Service_deviceid: void onStart(android.content.Intent,int)",
       "Line": 38
     },

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_contentProvider1/app/src/main/java/com/example/deviceid_contentprovider1/MainActivity.java

@@ -99,8 +99,8 @@ private void sendDeviceId()
     {
         Intent in = new Intent("com.example.collector");
         in.setType("text/plain");
-        in.putExtra(Intent.EXTRA_TEXT,num); // sink
-        startActivity(in);
+        in.putExtra(Intent.EXTRA_TEXT,num); 
+        startActivity(in); // sink
 
 
 

projects/InterAppCommunication/DeviceIDLeakage/DeviceId_contentProvider1/expected-info-flows.json

@@ -2,9 +2,9 @@
   "expected-info-flows":
   [
     {
-      "Sink": "android.content.Intent: android.content.Intent putExtra(java.lang.String,java.lang.String)",
+      "Sink": "android.app.Activity: void startActivity(android.content.Intent)",
       "Method": "com.example.deviceid_contentprovider1.MainActivity: void sendDeviceId()",
-      "Line": 102
+      "Line": 103
     },
     {
       "Source": "android.telephony.TelephonyManager: java.lang.String getDeviceId()",

projects/InterAppCommunication/Echoer/expected-info-flows.json

@@ -20,6 +20,16 @@
       "Source": "android.content.Intent: android.net.Uri getData()",
       "Method": "org.cert.echoer.MainActivity: void getDataFromIntent()",
       "Line": 49
+    },
+    {
+      "Sink": "android.app.Activity: void setResult(int,android.content.Intent)",
+      "Method": "org.cert.echoer.Button1Listener: void onClick(android.view.View)",
+      "Line": 21
+    },
+    {
+      "Source": "android.app.Activity: android.content.Intent getIntent()",
+      "Method": "org.cert.echoer.MainActivity: void getDataFromIntent()",
+      "Line": 42
     }
   ]
 }

projects/InterAppCommunication/LocationLeakage/Location_Broadcast1/expected-info-flows.json

@@ -2,7 +2,7 @@
   "expected-info-flows":
   [
     {
-      "Sink": "android.app.Activity: void startActivity(android.content.Intent)",
+      "Sink": "android.content.Context: void startActivity(android.content.Intent)",
       "Method": "com.example.location_broadcast.location_broadcast: void onReceive(android.content.Context,android.content.Intent)",
       "Line": 40
     },
@@ -12,7 +12,7 @@
       "Line": 48
     },
     {
-      "Sink": "android.app.Activity: void startActivity(android.content.Intent)",
+      "Sink": "android.content.Context: void startActivity(android.content.Intent)",
       "Method": "com.example.location_broadcast.location_broadcast: void onReceive(android.content.Context,android.content.Intent)",
       "Line": 40
     },

projects/InterAppCommunication/LocationLeakage/Location_Service1/expected-info-flows.json

@@ -2,7 +2,7 @@
   "expected-info-flows":
   [
     {
-      "Sink": "android.app.Activity: void startActivity(android.content.Intent)",
+      "Sink": "android.content.ContextWrapper: void startActivity(android.content.Intent)",
       "Method": "com.example.location_service.Locationservice: void onDestroy()",
       "Line": 56
     },
@@ -12,7 +12,7 @@
       "Line": 45
     },
     {
-      "Sink": "android.app.Activity: void startActivity(android.content.Intent)",
+      "Sink": "android.content.ContextWrapper: void startActivity(android.content.Intent)",
       "Method": "com.example.location_service.Locationservice: void onDestroy()",
       "Line": 56
     },

projects/InterAppCommunication/StartActivityForResult1/app/src/main/java/org/cert/WriteFile/Button1Listener.java

@@ -24,7 +24,7 @@ public void onClick(View arg0) {
 		String curLoc = getMyLocation();
 		i.putExtra("secret", curLoc);
 		Log.i("Phase2_3: ", "Sending implicit Intent with MIME data type text/plain: Current Location "+ curLoc); // SINK
-		this.act.startActivityForResult(i, 0);			// SINK
+		this.act.startActivityForResult(i, 0);
 	}
 
 	private String getMyLocation(){

projects/InterAppCommunication/StartActivityForResult1/app/src/main/java/org/cert/WriteFile/MainActivity.java

@@ -22,7 +22,7 @@
  * 		startActivityForResult which writes it to a file.
  * @dataflow getLastKnownLocation -> startActivityForResult
  * 		-> onActivityResult -> FileOutputStream
- * @number_of_leaks 1
+ * @number_of_leaks 6
  * @challenges Inter-component communication using startActivityForResult
  * 		must be handled correctly
  */
@@ -45,10 +45,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
 	}
 
 	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {				// SOURCE
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {			
 	  if (resultCode == 0 && requestCode == 0 && data != null) {
 	    if (data.hasExtra("secret")) {
-	    	if(data.getExtras().getString("secret") != null){ //sink
+	    	if(data.getExtras().getString("secret") != null){
 		    	String filename = "sinkFile.txt";
 		    	String sinkData = data.getExtras().getString("secret");		// another source
 		    	FileOutputStream outputStream;	

projects/InterAppCommunication/StartActivityForResult1/expected-info-flows.json

@@ -29,7 +29,7 @@
     {
       "Source": "android.content.Intent: android.os.Bundle getExtras()",
       "Method": "org.cert.WriteFile.MainActivity: void onActivityResult(int,int,android.content.Intent)",
-      "Line": 51
+      "Line": 53
     },
     {
       "Sink": "java.io.OutputStream: void write(byte[])",

projects/InterComponentCommunication/BroadcastTaintAndLeak1/expected-info-flows.json

@@ -3,7 +3,7 @@
   [
     {
       "Sink": "android.util.Log: int i(java.lang.String,java.lang.String)",
-      "Method": "edu.mit.icc_broadcast_programmatic_intentfilter.BroadcastTest: void onCreate(android.os.Bundle)",
+      "Method": "edu.mit.icc_broadcast_programmatic_intentfilter.BroadcastTest$1: void onReceive(android.content.Context,android.content.Intent)",
       "Line": 30
     },
     {