diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-17 16:37:54 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-17 16:37:54 +0000 |
| commit | 8e4878bcb354ceeeee81d088c52248281aeafc1a (patch) | |
| tree | 77435a7865efea0987732ace0b50be597d8c0ffd /sci-misc/boinc/files | |
| parent | Forced newer ast-4.6.2-r1 dependency (diff) | |
| download | historical-8e4878bcb354ceeeee81d088c52248281aeafc1a.tar.gz historical-8e4878bcb354ceeeee81d088c52248281aeafc1a.tar.bz2 historical-8e4878bcb354ceeeee81d088c52248281aeafc1a.zip | |
Update the patch so it works again.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'sci-misc/boinc/files')
| -rw-r--r-- | sci-misc/boinc/files/6.4.5-RSA_security.patch | 68 |
1 files changed, 27 insertions, 41 deletions
diff --git a/sci-misc/boinc/files/6.4.5-RSA_security.patch b/sci-misc/boinc/files/6.4.5-RSA_security.patch index 1f10ae467fe8..0098444ed5e7 100644 --- a/sci-misc/boinc/files/6.4.5-RSA_security.patch +++ b/sci-misc/boinc/files/6.4.5-RSA_security.patch @@ -1,5 +1,6 @@ ---- boinc-6.4.5/lib/crypt.cpp 2009-02-15 05:27:43.284347370 +0100 -+++ boinc-6.4.5/lib/crypt.cpp 2009-02-15 05:31:25.554348346 +0100 +diff -urN boinc-6.4.5.old/lib/crypt.cpp boinc-6.4.5/lib/crypt.cpp +--- boinc-6.4.5.old/lib/crypt.cpp 2008-09-26 20:20:24.000000000 +0200 ++++ boinc-6.4.5/lib/crypt.cpp 2009-02-17 17:33:10.000000000 +0100 @@ -243,7 +243,7 @@ // The output block must be decrypted in its entirety. // @@ -15,64 +16,49 @@ 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; -+ } ++ 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; ++ 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; -+ } ++ if (retval < 0) { ++ RSA_free(rp); ++ return ERR_CRYPTO; ++ } out.len = RSA_size(rp); -+ RSA_free(rp); ++ RSA_free(rp); return 0; } -@@ -684,4 +694,4 @@ - return verified; - } +diff -urN boinc-6.4.5.old/lib/error_numbers.h boinc-6.4.5/lib/error_numbers.h +--- boinc-6.4.5.old/lib/error_numbers.h 2008-08-06 20:36:30.000000000 +0200 ++++ boinc-6.4.5/lib/error_numbers.h 2009-02-17 17:34:17.000000000 +0100 +@@ -185,6 +185,7 @@ + #define ERR_RMDIR -227 + #define ERR_SYMLINK -229 + #define ERR_DB_CONN_LOST -230 ++#define ERR_CRYPTO -231 --const char *BOINC_RCSID_4f0c2e42ea = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $"; -+const char *BOINC_RCSID_4f0c2e42ea = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $"; - - ---- boinc-6.4.5/lib/str_util.cpp 2009-02-15 05:27:43.292347379 +0100 -+++ boinc-6.4.5/lib/str_util.cpp 2009-02-15 05:31:25.560347422 +0100 + // PLEASE: add a text description of your error to + // the text description function boincerror() in str_util.C. +diff -urN boinc-6.4.5.old/lib/str_util.cpp boinc-6.4.5/lib/str_util.cpp +--- boinc-6.4.5.old/lib/str_util.cpp 2008-09-26 20:20:24.000000000 +0200 ++++ boinc-6.4.5/lib/str_util.cpp 2009-02-17 17:33:50.000000000 +0100 @@ -735,6 +735,7 @@ case ERR_RMDIR: return "rmdir() failed"; case ERR_SYMLINK: return "symlink() failed"; case ERR_DB_CONN_LOST: return "DB connection lost during enumeration"; -+ case ERR_CRYPTO: return "encryption error"; ++ case ERR_CRYPTO: return "encryption error"; case 404: return "HTTP file not found"; case 407: return "HTTP proxy authentication failure"; case 416: return "HTTP range request error"; -@@ -876,4 +877,4 @@ - return retval; - } - --const char *BOINC_RCSID_ab90e1e = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $"; -+const char *BOINC_RCSID_ab90e1e = "$Id: 6.4.5-RSA_security.patch,v 1.1 2009/02/16 19:48:26 scarabeus Exp $"; - - ---- boinc-6.4.5/lib/error_numbers.h 2009-02-15 05:27:43.290347301 +0100 -+++ boinc-6.4.5/lib/error_numbers.h 2009-02-15 05:31:25.558348407 +0100 -@@ -185,6 +185,7 @@ - #define ERR_RMDIR -227 - #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. - |