diff options
Diffstat (limited to 'src/credman.c')
-rw-r--r-- | src/credman.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/credman.c b/src/credman.c index 76327e5..a382185 100644 --- a/src/credman.c +++ b/src/credman.c | |||
@@ -137,8 +137,8 @@ credman_tx(fido_dev_t *dev, uint8_t cmd, const fido_blob_t *param, | |||
137 | } | 137 | } |
138 | 138 | ||
139 | /* framing and transmission */ | 139 | /* framing and transmission */ |
140 | if (cbor_build_frame(CTAP_CBOR_CRED_MGMT_PRE, argv, 4, &f) < 0 || | 140 | if (cbor_build_frame(CTAP_CBOR_CRED_MGMT_PRE, argv, nitems(argv), |
141 | fido_tx(dev, CTAP_FRAME_INIT | CTAP_CMD_CBOR, f.ptr, f.len) < 0) { | 141 | &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) { |
142 | fido_log_debug("%s: fido_tx", __func__); | 142 | fido_log_debug("%s: fido_tx", __func__); |
143 | r = FIDO_ERR_TX; | 143 | r = FIDO_ERR_TX; |
144 | goto fail; | 144 | goto fail; |
@@ -181,14 +181,14 @@ credman_parse_metadata(const cbor_item_t *key, const cbor_item_t *val, | |||
181 | static int | 181 | static int |
182 | credman_rx_metadata(fido_dev_t *dev, fido_credman_metadata_t *metadata, int ms) | 182 | credman_rx_metadata(fido_dev_t *dev, fido_credman_metadata_t *metadata, int ms) |
183 | { | 183 | { |
184 | const uint8_t cmd = CTAP_FRAME_INIT | CTAP_CMD_CBOR; | 184 | unsigned char reply[FIDO_MAXMSG]; |
185 | unsigned char reply[512]; | ||
186 | int reply_len; | 185 | int reply_len; |
187 | int r; | 186 | int r; |
188 | 187 | ||
189 | memset(metadata, 0, sizeof(*metadata)); | 188 | memset(metadata, 0, sizeof(*metadata)); |
190 | 189 | ||
191 | if ((reply_len = fido_rx(dev, cmd, &reply, sizeof(reply), ms)) < 0) { | 190 | if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply), |
191 | ms)) < 0) { | ||
192 | fido_log_debug("%s: fido_rx", __func__); | 192 | fido_log_debug("%s: fido_rx", __func__); |
193 | return (FIDO_ERR_RX); | 193 | return (FIDO_ERR_RX); |
194 | } | 194 | } |
@@ -300,14 +300,14 @@ credman_parse_rk_count(const cbor_item_t *key, const cbor_item_t *val, | |||
300 | static int | 300 | static int |
301 | credman_rx_rk(fido_dev_t *dev, fido_credman_rk_t *rk, int ms) | 301 | credman_rx_rk(fido_dev_t *dev, fido_credman_rk_t *rk, int ms) |
302 | { | 302 | { |
303 | const uint8_t cmd = CTAP_FRAME_INIT | CTAP_CMD_CBOR; | 303 | unsigned char reply[FIDO_MAXMSG]; |
304 | unsigned char reply[2048]; | ||
305 | int reply_len; | 304 | int reply_len; |
306 | int r; | 305 | int r; |
307 | 306 | ||
308 | credman_reset_rk(rk); | 307 | credman_reset_rk(rk); |
309 | 308 | ||
310 | if ((reply_len = fido_rx(dev, cmd, &reply, sizeof(reply), ms)) < 0) { | 309 | if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply), |
310 | ms)) < 0) { | ||
311 | fido_log_debug("%s: fido_rx", __func__); | 311 | fido_log_debug("%s: fido_rx", __func__); |
312 | return (FIDO_ERR_RX); | 312 | return (FIDO_ERR_RX); |
313 | } | 313 | } |
@@ -339,12 +339,12 @@ credman_rx_rk(fido_dev_t *dev, fido_credman_rk_t *rk, int ms) | |||
339 | static int | 339 | static int |
340 | credman_rx_next_rk(fido_dev_t *dev, fido_credman_rk_t *rk, int ms) | 340 | credman_rx_next_rk(fido_dev_t *dev, fido_credman_rk_t *rk, int ms) |
341 | { | 341 | { |
342 | const uint8_t cmd = CTAP_FRAME_INIT | CTAP_CMD_CBOR; | 342 | unsigned char reply[FIDO_MAXMSG]; |
343 | unsigned char reply[2048]; | ||
344 | int reply_len; | 343 | int reply_len; |
345 | int r; | 344 | int r; |
346 | 345 | ||
347 | if ((reply_len = fido_rx(dev, cmd, &reply, sizeof(reply), ms)) < 0) { | 346 | if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply), |
347 | ms)) < 0) { | ||
348 | fido_log_debug("%s: fido_rx", __func__); | 348 | fido_log_debug("%s: fido_rx", __func__); |
349 | return (FIDO_ERR_RX); | 349 | return (FIDO_ERR_RX); |
350 | } | 350 | } |
@@ -514,14 +514,14 @@ credman_parse_rp_count(const cbor_item_t *key, const cbor_item_t *val, | |||
514 | static int | 514 | static int |
515 | credman_rx_rp(fido_dev_t *dev, fido_credman_rp_t *rp, int ms) | 515 | credman_rx_rp(fido_dev_t *dev, fido_credman_rp_t *rp, int ms) |
516 | { | 516 | { |
517 | const uint8_t cmd = CTAP_FRAME_INIT | CTAP_CMD_CBOR; | 517 | unsigned char reply[FIDO_MAXMSG]; |
518 | unsigned char reply[2048]; | ||
519 | int reply_len; | 518 | int reply_len; |
520 | int r; | 519 | int r; |
521 | 520 | ||
522 | credman_reset_rp(rp); | 521 | credman_reset_rp(rp); |
523 | 522 | ||
524 | if ((reply_len = fido_rx(dev, cmd, &reply, sizeof(reply), ms)) < 0) { | 523 | if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply), |
524 | ms)) < 0) { | ||
525 | fido_log_debug("%s: fido_rx", __func__); | 525 | fido_log_debug("%s: fido_rx", __func__); |
526 | return (FIDO_ERR_RX); | 526 | return (FIDO_ERR_RX); |
527 | } | 527 | } |
@@ -553,12 +553,12 @@ credman_rx_rp(fido_dev_t *dev, fido_credman_rp_t *rp, int ms) | |||
553 | static int | 553 | static int |
554 | credman_rx_next_rp(fido_dev_t *dev, fido_credman_rp_t *rp, int ms) | 554 | credman_rx_next_rp(fido_dev_t *dev, fido_credman_rp_t *rp, int ms) |
555 | { | 555 | { |
556 | const uint8_t cmd = CTAP_FRAME_INIT | CTAP_CMD_CBOR; | 556 | unsigned char reply[FIDO_MAXMSG]; |
557 | unsigned char reply[2048]; | ||
558 | int reply_len; | 557 | int reply_len; |
559 | int r; | 558 | int r; |
560 | 559 | ||
561 | if ((reply_len = fido_rx(dev, cmd, &reply, sizeof(reply), ms)) < 0) { | 560 | if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply), |
561 | ms)) < 0) { | ||
562 | fido_log_debug("%s: fido_rx", __func__); | 562 | fido_log_debug("%s: fido_rx", __func__); |
563 | return (FIDO_ERR_RX); | 563 | return (FIDO_ERR_RX); |
564 | } | 564 | } |