wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ori: move to OpenSSL 1.1 and patch

Browse source
This commit is contained in:
FX Coudert 2019-09-04 17:03:02 +02:00
parent d114608eaf
commit f058551688
1 changed files with 60 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
Formula/ori.rb
View file

@ -3,7 +3,7 @@ class Ori < Formula
homepage "http://ori.scs.stanford.edu/"
url "https://bitbucket.org/orifs/ori/downloads/ori-0.8.2.tar.xz"
sha256 "a9b12ac23beaf259aa830addea11b519d16068f38c479f916b2747644194672c"
revision 1
revision 2
bottle do
cellar :any
@ -15,9 +15,13 @@ class Ori < Formula
depends_on "pkg-config" => :build
depends_on "scons" => :build
depends_on "libevent"
depends_on "openssl"
depends_on "openssl@1.1"
depends_on :osxfuse
# Patch adapted from upstream for OpenSSL 1.1 compatibility
# https://bitbucket.org/orifs/ori/pull-requests/7/adjust-to-libssl-api-changes-from-10-to-11/diff
patch :DATA
def install
system "scons", "BUILDTYPE=RELEASE"
system "scons", "install", "PREFIX=#{prefix}"
@ -27,3 +31,57 @@ class Ori < Formula
system "#{bin}/ori"
end
end
__END__
diff -pur ori-0.8.2/liboriutil/key.cc ori-0.8.2-fixed/liboriutil/key.cc
--- ori-0.8.2/liboriutil/key.cc 2019-01-28 02:12:19.000000000 +0100
+++ ori-0.8.2-fixed/liboriutil/key.cc 2019-09-07 10:01:36.000000000 +0200
@@ -131,7 +131,7 @@ PublicKey::verify(const string &blob,
const string &digest) const
{
int err;
- EVP_MD_CTX * ctx = new EVP_MD_CTX(); // XXX: openssl 1.1+ EVP_MD_CTX_new();
+ EVP_MD_CTX * ctx = EVP_MD_CTX_new();
if (!ctx) {
throw system_error(ENOMEM, std::generic_category(), "Could not allocate EVP_MD_CTX");
return false;
@@ -146,14 +146,14 @@ PublicKey::verify(const string &blob,
if (err != 1)
{
ERR_print_errors_fp(stderr);
- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx);
+ EVP_MD_CTX_free(ctx);
throw exception();
return false;
}
// Prepend 8-byte public key digest
- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx);
+ EVP_MD_CTX_free(ctx);
return true;
}
@@ -191,7 +191,7 @@ PrivateKey::sign(const string &blob) con
int err;
unsigned int sigLen = SIGBUF_LEN;
char sigBuf[SIGBUF_LEN];
- EVP_MD_CTX * ctx = new EVP_MD_CTX(); // XXX: openssl 1.1+ EVP_MD_CTX_new();
+ EVP_MD_CTX * ctx = EVP_MD_CTX_new();
if (!ctx) {
throw system_error(ENOMEM, std::generic_category(), "Could not allocate EVP_MD_CTX");
}
@@ -202,13 +202,13 @@ PrivateKey::sign(const string &blob) con
if (err != 1)
{
ERR_print_errors_fp(stderr);
- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx);
+ EVP_MD_CTX_free(ctx);
throw exception();
}
// XXX: Prepend 8-byte public key digest
- delete ctx; // XXX: openssl 1.1+ EVP_MD_CTX_free(ctx);
+ EVP_MD_CTX_free(ctx);
return string().assign(sigBuf, sigLen);
}