Skip to content

Commit 4c2dcae

Browse files
committed
Merge branch 'ubuntu24'
2 parents a50cef1 + a1a9313 commit 4c2dcae

File tree

11 files changed

+114
-79
lines changed

11 files changed

+114
-79
lines changed

elft_1_x/include/elft.h

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,17 @@ namespace ELFT
12011201
* The files pointed to by `referenceTemplates` **will not
12021202
* exist** when SearchInterface is instantiated.
12031203
*
1204+
* @attention
1205+
* Implementations may not write more than 1000 **total** files.
1206+
*
1207+
* @attention
1208+
* Writing many files is detrimental to the performance of the
1209+
* file system during this evaluation. It is strongly encouraged
1210+
* to write a small number of large files to store the reference
1211+
* database. *NIST reserves the right to reject the
1212+
* implementation based on the file system requirements of the
1213+
* reference database scheme employed.*
1214+
*
12041215
* @note
12051216
* This method may use more than one thread.
12061217
*
@@ -1298,6 +1309,10 @@ namespace ELFT
12981309
* @return
12991310
* Information about the result of executing the method.
13001311
*
1312+
* @attention
1313+
* You should confirm that your database is fully loaded and all
1314+
* files expected are present before returning.
1315+
*
13011316
* @warning
13021317
* This method will be called after construction and should
13031318
* **not** be called from an implementation's constructor. This
@@ -1308,7 +1323,6 @@ namespace ELFT
13081323
* *after* this method returns! After calling this method, the
13091324
* test application may `fork()`, allowing calls to search() to
13101325
* share the contents of memory using copy-on-write semantics.
1311-
13121326
*
13131327
* @warning
13141328
* **DO NOT MODIFY** the contents of the database on disk at any
@@ -1480,7 +1494,6 @@ namespace ELFT
14801494
* call getIdentification() prior to creating an enrollment
14811495
* database.
14821496
*
1483-
*
14841497
* @note
14851498
* A possible implementation might be:
14861499
* `return (std::make_shared<SearchImplementation>(

elft_1_x/libelft/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# its use by other parties, and makes no guarantees, expressed or implied,
77
# about its quality, reliability, or any other characteristic.
88

9-
cmake_minimum_required(VERSION 3.11)
9+
cmake_minimum_required(VERSION 3.28.3)
1010

1111
project(elft_library)
1212

13-
set(CMAKE_CXX_STANDARD 17)
13+
set(CMAKE_CXX_STANDARD 20)
1414
set(CMAKE_CXX_STANDARD_REQUIRED True)
1515

1616
add_library(elft SHARED)

elft_1_x/libelft_output/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# its use by other parties, and makes no guarantees, expressed or implied,
77
# about its quality, reliability, or any other characteristic.
88

9-
cmake_minimum_required(VERSION 3.11)
9+
cmake_minimum_required(VERSION 3.28.3)
1010

1111
project(elft_output_library)
1212

13-
set(CMAKE_CXX_STANDARD 17)
13+
set(CMAKE_CXX_STANDARD 20)
1414
set(CMAKE_CXX_STANDARD_REQUIRED True)
1515

1616
add_library(elft_output SHARED)

elft_1_x/nullimpl/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# its use by other parties, and makes no guarantees, expressed or implied,
77
# about its quality, reliability, or any other characteristic.
88

9-
cmake_minimum_required(VERSION 3.11)
9+
cmake_minimum_required(VERSION 3.28.3)
1010

1111
project(elft_nullimpl)
1212

13-
set(CMAKE_CXX_STANDARD 17)
13+
set(CMAKE_CXX_STANDARD 20)
1414
set(CMAKE_CXX_STANDARD_REQUIRED True)
1515

1616
# Discover name and version

elft_1_x/randimpl/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# its use by other parties, and makes no guarantees, expressed or implied,
77
# about its quality, reliability, or any other characteristic.
88

9-
cmake_minimum_required(VERSION 3.11)
9+
cmake_minimum_required(VERSION 3.28.3)
1010

1111
project(elft_randimpl)
1212

13-
set(CMAKE_CXX_STANDARD 17)
13+
set(CMAKE_CXX_STANDARD 20)
1414
set(CMAKE_CXX_STANDARD_REQUIRED True)
1515

1616
# Discover name and version

elft_1_x/randimpl/elft_randimpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ ELFT::RandomImplementation::Util::readTemplate(
143143
file.seekg(std::ifstream::beg);
144144
file.read(reinterpret_cast<char*>(buf.data()), size);
145145

146-
return {{}, buf};
146+
return {ReturnStatus{}, buf};
147147
}
148148

149149
ELFT::ReturnStatus

elft_1_x/validation/CHECKSUMS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
SHA256 (../libelft/libelft.cpp) = 8ed0d1d2fdde0d959c187f1af4883c3408ba534dee66796416292e9d6858bed2
2+
SHA256 (../include/elft.h) = 638d3fd1b5bc80ba9ed05010faa3d44cf8794d8243ad9fd25f685ca419436930
3+
SHA256 (src/CMakeLists.txt) = 1e73c02ec694e1db65f533d45d0ca66d61b9c161b56d7d4b0f8bb3a5c7bd988c
4+
SHA256 (src/elft_validation.cpp) = de7d3812bf5a93ffa077b5ea3a5020549688ced0a9d5e70ad13304dc7addc9cc
5+
SHA256 (src/elft_validation.h) = 5de1a9f6c1b79539907131fc969dbff723248c7032b63807bc669847088419bd
6+
SHA256 (src/elft_validation_data.h) = 98dd1ac2b25f31c06ae68e92136e1441b157696dda78f643c0165426f8d4bdbd
7+
SHA256 (src/elft_validation_utils.h) = 7e7b8126c756e904877ffcf25901b1de8843adbbee9b9a13d0c626a8104f53e0
8+
SHA256 (validate) = 99f8ffb59391ee7b9fba9d408e03bda1261e579c48a1ab323d4c13ff2f4b1132

elft_1_x/validation/README.md

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ Requirements
3939
- Because organizations must agree to NIST Special Database terms and
4040
conditions, the required fingerprint imagery is not included in this GitHub
4141
repository. Request and download the data from our [requests website].
42-
* Ubuntu Server 20.04.03 LTS
42+
* Ubuntu Server 24.04.3 LTS
4343
- Even if this is not the latest version of Ubuntu Server, it will be the
44-
version used to run the evaluation. [Direct downloads] are available from
45-
the [Ubuntu Mirrors] and directly from the [NIST Image Group].
44+
version used to run the evaluation. Direct downloads are available from the
45+
[Ubuntu Mirrors] ([🇺🇸 USA], [🇪🇺 Europe]) and directly from the [NIST
46+
Image Group].
4647
- We **highly suggest** matching the exact versions of packages installed in
4748
our environment. A link to the names and versions of these pacakages is
4849
available.
@@ -102,14 +103,14 @@ $ export ELFT_REUSE_REFERENCE_TEMPLATES=NO
102103
$ export ELFT_REUSE_ENROLLMENT_DATABASES=NO
103104
$ ./validate
104105
================================================================================
105-
| ELFT Validation | Version 202201261021 | 26 Jan 2022 | 15:22:59 UTC |
106+
| ELFT Validation | Version 202508071622 | 07 Aug 2025 | 16:22:40 EDT |
106107
================================================================================
107108
Checking for required packages... [OKAY]
108109
Checking for previous validation attempts... [OKAY]
109-
Checking validation version... (connection failure) [SKIP]
110-
Checking OS and version... (Ubuntu Server 20.04.3 LTS (Focal Fossa)) [OKAY]
110+
Checking validation version... (202508071622) [OKAY]
111+
Checking OS and version... (Ubuntu Server 24.04.3 LTS (Noble Numbat)) [OKAY]
111112
Checking for unexpanded validation image tarballs... [DEFER]
112-
-> Expanding "elft_validation_images-202103120958.tar.xz"... [OKAY]
113+
-> Expanding "elft_validation_images-202310021336.tar.xz"... [OKAY]
113114
Checking for unexpanded validation image tarballs... [OKAY]
114115
Looking for core library... (libelft_nullimpl_0001.so) [OKAY]
115116
Checking for known environment variables... [SHOW]
@@ -119,19 +120,21 @@ Checking for known environment variables... [SHOW]
119120
Checking for known environment variables... [OKAY]
120121
Building... [OKAY]
121122
Checking API version... [OKAY]
123+
Checking library name... [OKAY]
122124
Testing ExtractionInterface (probe)... [OKAY]
123125
Checking probe extraction logs... [WARN]
124126
125127
================================================================================
126-
| There are some (117) zero-byte probe templates. Please review: |
128+
| There are some (117) unexpected zero-byte probe templates. Please review: |
127129
| output/driver/extractionCreate-0.log |
128130
================================================================================
129131
Still checking probe extraction logs... [OKAY]
130132
Testing ExtractionInterface (reference)... [OKAY]
131133
Checking reference extraction logs... [WARN]
132134
133135
================================================================================
134-
| There are some (55) zero-byte reference templates. Please review: |
136+
| There are some (55) unexpected zero-byte reference templates. Please |
137+
| review: |
135138
| output/driver/extractionCreate-1.log |
136139
================================================================================
137140
Still checking reference extraction logs... [OKAY]
@@ -140,10 +143,10 @@ Testing SearchInterface... [OKAY]
140143
Checking search logs (candidates)... [WARN]
141144
142145
================================================================================
143-
| There are some (117) searches that returned successfully, but did not |
144-
| produce any candidates. Please review: |
145-
| /mnt/hgfs/git/elft_public/elft_1_x/validation/output/driver/searchCandidates |
146-
| .log |
146+
| There are some (124) searches that returned successfully, but did not |
147+
| produce any candidates. This situation is converted to a failure to search |
148+
| during analysis. Please review: |
149+
| output/driver/searchCandidates.log |
147150
================================================================================
148151
Still checking search logs... [OKAY]
149152
Creating validation submission... (elft_validation_nullimpl_0001.tar.xz) [OKAY]
@@ -176,28 +179,16 @@ Creating validation submission... (elft_validation_nullimpl_0001.tar.xz) [OKAY]
176179
| Search Algorithm CBEFF Identifier = 0x0101 |
177180
================================================================================
178181
179-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
180-
+ This script could not check online to ensure there are no updates +
181-
+ available. NIST requires that ELFT submissions always use the latest +
182-
+ version. Retrieve the latest version number by visiting the URL below and +
183-
+ be sure it matches this version: 202201261021. +
184-
+ +
185-
+ https://github.com/usnistgov/elft/tree/master/elft_1_x/validation/VERSION +
186-
+ +
187-
+ If these numbers don't match, visit our website to retrieve the latest +
188-
+ version. +
189-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
190-
191182
================================================================================
192183
| You have successfully completed your part of ELFT validation. Please sign |
193184
| and encrypt the file listed below (run './validate encrypt' for an example). |
194185
| |
195186
| elft_validation_nullimpl_0001.tar.xz |
196187
| |
197-
| Please attach both elft_validation_nullimpl_0001.tar.xz.asc and your public |
198-
| key to an email addressed to elft@nist.gov. |
188+
| Please upload both elft_validation_nullimpl_0001.tar.xz.asc and your public |
189+
| key via https://pages.nist.gov/elft/upload |
199190
================================================================================
200-
Completed: 26 Jan 2022 | 15:23:44 UTC (Runtime: 45s)
191+
Completed: 07 Aug 2025 | 16:22:48 EDT (Runtime: 8s)
201192
```
202193
</details>
203194

