Skip to content

Commit 535def6

Browse files
committed
Typo in assigning buffer type via sshbuf_type().
I was passing a string instead of the int from the enum. This version also tries to start the oss-fuzz integration.
1 parent 879ba8a commit 535def6

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/cifuzz.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
name: CIFuzz
22
on:
33
push:
4-
branches: [master, pre-stage]
4+
branches: [master, dev_minor, dev_major, release_candidates]
55
paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
66
pull_request:
77
paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
88

99
jobs:
1010
Fuzzing:
11-
if: github.repository != 'rapier1/openssh-portable-selfhosted'
11+
if: github.repository != 'rapier1/hpn-ssh-selfhosted'
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Build Fuzzers
1515
id: build
1616
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
1717
with:
18-
oss-fuzz-project-name: 'openssh'
18+
oss-fuzz-project-name: 'hpn-ssh'
1919
dry-run: false
2020
language: c++
2121
- name: Run Fuzzers
2222
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
2323
with:
24-
oss-fuzz-project-name: 'openssh'
24+
oss-fuzz-project-name: 'hpn-ssh'
2525
fuzz-seconds: 600
2626
dry-run: false
2727
language: c++
@@ -30,4 +30,4 @@ jobs:
3030
if: failure() && steps.build.outcome == 'success'
3131
with:
3232
name: artifacts
33-
path: ./out/artifacts
33+
path: ./out/artifacts

packet.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ ssh_alloc_session_state(void)
259259
/* these buffers are important in terms of tracking buffer usage
260260
* so we explicitly label and type them with descriptive names */
261261
sshbuf_relabel(state->input, "input");
262-
sshbuf_type(state->input, "BUF_PACKET_INPUT");
262+
sshbuf_type(state->input, BUF_PACKET_INPUT);
263263
sshbuf_relabel(state->incoming_packet, "inpacket");
264-
sshbuf_type(state->incoming_packet, "BUF_PACKET_INCOMING");
264+
sshbuf_type(state->incoming_packet, BUF_PACKET_INCOMING);
265265
sshbuf_relabel(state->output, "output");
266-
sshbuf_type(state->output, "BUF_PACKET_OUTPUT");
266+
sshbuf_type(state->output, BUF_PACKET_OUTPUT);
267267
sshbuf_relabel(state->outgoing_packet, "outpacket");
268-
sshbuf_type(state->outgoing_packet, "BUF_PACKET_OUTGOING");
268+
sshbuf_type(state->outgoing_packet, BUF_PACKET_OUTGOING);
269269

270270
TAILQ_INIT(&state->outgoing);
271271
TAILQ_INIT(&ssh->private_keys);

0 commit comments

Comments
 (0)