chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
secnet: loadpub interface: Return a closure_t too
[secnet.git]
/
transform-cbcmac.c
diff --git
a/transform-cbcmac.c
b/transform-cbcmac.c
index ca260f013c94bed03216c2e703cbaadf84b8424f..b481346068833c12eefdc1463b20cf489a97286d 100644
(file)
--- a/
transform-cbcmac.c
+++ b/
transform-cbcmac.c
@@
-6,7
+6,7
@@
*
* secnet is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
*
* secnet is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version
d
of the License, or
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* secnet is distributed in the hope that it will be useful, but
* (at your option) any later version.
*
* secnet is distributed in the hope that it will be useful, but
@@
-101,8
+101,8
@@
static void transform_delkey(void *sst)
ti->keyed=False;
}
ti->keyed=False;
}
-static
uint32_t transform_forward(void *sst, struct buffer_if *buf
,
-
const char **errmsg)
+static
transform_apply_return transform_forward(void *sst
,
+
struct buffer_if *buf,
const char **errmsg)
{
struct transform_inst *ti=sst;
uint8_t *padp;
{
struct transform_inst *ti=sst;
uint8_t *padp;
@@
-172,8
+172,8
@@
static uint32_t transform_forward(void *sst, struct buffer_if *buf,
return 0;
}
return 0;
}
-static
uint32_t transform_reverse(void *sst, struct buffer_if *buf
,
-
const char **errmsg)
+static
transform_apply_return transform_reverse(void *sst
,
+
struct buffer_if *buf,
const char **errmsg)
{
struct transform_inst *ti=sst;
uint8_t *padp;
{
struct transform_inst *ti=sst;
uint8_t *padp;
@@
-191,7
+191,7
@@
static uint32_t transform_reverse(void *sst, struct buffer_if *buf,
if (buf->size < 4 + 16 + 16) {
*errmsg="msg too short";
if (buf->size < 4 + 16 + 16) {
*errmsg="msg too short";
- return
1
;
+ return
transform_apply_err
;
}
/* CBC */
}
/* CBC */
@@
-203,7
+203,7
@@
static uint32_t transform_reverse(void *sst, struct buffer_if *buf,
/* Assert bufsize is multiple of blocksize */
if (buf->size&0xf) {
*errmsg="msg not multiple of cipher blocksize";
/* Assert bufsize is multiple of blocksize */
if (buf->size&0xf) {
*errmsg="msg not multiple of cipher blocksize";
- return
1
;
+ return
transform_apply_err
;
}
serpentbe_encrypt(&ti->cryptkey,iv,iv);
for (n=buf->start; n<buf->start+buf->size; n+=16)
}
serpentbe_encrypt(&ti->cryptkey,iv,iv);
for (n=buf->start; n<buf->start+buf->size; n+=16)
@@
-231,9
+231,9
@@
static uint32_t transform_reverse(void *sst, struct buffer_if *buf,
serpentbe_encrypt(&ti->mackey,macplain,macacc);
}
serpentbe_encrypt(&ti->mackey,macacc,macacc);
serpentbe_encrypt(&ti->mackey,macplain,macacc);
}
serpentbe_encrypt(&ti->mackey,macacc,macacc);
- if (!consttime_memeq(macexpected,macacc,16)
!=0
) {
+ if (!consttime_memeq(macexpected,macacc,16)) {
*errmsg="invalid MAC";
*errmsg="invalid MAC";
- return
1
;
+ return
transform_apply_err
;
}
/* PKCS5, stolen from IWJ */
}
/* PKCS5, stolen from IWJ */
@@
-242,7
+242,7
@@
static uint32_t transform_reverse(void *sst, struct buffer_if *buf,
padlen=*padp;
if (!padlen || (padlen > PKCS5_MASK+1)) {
*errmsg="pkcs5: invalid length";
padlen=*padp;
if (!padlen || (padlen > PKCS5_MASK+1)) {
*errmsg="pkcs5: invalid length";
- return
1
;
+ return
transform_apply_err
;
}
buf_unappend(buf,padlen-1);
}
buf_unappend(buf,padlen-1);
@@
-292,13
+292,13
@@
static list_t *transform_apply(closure_t *self, struct cloc loc,
/* First parameter must be a dict */
item=list_elem(args,0);
if (!item || item->type!=t_dict)
/* First parameter must be a dict */
item=list_elem(args,0);
if (!item || item->type!=t_dict)
- cfgfatal(loc,"
userv-ipif
","parameter must be a dictionary\n");
+ cfgfatal(loc,"
serpent256-cbc
","parameter must be a dictionary\n");
dict=item->data.dict;
SEQNUM_PARAMS_INIT(dict,&st->p,"serpent-cbc256",loc);
dict=item->data.dict;
SEQNUM_PARAMS_INIT(dict,&st->p,"serpent-cbc256",loc);
- SET_CAPAB_
TRANSFORMNUM(CAPAB_TRANSFORMNUM
_SERPENT256CBC);
+ SET_CAPAB_
BIT(CAPAB_BIT
_SERPENT256CBC);
return new_closure(&st->cl);
}
return new_closure(&st->cl);
}