diff options
| author | Kenny Root <kroot@google.com> | 2015-10-02 16:09:15 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-10-02 16:09:49 -0700 |
| commit | fe7305364c3369f9222a61646c5c9842eae9bceb (patch) | |
| tree | 360ada970b7bb1046ae069d253ba24d9622eb3ad /src/include/openssl/digest.h | |
| parent | 691ef9d0ff0ece39ffd6a58960a7cd195ef584ae (diff) | |
| parent | b452bce3bf2034466cee6206ebf3994409468ee4 (diff) | |
| download | external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.zip external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.gz external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.bz2 | |
Merge mnc-dr-dev-plus-aosp into mnc-ub-dev
This pulls in the latest version of BoringSSL.
Change-Id: I0ab5c73d60f41a696c9a828fac87670aaca10dec
Diffstat (limited to 'src/include/openssl/digest.h')
| -rw-r--r-- | src/include/openssl/digest.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/include/openssl/digest.h b/src/include/openssl/digest.h index 2ea4ec4..66be4d0 100644 --- a/src/include/openssl/digest.h +++ b/src/include/openssl/digest.h @@ -234,15 +234,9 @@ struct evp_md_pctx_ops; struct env_md_ctx_st { /* digest is the underlying digest function, or NULL if not set. */ const EVP_MD *digest; - /* flags is the OR of a number of |EVP_MD_CTX_FLAG_*| values. */ - uint32_t flags; /* md_data points to a block of memory that contains the hash-specific * context. */ void *md_data; - /* update is usually copied from |digest->update| but can differ in some - * cases, i.e. HMAC. - * TODO(davidben): Remove this hook once |EVP_PKEY_HMAC| is gone. */ - void (*update)(EVP_MD_CTX *ctx, const void *data, size_t count); /* pctx is an opaque (at this layer) pointer to additional context that * EVP_PKEY functions may store in this object. */ @@ -258,8 +252,6 @@ struct env_md_ctx_st { } /* extern C */ #endif -#define DIGEST_F_EVP_DigestInit_ex 100 -#define DIGEST_F_EVP_MD_CTX_copy_ex 101 #define DIGEST_R_INPUT_NOT_INITIALIZED 100 #endif /* OPENSSL_HEADER_DIGEST_H */ |