Skip to content
This repository was archived by the owner on Dec 15, 2020. It is now read-only.

Return correct HID metadata #16

Merged
btoews merged 2 commits into from
Jul 25, 2017
Merged

Return correct HID metadata #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cade54
fix usage page number and usage number
btoews Jul 25, 2017
9dd33d3
re-enable integration test now that we work with libu2f-host again
btoews Jul 25, 2017
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
6 changes: 3 additions & 3 deletions SoftU2F.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,12 @@
isa = PBXGroup;
children = (
F725EBCE1F1FAD9B000A003C /* UserKernelShared.h */,
F725EBCF1F1FAD9B000A003C /* SoftU2FDevice.hpp */,
F725EBD01F1FAD9B000A003C /* SoftU2FDriver.hpp */,
F725EBD11F1FAD9B000A003C /* SoftU2FUserClient.hpp */,
F725EBD21F1FAD9B000A003C /* SoftU2FDevice.cpp */,
F725EBD31F1FAD9B000A003C /* SoftU2FDriver.cpp */,
F725EBD11F1FAD9B000A003C /* SoftU2FUserClient.hpp */,
F725EBD41F1FAD9B000A003C /* SoftU2FUserClient.cpp */,
F725EBCF1F1FAD9B000A003C /* SoftU2FDevice.hpp */,
F725EBD21F1FAD9B000A003C /* SoftU2FDevice.cpp */,
F725EBD51F1FAD9B000A003C /* Info.plist */,
);
path = SoftU2FDriver;
Expand Down
5 changes: 0 additions & 5 deletions SoftU2F.xcodeproj/xcshareddata/xcschemes/SoftU2F.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@
BlueprintName = "SoftU2FTests"
ReferencedContainer = "container:SoftU2F.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Identifier = "IntegrationTests">
</Test>
</SkippedTests>
</TestableReference>
</Testables>
<MacroExpansion>
Expand Down
7 changes: 6 additions & 1 deletion SoftU2FDriver/SoftU2FDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "SoftU2FDevice.hpp"
#include "SoftU2FUserClient.hpp"
#include <IOKit/IOLib.h>
#include "u2f_hid.h"

#define super IOHIDDevice
OSDefineMetaClassAndStructors(SoftU2FDevice, IOHIDDevice)
Expand Down Expand Up @@ -66,6 +67,10 @@ OSNumber *SoftU2FDevice::newProductIDNumber() const {
return OSNumber::withNumber(123, 32);
}

OSNumber* SoftU2FDevice::newPrimaryUsagePageNumber() const {
return OSNumber::withNumber(FIDO_USAGE_PAGE, 32);
}

OSNumber* SoftU2FDevice::newPrimaryUsageNumber() const {
return OSNumber::withNumber(kHIDUsage_PID_TriggerButton, 32);
return OSNumber::withNumber(FIDO_USAGE_U2FHID, 32);
}
1 change: 1 addition & 0 deletions SoftU2FDriver/SoftU2FDevice.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class SoftU2FDevice : public IOHIDDevice {
virtual OSString *newSerialNumberString() const override;
virtual OSNumber *newVendorIDNumber() const override;
virtual OSNumber *newProductIDNumber() const override;
virtual OSNumber *newPrimaryUsagePageNumber() const override;
virtual OSNumber *newPrimaryUsageNumber() const override;
virtual IOReturn newReportDescriptor(IOMemoryDescriptor **descriptor) const override;
virtual IOReturn setReport(IOMemoryDescriptor *report, IOHIDReportType reportType, IOOptionBits options = 0) override;
Expand Down