rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 17:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libksi: removed further issues reported by clang.

Browse Source
This commit is contained in:
Andre Lorbach 2015-12-02 16:53:42 +01:00
parent 6ae1c5c1db
commit cf05b04973
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/librsgt_read.c
View File

@ -1200,6 +1200,7 @@ done:
iWr += subrec.lenHdr; \
memcpy(newrec.data+iWr, subrec.data, subrec.tlvlen); \
iWr += subrec.tlvlen;
static inline int
rsgt_extendSig(GTTimestamp *timestamp, tlvrecord_t *rec, gterrctx_t *ectx)
{
@ -1228,19 +1229,19 @@ rsgt_extendSig(GTTimestamp *timestamp, tlvrecord_t *rec, gterrctx_t *ectx)
*/
iRd = iWr = 0;
// TODO; check tlvtypes at comment places below!
if ((r = rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* HASH_ALGO */
COPY_SUBREC_TO_NEWREC
if ((r = rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* BLOCK_IV */
COPY_SUBREC_TO_NEWREC
if ((r = rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* LAST_HASH */
COPY_SUBREC_TO_NEWREC
if ((r = rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* REC_COUNT */
COPY_SUBREC_TO_NEWREC
if ((r = rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsgt_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* actual sig! */
newrec.data[iWr++] = 0x09 | RSGT_FLAG_TLV16_RUNTIME;
newrec.data[iWr++] = 0x06;

31
runtime/librsksi_read.c
View File

@ -996,6 +996,7 @@ rsksi_vrfyConstruct_gf(void)
ksistate = KSI_CTX_setExtender(ksi->ctx->ksi_ctx, rsksi_read_puburl, rsksi_userid, rsksi_userkey);
if(ksistate != KSI_OK) {
fprintf(stderr, "Error %d setting KSI Extender: %s\n", ksistate, KSI_getErrorString(ksistate));
free(ksi);
return NULL;
}
@ -1083,8 +1084,8 @@ rsksi_vrfy_chkTreeHash(ksifile ksi, FILE *sigfp, FILE *nsigfp,
r = 0;
done:
if(imp != NULL) {
if(rsgt_read_debug)
printf("debug: rsgt_vrfy_chkTreeHash returned %d, hashID=%d, Length=%d\n", r, imp->hashID, hashOutputLengthOctets(imp->hashID));
if(rsksi_read_debug)
printf("debug: rsgt_vrfy_chkTreeHash returned %d, hashID=%d, Length=%d\n", r, imp->hashID, hashOutputLengthOctetsKSI(imp->hashID));
/* Free memory */
rsksi_objfree(0x0903, imp);
}
@ -1203,7 +1204,6 @@ static inline int
rsksi_extendSig(KSI_Signature *sig, ksifile ksi, tlvrecord_t *rec, ksierrctx_t *ectx)
{
KSI_Signature *extended = NULL;
/*OLDCODE GTTimestamp *out_timestamp;*/
uint8_t *der;
size_t lenDer;
int r, rgt;
@ -1217,40 +1217,25 @@ rsksi_extendSig(KSI_Signature *sig, ksifile ksi, tlvrecord_t *rec, ksierrctx_t *
r = RSGTE_SIG_EXTEND;
goto done;
}
/*OLD CODE
rgt = GTHTTP_extendTimestamp(timestamp, rsksi_extend_puburl, &out_timestamp);
if(rgt != KSI_OK) {
ectx->gtstate = rgt;
r = RSGTE_TS_EXTEND;
goto done;
}
r = GTTimestamp_getDEREncoded(out_timestamp, &der, &lenDer);
if(r != KSI_OK) {
r = RSGTE_TS_DERENCODE;
ectx->gtstate = rgt;
goto done;
}
*/
/* update block_sig tlv record with new extended timestamp */
/* we now need to copy all tlv records before the actual der
* encoded part.
*/
iRd = iWr = 0;
// TODO; check tlvtypes at comment places below!
if ((r = rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* HASH_ALGO */
COPY_SUBREC_TO_NEWREC
if ((r = rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* BLOCK_IV */
COPY_SUBREC_TO_NEWREC
if ((r = rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* LAST_HASH */
COPY_SUBREC_TO_NEWREC
if ((r = rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* REC_COUNT */
COPY_SUBREC_TO_NEWREC
if ((r = rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec)) != 0) goto done;
CHKr(rsksi_tlvDecodeSUBREC(rec, &iRd, &subrec));
/* actual sig! */
newrec.data[iWr++] = 0x09 | RSKSI_FLAG_TLV16_RUNTIME;
newrec.data[iWr++] = 0x06;