Skip to content

Commit 70a2929

Browse files
authored
Merge pull request #1296 from NickeZ/nickez/various-fixes
Nickez/various fixes
2 parents dc77cda + 5bf1f1b commit 70a2929

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.clang-tidy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Checks: >-
1515
-bugprone-narrowing-conversions,
1616
-performance-no-int-to-ptr,
1717
-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
18-
-readability-avoid-unconditional-preprocessor-if
18+
-readability-avoid-unconditional-preprocessor-if,
19+
-readability-suspicious-call-argument
1920
HeaderFilterRegex: '.*'
2021
ExtraArgs:
2122
- -Wno-unknown-warning-option

.github/workflows/pr-ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
name: Pull request CI
55
on: pull_request
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
8+
cancel-in-progress: true
69

710
jobs:
811
pr-head-ci:
@@ -47,13 +50,13 @@ jobs:
4750
runs-on: ubuntu-22.04
4851
needs: [ generate-matrix ]
4952
strategy:
53+
fail-fast: false
5054
matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
5155
if: needs.generate-matrix.outputs.matrix != ''
5256
steps:
5357
- name: Clone the repo
5458
uses: actions/checkout@v4
5559
with:
56-
submodules: recursive
5760
fetch-depth: 0
5861
ref: ${{ github.event.pull_request.base.sha }}
5962

@@ -66,6 +69,7 @@ jobs:
6669
run: |
6770
git fetch origin ${{ matrix.commit }} ${{ github.event.pull_request.merge_commit_sha }}
6871
git merge --no-ff --no-edit ${{ matrix.commit }}
72+
git submodule update --init --recursive
6973
git log -1 --format="Head %H, Parents %P"
7074
# Since the workflow definition is taken from the pull request merge commit, we need to
7175
# get the .ci scripts from there as well.

src/u2f.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,8 @@ static void _authenticate_continue(const USB_APDU* apdu, Packet* out_packet)
696696
size_t auth_packet_len = sizeof(U2F_AUTHENTICATE_RESP) - U2F_MAX_EC_SIG_SIZE + der_len;
697697

698698
// Append success bytes
699-
memcpy(buf + auth_packet_len, "\x90\x00", 2);
699+
uint8_t success_bytes[] = {0x90, 0x00};
700+
memcpy(buf + auth_packet_len, success_bytes, sizeof(success_bytes));
700701

701702
_fill_message(buf, auth_packet_len + 2, out_packet);
702703
}

0 commit comments

Comments
 (0)