Skip to content

Commit

Permalink
Merge branch 'release/v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Agbar committed Oct 21, 2017
2 parents 17ae27d + e12668e commit 5cf1e3c
Show file tree
Hide file tree
Showing 91 changed files with 6,064 additions and 5,319 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -6,6 +6,8 @@
# binary compiler output
code_blocks/obj
code_blocks/bin
code_blocks/libEnigma/obj
code_blocks/libEnigma/bin
tests/obj
tests/bin

Expand All @@ -19,3 +21,5 @@ enigma-optima.workspace.layout

# CCCC
code_blocks/.cccc

code_blocks/libEnigma/libEnigma\.depend
44 changes: 40 additions & 4 deletions BOINC/Linux/app_info.xml
@@ -1,24 +1,34 @@
<app_info>
<app>
<name>enigma_m4_2</name>
<user_friendly_name>Enigma Optima v1.0.1</user_friendly_name>
<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
<non_cpu_intensive>0</non_cpu_intensive>
</app>
<app>
<name>enigma_m4_3</name>
<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
<non_cpu_intensive>0</non_cpu_intensive>
</app>
<file_info>
<name>wrapper_5.32_i686-pc-linux-gnu</name>
<executable/>
<!--
<download_url>http://download.enigmaathome.net/wrapper_5.32_windows_intelx86.exe</download_url>
<download_url>http://download.enigmaathome.net/wrapper_5.32_i686-pc-linux-gnu</download_url>
-->
</file_info>
<file_info>
<name>enigma-optima</name>
<executable/>
</file_info>
<file_info>
<name>job_optima.xml</name>
<name>job_optima_Krah.xml</name>
<status>1</status>
</file_info>
<file_info>
<name>job_optima_AV.xml</name>
<status>1</status>
</file_info>

<app_version>
<app_name>enigma_m4_2</app_name>
<version_num>532</version_num>
Expand All @@ -39,7 +49,33 @@
<copy_file/>
</file_ref>
<file_ref>
<file_name>job_optima.xml</file_name>
<file_name>job_optima_Krah.xml</file_name>
<open_name>job.xml</open_name>
<copy_file/>
</file_ref>
</app_version>

<app_version>
<app_name>enigma_m4_3</app_name>
<version_num>105</version_num>
<avg_ncpus>1.000000</avg_ncpus>
<max_ncpus>1.000000</max_ncpus>
<flops>4500000000</flops>
<api_version>6.11.4</api_version>
<is_wrapper>1</is_wrapper>
<file_ref>
<file_name>wrapper_5.32_i686-pc-linux-gnu</file_name>
<open_name>enigma_wrapper</open_name>
<main_program/>
<copy_file/>
</file_ref>
<file_ref>
<file_name>enigma-optima</file_name>
<open_name>enigma_av</open_name>
<copy_file/>
</file_ref>
<file_ref>
<file_name>job_optima_AV.xml</file_name>
<open_name>job.xml</open_name>
<copy_file/>
</file_ref>
Expand Down
7 changes: 0 additions & 7 deletions BOINC/Linux/job_optima.xml

This file was deleted.

7 changes: 7 additions & 0 deletions BOINC/Linux/job_optima_AV.xml
@@ -0,0 +1,7 @@
<job_desc>
<!-- Author: TJM@enigmaathome.net -->
<task>
<application>enigma_av</application>
<command_line>--optimizer AV -R -o results.txt 03trigr.cur 03unigr.cur 00ciphertext</command_line>
</task>
</job_desc>
7 changes: 7 additions & 0 deletions BOINC/Linux/job_optima_Krah.xml
@@ -0,0 +1,7 @@
<job_desc>
<!-- Author: TJM@enigmaathome.net -->
<task>
<application>enigma_0.76</application>
<command_line>--optimizer Krah -R -o results.txt 00trigr.cur 00bigr.cur 00ciphertext</command_line>
</task>
</job_desc>
7 changes: 0 additions & 7 deletions BOINC/Windows/job_optima.xml

This file was deleted.

