diff options
| author | Kenny Root <kroot@google.com> | 2015-05-10 00:13:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-10 00:13:21 +0000 |
| commit | 7306b2e20b2949f7114a5e392dd5651dd7300738 (patch) | |
| tree | 84c3f1f69899ae2627caff862da4f8b9087bd917 /verity | |
| parent | ce1c0be20038f160ae922a768444413c2f1423e3 (diff) | |
| parent | 3d59e00f74fa6b866aba09628416555ce06f2bfe (diff) | |
| download | extras-7306b2e20b2949f7114a5e392dd5651dd7300738.tar.gz | |
am 3d59e00f: Merge "Revert "system/extra: include more of what you use.""
* commit '3d59e00f74fa6b866aba09628416555ce06f2bfe':
Revert "system/extra: include more of what you use."
Diffstat (limited to 'verity')
| -rw-r--r-- | verity/generate_verity_key.c | 5 | ||||
| -rw-r--r-- | verity/verify_boot_signature.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/verity/generate_verity_key.c b/verity/generate_verity_key.c index 0da978fc..a55600cd 100644 --- a/verity/generate_verity_key.c +++ b/verity/generate_verity_key.c @@ -14,13 +14,10 @@ * limitations under the License. */ -#define _GNU_SOURCE /* needed for asprintf */ - #include <stdio.h> -#include <stdlib.h> #include <string.h> -#include <sys/stat.h> #include <sys/types.h> +#include <sys/stat.h> #include <unistd.h> /* HACK: we need the RSAPublicKey struct diff --git a/verity/verify_boot_signature.c b/verity/verify_boot_signature.c index cf4cfac6..55591aaf 100644 --- a/verity/verify_boot_signature.c +++ b/verity/verify_boot_signature.c @@ -19,7 +19,6 @@ #include <endian.h> #include <stddef.h> #include <stdint.h> -#include <stdlib.h> #include <string.h> #include <sys/stat.h> #include <sys/types.h> @@ -31,7 +30,6 @@ #include <openssl/asn1t.h> #include <openssl/err.h> #include <openssl/evp.h> -#include <openssl/mem.h> #include <openssl/rsa.h> #include <openssl/x509.h> |