conversion from 8 spaces to 4 spaces per tab
This commit is contained in:
Andreas Steffen
+288
-288
@@ -43,15 +43,15 @@
|
||||
static bool
|
||||
present(const char* pattern, chunk_t* ch)
|
||||
{
|
||||
u_int pattern_len = strlen(pattern);
|
||||
u_int pattern_len = strlen(pattern);
|
||||
|
||||
if (ch->len >= pattern_len && strneq(ch->ptr, pattern, pattern_len))
|
||||
{
|
||||
ch->ptr += pattern_len;
|
||||
ch->len -= pattern_len;
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
if (ch->len >= pattern_len && strneq(ch->ptr, pattern, pattern_len))
|
||||
{
|
||||
ch->ptr += pattern_len;
|
||||
ch->len -= pattern_len;
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -60,7 +60,7 @@ present(const char* pattern, chunk_t* ch)
|
||||
static bool
|
||||
match(const char *pattern, const chunk_t *ch)
|
||||
{
|
||||
return ch->len == strlen(pattern) && strneq(pattern, ch->ptr, ch->len);
|
||||
return ch->len == strlen(pattern) && strneq(pattern, ch->ptr, ch->len);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -69,31 +69,31 @@ match(const char *pattern, const chunk_t *ch)
|
||||
static bool
|
||||
find_boundary(const char* tag, chunk_t *line)
|
||||
{
|
||||
chunk_t name = chunk_empty;
|
||||
chunk_t name = chunk_empty;
|
||||
|
||||
if (!present("-----", line))
|
||||
return FALSE;
|
||||
if (!present(tag, line))
|
||||
return FALSE;
|
||||
if (*line->ptr != ' ')
|
||||
return FALSE;
|
||||
line->ptr++; line->len--;
|
||||
if (!present("-----", line))
|
||||
return FALSE;
|
||||
if (!present(tag, line))
|
||||
return FALSE;
|
||||
if (*line->ptr != ' ')
|
||||
return FALSE;
|
||||
line->ptr++; line->len--;
|
||||
|
||||
/* extract name */
|
||||
name.ptr = line->ptr;
|
||||
while (line->len > 0)
|
||||
{
|
||||
if (present("-----", line))
|
||||
/* extract name */
|
||||
name.ptr = line->ptr;
|
||||
while (line->len > 0)
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" -----%s %.*s-----",
|
||||
tag, (int)name.len, name.ptr);
|
||||
)
|
||||
return TRUE;
|
||||
if (present("-----", line))
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" -----%s %.*s-----",
|
||||
tag, (int)name.len, name.ptr);
|
||||
)
|
||||
return TRUE;
|
||||
}
|
||||
line->ptr++; line->len--; name.len++;
|
||||
}
|
||||
line->ptr++; line->len--; name.len++;
|
||||
}
|
||||
return FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -102,10 +102,10 @@ find_boundary(const char* tag, chunk_t *line)
|
||||
static void
|
||||
eat_whitespace(chunk_t *src)
|
||||
{
|
||||
while (src->len > 0 && (*src->ptr == ' ' || *src->ptr == '\t'))
|
||||
{
|
||||
src->ptr++; src->len--;
|
||||
}
|
||||
while (src->len > 0 && (*src->ptr == ' ' || *src->ptr == '\t'))
|
||||
{
|
||||
src->ptr++; src->len--;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -114,21 +114,21 @@ eat_whitespace(chunk_t *src)
|
||||
static bool
|
||||
extract_token(chunk_t *token, char termination, chunk_t *src)
|
||||
{
|
||||
u_char *eot = memchr(src->ptr, termination, src->len);
|
||||
u_char *eot = memchr(src->ptr, termination, src->len);
|
||||
|
||||
/* initialize empty token */
|
||||
*token = chunk_empty;
|
||||
/* initialize empty token */
|
||||
*token = chunk_empty;
|
||||
|
||||
if (eot == NULL) /* termination symbol not found */
|
||||
return FALSE;
|
||||
if (eot == NULL) /* termination symbol not found */
|
||||
return FALSE;
|
||||
|
||||
/* extract token */
|
||||
token->ptr = src->ptr;
|
||||
token->len = (u_int)(eot - src->ptr);
|
||||
/* extract token */
|
||||
token->ptr = src->ptr;
|
||||
token->len = (u_int)(eot - src->ptr);
|
||||
|
||||
/* advance src pointer after termination symbol */
|
||||
src->ptr = eot + 1;
|
||||
src->len -= (token->len + 1);
|
||||
/* advance src pointer after termination symbol */
|
||||
src->ptr = eot + 1;
|
||||
src->len -= (token->len + 1);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -139,19 +139,19 @@ extract_token(chunk_t *token, char termination, chunk_t *src)
|
||||
static bool
|
||||
extract_parameter(chunk_t *name, chunk_t *value, chunk_t *line)
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" %.*s", (int)line->len, line->ptr);
|
||||
)
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" %.*s", (int)line->len, line->ptr);
|
||||
)
|
||||
|
||||
/* extract name */
|
||||
if (!extract_token(name,':', line))
|
||||
return FALSE;
|
||||
/* extract name */
|
||||
if (!extract_token(name,':', line))
|
||||
return FALSE;
|
||||
|
||||
eat_whitespace(line);
|
||||
eat_whitespace(line);
|
||||
|
||||
/* extract value */
|
||||
*value = *line;
|
||||
return TRUE;
|
||||
/* extract value */
|
||||
*value = *line;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -160,21 +160,21 @@ extract_parameter(chunk_t *name, chunk_t *value, chunk_t *line)
|
||||
static bool
|
||||
fetchline(chunk_t *src, chunk_t *line)
|
||||
{
|
||||
if (src->len == 0) /* end of src reached */
|
||||
return FALSE;
|
||||
if (src->len == 0) /* end of src reached */
|
||||
return FALSE;
|
||||
|
||||
if (extract_token(line, '\n', src))
|
||||
{
|
||||
if (line->len > 0 && *(line->ptr + line->len -1) == '\r')
|
||||
line->len--; /* remove optional \r */
|
||||
}
|
||||
else /*last line ends without newline */
|
||||
{
|
||||
*line = *src;
|
||||
src->ptr += src->len;
|
||||
src->len = 0;
|
||||
}
|
||||
return TRUE;
|
||||
if (extract_token(line, '\n', src))
|
||||
{
|
||||
if (line->len > 0 && *(line->ptr + line->len -1) == '\r')
|
||||
line->len--; /* remove optional \r */
|
||||
}
|
||||
else /*last line ends without newline */
|
||||
{
|
||||
*line = *src;
|
||||
src->ptr += src->len;
|
||||
src->len = 0;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -183,55 +183,55 @@ fetchline(chunk_t *src, chunk_t *line)
|
||||
static bool
|
||||
pem_decrypt_3des(chunk_t *blob, chunk_t *iv, const char *passphrase)
|
||||
{
|
||||
MD5_CTX context;
|
||||
u_char digest[MD5_DIGEST_SIZE];
|
||||
u_char des_iv[DES_CBC_BLOCK_SIZE];
|
||||
u_char key[24];
|
||||
des_cblock *deskey = (des_cblock *)key;
|
||||
des_key_schedule ks[3];
|
||||
u_char padding, *last_padding_pos, *first_padding_pos;
|
||||
MD5_CTX context;
|
||||
u_char digest[MD5_DIGEST_SIZE];
|
||||
u_char des_iv[DES_CBC_BLOCK_SIZE];
|
||||
u_char key[24];
|
||||
des_cblock *deskey = (des_cblock *)key;
|
||||
des_key_schedule ks[3];
|
||||
u_char padding, *last_padding_pos, *first_padding_pos;
|
||||
|
||||
/* Convert passphrase to 3des key */
|
||||
MD5Init(&context);
|
||||
MD5Update(&context, passphrase, strlen(passphrase));
|
||||
MD5Update(&context, iv->ptr, iv->len);
|
||||
MD5Final(digest, &context);
|
||||
/* Convert passphrase to 3des key */
|
||||
MD5Init(&context);
|
||||
MD5Update(&context, passphrase, strlen(passphrase));
|
||||
MD5Update(&context, iv->ptr, iv->len);
|
||||
MD5Final(digest, &context);
|
||||
|
||||
memcpy(key, digest, MD5_DIGEST_SIZE);
|
||||
memcpy(key, digest, MD5_DIGEST_SIZE);
|
||||
|
||||
MD5Init(&context);
|
||||
MD5Update(&context, digest, MD5_DIGEST_SIZE);
|
||||
MD5Update(&context, passphrase, strlen(passphrase));
|
||||
MD5Update(&context, iv->ptr, iv->len);
|
||||
MD5Final(digest, &context);
|
||||
MD5Init(&context);
|
||||
MD5Update(&context, digest, MD5_DIGEST_SIZE);
|
||||
MD5Update(&context, passphrase, strlen(passphrase));
|
||||
MD5Update(&context, iv->ptr, iv->len);
|
||||
MD5Final(digest, &context);
|
||||
|
||||
memcpy(key + MD5_DIGEST_SIZE, digest, 24 - MD5_DIGEST_SIZE);
|
||||
memcpy(key + MD5_DIGEST_SIZE, digest, 24 - MD5_DIGEST_SIZE);
|
||||
|
||||
(void) des_set_key(&deskey[0], ks[0]);
|
||||
(void) des_set_key(&deskey[1], ks[1]);
|
||||
(void) des_set_key(&deskey[2], ks[2]);
|
||||
(void) des_set_key(&deskey[0], ks[0]);
|
||||
(void) des_set_key(&deskey[1], ks[1]);
|
||||
(void) des_set_key(&deskey[2], ks[2]);
|
||||
|
||||
/* decrypt data block */
|
||||
memcpy(des_iv, iv->ptr, DES_CBC_BLOCK_SIZE);
|
||||
des_ede3_cbc_encrypt((des_cblock *)blob->ptr, (des_cblock *)blob->ptr,
|
||||
blob->len, ks[0], ks[1], ks[2], (des_cblock *)des_iv, FALSE);
|
||||
/* decrypt data block */
|
||||
memcpy(des_iv, iv->ptr, DES_CBC_BLOCK_SIZE);
|
||||
des_ede3_cbc_encrypt((des_cblock *)blob->ptr, (des_cblock *)blob->ptr,
|
||||
blob->len, ks[0], ks[1], ks[2], (des_cblock *)des_iv, FALSE);
|
||||
|
||||
/* determine amount of padding */
|
||||
last_padding_pos = blob->ptr + blob->len - 1;
|
||||
padding = *last_padding_pos;
|
||||
first_padding_pos = (padding > blob->len)?
|
||||
blob->ptr : last_padding_pos - padding;
|
||||
/* determine amount of padding */
|
||||
last_padding_pos = blob->ptr + blob->len - 1;
|
||||
padding = *last_padding_pos;
|
||||
first_padding_pos = (padding > blob->len)?
|
||||
blob->ptr : last_padding_pos - padding;
|
||||
|
||||
/* check the padding pattern */
|
||||
while (--last_padding_pos > first_padding_pos)
|
||||
{
|
||||
if (*last_padding_pos != padding)
|
||||
return FALSE;
|
||||
}
|
||||
/* check the padding pattern */
|
||||
while (--last_padding_pos > first_padding_pos)
|
||||
{
|
||||
if (*last_padding_pos != padding)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* remove padding */
|
||||
blob->len -= padding;
|
||||
return TRUE;
|
||||
/* remove padding */
|
||||
blob->len -= padding;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -241,74 +241,74 @@ pem_decrypt_3des(chunk_t *blob, chunk_t *iv, const char *passphrase)
|
||||
static err_t
|
||||
pem_decrypt(chunk_t *blob, chunk_t *iv, prompt_pass_t *pass, const char* label)
|
||||
{
|
||||
DBG(DBG_CRYPT,
|
||||
DBG_log(" decrypting file using 'DES-EDE3-CBC'");
|
||||
)
|
||||
if (iv->len != DES_CBC_BLOCK_SIZE)
|
||||
return "size of DES-EDE3-CBC IV is not 8 bytes";
|
||||
DBG(DBG_CRYPT,
|
||||
DBG_log(" decrypting file using 'DES-EDE3-CBC'");
|
||||
)
|
||||
if (iv->len != DES_CBC_BLOCK_SIZE)
|
||||
return "size of DES-EDE3-CBC IV is not 8 bytes";
|
||||
|
||||
if (pass == NULL)
|
||||
return "no passphrase available";
|
||||
if (pass == NULL)
|
||||
return "no passphrase available";
|
||||
|
||||
/* do we prompt for the passphrase? */
|
||||
if (pass->prompt && pass->fd != NULL_FD)
|
||||
{
|
||||
int i;
|
||||
chunk_t blob_copy;
|
||||
err_t ugh = "invalid passphrase, too many trials";
|
||||
|
||||
whack_log(RC_ENTERSECRET, "need passphrase for '%s'", label);
|
||||
|
||||
for (i = 0; i < MAX_PROMPT_PASS_TRIALS; i++)
|
||||
/* do we prompt for the passphrase? */
|
||||
if (pass->prompt && pass->fd != NULL_FD)
|
||||
{
|
||||
int n;
|
||||
int i;
|
||||
chunk_t blob_copy;
|
||||
err_t ugh = "invalid passphrase, too many trials";
|
||||
|
||||
if (i > 0)
|
||||
whack_log(RC_ENTERSECRET, "invalid passphrase, please try again");
|
||||
whack_log(RC_ENTERSECRET, "need passphrase for '%s'", label);
|
||||
|
||||
n = read(pass->fd, pass->secret, PROMPT_PASS_LEN);
|
||||
for (i = 0; i < MAX_PROMPT_PASS_TRIALS; i++)
|
||||
{
|
||||
int n;
|
||||
|
||||
if (n == -1)
|
||||
{
|
||||
err_t ugh = "read(whackfd) failed";
|
||||
if (i > 0)
|
||||
whack_log(RC_ENTERSECRET, "invalid passphrase, please try again");
|
||||
|
||||
whack_log(RC_LOG_SERIOUS,ugh);
|
||||
return ugh;
|
||||
}
|
||||
n = read(pass->fd, pass->secret, PROMPT_PASS_LEN);
|
||||
|
||||
pass->secret[n-1] = '\0';
|
||||
|
||||
if (strlen(pass->secret) == 0)
|
||||
{
|
||||
err_t ugh = "no passphrase entered, aborted";
|
||||
if (n == -1)
|
||||
{
|
||||
err_t ugh = "read(whackfd) failed";
|
||||
|
||||
whack_log(RC_LOG_SERIOUS,ugh);
|
||||
return ugh;
|
||||
}
|
||||
|
||||
pass->secret[n-1] = '\0';
|
||||
|
||||
if (strlen(pass->secret) == 0)
|
||||
{
|
||||
err_t ugh = "no passphrase entered, aborted";
|
||||
|
||||
whack_log(RC_LOG_SERIOUS, ugh);
|
||||
return ugh;
|
||||
}
|
||||
|
||||
blob_copy = chunk_clone(*blob);
|
||||
|
||||
if (pem_decrypt_3des(blob, iv, pass->secret))
|
||||
{
|
||||
whack_log(RC_SUCCESS, "valid passphrase");
|
||||
free(blob_copy.ptr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* blob is useless after wrong decryption, restore the original */
|
||||
free(blob->ptr);
|
||||
*blob = blob_copy;
|
||||
}
|
||||
whack_log(RC_LOG_SERIOUS, ugh);
|
||||
return ugh;
|
||||
}
|
||||
|
||||
blob_copy = chunk_clone(*blob);
|
||||
|
||||
if (pem_decrypt_3des(blob, iv, pass->secret))
|
||||
{
|
||||
whack_log(RC_SUCCESS, "valid passphrase");
|
||||
free(blob_copy.ptr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* blob is useless after wrong decryption, restore the original */
|
||||
free(blob->ptr);
|
||||
*blob = blob_copy;
|
||||
}
|
||||
whack_log(RC_LOG_SERIOUS, ugh);
|
||||
return ugh;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (pem_decrypt_3des(blob, iv, pass->secret))
|
||||
return NULL;
|
||||
else
|
||||
return "invalid passphrase";
|
||||
}
|
||||
{
|
||||
if (pem_decrypt_3des(blob, iv, pass->secret))
|
||||
return NULL;
|
||||
else
|
||||
return "invalid passphrase";
|
||||
}
|
||||
}
|
||||
|
||||
/* Converts a PEM encoded file into its binary form
|
||||
@@ -319,144 +319,144 @@ pem_decrypt(chunk_t *blob, chunk_t *iv, prompt_pass_t *pass, const char* label)
|
||||
err_t
|
||||
pemtobin(chunk_t *blob, prompt_pass_t *pass, const char* label, bool *pgp)
|
||||
{
|
||||
typedef enum {
|
||||
PEM_PRE = 0,
|
||||
PEM_MSG = 1,
|
||||
PEM_HEADER = 2,
|
||||
PEM_BODY = 3,
|
||||
PEM_POST = 4,
|
||||
PEM_ABORT = 5
|
||||
} state_t;
|
||||
typedef enum {
|
||||
PEM_PRE = 0,
|
||||
PEM_MSG = 1,
|
||||
PEM_HEADER = 2,
|
||||
PEM_BODY = 3,
|
||||
PEM_POST = 4,
|
||||
PEM_ABORT = 5
|
||||
} state_t;
|
||||
|
||||
bool encrypted = FALSE;
|
||||
bool encrypted = FALSE;
|
||||
|
||||
state_t state = PEM_PRE;
|
||||
state_t state = PEM_PRE;
|
||||
|
||||
chunk_t src = *blob;
|
||||
chunk_t dst = *blob;
|
||||
chunk_t line = chunk_empty;
|
||||
chunk_t iv = chunk_empty;
|
||||
chunk_t src = *blob;
|
||||
chunk_t dst = *blob;
|
||||
chunk_t line = chunk_empty;
|
||||
chunk_t iv = chunk_empty;
|
||||
|
||||
u_char iv_buf[MAX_DIGEST_LEN];
|
||||
u_char iv_buf[MAX_DIGEST_LEN];
|
||||
|
||||
/* zero size of converted blob */
|
||||
dst.len = 0;
|
||||
/* zero size of converted blob */
|
||||
dst.len = 0;
|
||||
|
||||
/* zero size of IV */
|
||||
iv.ptr = iv_buf;
|
||||
iv.len = 0;
|
||||
/* zero size of IV */
|
||||
iv.ptr = iv_buf;
|
||||
iv.len = 0;
|
||||
|
||||
while (fetchline(&src, &line))
|
||||
{
|
||||
if (state == PEM_PRE)
|
||||
while (fetchline(&src, &line))
|
||||
{
|
||||
if (find_boundary("BEGIN", &line))
|
||||
{
|
||||
*pgp = FALSE;
|
||||
state = PEM_MSG;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (find_boundary("END", &line))
|
||||
{
|
||||
state = PEM_POST;
|
||||
break;
|
||||
}
|
||||
if (state == PEM_MSG)
|
||||
{
|
||||
state = (memchr(line.ptr, ':', line.len) == NULL)?
|
||||
PEM_BODY : PEM_HEADER;
|
||||
}
|
||||
if (state == PEM_HEADER)
|
||||
{
|
||||
chunk_t name = chunk_empty;
|
||||
chunk_t value = chunk_empty;
|
||||
|
||||
/* an empty line separates HEADER and BODY */
|
||||
if (line.len == 0)
|
||||
if (state == PEM_PRE)
|
||||
{
|
||||
state = PEM_BODY;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* we are looking for a name: value pair */
|
||||
if (!extract_parameter(&name, &value, &line))
|
||||
continue;
|
||||
|
||||
if (match("Proc-Type", &name) && *value.ptr == '4')
|
||||
encrypted = TRUE;
|
||||
else if (match("DEK-Info", &name))
|
||||
{
|
||||
const char *ugh = NULL;
|
||||
size_t len = 0;
|
||||
chunk_t dek;
|
||||
|
||||
if (!extract_token(&dek, ',', &value))
|
||||
dek = value;
|
||||
|
||||
/* we support DES-EDE3-CBC encrypted files, only */
|
||||
if (!match("DES-EDE3-CBC", &dek))
|
||||
return "we support DES-EDE3-CBC encrypted files, only";
|
||||
|
||||
eat_whitespace(&value);
|
||||
ugh = ttodata(value.ptr, value.len, 16,
|
||||
iv.ptr, MAX_DIGEST_LEN, &len);
|
||||
if (ugh)
|
||||
return "error in IV";
|
||||
|
||||
iv.len = len;
|
||||
}
|
||||
}
|
||||
else /* state is PEM_BODY */
|
||||
{
|
||||
const char *ugh = NULL;
|
||||
size_t len = 0;
|
||||
chunk_t data;
|
||||
|
||||
/* remove any trailing whitespace */
|
||||
if (!extract_token(&data ,' ', &line))
|
||||
data = line;
|
||||
|
||||
/* check for PGP armor checksum */
|
||||
if (*data.ptr == '=')
|
||||
{
|
||||
*pgp = TRUE;
|
||||
data.ptr++;
|
||||
data.len--;
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" Armor checksum: %.*s", (int)data.len, data.ptr);
|
||||
)
|
||||
continue;
|
||||
}
|
||||
|
||||
ugh = ttodata(data.ptr, data.len, 64,
|
||||
dst.ptr, blob->len - dst.len, &len);
|
||||
if (ugh)
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" %s", ugh);
|
||||
)
|
||||
state = PEM_ABORT;
|
||||
break;
|
||||
if (find_boundary("BEGIN", &line))
|
||||
{
|
||||
*pgp = FALSE;
|
||||
state = PEM_MSG;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
dst.ptr += len;
|
||||
dst.len += len;
|
||||
if (find_boundary("END", &line))
|
||||
{
|
||||
state = PEM_POST;
|
||||
break;
|
||||
}
|
||||
if (state == PEM_MSG)
|
||||
{
|
||||
state = (memchr(line.ptr, ':', line.len) == NULL)?
|
||||
PEM_BODY : PEM_HEADER;
|
||||
}
|
||||
if (state == PEM_HEADER)
|
||||
{
|
||||
chunk_t name = chunk_empty;
|
||||
chunk_t value = chunk_empty;
|
||||
|
||||
/* an empty line separates HEADER and BODY */
|
||||
if (line.len == 0)
|
||||
{
|
||||
state = PEM_BODY;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* we are looking for a name: value pair */
|
||||
if (!extract_parameter(&name, &value, &line))
|
||||
continue;
|
||||
|
||||
if (match("Proc-Type", &name) && *value.ptr == '4')
|
||||
encrypted = TRUE;
|
||||
else if (match("DEK-Info", &name))
|
||||
{
|
||||
const char *ugh = NULL;
|
||||
size_t len = 0;
|
||||
chunk_t dek;
|
||||
|
||||
if (!extract_token(&dek, ',', &value))
|
||||
dek = value;
|
||||
|
||||
/* we support DES-EDE3-CBC encrypted files, only */
|
||||
if (!match("DES-EDE3-CBC", &dek))
|
||||
return "we support DES-EDE3-CBC encrypted files, only";
|
||||
|
||||
eat_whitespace(&value);
|
||||
ugh = ttodata(value.ptr, value.len, 16,
|
||||
iv.ptr, MAX_DIGEST_LEN, &len);
|
||||
if (ugh)
|
||||
return "error in IV";
|
||||
|
||||
iv.len = len;
|
||||
}
|
||||
}
|
||||
else /* state is PEM_BODY */
|
||||
{
|
||||
const char *ugh = NULL;
|
||||
size_t len = 0;
|
||||
chunk_t data;
|
||||
|
||||
/* remove any trailing whitespace */
|
||||
if (!extract_token(&data ,' ', &line))
|
||||
data = line;
|
||||
|
||||
/* check for PGP armor checksum */
|
||||
if (*data.ptr == '=')
|
||||
{
|
||||
*pgp = TRUE;
|
||||
data.ptr++;
|
||||
data.len--;
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" Armor checksum: %.*s", (int)data.len, data.ptr);
|
||||
)
|
||||
continue;
|
||||
}
|
||||
|
||||
ugh = ttodata(data.ptr, data.len, 64,
|
||||
dst.ptr, blob->len - dst.len, &len);
|
||||
if (ugh)
|
||||
{
|
||||
DBG(DBG_PARSING,
|
||||
DBG_log(" %s", ugh);
|
||||
)
|
||||
state = PEM_ABORT;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
dst.ptr += len;
|
||||
dst.len += len;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/* set length to size of binary blob */
|
||||
blob->len = dst.len;
|
||||
/* set length to size of binary blob */
|
||||
blob->len = dst.len;
|
||||
|
||||
if (state != PEM_POST)
|
||||
return "file coded in unknown format, discarded";
|
||||
if (state != PEM_POST)
|
||||
return "file coded in unknown format, discarded";
|
||||
|
||||
if (encrypted)
|
||||
return pem_decrypt(blob, &iv, pass, label);
|
||||
else
|
||||
return NULL;
|
||||
if (encrypted)
|
||||
return pem_decrypt(blob, &iv, pass, label);
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user