Skip to content

Merge master upstream #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: feature-unittest
Choose a base branch
from
Open

Merge master upstream #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
141037c
Remove support for EC without precomphash
arekinath Jul 1, 2022
1cb2934
don't change serial number at reset
arekinath Jul 1, 2022
60fc61a
read object: check security status before checking for data
arekinath Jul 1, 2022
c1dbe2e
PIN handling improvements
arekinath Aug 22, 2022
fd39765
ykpivtool needs slashes at end of DNs now
arekinath Aug 22, 2022
472ac03
simulator tests: let pivy get the admin key out of pinfo
arekinath Aug 22, 2022
5cb14a9
Don't allow PUK with VERIFY, support VERIFY with P1=FF
arekinath Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions build.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
'R' => 'PIV_SUPPORT_RSA',
'E' => 'PIV_SUPPORT_EC',
'e' => 'PIV_SUPPORT_ECCP384',
'P' => 'PIV_USE_EC_PRECOMPHASH',
'S' => 'PIV_STRICT_CONTACTLESS',
'A' => 'YKPIV_ATTESTATION',
'x' => 'APPLET_EXTLEN',
Expand Down Expand Up @@ -46,20 +45,20 @@ def build(ver, jcver, flags)

`rm -fr dist`
`mkdir dist`
build(VER, 'jc221', 'RESaD')
build(VER, 'jc221', 'RESAaD')
build(VER, 'jc221', 'RESLaD')
build(VER, 'jc221', 'RESLD')
build(VER, 'jc221', 'RSaD')
build(VER, 'jc221', 'RSAaD')
build(VER, 'jc221', 'RSLaD')
build(VER, 'jc221', 'RSLD')

build(VER, 'jc222', 'RESAaD')
build(VER, 'jc222', 'RESAxaD')
build(VER, 'jc222', 'REAxaD')
build(VER, 'jc222', 'RESxLD')
build(VER, 'jc222', 'RSAaD')
build(VER, 'jc222', 'RSAxaD')
build(VER, 'jc222', 'RAxaD')
build(VER, 'jc222', 'RSxLD')

build(VER, 'jc304', 'EPSxLaD')
build(VER, 'jc304', 'ESxLaD')
build(VER, 'jc304', 'RSxLaD')
build(VER, 'jc304', 'REePSAa')
build(VER, 'jc304', 'REePSAaD')
build(VER, 'jc304', 'REePSAxa')
build(VER, 'jc304', 'REePSAxaD')
build(VER, 'jc304', 'REePAxaD')
build(VER, 'jc304', 'REeSAa')
build(VER, 'jc304', 'REeSAaD')
build(VER, 'jc304', 'REeSAxa')
build(VER, 'jc304', 'REeSAxaD')
build(VER, 'jc304', 'REeAxaD')
9 changes: 1 addition & 8 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,12 @@
<property name="PIV_SUPPORT_AES" value="true"/>
<property name="PIV_SUPPORT_3DES" value="true"/>

<!--
PIV_USE_EC_PRECOMPHASH: build with support for using signPreComputedHash()
for EC signing. This can only work with JC3.0.5, but will build an applet
that is capable of PIV standards-compliant EC signing.
-->
<property name="PIV_USE_EC_PRECOMPHASH" value="true"/>

<!--
PIV_STRICT_CONTACTLESS: if true, strictly enforce the PIV spec requirements
around which slots and keys are allowed to be used over the contactless
interface. If false, allow anything to be used over contactless.
-->
<property name="PIV_STRICT_CONTACTLESS" value="true"/>
<property name="PIV_STRICT_CONTACTLESS" value="false"/>
<!--
YKPIV_ATTESTATION: whether to build support for YubicoPIV attestation.
Without this, the attestation slots and commands will all return
Expand Down
Loading