detect-tls: various indent fixes.

And delete a useless FIXME.
pull/34/head
Eric Leblond 13 years ago
parent b253d1a499
commit a3b2cee0d5

@ -290,8 +290,7 @@ static DetectTlsData *DetectTlsSubjectParse (char *str)
} }
/* Let's see if we need to escape "'s */ /* Let's see if we need to escape "'s */
if (tmp_str[0] == '"') if (tmp_str[0] == '"') {
{
tmp_str[strlen(tmp_str) - 1] = '\0'; tmp_str[strlen(tmp_str) - 1] = '\0';
tmp_str += 1; tmp_str += 1;
} }
@ -531,7 +530,8 @@ static int DetectTlsIssuerDNSetup (DetectEngineCtx *de_ctx, Signature *s, char *
SigMatch *sm = NULL; SigMatch *sm = NULL;
tls = DetectTlsIssuerDNParse(str); tls = DetectTlsIssuerDNParse(str);
if (tls == NULL) goto error; if (tls == NULL)
goto error;
/* Okay so far so good, lets get this into a SigMatch /* Okay so far so good, lets get this into a SigMatch
* and put it in the Signature. */ * and put it in the Signature. */
@ -553,8 +553,10 @@ static int DetectTlsIssuerDNSetup (DetectEngineCtx *de_ctx, Signature *s, char *
return 0; return 0;
error: error:
if (tls != NULL) DetectTlsIssuerDNFree(tls); if (tls != NULL)
if (sm != NULL) SCFree(sm); DetectTlsIssuerDNFree(tls);
if (sm != NULL)
SCFree(sm);
return -1; return -1;
} }
@ -717,7 +719,8 @@ static int DetectTlsFingerprintSetup (DetectEngineCtx *de_ctx, Signature *s, cha
SigMatch *sm = NULL; SigMatch *sm = NULL;
tls = DetectTlsFingerprintParse(str); tls = DetectTlsFingerprintParse(str);
if (tls == NULL) goto error; if (tls == NULL)
goto error;
/* Okay so far so good, lets get this into a SigMatch /* Okay so far so good, lets get this into a SigMatch
* and put it in the Signature. */ * and put it in the Signature. */
@ -739,8 +742,10 @@ static int DetectTlsFingerprintSetup (DetectEngineCtx *de_ctx, Signature *s, cha
return 0; return 0;
error: error:
if (tls != NULL) DetectTlsFingerprintFree(tls); if (tls != NULL)
if (sm != NULL) SCFree(sm); DetectTlsFingerprintFree(tls);
if (sm != NULL)
SCFree(sm);
return -1; return -1;
} }
@ -790,8 +795,9 @@ static int DetectTlsStoreSetup (DetectEngineCtx *de_ctx, Signature *s, char *str
return 0; return 0;
error: error:
if (sm != NULL) SCFree(sm); if (sm != NULL)
return -1; SCFree(sm);
return -1;
} }

@ -535,7 +535,6 @@ OutputCtx *LogTlsLogInitCtx(ConfNode *conf)
} }
} }
/* FIXME config variable here */
if (SCConfLogOpenGeneric(conf, file_ctx, DEFAULT_LOG_FILENAME) < 0) { if (SCConfLogOpenGeneric(conf, file_ctx, DEFAULT_LOG_FILENAME) < 0) {
LogFileFreeCtx(file_ctx); LogFileFreeCtx(file_ctx);
return NULL; return NULL;

Loading…
Cancel
Save