- if (serial_init(&srl, challenge, *challengesize)) return -1;
- if (serial_put(&srl, id, strlen(id)) != strlen(id)) return -1;
- if (serial_put(&srl, pass, strlen(pass)) != strlen(pass)) return -1;
- if (serial_put(&srl, nonce, strlen(nonce)) != strlen(nonce)) return -1;
- if (serial_put(&srl, NULL, 0) != 0) return -1;
- *challengesize = ((serial_size(&srl) -1) / CBLKSIZE + 1) * CBLKSIZE;
+ serial_init(&srl, challenge, *challengesize);
+ if (serial_put(&srl, id, strlen(id)) != strlen(id))
+ return aoe_serial;
+ if (serial_put(&srl, pass, strlen(pass)) != strlen(pass))
+ return aoe_serial;
+ if (serial_put(&srl, nonce, strlen(nonce)) != strlen(nonce))
+ return aoe_serial;
+ if (serial_put(&srl, NULL, 0) != 0)
+ return aoe_serial;
+ *challengesize = serial_size(&srl);