@@ -291,8 +282,9 @@ The items in this repository are released in the public domain. See the
291282

292283
[API]: https://pages.nist.gov/elft/elft_1_x/doc/api/
293284
[Ubuntu Mirrors]: https://launchpad.net/ubuntu/+cdmirrors
294-
[Direct downloads]: https://old-releases.ubuntu.com/releases/20.04.3/ubuntu-20.04.3-live-server-amd64.iso
295-
[NIST Image Group]: https://nigos.nist.gov/evaluations/ubuntu-20.04.3-live-server-amd64.iso
285+
[🇺🇸 USA]: https://mirror.math.princeton.edu/pub/ubuntu-iso/noble/ubuntu-24.04.3-live-server-amd64.iso
286+
[🇪🇺 Europe]: http://mirror.init7.net/ubuntu-releases/noble/ubuntu-24.04.3-live-server-amd64.iso
287+
[NIST Image Group]: https://nigos.nist.gov/evaluations/ubuntu-24.04.3-live-server-amd64.iso
296288
[lib/]: https://github.com/usnistgov/elft/blob/master/elft_1_x/validation/lib
297289
[../libelft/]: https://github.com/usnistgov/elft/blob/master/elft_1_x/libelft
298290
[../include/elft.h]: https://github.com/usnistgov/elft/blob/master/elft_1_x/include/elft.h

elft_1_x/validation/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
202404051110
1+
202508071622

elft_1_x/validation/src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# its use by other parties, and makes no guarantees, expressed or implied,
77
# about its quality, reliability, or any other characteristic.
88

9-
cmake_minimum_required(VERSION 3.11)
9+
cmake_minimum_required(VERSION 3.28.3)
1010

1111
project(elft_validation)
1212
include(GNUInstallDirs)
1313

14-
set(CMAKE_CXX_STANDARD 17)
14+
set(CMAKE_CXX_STANDARD 20)
1515
set(CMAKE_CXX_STANDARD_REQUIRED True)
1616

1717
add_executable(elft_validation)

0 commit comments

Comments
 (0)