7 changes: 7 additions & 0 deletions BOINC/Windows/job_optima_AV.xml
@@ -0,0 +1,7 @@
<job_desc>
<!-- Author: TJM@enigmaathome.net -->
<task>
<application>enigma_av.exe</application>
<command_line>--optimizer AV -R -o results.txt 03trigr.cur 03unigr.cur 00ciphertext</command_line>
</task>
</job_desc>
7 changes: 7 additions & 0 deletions BOINC/Windows/job_optima_Krah.xml
@@ -0,0 +1,7 @@
<job_desc>
<!-- Author: TJM@enigmaathome.net -->
<task>
<application>enigma_0.76.exe</application>
<command_line>--optimizer Krah -R -o results.txt 00trigr.cur 00bigr.cur 00ciphertext</command_line>
</task>
</job_desc>
42 changes: 39 additions & 3 deletions BOINC/Windows/app_info.xml → BOINC/Windows/x64/app_info.xml
@@ -1,7 +1,12 @@
<app_info>
<app>
<name>enigma_m4_2</name>
<user_friendly_name>Enigma Optima v1.0.1</user_friendly_name>
<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
<non_cpu_intensive>0</non_cpu_intensive>
</app>
<app>
<name>enigma_m4_3</name>
<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
<non_cpu_intensive>0</non_cpu_intensive>
</app>
<file_info>
Expand All @@ -11,14 +16,27 @@
<download_url>http://download.enigmaathome.net/wrapper_5.32_windows_intelx86.exe</download_url>
-->
</file_info>
<file_info>
<name>wrapper_1.05_windows_x86_64.exe</name>
<executable/>
<!--
<download_url>http://download.enigmaathome.net/wrapper_1.05_windows_x86_64.exe</download_url>
-->
</file_info>
<file_info>
<name>enigma-optima.exe</name>
<executable/>
</file_info>

<file_info>
<name>job_optima_Krah.xml</name>
<status>1</status>
</file_info>
<file_info>
<name>job_optima.xml</name>
<name>job_optima_AV.xml</name>
<status>1</status>
</file_info>

<app_version>
<app_name>enigma_m4_2</app_name>
<version_num>532</version_num>
Expand All @@ -39,9 +57,27 @@
<copy_file/>
</file_ref>
<file_ref>
<file_name>job_optima.xml</file_name>
<file_name>job_optima_Krah.xml</file_name>
<open_name>job.xml</open_name>
<copy_file/>
</file_ref>
</app_version>

<app_version>
<app_name>enigma_m4_3</app_name>
<version_num>105</version_num>
<file_ref>
<file_name>wrapper_1.05_windows_x86_64.exe</file_name>
<open_name>enigma_wrapper.exe</open_name>
<main_program/>
</file_ref>
<file_ref>
<file_name>enigma-optima.exe</file_name>
<open_name>enigma_av.exe</open_name>
</file_ref>
<file_ref>
<file_name>job_optima_AV.xml</file_name>
<open_name>job.xml</open_name>
</file_ref>
</app_version>
</app_info>
83 changes: 83 additions & 0 deletions BOINC/Windows/x86/app_info.xml
@@ -0,0 +1,83 @@
<app_info>
<app>
<name>enigma_m4_2</name>
<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
<non_cpu_intensive>0</non_cpu_intensive>
</app>
<app>
<name>enigma_m4_3</name>
<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
<non_cpu_intensive>0</non_cpu_intensive>
</app>
<file_info>
<name>wrapper_5.32_windows_intelx86.exe</name>
<executable/>
<!--
<download_url>http://download.enigmaathome.net/wrapper_5.32_windows_intelx86.exe</download_url>
-->
</file_info>
<file_info>
<name>wrapper_1.05_windows_intelx86.exe</name>
<executable/>
<!--
<download_url>http://download.enigmaathome.net/wrapper_1.05_windows_intelx86.exe</download_url>
-->
</file_info>
<file_info>
<name>enigma-optima.exe</name>
<executable/>
</file_info>

<file_info>
<name>job_optima_Krah.xml</name>
<status>1</status>
</file_info>
<file_info>
<name>job_optima_AV.xml</name>
<status>1</status>
</file_info>

<app_version>
<app_name>enigma_m4_2</app_name>
<version_num>532</version_num>
<avg_ncpus>1.000000</avg_ncpus>
<max_ncpus>1.000000</max_ncpus>
<flops>4500000000</flops>
<api_version>6.11.4</api_version>
<is_wrapper>1</is_wrapper>
<file_ref>
<file_name>wrapper_5.32_windows_intelx86.exe</file_name>
<open_name>enigma_wrapper.exe</open_name>
<main_program/>
<copy_file/>
</file_ref>
<file_ref>
<file_name>enigma-optima.exe</file_name>
<open_name>enigma_0.76.exe</open_name>
<copy_file/>
</file_ref>
<file_ref>
<file_name>job_optima_Krah.xml</file_name>
<open_name>job.xml</open_name>
<copy_file/>
</file_ref>
</app_version>

<app_version>
<app_name>enigma_m4_3</app_name>
<version_num>105</version_num>
<file_ref>
<file_name>wrapper_1.05_windows_intelx86.exe</file_name>
<open_name>enigma_wrapper.exe</open_name>
<main_program/>
</file_ref>
<file_ref>
<file_name>enigma-optima.exe</file_name>
<open_name>enigma_av.exe</open_name>
</file_ref>
<file_ref>
<file_name>job_optima_AV.xml</file_name>
<open_name>job.xml</open_name>
</file_ref>
</app_version>
</app_info>

0 comments on commit 5cf1e3c

Please sign in to comment.