git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH, resent] fix openssl headers conflicting with custom SHA1 implementations

From
Jeff King <peff@peff.net>
Date
Oct 1, 2008, 16:04 UTC
Message-ID
<20081001160418.GA13917@coredump.intra.peff.net>
In-Reply-To
<20081001155458.GF21310@spearce.org>
On Wed, Oct 01, 2008 at 08:54:58AM -0700, Shawn O. Pearce wrote:
Show 10 quoted lines
> >   void ARM_SHA1_Init()
> > 
> > and
> > 
> >   #define SHA1_Init ARM_SHA1_Init
> 
> Ick.  I agree that renaming our SHA1 implementation to a different
> set of symbols is the right solution.  But this could cause trouble
> in any code that needs both SHA1 implementation and OpenSSL,
> especially if a SHA_CTX was passed to a function in another module.

Yes. You're never going to be able to get access to _both_ implementations if they have the same name. ;)

> I think its easy enough to just rename our SHA_CTX and SHA_*
> functions to something more git specific.  Since its mostly a global

I think that is the cleanest and simplest solution. As for merging pain, I think Junio would generally do a mechanical change like this as the first thing after a release. However, in this case, I think we might want it sooner if the conflict is causing breakage.

-Peff
Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 7 of 11 in “fix openssl headers conflicting with custom SHA1 implementations”
  1. fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre, Sep 30, 2008
  2. Shawn O. PearceSep 30, 2008
  3. Nicolas PitreSep 30, 2008
  4. Shawn O. PearceSep 30, 2008
  5. Jeff KingOct 1, 2008
  6. Shawn O. PearceOct 1, 2008
  7. Jeff KingOct 1, 2008
  8. Shawn O. PearceOct 1, 2008
  9. Nicolas PitreOct 1, 2008
  10. Shawn O. PearceOct 1, 2008
  11. fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre, Oct 1, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.