diff options
| -rw-r--r-- | checks/validate.dat | 55 | ||||
| -rwxr-xr-x | configure.py | 16 | ||||
| -rw-r--r-- | doc/log.txt | 3 | ||||
| -rw-r--r-- | src/cms/info.txt | 2 |
4 files changed, 72 insertions, 4 deletions
diff --git a/checks/validate.dat b/checks/validate.dat index 41e5bf61f..2e060abe3 100644 --- a/checks/validate.dat +++ b/checks/validate.dat @@ -4406,6 +4406,61 @@ D2FD8867D50D2DFE:0000000000000004:0101010101010101 0000000000000000:E2F5728F0995013C:1002911598100201 0000000000000000:1AEAC39A61F0A464:1002911698100101 +# Tests all sboxes +01A1D6D039776742:690F5B0D9A26939B:7CA110454A1A6E57 +5CD54CA83DEF57DA:7A389D10354BD271:0131D9619DC1376E +0248D43806F67172:868EBB51CAB4599A:07A1133E4A0B2686 +51454B582DDF440A:7178876E01F19B2A:3849674C2602319E +42FD443059577FA2:AF37FB421F8C4095:04B915BA43FEB5B6 +059B5E0851CF143A:86A560F10EC6D85B:0113B970FD34F2CE +0756D8E0774761D2:0CD3DA020021DC09:0170F175468FB5E6 +762514B829BF486A:EA676B2CB7DB2B7A:43297FAD38E373FE +3BDD119049372802:DFD64A815CAF1A0F:07A7137045DA2A16 +26955F6835AF609A:5C513C9C4886C088:04689104C2FD3B2F +164D5E404F275232:0A2AEEAE3FF4AB77:37D06BB516CB7546 +6B056E18759F5CCA:EF1BF03E5DFA575A:1F08260D1AC2465E +004BD6EF09176062:88BF0DB6D70DEE56:584023641ABA6176 +480D39006EE762F2:A1F9915541020B56:025816164629B007 +437540C8698F3CFA:6FBF1CAFCFFD0556:49793EBC79B3258F +072D43A077075292:2F22E49BAB7CA1AC:4FB05E1515AB73A7 +02FE55778117F12A:5A6B612CC26CCE4A:49E95D6D4CA229BF +1D9D5C5018F728C2:5F4C038ED12B2E41:018310DC409B26D6 +305532286D6F295A:63FAC0D034D9F793:1C587F1C13924FEF + +# Tests the permutation +0000000000000000:88D55E54F54C97B4:1046913489980131 +0000000000000000:0C0CC00C83EA48FD:1007103489988020 +0000000000000000:83BC8EF3A6570183:10071034C8980120 +0000000000000000:DF725DCAD94EA2E9:1046103489988020 +0000000000000000:E652B53B550BE8B0:1086911519190101 +0000000000000000:AF527120C485CBB0:1086911519580101 +0000000000000000:0F04CE393DB926D5:5107B01519580101 +0000000000000000:C9F00FFC74079067:1007B01519190101 +0000000000000000:7CFD82A593252B4E:3107915498080101 +0000000000000000:CB49A2F9E91363E3:3107919498080101 +0000000000000000:00B588BE70D23F56:10079115B9080140 +0000000000000000:406A9A6AB43399AE:3107911598080140 +0000000000000000:6CB773611DCA9ADA:1007D01589980101 +0000000000000000:67FD21C17DBB5D70:9107911589980101 +0000000000000000:9592CB4110430787:9107D01589190101 +0000000000000000:A6B7FF68A318DDD3:1007D01598980120 +0000000000000000:4D102196C914CA16:1007940498190101 +0000000000000000:2DFA9F4573594965:0107910491190401 +0000000000000000:B46604816C0E0774:0107910491190101 +0000000000000000:6E7E6221A4F34E87:0107940491190401 +0000000000000000:AA85E74643233199:19079210981A0101 +0000000000000000:2E5A19DB4D1962D6:1007911998190801 +0000000000000000:23A866A809D30894:10079119981A0801 +0000000000000000:D812D961F017D320:1007921098190101 +0000000000000000:055605816E58608F:100791159819010B +0000000000000000:ABD88E8B1B7716F1:1004801598190101 +0000000000000000:537AC95BE69DA1E1:1004801598190102 +0000000000000000:AED0F6AE3C25CDD8:1004801598190108 +0000000000000000:B3E35A5EE53E7B8D:1002911598100104 +0000000000000000:61C79C71921A2EF8:1002911598190104 +0000000000000000:E2F5728F0995013C:1002911598100201 +0000000000000000:1AEAC39A61F0A464:1002911698100101 + # Vectors randomly generated using OpenSSL 0CEB1136A85AD37A:9CE3A1058A483F55:309A4B21A2067196 diff --git a/configure.py b/configure.py index b35871c8b..26af5d499 100755 --- a/configure.py +++ b/configure.py @@ -952,13 +952,21 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): def objectfile_list(sources, obj_dir): for src in sources: - basename = os.path.basename(src) + (dir,file) = os.path.split(os.path.normpath(src)) + + if dir.startswith('src'): + parts = dir.split(os.sep)[1:] + if file == parts[-1] + '.cpp': + name = '_'.join(dir.split(os.sep)[1:]) + '.cpp' + else: + name = '_'.join(dir.split(os.sep)[1:]) + '_' + file + else: + name = file for src_suffix in ['.cpp', '.S']: - basename = basename.replace(src_suffix, - '.' + osinfo.obj_suffix) + name = name.replace(src_suffix, '.' + osinfo.obj_suffix) - yield os.path.join(obj_dir, basename) + yield os.path.join(obj_dir, name) def choose_mp_bits(): diff --git a/doc/log.txt b/doc/log.txt index b68420b44..c2ea01cac 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -24,6 +24,9 @@ Version 1.10.0, Not Yet Released * TR1 support is not longer automatically assumed under older versions of GCC +* The (incomplete) CMS support is disabled by default; add + ``--enable-modules=cms`` during configuration to turn it back on. + Series 1.9 ---------------------------------------- diff --git a/src/cms/info.txt b/src/cms/info.txt index dc2110ae5..34e2c089c 100644 --- a/src/cms/info.txt +++ b/src/cms/info.txt @@ -1,5 +1,7 @@ define CMS +load_on request + <requires> asn1 bigint |