Changeset View
Changeset View
Standalone View
Standalone View
security/razorback-api/files/extrapatch-openssl11
- This file was added.
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- include/razorback/types.h.orig 2019-07-03 11:01:48.211000000 -0700 | |||||
| +++ include/razorback/types.h 2019-07-03 11:01:57.144863000 -0700 | |||||
| @@ -56,7 +56,7 @@ struct Hash | |||||
| uint32_t iType; ///< The hash Type. | |||||
| uint32_t iSize; ///< size of the data stored, must be the same for all hashes in system | |||||
| uint8_t *pData; ///< actual data of the hash | |||||
| - EVP_MD_CTX CTX; ///< Private hash data. | |||||
| + EVP_MD_CTX *CTX; ///< Private hash data. | |||||
| uint32_t iFlags; ///< Hash Flags. | |||||
| }; | |||||
| --- src/hash.c.orig 2019-07-03 11:04:34.397139000 -0700 | |||||
| +++ src/hash.c 2019-07-03 11:08:44.895495000 -0700 | |||||
| @@ -96,7 +96,8 @@ Hash_Init_OpenSSL(struct Hash *hash) | |||||
| return false; | |||||
| } | |||||
| - EVP_DigestInit(&hash->CTX, m); | |||||
| + hash->CTX = EVP_MD_CTX_new(); | |||||
| + EVP_DigestInit(hash->CTX, m); | |||||
| return true; | |||||
| } | |||||
| @@ -129,7 +130,7 @@ Hash_Update (struct Hash * p_pHash, uint8_t * p_pData, | |||||
| ASSERT (p_pHash->pData != NULL); | |||||
| ASSERT (p_pHash->iType > 0); | |||||
| ASSERT (!(p_pHash->iFlags & HASH_FLAG_FINAL)); | |||||
| - EVP_DigestUpdate(&p_pHash->CTX, p_pData, p_iLength); | |||||
| + EVP_DigestUpdate(p_pHash->CTX, p_pData, p_iLength); | |||||
| return true; | |||||
| } | |||||
| SO_PUBLIC bool | |||||
| @@ -143,7 +144,7 @@ Hash_Update_File (struct Hash * p_pHash, FILE *file) | |||||
| ASSERT (!(p_pHash->iFlags & HASH_FLAG_FINAL)); | |||||
| while((len = fread(data,1,4096, file)) > 0) | |||||
| { | |||||
| - EVP_DigestUpdate(&p_pHash->CTX, data, len); | |||||
| + EVP_DigestUpdate(p_pHash->CTX, data, len); | |||||
| } | |||||
| rewind(file); | |||||
| return true; | |||||
| @@ -156,7 +157,7 @@ Hash_Finalize (struct Hash * p_pHash) | |||||
| ASSERT (p_pHash->pData != NULL); | |||||
| ASSERT (p_pHash->iType > 0); | |||||
| ASSERT (!(p_pHash->iFlags & HASH_FLAG_FINAL)); | |||||
| - EVP_DigestFinal(&p_pHash->CTX, p_pHash->pData, &p_pHash->iSize); | |||||
| + EVP_DigestFinal(p_pHash->CTX, p_pHash->pData, &p_pHash->iSize); | |||||
| p_pHash->iFlags = p_pHash->iFlags | HASH_FLAG_FINAL; | |||||
| return true; | |||||
| } | |||||
| @@ -186,7 +187,7 @@ Hash_Destroy (struct Hash *p_pHash) | |||||
| if (p_pHash->pData != NULL) | |||||
| free (p_pHash->pData); | |||||
| - EVP_MD_CTX_cleanup(&p_pHash->CTX); | |||||
| + EVP_MD_CTX_free(p_pHash->CTX); | |||||
| free(p_pHash); | |||||
| } | |||||