From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkpgp/kpgpbase6.cpp | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'libkpgp/kpgpbase6.cpp') diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp index 6ee6af221..fba6d4ec7 100644 --- a/libkpgp/kpgpbase6.cpp +++ b/libkpgp/kpgpbase6.cpp @@ -49,19 +49,19 @@ int Base6::decrypt( Block& block, const char *passphrase ) { int index, index2; - int exitStatus = 0; + int exiStatus = 0; clear(); input = block.text(); - exitStatus = run( PGP6 " +batchmode +language=C -f", passphrase); + exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exitStatus == -1) { + if(exiStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; - block.setStatus( status ); + block.seStatus( status ); return status; } @@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.setStatus( status ); + block.seStatus( status ); return status; } @@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exitStatus = 0; + int exiStatus = 0; status = 0; - exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " + exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " "0x" + keyID, 0, true ); - if(exitStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID, if( readTrust ) { - exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc " + exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc " "0x" + keyID, 0, true ); - if(exitStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -238,13 +238,13 @@ QStrList Base6::pubKeys() { int index, index2; - int exitStatus = 0; + int exiStatus = 0; int compatibleMode = 1; status = 0; - exitStatus = run("pgp +batchmode +language=C -kv -f"); + exiStatus = run("pgp +batchmode +language=C -kv -f"); - if(exitStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -319,9 +319,9 @@ Base6::pubKeys() } // Also look for pgp key groups - exitStatus = run("pgp +batchmode +language=C -gv -f"); + exiStatus = run("pgp +batchmode +language=C -gv -f"); - if(exitStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns ) int Base6::isVersion6() { - int exitStatus = 0; + int exiStatus = 0; - exitStatus = run( PGP6, 0, true ); + exiStatus = run( PGP6, 0, true ); - if(exitStatus == -1) { + if(exiStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; return 0; @@ -406,7 +406,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) if( firstLine && ( !strncmp( output.data() + offset, "DSS", 3 ) || !strncmp( output.data() + offset, "RSA", 3 ) ) ) - { // line contains primary key data + { // line tqcontains primary key data // Example 1: // RSA 1024 0xE2D074D3 2001/09/09 Test Key // Example 2 (disabled key): @@ -554,7 +554,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) else if( !strncmp( output.data() + offset, "DSS", 3 ) || !strncmp( output.data() + offset, " DH", 3 ) || !strncmp( output.data() + offset, "RSA", 3 ) ) - { // line contains secondary key data (or data for the next key) + { // line tqcontains secondary key data (or data for the next key) if( fpr ) break; // here begins the next key's data //kdDebug(5100)<<"Secondary key data:\n"; @@ -639,11 +639,11 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) canEncr = canEncr || encr; } else if( !strncmp( output.data() + offset, "Unknown type", 12 ) ) - { // line contains key data of unknown type (ignored) + { // line tqcontains key data of unknown type (ignored) kdDebug(5100)<<"Unknown key type.\n"; } else if( output[offset] == ' ' ) - { // line contains additional key data + { // line tqcontains additional key data if( key == 0 ) break; //kdDebug(5100)<<"Additional key data:\n"; @@ -653,7 +653,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) pos++; if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) ) - { // line contains a fingerprint + { // line tqcontains a fingerprint // Example: // Key fingerprint = D0 6C BB 3A F5 16 82 C4 F3 A0 8A B3 7B 16 99 70 @@ -663,14 +663,14 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) TQCString fingerprint = output.mid( pos, eol-pos ); // remove white space from the fingerprint for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; ) - fingerprint.replace( idx, 1, "" ); + fingerprint.tqreplace( idx, 1, "" ); //kdDebug(5100)<<"Fingerprint: "<setFingerprint( fingerprint ); } else - { // line contains an additional user id + { // line tqcontains an additional user id // Example: // Test key (2nd user ID) @@ -679,7 +679,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) } } else if( !strncmp( output.data() + offset, "sig", 3 ) ) - { // line contains signature data (ignored) + { // line tqcontains signature data (ignored) //kdDebug(5100)<<"Signature.\n"; } else // end of key data @@ -804,7 +804,7 @@ Base6::parseTrustDataForKey( Key* key, const TQCString& str ) break; if( str[offset+23] != ' ' ) - { // line contains a validity value for a user ID + { // line tqcontains a validity value for a user ID // determine the validity Validity validity = KPGP_VALIDITY_UNKNOWN; -- cgit v1.2.1