Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
1b84cb26
Commit
1b84cb26
authored
Nov 12, 2002
by
Alexey Kuznetsov
Committed by
David S. Miller
Nov 12, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[IPSEC]: authentication signature for MD5/SHA was not truncated to conform RFC.
parent
dbbb588c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
9 deletions
+14
-9
net/ipv4/esp.c
net/ipv4/esp.c
+14
-9
No files found.
net/ipv4/esp.c
View file @
1b84cb26
...
@@ -190,11 +190,10 @@ esp_hmac_digest(struct esp_data *esp, struct sk_buff *skb, int offset,
...
@@ -190,11 +190,10 @@ esp_hmac_digest(struct esp_data *esp, struct sk_buff *skb, int offset,
struct
crypto_tfm
*
tfm
=
esp
->
auth
.
tfm
;
struct
crypto_tfm
*
tfm
=
esp
->
auth
.
tfm
;
char
*
digest
=
esp
->
auth
.
work_digest
;
char
*
digest
=
esp
->
auth
.
work_digest
;
memset
(
auth_data
,
0
,
esp
->
auth
.
authlen
);
crypto_hmac_init
(
tfm
,
esp
->
auth
.
key
,
&
esp
->
auth
.
key_len
);
crypto_hmac_init
(
tfm
,
esp
->
auth
.
key
,
&
esp
->
auth
.
key_len
);
skb_digest_walk
(
skb
,
tfm
,
offset
,
len
);
skb_digest_walk
(
skb
,
tfm
,
offset
,
len
);
crypto_hmac_final
(
tfm
,
esp
->
auth
.
key
,
&
esp
->
auth
.
key_len
,
digest
);
crypto_hmac_final
(
tfm
,
esp
->
auth
.
key
,
&
esp
->
auth
.
key_len
,
digest
);
memcpy
(
auth_data
,
digest
,
crypto_tfm_alg_digestsize
(
tfm
)
);
memcpy
(
auth_data
,
digest
,
esp
->
auth
.
authlen
);
}
}
/* Check that skb data bits are writable. If they are not, copy data
/* Check that skb data bits are writable. If they are not, copy data
...
@@ -463,16 +462,16 @@ int esp_input(struct xfrm_state *x, struct sk_buff *skb)
...
@@ -463,16 +462,16 @@ int esp_input(struct xfrm_state *x, struct sk_buff *skb)
/* If integrity check is required, do this. */
/* If integrity check is required, do this. */
if
(
esp
->
auth
.
authlen
)
{
if
(
esp
->
auth
.
authlen
)
{
int
icvsize
=
crypto_tfm_alg_digestsize
(
esp
->
auth
.
tfm
);
u8
sum
[
esp
->
auth
.
authlen
];
u8
sum
[
icvsize
];
u8
sum1
[
esp
->
auth
.
authlen
];
u8
sum1
[
icvsize
];
esp
->
auth
.
digest
(
esp
,
skb
,
0
,
skb
->
len
-
esp
->
auth
.
authlen
,
sum
);
esp
->
auth
.
digest
(
esp
,
skb
,
0
,
skb
->
len
-
esp
->
auth
.
authlen
,
sum
);
if
(
skb_copy_bits
(
skb
,
skb
->
len
-
esp
->
auth
.
authlen
,
sum1
,
icvsize
))
if
(
skb_copy_bits
(
skb
,
skb
->
len
-
esp
->
auth
.
authlen
,
sum1
,
esp
->
auth
.
authlen
))
BUG
();
BUG
();
if
(
unlikely
(
memcmp
(
sum
,
sum1
,
icvsize
)))
{
if
(
unlikely
(
memcmp
(
sum
,
sum1
,
esp
->
auth
.
authlen
)))
{
x
->
stats
.
integrity_failed
++
;
x
->
stats
.
integrity_failed
++
;
goto
out
;
goto
out
;
}
}
...
@@ -605,14 +604,20 @@ int esp_init_state(struct xfrm_state *x, void *args)
...
@@ -605,14 +604,20 @@ int esp_init_state(struct xfrm_state *x, void *args)
memset
(
esp
,
0
,
sizeof
(
*
esp
));
memset
(
esp
,
0
,
sizeof
(
*
esp
));
if
(
x
->
aalg
)
{
if
(
x
->
aalg
)
{
int
digestsize
;
esp
->
auth
.
key
=
x
->
aalg
->
alg_key
;
esp
->
auth
.
key
=
x
->
aalg
->
alg_key
;
esp
->
auth
.
key_len
=
(
x
->
aalg
->
alg_key_len
+
7
)
/
8
;
esp
->
auth
.
key_len
=
(
x
->
aalg
->
alg_key_len
+
7
)
/
8
;
esp
->
auth
.
tfm
=
crypto_alloc_tfm
(
x
->
aalg
->
alg_name
,
0
);
esp
->
auth
.
tfm
=
crypto_alloc_tfm
(
x
->
aalg
->
alg_name
,
0
);
if
(
esp
->
auth
.
tfm
==
NULL
)
if
(
esp
->
auth
.
tfm
==
NULL
)
goto
error
;
goto
error
;
esp
->
auth
.
digest
=
esp_hmac_digest
;
esp
->
auth
.
digest
=
esp_hmac_digest
;
esp
->
auth
.
authlen
=
crypto_tfm_alg_digestsize
(
esp
->
auth
.
tfm
);
digestsize
=
crypto_tfm_alg_digestsize
(
esp
->
auth
.
tfm
);
esp
->
auth
.
work_digest
=
kmalloc
(
esp
->
auth
.
authlen
,
GFP_KERNEL
);
/* XXX RFC2403 and RFC 2404 truncate auth to 96 bit */
esp
->
auth
.
authlen
=
12
;
if
(
esp
->
auth
.
authlen
>
digestsize
)
/* XXX */
BUG
();
esp
->
auth
.
work_digest
=
kmalloc
(
digestsize
,
GFP_KERNEL
);
if
(
!
esp
->
auth
.
work_digest
)
if
(
!
esp
->
auth
.
work_digest
)
goto
error
;
goto
error
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment