From a0a305ddf0105f50f89414c574973acf55431a9a Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:04:47 +0100 Subject: [PATCH 1/8] Compile janalyzer/string-initializer test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer/pom.xml | 21 ++++++++++++ .../janalyzer/string-initializer/Basic1.class | Bin 911 -> 0 bytes .../janalyzer/string-initializer/pom.xml | 30 ++++++++++++++++++ .../{ => src/main/java}/Basic1.java | 0 .../janalyzer/string-initializer/test.desc | 2 +- jbmc/regression/pom.xml | 1 + 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 jbmc/regression/janalyzer/pom.xml delete mode 100644 jbmc/regression/janalyzer/string-initializer/Basic1.class create mode 100644 jbmc/regression/janalyzer/string-initializer/pom.xml rename jbmc/regression/janalyzer/string-initializer/{ => src/main/java}/Basic1.java (100%) diff --git a/jbmc/regression/janalyzer/pom.xml b/jbmc/regression/janalyzer/pom.xml new file mode 100644 index 00000000000..01342ed8256 --- /dev/null +++ b/jbmc/regression/janalyzer/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + org.cprover.regression + regression.janalyzer + 1.0-SNAPSHOT + pom + + + org.cprover.regression + regression + 1.0-SNAPSHOT + + + + string-initializer + + + diff --git a/jbmc/regression/janalyzer/string-initializer/Basic1.class b/jbmc/regression/janalyzer/string-initializer/Basic1.class deleted file mode 100644 index 49e41ebb0be3a4834ee2233b3698bbce8f80738f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 911 zcmZuw+iuf95Iq|wvE#V3IBm+kDOaZ<359Y^#X~D09?V4wY6U!PoF!~=?BF;^yzv`+ z20Ww^2tI&sLWo&A6$z;&&+eR=IcL_h{`KeEPXJqJnJ8k-Kt;#82@Pw?Tr_Y=t(Og4 zF>w{w3UE->v0pJQT`E41<_#uPlRQDLNyJ1%_EV?ofPe=WZh+goHPl)Y?9{2Zn zB$Yn_v+-LwWH8(vK9t^Oi|YGa1`K8AwR^xn@TSj$Ub7uXGU&AuejfFxqI67{flA5M! z2Llmw8S2jb>8f+kq(S^JH<&XIqf{0uJq1^MvJJOBUy diff --git a/jbmc/regression/janalyzer/string-initializer/pom.xml b/jbmc/regression/janalyzer/string-initializer/pom.xml new file mode 100644 index 00000000000..9759342d102 --- /dev/null +++ b/jbmc/regression/janalyzer/string-initializer/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + org.cprover.regression + regression.janalyzer.string-initializer + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer/string-initializer/Basic1.java b/jbmc/regression/janalyzer/string-initializer/src/main/java/Basic1.java similarity index 100% rename from jbmc/regression/janalyzer/string-initializer/Basic1.java rename to jbmc/regression/janalyzer/string-initializer/src/main/java/Basic1.java diff --git a/jbmc/regression/janalyzer/string-initializer/test.desc b/jbmc/regression/janalyzer/string-initializer/test.desc index 67e49735084..e8cfb892f55 100644 --- a/jbmc/regression/janalyzer/string-initializer/test.desc +++ b/jbmc/regression/janalyzer/string-initializer/test.desc @@ -1,6 +1,6 @@ CORE Basic1 ---location-sensitive --constants --show +--location-sensitive --constants --show -cp target/classes ^EXIT=0$ ^SIGNAL=0$ Hello_20 := \{ "java::java\.lang\.String" \} diff --git a/jbmc/regression/pom.xml b/jbmc/regression/pom.xml index 9cb0f685389..f46474ac6eb 100644 --- a/jbmc/regression/pom.xml +++ b/jbmc/regression/pom.xml @@ -14,6 +14,7 @@ + janalyzer jbmc From 4758721926f9bb71f72ddf48f7e21d0215567f4d Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:07:29 +0100 Subject: [PATCH 2/8] Compile janalyzer/too-many-args test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer/pom.xml | 1 + .../janalyzer/too-many-args/A.class | Bin 228 -> 0 bytes .../janalyzer/too-many-args/B.class | Bin 228 -> 0 bytes .../janalyzer/too-many-args/pom.xml | 30 ++++++++++++++++++ .../too-many-args/{ => src/main/java}/A.java | 0 .../janalyzer/too-many-args/test.desc | 2 +- 6 files changed, 32 insertions(+), 1 deletion(-) delete mode 100644 jbmc/regression/janalyzer/too-many-args/A.class delete mode 100644 jbmc/regression/janalyzer/too-many-args/B.class create mode 100644 jbmc/regression/janalyzer/too-many-args/pom.xml rename jbmc/regression/janalyzer/too-many-args/{ => src/main/java}/A.java (100%) diff --git a/jbmc/regression/janalyzer/pom.xml b/jbmc/regression/janalyzer/pom.xml index 01342ed8256..7131df0cd6a 100644 --- a/jbmc/regression/janalyzer/pom.xml +++ b/jbmc/regression/janalyzer/pom.xml @@ -16,6 +16,7 @@ string-initializer + too-many-args diff --git a/jbmc/regression/janalyzer/too-many-args/A.class b/jbmc/regression/janalyzer/too-many-args/A.class deleted file mode 100644 index af02287ac8e875a067ff583c5fe658c8f8d971ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmXYrJqp4=5QX2w{Ai3Cyn&rsn8r>Kf?yT2Q0zBx(G4+yn0PNM!NLQ0C~-D8#mBsl zH!z>?>kVKI-$e^O2Ym+vg1uC^s#b*7cyc6|>*6E{gGl9aTVG>Y9z>k68Ae4SvZE-K z&VOlE7j@&)C|nTSeNmT*+$deQ!&xfs!h;EmKq0}`ImkqQ4t8-WlL{jk{D~fJ=pxhR f6f_yIrccm=g#m|Yv)0u%(`$AM9k`9_G7We?{+T9s diff --git a/jbmc/regression/janalyzer/too-many-args/B.class b/jbmc/regression/janalyzer/too-many-args/B.class deleted file mode 100644 index 7ca3e5dbbb7a7948cd3f068b51095402992c9c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmXYr!4APt5Jm4)wNz>23oNnFjUAC7v1(Wl``3EmNwrC}{>w^Y;RAe>m{%s5nR`#} zB=i0}UjWAN9n{da(XrtXtf@*>F(cIagFV4qW(P^|LY2yOd5L7c6H&sX8)mUc_99o> z|Djo&)Rj-e#f0E&voeq6O6j;YADzWbxG+&C(1PG=A0#3@2Ak+C;{rVx{E05&<{)p2 gRlr-5`tSj|voK)uv?^$z!P@-=(1gQ|(5h1I7yk? + + 4.0.0 + org.cprover.regression + regression.janalyzer.too-many-args + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer/too-many-args/A.java b/jbmc/regression/janalyzer/too-many-args/src/main/java/A.java similarity index 100% rename from jbmc/regression/janalyzer/too-many-args/A.java rename to jbmc/regression/janalyzer/too-many-args/src/main/java/A.java diff --git a/jbmc/regression/janalyzer/too-many-args/test.desc b/jbmc/regression/janalyzer/too-many-args/test.desc index a705ba56b72..de7054254ca 100644 --- a/jbmc/regression/janalyzer/too-many-args/test.desc +++ b/jbmc/regression/janalyzer/too-many-args/test.desc @@ -1,6 +1,6 @@ CORE A -B +B -cp target/classes Please give exactly one class name, and/or use -jar jarfile or --gb goto-binary ^EXIT=1$ ^SIGNAL=0$ From 0fe0fdca4bf0f9d94847326382d153b5577b54d0 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:17:37 +0100 Subject: [PATCH 3/8] Compile janalyzer-taint/taint-aliasing1 test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer-taint/pom.xml | 21 ++++++++++++ .../taint-aliasing1/aliasing1.class | Bin 453 -> 0 bytes .../janalyzer-taint/taint-aliasing1/pom.xml | 30 ++++++++++++++++++ .../{ => src/main/java}/aliasing1.java | 0 .../janalyzer-taint/taint-aliasing1/test.desc | 2 +- jbmc/regression/pom.xml | 1 + 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 jbmc/regression/janalyzer-taint/pom.xml delete mode 100644 jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.class create mode 100644 jbmc/regression/janalyzer-taint/taint-aliasing1/pom.xml rename jbmc/regression/janalyzer-taint/taint-aliasing1/{ => src/main/java}/aliasing1.java (100%) diff --git a/jbmc/regression/janalyzer-taint/pom.xml b/jbmc/regression/janalyzer-taint/pom.xml new file mode 100644 index 00000000000..425eff8778c --- /dev/null +++ b/jbmc/regression/janalyzer-taint/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + org.cprover.regression + regression.janalyzer-taint + 1.0-SNAPSHOT + pom + + + org.cprover.regression + regression + 1.0-SNAPSHOT + + + + taint-aliasing1 + + + diff --git a/jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.class b/jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.class deleted file mode 100644 index 099386f68dfd6c57b65a6fa8dfb8bc8d8e17ffbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmZXP%}T>i5QWce(j>;TjhYl(2rknKmV!HfHi8?2E)>C)+_a&l<_FqT@U3)ZQSbqL zDDm7_T2U^S8D`G;X6Ezj?E}C8+BP(7*r;RE#FmPl317fCO7f&U5zvCpjevey3}b;- znB?)rEQ{jFwTx0$*0QI&EH3Yh;ZHs-W|INyUeF20@=^9unU8vx(KsHIhXN+$(PP*31#@7)bg&Lb!2L^i&_I(*EG^jOH5#u3bbeYPU@_Za z6pZ!mE5r*Ex+;MxDv7<69;3zw_;b|G-=W>o5$?^QcllS=HYbtCIVKzeTp~Q~X{lW+ kB)E+N0oDTZ%>4J@2GzV^q28{#RIG*=Y@rgg7;A990W{M`Pyhe` diff --git a/jbmc/regression/janalyzer-taint/taint-aliasing1/pom.xml b/jbmc/regression/janalyzer-taint/taint-aliasing1/pom.xml new file mode 100644 index 00000000000..3d602f7bedc --- /dev/null +++ b/jbmc/regression/janalyzer-taint/taint-aliasing1/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + org.cprover.regression + regression.janalyzer-taint.taint-aliasing1 + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer-taint + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.java b/jbmc/regression/janalyzer-taint/taint-aliasing1/src/main/java/aliasing1.java similarity index 100% rename from jbmc/regression/janalyzer-taint/taint-aliasing1/aliasing1.java rename to jbmc/regression/janalyzer-taint/taint-aliasing1/src/main/java/aliasing1.java diff --git a/jbmc/regression/janalyzer-taint/taint-aliasing1/test.desc b/jbmc/regression/janalyzer-taint/taint-aliasing1/test.desc index 4bb46b7dfcb..74baa634e3c 100644 --- a/jbmc/regression/janalyzer-taint/taint-aliasing1/test.desc +++ b/jbmc/regression/janalyzer-taint/taint-aliasing1/test.desc @@ -1,6 +1,6 @@ CORE aliasing1 ---taint taint.json +--taint taint.json --cp target/classes ^EXIT=0$ ^SIGNAL=0$ ^file aliasing1.java line 10( function .*)?: There is a flow \(taint rule my_sink\)$ diff --git a/jbmc/regression/pom.xml b/jbmc/regression/pom.xml index f46474ac6eb..37525b8d080 100644 --- a/jbmc/regression/pom.xml +++ b/jbmc/regression/pom.xml @@ -15,6 +15,7 @@ janalyzer + janalyzer-taint jbmc From 52a6e00fd9f18efdbed8b4d93ecf843252c9a5c0 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:18:46 +0100 Subject: [PATCH 4/8] Compile janalyzer-taint/taint-basic1 test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer-taint/pom.xml | 1 + .../janalyzer-taint/taint-basic1/basic1.class | Bin 497 -> 0 bytes .../janalyzer-taint/taint-basic1/pom.xml | 30 ++++++++++++++++++ .../{ => src/main/java}/basic1.java | 0 .../janalyzer-taint/taint-basic1/test.desc | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) delete mode 100644 jbmc/regression/janalyzer-taint/taint-basic1/basic1.class create mode 100644 jbmc/regression/janalyzer-taint/taint-basic1/pom.xml rename jbmc/regression/janalyzer-taint/taint-basic1/{ => src/main/java}/basic1.java (100%) diff --git a/jbmc/regression/janalyzer-taint/pom.xml b/jbmc/regression/janalyzer-taint/pom.xml index 425eff8778c..d2648e391f2 100644 --- a/jbmc/regression/janalyzer-taint/pom.xml +++ b/jbmc/regression/janalyzer-taint/pom.xml @@ -16,6 +16,7 @@ taint-aliasing1 + taint-basic1 diff --git a/jbmc/regression/janalyzer-taint/taint-basic1/basic1.class b/jbmc/regression/janalyzer-taint/taint-basic1/basic1.class deleted file mode 100644 index f5c1be3c0738984fc7e1139d32c38991c1aebe55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 497 zcmah^%SyvQ6g`tP57U^`KGX_AmuVLk!JVQD!Hq>1ir`9;G`1;C3N;n{D_vO>`~W{n zJd+dyx-dg-?%bTmJ)d819{>)}wxFS5K}S=TmMohFwhU|w=tprHXU77n*S!&_oX&=k zfIEoO=wgus(fryErkt!LPj^X_jb}rG*xw7ZyurkO^!rmk9rZ7RNfc&>xdwla3)D!U z>2?3Y1gxvsVjf0ku@tWc{zDw@?@2iu222|^)@?YlxTp!#emimVf`ks^Xbg(Hk_>Lk z+b+LCPJ6EqFKlSas^>#NSoH^bvVu0md2b1YuewA<_G(GoAys-PTu>*~;&CWa=dPyQ umm<=)om + + 4.0.0 + org.cprover.regression + regression.janalyzer-taint.taint-basic1 + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer-taint + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer-taint/taint-basic1/basic1.java b/jbmc/regression/janalyzer-taint/taint-basic1/src/main/java/basic1.java similarity index 100% rename from jbmc/regression/janalyzer-taint/taint-basic1/basic1.java rename to jbmc/regression/janalyzer-taint/taint-basic1/src/main/java/basic1.java diff --git a/jbmc/regression/janalyzer-taint/taint-basic1/test.desc b/jbmc/regression/janalyzer-taint/taint-basic1/test.desc index 478d563244e..83c40ff1a89 100644 --- a/jbmc/regression/janalyzer-taint/taint-basic1/test.desc +++ b/jbmc/regression/janalyzer-taint/taint-basic1/test.desc @@ -1,6 +1,6 @@ CORE basic1 ---taint taint.json +--taint taint.json -cp target/classes ^EXIT=0$ ^SIGNAL=0$ ^file basic1.java line 8( function .*)?: There is a T1 flow \(taint rule my_h1\)$ From 1bc572ad7e8c548a3291b3953f0c6d052cbabada Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:20:52 +0100 Subject: [PATCH 5/8] Compile janalyzer-taint/taint-basic2 test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer-taint/pom.xml | 1 + .../janalyzer-taint/taint-basic2/basic2.class | Bin 501 -> 0 bytes .../janalyzer-taint/taint-basic2/pom.xml | 30 ++++++++++++++++++ .../{ => src/main/java}/basic2.java | 0 .../janalyzer-taint/taint-basic2/test.desc | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) delete mode 100644 jbmc/regression/janalyzer-taint/taint-basic2/basic2.class create mode 100644 jbmc/regression/janalyzer-taint/taint-basic2/pom.xml rename jbmc/regression/janalyzer-taint/taint-basic2/{ => src/main/java}/basic2.java (100%) diff --git a/jbmc/regression/janalyzer-taint/pom.xml b/jbmc/regression/janalyzer-taint/pom.xml index d2648e391f2..94dd62caaf4 100644 --- a/jbmc/regression/janalyzer-taint/pom.xml +++ b/jbmc/regression/janalyzer-taint/pom.xml @@ -17,6 +17,7 @@ taint-aliasing1 taint-basic1 + taint-basic2 diff --git a/jbmc/regression/janalyzer-taint/taint-basic2/basic2.class b/jbmc/regression/janalyzer-taint/taint-basic2/basic2.class deleted file mode 100644 index de24af2b462dbeeb05cf145c2c918b375e6244c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 501 zcmah^O-sX25S*7bX-#9(YCo(X^w>tQAl?)&1y4l}ir`6-G`1;C0&Obzuk=zu!5`p{ z5@%CUu?Gp6w{PF<%+CAA%Nu|rv`pyOHesM9P#0(v&@5m_!8i%yFg;bsb-LFI`F=7C z6zoA52j`2(3uafYH)Urddbo{(bes%HVtuDj?+hmHz1y3*@u+v|B zwN7`PreIzsi + + 4.0.0 + org.cprover.regression + regression.janalyzer-taint.taint-basic2 + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer-taint + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer-taint/taint-basic2/basic2.java b/jbmc/regression/janalyzer-taint/taint-basic2/src/main/java/basic2.java similarity index 100% rename from jbmc/regression/janalyzer-taint/taint-basic2/basic2.java rename to jbmc/regression/janalyzer-taint/taint-basic2/src/main/java/basic2.java diff --git a/jbmc/regression/janalyzer-taint/taint-basic2/test.desc b/jbmc/regression/janalyzer-taint/taint-basic2/test.desc index b855f1c4101..ad86971f6e1 100644 --- a/jbmc/regression/janalyzer-taint/taint-basic2/test.desc +++ b/jbmc/regression/janalyzer-taint/taint-basic2/test.desc @@ -1,6 +1,6 @@ CORE basic2 ---taint taint.json +--taint taint.json -cp target/classes ^EXIT=0$ ^SIGNAL=0$ ^file basic2.java line 8( function .*)?: There is a T1 flow \(taint rule my_h1\)$ From c10880b46036ee016ed641def4dd59304d6601ae Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:22:15 +0100 Subject: [PATCH 6/8] Compile janalyzer-taint/taint-interface1 test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer-taint/pom.xml | 1 + .../taint-interface1/interface1.class | Bin 424 -> 0 bytes .../taint-interface1/my_I.class | Bin 138 -> 0 bytes .../janalyzer-taint/taint-interface1/pom.xml | 30 ++++++++++++++++++ .../taint-interface1/some_class.class | Bin 287 -> 0 bytes .../{ => src/main/java}/interface1.java | 0 .../taint-interface1/test.desc | 2 +- 7 files changed, 32 insertions(+), 1 deletion(-) delete mode 100644 jbmc/regression/janalyzer-taint/taint-interface1/interface1.class delete mode 100644 jbmc/regression/janalyzer-taint/taint-interface1/my_I.class create mode 100644 jbmc/regression/janalyzer-taint/taint-interface1/pom.xml delete mode 100644 jbmc/regression/janalyzer-taint/taint-interface1/some_class.class rename jbmc/regression/janalyzer-taint/taint-interface1/{ => src/main/java}/interface1.java (100%) diff --git a/jbmc/regression/janalyzer-taint/pom.xml b/jbmc/regression/janalyzer-taint/pom.xml index 94dd62caaf4..d57d72dcbd7 100644 --- a/jbmc/regression/janalyzer-taint/pom.xml +++ b/jbmc/regression/janalyzer-taint/pom.xml @@ -18,6 +18,7 @@ taint-aliasing1 taint-basic1 taint-basic2 + taint-interface1 diff --git a/jbmc/regression/janalyzer-taint/taint-interface1/interface1.class b/jbmc/regression/janalyzer-taint/taint-interface1/interface1.class deleted file mode 100644 index 056ea5d7b3ad82ab157d9df8940d362f31d7b6a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 424 zcmZWl%SyvQ6g`u+iH*_p6}1b&W!j2GT)0r&2(F?o6v0)QrlY1d2_&iDXSr!X!4L4G z#4{BvScdzUJLjHr?|gl~e*!o{+lGa@g@z3Sb?urqOtdU`7PbV;(I}JtOnsk=DCAy>^RuKCd*5-K + + 4.0.0 + org.cprover.regression + regression.janalyzer-taint.taint-interface1 + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer-taint + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer-taint/taint-interface1/some_class.class b/jbmc/regression/janalyzer-taint/taint-interface1/some_class.class deleted file mode 100644 index b3261423efde01591acc745113efc4d9682ba637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmZ9GPiw+J5XIlb*2GjBgOmIj>&0lP#{|)(~5O|EX{U2-asV&;Mi~zh} QI4jbhSF}g&jx`7MGdSflm;e9( diff --git a/jbmc/regression/janalyzer-taint/taint-interface1/interface1.java b/jbmc/regression/janalyzer-taint/taint-interface1/src/main/java/interface1.java similarity index 100% rename from jbmc/regression/janalyzer-taint/taint-interface1/interface1.java rename to jbmc/regression/janalyzer-taint/taint-interface1/src/main/java/interface1.java diff --git a/jbmc/regression/janalyzer-taint/taint-interface1/test.desc b/jbmc/regression/janalyzer-taint/taint-interface1/test.desc index f2ffa5e6bda..633afc7c0c8 100644 --- a/jbmc/regression/janalyzer-taint/taint-interface1/test.desc +++ b/jbmc/regression/janalyzer-taint/taint-interface1/test.desc @@ -1,6 +1,6 @@ CORE interface1 ---taint taint.json +--taint taint.json -cp target/classes ^EXIT=0$ ^SIGNAL=0$ ^file interface1.java line 18( function .*)?: There is a flow! \(taint rule sink_rule\)$ From 67ed88c98ad8c413a4a515ce6b8d9c5a68f048c2 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:23:18 +0100 Subject: [PATCH 7/8] Compile janalyzer-taint/taint-interproc1 test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer-taint/pom.xml | 1 + .../taint-interproc1/interproc1.class | Bin 467 -> 0 bytes .../janalyzer-taint/taint-interproc1/pom.xml | 30 ++++++++++++++++++ .../{ => src/main/java}/interproc1.java | 0 .../taint-interproc1/test.desc | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) delete mode 100644 jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.class create mode 100644 jbmc/regression/janalyzer-taint/taint-interproc1/pom.xml rename jbmc/regression/janalyzer-taint/taint-interproc1/{ => src/main/java}/interproc1.java (100%) diff --git a/jbmc/regression/janalyzer-taint/pom.xml b/jbmc/regression/janalyzer-taint/pom.xml index d57d72dcbd7..778e68d8f9e 100644 --- a/jbmc/regression/janalyzer-taint/pom.xml +++ b/jbmc/regression/janalyzer-taint/pom.xml @@ -19,6 +19,7 @@ taint-basic1 taint-basic2 taint-interface1 + taint-interproc1 diff --git a/jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.class b/jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.class deleted file mode 100644 index 6d8559b30858942608eb6b41ef7ccb28adbe837b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmaivKTE?<6vfX=( + + 4.0.0 + org.cprover.regression + regression.janalyzer-taint.taint-interproc1 + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer-taint + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.java b/jbmc/regression/janalyzer-taint/taint-interproc1/src/main/java/interproc1.java similarity index 100% rename from jbmc/regression/janalyzer-taint/taint-interproc1/interproc1.java rename to jbmc/regression/janalyzer-taint/taint-interproc1/src/main/java/interproc1.java diff --git a/jbmc/regression/janalyzer-taint/taint-interproc1/test.desc b/jbmc/regression/janalyzer-taint/taint-interproc1/test.desc index 54a2d1ae140..94800305b3a 100644 --- a/jbmc/regression/janalyzer-taint/taint-interproc1/test.desc +++ b/jbmc/regression/janalyzer-taint/taint-interproc1/test.desc @@ -1,6 +1,6 @@ CORE interproc1 ---taint taint.json +--taint taint.json -cp target/classes ^EXIT=0$ ^SIGNAL=0$ ^file interproc1.java line 13( function .*)?: There is a T1 flow \(taint rule my_h1\)$ From b51acc48e4da101577e059933c32113e4cf2e2f5 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 31 Dec 2024 14:25:00 +0100 Subject: [PATCH 8/8] Compile janalyzer-taint/taint-map1 test sources Add pom.xml for compilation, move sources remove obsolete pre-compiled class files. --- jbmc/regression/janalyzer-taint/pom.xml | 1 + .../janalyzer-taint/taint-map1/map1.class | Bin 713 -> 0 bytes .../janalyzer-taint/taint-map1/pom.xml | 30 ++++++++++++++++++ .../taint-map1/{ => src/main/java}/map1.java | 0 .../janalyzer-taint/taint-map1/test.desc | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) delete mode 100644 jbmc/regression/janalyzer-taint/taint-map1/map1.class create mode 100644 jbmc/regression/janalyzer-taint/taint-map1/pom.xml rename jbmc/regression/janalyzer-taint/taint-map1/{ => src/main/java}/map1.java (100%) diff --git a/jbmc/regression/janalyzer-taint/pom.xml b/jbmc/regression/janalyzer-taint/pom.xml index 778e68d8f9e..d51891beaed 100644 --- a/jbmc/regression/janalyzer-taint/pom.xml +++ b/jbmc/regression/janalyzer-taint/pom.xml @@ -20,6 +20,7 @@ taint-basic2 taint-interface1 taint-interproc1 + taint-map1 diff --git a/jbmc/regression/janalyzer-taint/taint-map1/map1.class b/jbmc/regression/janalyzer-taint/taint-map1/map1.class deleted file mode 100644 index 46876c31837f9308c90e81f546a43b9a788e5663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 713 zcmZvaTQ37q6ouF6ROe!7-Re%=r-(-4K|;JpgeV>~#FI=pYG|iTJ0tP0cv2*OfFC8+ zOiLR&lR0N+pOtT~efE5Qy?p@KK-z$gq>5n!5hM*57%?!4v2KiGB3LGa+?0xG6)Az( zw&Ob9j(}pN&jg~ovdF5>hsFc?n_g-Mg`hOl&GEPInp3|V)mG!lNW1<_TKwrr8J*Sx2w`;dY zcEv;jeJW;5%wkT(yom)YnplEmq8|eSiN7}3O^MhaSZMIT^<+U-Y4E`=`tsyPAZZ=6 zx6o9uhn|)P*5?gXd{1DrLq8ol{GTGAAPHFP0BASRyhEfoCY>V%qWpL(pe06=+y(cp zE_r>PzdPpN1XYS>OtFv!CQ GhQ0ypG>WzW diff --git a/jbmc/regression/janalyzer-taint/taint-map1/pom.xml b/jbmc/regression/janalyzer-taint/taint-map1/pom.xml new file mode 100644 index 00000000000..162ded92a26 --- /dev/null +++ b/jbmc/regression/janalyzer-taint/taint-map1/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + org.cprover.regression + regression.janalyzer-taint.taint-map1 + 1.0-SNAPSHOT + + + org.cprover.regression + regression.janalyzer-taint + 1.0-SNAPSHOT + + + + + + maven-jar-plugin + + + default-jar + none + + + + + + + diff --git a/jbmc/regression/janalyzer-taint/taint-map1/map1.java b/jbmc/regression/janalyzer-taint/taint-map1/src/main/java/map1.java similarity index 100% rename from jbmc/regression/janalyzer-taint/taint-map1/map1.java rename to jbmc/regression/janalyzer-taint/taint-map1/src/main/java/map1.java diff --git a/jbmc/regression/janalyzer-taint/taint-map1/test.desc b/jbmc/regression/janalyzer-taint/taint-map1/test.desc index 850c9775508..65b4d101cf8 100644 --- a/jbmc/regression/janalyzer-taint/taint-map1/test.desc +++ b/jbmc/regression/janalyzer-taint/taint-map1/test.desc @@ -1,6 +1,6 @@ CORE map1 ---taint taint.json +--taint taint.json -cp target/classes ^EXIT=0$ ^SIGNAL=0$ ^file map1.java line 12( function .*)?: There is a flow \(taint rule my_sink\)$