Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jack Humbert
reform-boundary-uboot
Commits
8b27abd8
Commit
8b27abd8
authored
9 years ago
by
Andreas Fenkart
Committed by
Tom Rini
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
tools: env: make parse_aes_key stateless
Signed-off-by:
Andreas Fenkart
<
andreas.fenkart@digitalstrom.com
>
parent
167f5258
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/env/fw_env.c
+6
-6
6 additions, 6 deletions
tools/env/fw_env.c
with
6 additions
and
6 deletions
tools/env/fw_env.c
+
6
−
6
View file @
8b27abd8
...
@@ -208,7 +208,7 @@ char *fw_getdefenv(char *name)
...
@@ -208,7 +208,7 @@ char *fw_getdefenv(char *name)
return
NULL
;
return
NULL
;
}
}
static
int
parse_aes_key
(
char
*
key
)
static
int
parse_aes_key
(
char
*
key
,
uint8_t
*
bin_key
)
{
{
char
tmp
[
5
]
=
{
'0'
,
'x'
,
0
,
0
,
0
};
char
tmp
[
5
]
=
{
'0'
,
'x'
,
0
,
0
,
0
};
unsigned
long
ul
;
unsigned
long
ul
;
...
@@ -230,11 +230,9 @@ static int parse_aes_key(char *key)
...
@@ -230,11 +230,9 @@ static int parse_aes_key(char *key)
"## Error: '-a' option requires valid AES key
\n
"
);
"## Error: '-a' option requires valid AES key
\n
"
);
return
-
1
;
return
-
1
;
}
}
aes
_key
[
i
]
=
ul
&
0xff
;
bin
_key
[
i
]
=
ul
&
0xff
;
key
+=
2
;
key
+=
2
;
}
}
aes_flag
=
1
;
return
0
;
return
0
;
}
}
...
@@ -267,9 +265,10 @@ int fw_printenv (int argc, char *argv[])
...
@@ -267,9 +265,10 @@ int fw_printenv (int argc, char *argv[])
"## Error: '-a' option requires AES key
\n
"
);
"## Error: '-a' option requires AES key
\n
"
);
return
-
1
;
return
-
1
;
}
}
rc
=
parse_aes_key
(
argv
[
2
]);
rc
=
parse_aes_key
(
argv
[
2
]
,
aes_key
);
if
(
rc
)
if
(
rc
)
return
rc
;
return
rc
;
aes_flag
=
1
;
argv
+=
2
;
argv
+=
2
;
argc
-=
2
;
argc
-=
2
;
}
}
...
@@ -526,9 +525,10 @@ int fw_setenv(int argc, char *argv[])
...
@@ -526,9 +525,10 @@ int fw_setenv(int argc, char *argv[])
"## Error: '-a' option requires AES key
\n
"
);
"## Error: '-a' option requires AES key
\n
"
);
return
-
1
;
return
-
1
;
}
}
rc
=
parse_aes_key
(
argv
[
2
]);
rc
=
parse_aes_key
(
argv
[
2
]
,
aes_key
);
if
(
rc
)
if
(
rc
)
return
rc
;
return
rc
;
aes_flag
=
1
;
argv
+=
2
;
argv
+=
2
;
argc
-=
2
;
argc
-=
2
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment