[SCM] BOINC packaging branch, master, updated. upstream/6.2.14-5-g810db27

rmayorga rmayorga at debian.org.sv
Wed Jan 14 01:13:42 UTC 2009 

The following commit has been merged in the master branch:
commit 810db27ca4d3ad9ebfce1b350666e0bbe4fccc41
Author: rmayorga <rmayorga at debian.org.sv>
Date:   Tue Jan 13 17:11:22 2009 -0600

    Add debian/patches/101_check_RSA_returned_values.patch  Check the returned values for RSA_public_decrypt and RSA_private_encrypt functions. Change ported by upstream changeset 16883 (http://boinc.berkeley.edu/trac/changeset/16883) Closes: #511521
    
    * Add debian/patches/101_check_RSA_returned_values.patch
      Check the returned values for RSA_public_decrypt and
      RSA_private_encrypt functions. Change ported by upstream changeset 16883
      (http://boinc.berkeley.edu/trac/changeset/16883) Closes: #511521
    * debian/patches
      001_dont_install_ca-bundle.crt.patch and
      002_remove_hardcoded_optimization.patch Refreshed
    * debian/control - add myself to uploaders

diff --git a/debian/changelog b/debian/changelog
index 98cf6e3..6d9e9fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+boinc (6.2.14-3) unstable; urgency=low
+
+  * Add debian/patches/101_check_RSA_returned_values.patch 
+    Check the returned values for RSA_public_decrypt and
+    RSA_private_encrypt functions. Change ported by upstream changeset 16883
+    (http://boinc.berkeley.edu/trac/changeset/16883) Closes: #511521
+  * debian/patches
+    001_dont_install_ca-bundle.crt.patch and 
+    002_remove_hardcoded_optimization.patch Refreshed
+  * debian/control - add myself to uploaders
+
+ -- Rene Mayorga <rmayorga at debian.org.sv>  Tue, 13 Jan 2009 14:05:38 -0600
+
 boinc (6.2.14-2) unstable; urgency=low
 
   * Updated translations for the BOINC Manager from the 6.2.16 release:
diff --git a/debian/control b/debian/control
index fba661e..43e4092 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: boinc
 Section: net
 Priority: optional
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
-Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <fst at debian.org>, Christoph Martin <christoph.martin at uni-mainz.de>
+Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <fst at debian.org>, Christoph Martin <christoph.martin at uni-mainz.de>, Rene Mayorga <rmayorga at debian.org.sv>
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 5), quilt (>= 0.40), po-debconf, dh-buildinfo,
  docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3),
diff --git a/debian/patches/001_dont_install_ca-bundle.crt.patch b/debian/patches/001_dont_install_ca-bundle.crt.patch
index 28831b2..315ccf8 100644
--- a/debian/patches/001_dont_install_ca-bundle.crt.patch
+++ b/debian/patches/001_dont_install_ca-bundle.crt.patch
@@ -1,13 +1,11 @@
-Index: boinc-5.10.25/client/Makefile.am
-===================================================================
---- boinc-5.10.25.orig/client/Makefile.am
-+++ boinc-5.10.25/client/Makefile.am
+--- boinc.orig/client/Makefile.am
++++ boinc/client/Makefile.am
 @@ -66,7 +66,7 @@
- boinc_client_LDADD = -L../lib -lboinc $(PTHREAD_LIBS)
+ boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
  
  boinc_clientdir = $(bindir)
 -boinc_client_DATA = ../curl/ca-bundle.crt
 +#boinc_client_DATA = ../curl/ca-bundle.crt
  
  switcher_SOURCES = switcher.C
- switcher_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
+ 
diff --git a/debian/patches/002_remove_hardcoded_optimization.patch b/debian/patches/002_remove_hardcoded_optimization.patch
index bf746ad..2f73386 100644
--- a/debian/patches/002_remove_hardcoded_optimization.patch
+++ b/debian/patches/002_remove_hardcoded_optimization.patch
@@ -1,7 +1,5 @@
-Index: boinc-6.1.0/client/Makefile.am
-===================================================================
---- boinc-6.1.0.orig/client/Makefile.am
-+++ boinc-6.1.0/client/Makefile.am
+--- boinc.orig/client/Makefile.am
++++ boinc/client/Makefile.am
 @@ -61,7 +61,7 @@
      work_fetch.C
  
@@ -9,5 +7,5 @@ Index: boinc-6.1.0/client/Makefile.am
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
 +boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
  boinc_client_LDFLAGS = -static-libgcc
- boinc_client_LDADD = -L../lib -lboinc $(PTHREAD_LIBS)
+ boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
  
diff --git a/debian/patches/101_check_RSA_returned_values.patch b/debian/patches/101_check_RSA_returned_values.patch
new file mode 100644
index 0000000..e5db164
--- /dev/null
+++ b/debian/patches/101_check_RSA_returned_values.patch
@@ -0,0 +1,66 @@
+Author: davea
+Description: Check the returned values for RSA_public_decrypt and
+RSA_private_encrypt functions. Change ported by upstream changeset 16883
+(http://boinc.berkeley.edu/trac/changeset/16883) 
+Bug: #511521
+--- boinc.orig/lib/crypt.C
++++ boinc/lib/crypt.C
+@@ -210,7 +210,7 @@
+ // The output block must be decrypted in its entirety.
+ //
+ int encrypt_private(R_RSA_PRIVATE_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
+-    int n, modulus_len;
++    int n, modulus_len, retval;
+ 
+     modulus_len = (key.bits+7)/8;
+     n = in.len;
+@@ -219,17 +219,27 @@
+     }
+     RSA* rp = RSA_new();
+     private_to_openssl(key, rp);
+-    RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
++    retval = RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
++    if (retval < 0) {
++	    RSA_free(rp);
++	    return ERR_CRYPTO;
++    }
+     out.len = RSA_size(rp);
+     RSA_free(rp);
+     return 0;
+ }
+ 
+ int decrypt_public(R_RSA_PUBLIC_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
++    int retval;
+     RSA* rp = RSA_new();
+     public_to_openssl(key, rp);
+-    RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
++    retval = RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
++    if (retval < 0) {
++        RSA_free(rp);
++	return ERR_CRYPTO;
++    }
+     out.len = RSA_size(rp);
++    RSA_free(rp);
+     return 0;
+ }
+ 
+--- boinc.orig/lib/error_numbers.h
++++ boinc/lib/error_numbers.h
+@@ -187,6 +187,7 @@
+ #define ERR_CHILD_FAILED    -228
+ #define ERR_SYMLINK         -229
+ #define ERR_DB_CONN_LOST    -230
++#define ERR_CRYPTO          -231
+ 
+ // PLEASE: add a text description of your error to 
+ // the text description function boincerror() in str_util.C.
+--- boinc.orig/lib/str_util.C
++++ boinc/lib/str_util.C
+@@ -735,6 +735,7 @@
+         case ERR_BAD_FILENAME: return "file name is empty or has '..'";
+         case ERR_TOO_MANY_EXITS: return "application exited too many times";
+         case ERR_RMDIR: return "rmdir() failed";
++	case ERR_CRYPTO: return "encryption/decryption error";
+         case 404: return "HTTP file not found";
+         case 407: return "HTTP proxy authentication failure";
+         case 416: return "HTTP range request error";
diff --git a/debian/patches/series b/debian/patches/series
index 78c46c7..9177da7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 002_remove_hardcoded_optimization.patch
 003_use_sensible-browser.patch
 004_exclude_sea.patch
+101_check_RSA_returned_values.patch

-- 
BOINC packaging

More information about the pkg-boinc-commits mailing list