SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync

Browse source
This commit is contained in:
purplerain 2023-06-24 02:57:55 +00:00
parent be633fa56a
commit 82bafdd0b3
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
18 changed files with 514 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

18
usr.sbin/rpki-client/main.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: main.c,v 1.242 2023/06/20 15:15:14 claudio Exp $ */
/* $OpenBSD: main.c,v 1.243 2023/06/23 11:36:24 claudio Exp $ */
/*
* Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
* Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@ -280,9 +280,8 @@ rrdp_fetch(unsigned int id, const char *uri, const char *local,
io_simple_buffer(b, &id, sizeof(id));
io_str_buffer(b, local);
io_str_buffer(b, uri);
io_str_buffer(b, s->session_id);
io_simple_buffer(b, &s->serial, sizeof(s->serial));
io_str_buffer(b, s->last_mod);
rrdp_session_buffer(b, s);
io_close_buffer(&rrdpq, b);
}
@ -679,7 +678,7 @@ rrdp_process(struct ibuf *b)
{
enum rrdp_msg type;
enum publish_type pt;
struct rrdp_session s;
struct rrdp_session *s;
char *uri, *last_mod, *data;
char hash[SHA256_DIGEST_LENGTH];
size_t dsz;
@ -700,12 +699,9 @@ rrdp_process(struct ibuf *b)
rrdp_http_fetch(id, uri, last_mod);
break;
case RRDP_SESSION:
io_read_str(b, &s.session_id);
io_read_buf(b, &s.serial, sizeof(s.serial));
io_read_str(b, &s.last_mod);
rrdp_save_state(id, &s);
free(s.session_id);
free(s.last_mod);
s = rrdp_session_read(b);
rrdp_session_save(id, s);
rrdp_session_free(s);
break;
case RRDP_FILE:
io_read_buf(b, &pt, sizeof(pt));