diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2006-04-22 10:59:45 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2006-04-22 10:59:45 +0000 |
| commit | 585e6b5402bad62ab17c3a4e5c99cc8c84baa4e8 (patch) | |
| tree | 3fedcbd7b8eacad60bd1d4d057ca9bdd87a86532 /kde-base/libkpgp/files | |
| parent | Stable on ppc. bug 123462 (diff) | |
| download | historical-585e6b5402bad62ab17c3a4e5c99cc8c84baa4e8.tar.gz historical-585e6b5402bad62ab17c3a4e5c99cc8c84baa4e8.tar.bz2 historical-585e6b5402bad62ab17c3a4e5c99cc8c84baa4e8.zip | |
Correct key handling.
Package-Manager: portage-2.0.54
Diffstat (limited to 'kde-base/libkpgp/files')
| -rw-r--r-- | kde-base/libkpgp/files/digest-libkpgp-3.5.0-r1 | 1 | ||||
| -rw-r--r-- | kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff | 47 |
2 files changed, 48 insertions, 0 deletions
diff --git a/kde-base/libkpgp/files/digest-libkpgp-3.5.0-r1 b/kde-base/libkpgp/files/digest-libkpgp-3.5.0-r1 new file mode 100644 index 000000000000..8cfd9db2e7e4 --- /dev/null +++ b/kde-base/libkpgp/files/digest-libkpgp-3.5.0-r1 @@ -0,0 +1 @@ +MD5 e19a2a40e422ecd483884ce6e9ac8925 kdepim-3.5.0.tar.bz2 12865623 diff --git a/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff b/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff new file mode 100644 index 000000000000..85d5008f4c41 --- /dev/null +++ b/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff @@ -0,0 +1,47 @@ +--- kdepim/libkpgp/kpgpbase2.cpp 2005/07/26 18:54:59 438982 ++++ kdepim/libkpgp/kpgpbase2.cpp 2006/04/15 12:39:26 530112 +@@ -863,9 +863,9 @@ + validity = KPGP_VALIDITY_FULL; + else if( !strncmp( str.data() + index+21, "marginal", 8 ) ) + validity = KPGP_VALIDITY_MARGINAL; +- else if( !strncmp( str.data() + index+21, "never", 8 ) ) ++ else if( !strncmp( str.data() + index+21, "never", 5 ) ) + validity = KPGP_VALIDITY_NEVER; +- else if( !strncmp( str.data() + index+21, "undefined", 8 ) ) ++ else if( !strncmp( str.data() + index+21, "undefined", 9 ) ) + validity = KPGP_VALIDITY_UNDEFINED; + + // determine the user ID +--- kdepim/libkpgp/kpgpbase6.cpp 2005/07/26 18:54:59 438982 ++++ kdepim/libkpgp/kpgpbase6.cpp 2006/04/15 12:39:26 530112 +@@ -634,8 +634,8 @@ + } + } + // store the global key capabilities +- canSign |= sign; +- canEncr |= encr; ++ canSign = canSign || sign; ++ canEncr = canEncr || encr; + } + else if( !strncmp( output.data() + offset, "Unknown type", 12 ) ) + { // line contains key data of unknown type (ignored) +--- kdepim/libkpgp/kpgpui.cpp 2005/07/26 18:54:59 438982 ++++ kdepim/libkpgp/kpgpui.cpp 2006/04/15 12:39:26 530112 +@@ -985,7 +985,7 @@ + kdDebug(5100) << "Selected keys: " << newKeyIdList.toStringList().join(", ") << endl; + mKeyIds = newKeyIdList; + if( !keysToBeChecked.isEmpty() ) { +- keysAllowed &= checkKeys( keysToBeChecked ); ++ keysAllowed = keysAllowed && checkKeys( keysToBeChecked ); + } + enableButtonOK( keysAllowed ); + +@@ -1016,7 +1016,7 @@ + pProgressDlg->setLabel( i18n("Checking key 0x%1...") + .arg( getKeyId( *it ) ) ); + kapp->processEvents(); +- keysAllowed &= ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); ++ keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); + pProgressDlg->progressBar()->advance( 1 ); + kapp->processEvents(); + } |