Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 515e1639 authored by Doug Zongker's avatar Doug Zongker
Browse files

mincrypt: support SHA-256 hash algorithm 

- adds a library to compute the SHA-256 hash

- updates the RSA verifier to take an argument specifying either SHA-1
  or SHA-256

- updates DumpPublicKey to with new "key" version numbers for
  specifying SHA-256

- adds new argument to adb auth code to maintain existing behavior

Change-Id: I5b1406cf57c2b8993f6032eda3e29139f7740839
parent 5cad7119

adb/adb_auth_client.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "adb_auth.h"

#include "fdevent.h"

#include "mincrypt/rsa.h"

#include "mincrypt/sha.h"



#define TRACE_TAG TRACE_AUTH
@@ -149,7 +150,7 @@ int adb_auth_verify(void *token, void *sig, int siglen) 


    list_for_each(item, &key_list) {

        key = node_to_item(item, struct adb_public_key, node);

        ret = RSA_verify(&key->key, sig, siglen, token);

        ret = RSA_verify(&key->key, sig, siglen, token, SHA_DIGEST_SIZE);

        if (ret)

            break;

    }

include/mincrypt/hash-internal.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
// Copyright 2007 Google Inc. All Rights Reserved.

// Author: mschilder@google.com (Marius Schilder)



#ifndef SECURITY_UTIL_LITE_HASH_INTERNAL_H__

#define SECURITY_UTIL_LITE_HASH_INTERNAL_H__



#include <stdint.h>



#ifdef __cplusplus

extern "C" {

#endif  // __cplusplus



struct HASH_CTX;  // forward decl



typedef struct HASH_VTAB {

  void (* const init)(struct HASH_CTX*);

  void (* const update)(struct HASH_CTX*, const void*, int);

  const uint8_t* (* const final)(struct HASH_CTX*);

  const uint8_t* (* const hash)(const void*, int, uint8_t*);

  int size;

} HASH_VTAB;



typedef struct HASH_CTX {

  const HASH_VTAB * f;

  uint64_t count;

  uint8_t buf[64];

  uint32_t state[8];  // upto SHA2

} HASH_CTX;



#define HASH_init(ctx) (ctx)->f->init(ctx)

#define HASH_update(ctx, data, len) (ctx)->f->update(ctx, data, len)

#define HASH_final(ctx) (ctx)->f->final(ctx)

#define HASH_hash(data, len, digest) (ctx)->f->hash(data, len, digest)

#define HASH_size(ctx) (ctx)->f->size



#ifdef __cplusplus

}

#endif  // __cplusplus



#endif  // SECURITY_UTIL_LITE_HASH_INTERNAL_H__

include/mincrypt/rsa.h

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ typedef struct RSAPublicKey { 
int RSA_verify(const RSAPublicKey *key,

               const uint8_t* signature,

               const int len,

               const uint8_t* sha);

               const uint8_t* hash,

               const int hash_len);



#ifdef __cplusplus

}

include/mincrypt/sha.h

+16 −49
Original line number Diff line number Diff line 
/* sha.h

**

** Copyright 2008, The Android Open Source Project

**

** Redistribution and use in source and binary forms, with or without

** modification, are permitted provided that the following conditions are met:

**     * Redistributions of source code must retain the above copyright

**       notice, this list of conditions and the following disclaimer.

**     * Redistributions in binary form must reproduce the above copyright

**       notice, this list of conditions and the following disclaimer in the

**       documentation and/or other materials provided with the distribution.

**     * Neither the name of Google Inc. nor the names of its contributors may

**       be used to endorse or promote products derived from this software

**       without specific prior written permission.

**

** THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR

** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO

** EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;

** OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

** OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*/



#ifndef _EMBEDDED_SHA_H_

#define _EMBEDDED_SHA_H_



#include <inttypes.h>

// Copyright 2005 Google Inc. All Rights Reserved.

// Author: mschilder@google.com (Marius Schilder)



#ifndef SECURITY_UTIL_LITE_SHA1_H__

#define SECURITY_UTIL_LITE_SHA1_H__



#include <stdint.h>

#include "hash-internal.h"



#ifdef __cplusplus

extern "C" {

#endif



typedef struct SHA_CTX {

    uint64_t count;

    uint32_t state[5];

#if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN)

    union {

        uint8_t b[64];

        uint32_t w[16];

    } buf;

#else

    uint8_t buf[64];

#endif

} SHA_CTX;

#endif // __cplusplus



typedef HASH_CTX SHA_CTX;



void SHA_init(SHA_CTX* ctx);

void SHA_update(SHA_CTX* ctx, const void* data, int len);

const uint8_t* SHA_final(SHA_CTX* ctx);



/* Convenience method. Returns digest parameter value. */

const uint8_t* SHA(const void* data, int len, uint8_t* digest);

// Convenience method. Returns digest address.

// NOTE: *digest needs to hold SHA_DIGEST_SIZE bytes.

const uint8_t* SHA_hash(const void* data, int len, uint8_t* digest);



#define SHA_DIGEST_SIZE 20



#ifdef __cplusplus

}

#endif

#endif // __cplusplus



#endif
 
#endif  // SECURITY_UTIL_LITE_SHA1_H__

include/mincrypt/sha256.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
// Copyright 2011 Google Inc. All Rights Reserved.

// Author: mschilder@google.com (Marius Schilder)



#ifndef SECURITY_UTIL_LITE_SHA256_H__

#define SECURITY_UTIL_LITE_SHA256_H__



#include <stdint.h>

#include "hash-internal.h"



#ifdef __cplusplus

extern "C" {

#endif // __cplusplus



typedef HASH_CTX SHA256_CTX;



void SHA256_init(SHA256_CTX* ctx);

void SHA256_update(SHA256_CTX* ctx, const void* data, int len);

const uint8_t* SHA256_final(SHA256_CTX* ctx);



// Convenience method. Returns digest address.

const uint8_t* SHA256_hash(const void* data, int len, uint8_t* digest);



#define SHA256_DIGEST_SIZE 32



#ifdef __cplusplus

}

#endif // __cplusplus



#endif  // SECURITY_UTIL_LITE_SHA256_H__