← Back to branch summary

~cz.nic-labs/knot-dns/trunk

« back to all changes in this revision

Viewing changes to src/knot/dnssec/kasp/kasp_db.c

  • Committer: Daniel Salzman
  • Date: 2017-09-19 11:32:38 UTC
  • mfrom: (4815.1.4)
  • Revision ID: git-v1:cd7324d7ce2fed86819dab0246682cf9873bb762
Merge branch 'rollover_improve' into 'master'

Rollover improve

Closes #472

See merge request !828

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/knot/dnssec/kasp/kasp_db.c
230
230
        wire_ctx_write_u64(&wire, 0); // length of Unused-future block at the end
231
231
        wire_ctx_write_u16(&wire, params->keytag);
232
232
        wire_ctx_write_u8(&wire, params->algorithm);
233
 
        wire_ctx_write_u8(&wire, (uint8_t)(params->is_ksk ? 0x03 : 0x02));
 
233
        uint8_t flags = 0x02;
 
234
        flags |= (params->is_ksk ? 0x01 : 0);
 
235
        flags |= (params->is_pub_only ? 0x04 : 0);
 
236
        wire_ctx_write_u8(&wire, flags);
234
237
        wire_ctx_write_u64(&wire, (uint64_t)params->timing.created);
235
238
        wire_ctx_write_u64(&wire, (uint64_t)params->timing.pre_active);
236
239
        wire_ctx_write_u64(&wire, (uint64_t)params->timing.publish);
270
273
        params->algorithm = wire_ctx_read_u8(&wire);
271
274
        uint8_t isksk_plus_flags = wire_ctx_read_u8(&wire);
272
275
        params->is_ksk = ((isksk_plus_flags & (uint8_t)0x01) != (uint8_t)0x00);
 
276
        params->is_pub_only = ((isksk_plus_flags & (uint8_t)0x04) != (uint8_t)0x00);
273
277
        if ((isksk_plus_flags & (uint8_t)0x02) != (uint8_t)0x00) {
274
278
                params->timing.created = (knot_time_t)wire_ctx_read_u64(&wire);
275
279
                params->timing.pre_active = (knot_time_t)wire_ctx_read_u64(&wire);