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
nexedi
linux
Commits
78c2f0b8
Commit
78c2f0b8
authored
Oct 22, 2007
by
Jens Axboe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SG] Update crypto/ to sg helpers
Signed-off-by:
Jens Axboe
<
jens.axboe@oracle.com
>
parent
9b61764b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
9 deletions
+10
-9
crypto/digest.c
crypto/digest.c
+1
-1
crypto/hmac.c
crypto/hmac.c
+2
-1
crypto/scatterwalk.c
crypto/scatterwalk.c
+1
-1
crypto/scatterwalk.h
crypto/scatterwalk.h
+3
-3
crypto/tcrypt.c
crypto/tcrypt.c
+2
-2
crypto/xcbc.c
crypto/xcbc.c
+1
-1
No files found.
crypto/digest.c
View file @
78c2f0b8
...
@@ -41,7 +41,7 @@ static int update2(struct hash_desc *desc,
...
@@ -41,7 +41,7 @@ static int update2(struct hash_desc *desc,
return
0
;
return
0
;
for
(;;)
{
for
(;;)
{
struct
page
*
pg
=
sg
->
page
;
struct
page
*
pg
=
sg
_page
(
sg
)
;
unsigned
int
offset
=
sg
->
offset
;
unsigned
int
offset
=
sg
->
offset
;
unsigned
int
l
=
sg
->
length
;
unsigned
int
l
=
sg
->
length
;
...
...
crypto/hmac.c
View file @
78c2f0b8
...
@@ -159,7 +159,8 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
...
@@ -159,7 +159,8 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
desc
.
flags
=
pdesc
->
flags
&
CRYPTO_TFM_REQ_MAY_SLEEP
;
desc
.
flags
=
pdesc
->
flags
&
CRYPTO_TFM_REQ_MAY_SLEEP
;
sg_set_buf
(
sg1
,
ipad
,
bs
);
sg_set_buf
(
sg1
,
ipad
,
bs
);
sg1
[
1
].
page
=
(
void
*
)
sg
;
sg_set_page
(
&
sg
[
1
],
(
void
*
)
sg
);
sg1
[
1
].
length
=
0
;
sg1
[
1
].
length
=
0
;
sg_set_buf
(
sg2
,
opad
,
bs
+
ds
);
sg_set_buf
(
sg2
,
opad
,
bs
+
ds
);
...
...
crypto/scatterwalk.c
View file @
78c2f0b8
...
@@ -54,7 +54,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
...
@@ -54,7 +54,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
if
(
out
)
{
if
(
out
)
{
struct
page
*
page
;
struct
page
*
page
;
page
=
walk
->
sg
->
page
+
((
walk
->
offset
-
1
)
>>
PAGE_SHIFT
);
page
=
sg_page
(
walk
->
sg
)
+
((
walk
->
offset
-
1
)
>>
PAGE_SHIFT
);
flush_dcache_page
(
page
);
flush_dcache_page
(
page
);
}
}
...
...
crypto/scatterwalk.h
View file @
78c2f0b8
...
@@ -22,13 +22,13 @@
...
@@ -22,13 +22,13 @@
static
inline
struct
scatterlist
*
scatterwalk_sg_next
(
struct
scatterlist
*
sg
)
static
inline
struct
scatterlist
*
scatterwalk_sg_next
(
struct
scatterlist
*
sg
)
{
{
return
(
++
sg
)
->
length
?
sg
:
(
void
*
)
sg
->
page
;
return
(
++
sg
)
->
length
?
sg
:
(
void
*
)
sg_page
(
sg
)
;
}
}
static
inline
unsigned
long
scatterwalk_samebuf
(
struct
scatter_walk
*
walk_in
,
static
inline
unsigned
long
scatterwalk_samebuf
(
struct
scatter_walk
*
walk_in
,
struct
scatter_walk
*
walk_out
)
struct
scatter_walk
*
walk_out
)
{
{
return
!
(((
walk_in
->
sg
->
page
-
walk_out
->
sg
->
page
)
<<
PAGE_SHIFT
)
+
return
!
(((
sg_page
(
walk_in
->
sg
)
-
sg_page
(
walk_out
->
sg
)
)
<<
PAGE_SHIFT
)
+
(
int
)(
walk_in
->
offset
-
walk_out
->
offset
));
(
int
)(
walk_in
->
offset
-
walk_out
->
offset
));
}
}
...
@@ -60,7 +60,7 @@ static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,
...
@@ -60,7 +60,7 @@ static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,
static
inline
struct
page
*
scatterwalk_page
(
struct
scatter_walk
*
walk
)
static
inline
struct
page
*
scatterwalk_page
(
struct
scatter_walk
*
walk
)
{
{
return
walk
->
sg
->
page
+
(
walk
->
offset
>>
PAGE_SHIFT
);
return
sg_page
(
walk
->
sg
)
+
(
walk
->
offset
>>
PAGE_SHIFT
);
}
}
static
inline
void
scatterwalk_unmap
(
void
*
vaddr
,
int
out
)
static
inline
void
scatterwalk_unmap
(
void
*
vaddr
,
int
out
)
...
...
crypto/tcrypt.c
View file @
78c2f0b8
...
@@ -317,7 +317,7 @@ static void test_cipher(char *algo, int enc,
...
@@ -317,7 +317,7 @@ static void test_cipher(char *algo, int enc,
goto
out
;
goto
out
;
}
}
q
=
kmap
(
sg
[
0
].
page
)
+
sg
[
0
].
offset
;
q
=
kmap
(
sg
_page
(
&
sg
[
0
])
)
+
sg
[
0
].
offset
;
hexdump
(
q
,
cipher_tv
[
i
].
rlen
);
hexdump
(
q
,
cipher_tv
[
i
].
rlen
);
printk
(
"%s
\n
"
,
printk
(
"%s
\n
"
,
...
@@ -390,7 +390,7 @@ static void test_cipher(char *algo, int enc,
...
@@ -390,7 +390,7 @@ static void test_cipher(char *algo, int enc,
temp
=
0
;
temp
=
0
;
for
(
k
=
0
;
k
<
cipher_tv
[
i
].
np
;
k
++
)
{
for
(
k
=
0
;
k
<
cipher_tv
[
i
].
np
;
k
++
)
{
printk
(
"page %u
\n
"
,
k
);
printk
(
"page %u
\n
"
,
k
);
q
=
kmap
(
sg
[
k
].
page
)
+
sg
[
k
].
offset
;
q
=
kmap
(
sg
_page
(
&
sg
[
k
])
)
+
sg
[
k
].
offset
;
hexdump
(
q
,
cipher_tv
[
i
].
tap
[
k
]);
hexdump
(
q
,
cipher_tv
[
i
].
tap
[
k
]);
printk
(
"%s
\n
"
,
printk
(
"%s
\n
"
,
memcmp
(
q
,
cipher_tv
[
i
].
result
+
temp
,
memcmp
(
q
,
cipher_tv
[
i
].
result
+
temp
,
...
...
crypto/xcbc.c
View file @
78c2f0b8
...
@@ -120,7 +120,7 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,
...
@@ -120,7 +120,7 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,
do
{
do
{
struct
page
*
pg
=
sg
[
i
].
page
;
struct
page
*
pg
=
sg
_page
(
&
sg
[
i
])
;
unsigned
int
offset
=
sg
[
i
].
offset
;
unsigned
int
offset
=
sg
[
i
].
offset
;
unsigned
int
slen
=
sg
[
i
].
length
;
unsigned
int
slen
=
sg
[
i
].
length
;
...
...
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