From 76fdb2419bfec0e747db2530379484a3dc571f34 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 20 Mar 2017 17:09:13 -0700 Subject: verify_file: Add constness to a few addresses. We should not touch any data while verifying packages (or parsing the in-memory ASN.1 structures). Test: mmma bootable/recovery Test: recovery_component_test passes. Test: recovery_unit_test passes. Change-Id: Ie990662c6451ec066a1807b3081c9296afbdb0bf --- asn1_decoder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asn1_decoder.cpp') diff --git a/asn1_decoder.cpp b/asn1_decoder.cpp index e7aef781c..ca4ee5267 100644 --- a/asn1_decoder.cpp +++ b/asn1_decoder.cpp @@ -22,9 +22,9 @@ typedef struct asn1_context { - size_t length; - uint8_t* p; - int app_type; + size_t length; + const uint8_t* p; + int app_type; } asn1_context_t; @@ -38,7 +38,7 @@ static const int kTagSequence = 0x30; static const int kTagSet = 0x31; static const int kTagConstructed = 0xA0; -asn1_context_t* asn1_context_new(uint8_t* buffer, size_t length) { +asn1_context_t* asn1_context_new(const uint8_t* buffer, size_t length) { asn1_context_t* ctx = (asn1_context_t*) calloc(1, sizeof(asn1_context_t)); if (ctx == NULL) { return NULL; @@ -168,7 +168,7 @@ bool asn1_sequence_next(asn1_context_t* ctx) { return true; } -bool asn1_oid_get(asn1_context_t* ctx, uint8_t** oid, size_t* length) { +bool asn1_oid_get(asn1_context_t* ctx, const uint8_t** oid, size_t* length) { if (get_byte(ctx) != kTagOid) { return false; } @@ -179,7 +179,7 @@ bool asn1_oid_get(asn1_context_t* ctx, uint8_t** oid, size_t* length) { return true; } -bool asn1_octet_string_get(asn1_context_t* ctx, uint8_t** octet_string, size_t* length) { +bool asn1_octet_string_get(asn1_context_t* ctx, const uint8_t** octet_string, size_t* length) { if (get_byte(ctx) != kTagOctetString) { return false; } -- cgit v1.2.3