Skip to content

Commit

Permalink
Convert all tabs to 4 spaces and remove CRLF line terminators
Browse files Browse the repository at this point in the history 
Signed-off-by: Daniele Ricci <[email protected]>
  • Loading branch information
@daniele-athome
daniele-athome committed Jul 8, 2014
1 parent 75dd5dc commit 108e6eb
Show file tree
Hide file tree
Showing 71 changed files with 3,721 additions and 3,721 deletions.
16 changes: 8 additions & 8 deletions src/org/kontalk/Kontalk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ public PersonalKey getPersonalKey() throws PGPException, IOException, Certificat
}

public void exportPersonalKey()
throws CertificateException, PGPException, IOException,
NoSuchProviderException, KeyStoreException, NoSuchAlgorithmException {
throws CertificateException, PGPException, IOException,
NoSuchProviderException, KeyStoreException, NoSuchAlgorithmException {

Authenticator.exportDefaultPersonalKey(this, getCachedPassphrase(), true);
Authenticator.exportDefaultPersonalKey(this, getCachedPassphrase(), true);
}

/** Invalidates the cached personal key. */
Expand All @@ -202,16 +202,16 @@ public void invalidatePersonalKey() {
}

private void ensureCachedPassphrase() {
if (mKeyPassphrase == null) {
if (mKeyPassphrase == null) {
AccountManager am = AccountManager.get(this);
Account account = Authenticator.getDefaultAccount(am);
// cache passphrase from account
mKeyPassphrase = am.getPassword(account);
}
}
}

public String getCachedPassphrase() {
ensureCachedPassphrase();
ensureCachedPassphrase();
return mKeyPassphrase;
}

Expand All @@ -236,13 +236,13 @@ private static void enableService(Context context, PackageManager pm, Class<?> k
public static int getVersionCode(Context context) {
try {
PackageInfo pInfo = context.getPackageManager()
.getPackageInfo(context.getPackageName(), 0);
.getPackageInfo(context.getPackageName(), 0);

return pInfo.versionCode;
}
catch (NameNotFoundException e) {
// shouldn't happen
return 0;
return 0;
}
}

Expand Down
32 changes: 16 additions & 16 deletions src/org/kontalk/authenticator/Authenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public static String getDefaultAccountName(Context ctx) {
}

public static boolean isSelfUserId(Context ctx, String userId) {
String name = getDefaultAccountName(ctx);
return (name != null && MessageUtils.sha1(name).equals(userId));
String name = getDefaultAccountName(ctx);
return (name != null && MessageUtils.sha1(name).equals(userId));
}

public static boolean hasPersonalKey(AccountManager am, Account account) {
Expand All @@ -126,23 +126,23 @@ public static PersonalKey loadDefaultPersonalKey(Context ctx, String passphrase)
String bridgeCertData = m.getUserData(acc, DATA_BRIDGECERT);

if (privKeyData != null && pubKeyData != null && bridgeCertData != null)
return PersonalKey
.load(Base64.decode(privKeyData, Base64.DEFAULT),
Base64.decode(pubKeyData, Base64.DEFAULT),
passphrase,
Base64.decode(bridgeCertData, Base64.DEFAULT)
);
return PersonalKey
.load(Base64.decode(privKeyData, Base64.DEFAULT),
Base64.decode(pubKeyData, Base64.DEFAULT),
passphrase,
Base64.decode(bridgeCertData, Base64.DEFAULT)
);

else
return null;
return null;
}

public static void exportDefaultPersonalKey(Context ctx, String passphrase, boolean bridgeCertificate)
throws CertificateException, NoSuchProviderException, PGPException,
IOException, KeyStoreException, NoSuchAlgorithmException {
throws CertificateException, NoSuchProviderException, PGPException,
IOException, KeyStoreException, NoSuchAlgorithmException {

AccountManager m = AccountManager.get(ctx);
Account acc = getDefaultAccount(m);
AccountManager m = AccountManager.get(ctx);
Account acc = getDefaultAccount(m);

String privKeyData = m.getUserData(acc, DATA_PRIVATEKEY);
String pubKeyData = m.getUserData(acc, DATA_PUBLICKEY);
Expand All @@ -154,7 +154,7 @@ public static void exportDefaultPersonalKey(Context ctx, String passphrase, bool
byte[] privateKey = Base64.decode(privKeyData, Base64.DEFAULT);

if (bridgeCertificate) {
// bridge certificate is just plain data
// bridge certificate is just plain data
String bridgeCertData = m.getUserData(acc, DATA_BRIDGECERT);
byte[] bridgeCert = Base64.decode(bridgeCertData, Base64.DEFAULT);

Expand All @@ -164,7 +164,7 @@ public static void exportDefaultPersonalKey(Context ctx, String passphrase, bool
writer.close();

// export bridge private key
PrivateKey bridgeKey = PGP.convertPrivateKey(privateKey, passphrase);
PrivateKey bridgeKey = PGP.convertPrivateKey(privateKey, passphrase);
writer = new PemWriter(new FileWriter(new File(path, BRIDGE_KEY_FILENAME)));
writer.writeObject(new PemObject(X509Bridge.PEM_TYPE_PRIVATE_KEY, bridgeKey.getEncoded()));
writer.close();
Expand Down Expand Up @@ -194,7 +194,7 @@ public static void setDefaultPersonalKey(Context ctx, byte[] publicKeyData, byte

// private key data is optional when updating just the public key
if (privateKeyData != null)
am.setUserData(acc, Authenticator.DATA_PRIVATEKEY, Base64.encodeToString(privateKeyData, Base64.NO_WRAP));
am.setUserData(acc, Authenticator.DATA_PRIVATEKEY, Base64.encodeToString(privateKeyData, Base64.NO_WRAP));

am.setUserData(acc, Authenticator.DATA_PUBLICKEY, Base64.encodeToString(publicKeyData, Base64.NO_WRAP));
am.setUserData(acc, Authenticator.DATA_BRIDGECERT, Base64.encodeToString(bridgeCertData, Base64.NO_WRAP));
Expand Down
10 changes: 5 additions & 5 deletions src/org/kontalk/client/AndroidConnectionConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public AndroidConnectionConfiguration(String host, int port) {

public AndroidConnectionConfiguration(String host, int port, String name) {
super(host, port, name);
//AndroidInit();
//AndroidInit();
}

/* TODO move to custom SSL context
private void AndroidInit() {
// API 14 is Ice Cream Sandwich
// API 14 is Ice Cream Sandwich
if (Build.VERSION.SDK_INT >= 14) {
setTruststoreType("AndroidCAStore");
setTruststorePassword(null);
Expand All @@ -49,9 +49,9 @@ private void AndroidInit() {
setTruststoreType("BKS");
String path = System.getProperty("javax.net.ssl.trustStore");
if (path == null)
path = System.getProperty("java.home") + File.separator + "etc"
+ File.separator + "security" + File.separator
+ "cacerts.bks";
path = System.getProperty("java.home") + File.separator + "etc"
+ File.separator + "security" + File.separator
+ "cacerts.bks";
setTruststorePath(path);
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/org/kontalk/client/ClientHTTPConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ public static SSLSocketFactory setupSSLSocketFactory(Context context,
// load merged truststore (system + internal)
KeyStore truststore = InternalTrustStore.getTrustStore(context);

if (acceptAnyCertificate)
return new BlackholeSSLSocketFactory(keystore, null, truststore);
if (acceptAnyCertificate)
return new BlackholeSSLSocketFactory(keystore, null, truststore);

else
return new SSLSocketFactory(keystore, null, truststore);
else
return new SSLSocketFactory(keystore, null, truststore);
}

/**
Expand All @@ -148,7 +148,7 @@ private HttpResponse execute(HttpRequestBase request) throws IOException {

boolean acceptAnyCertificate = Preferences.getAcceptAnyCertificate(mContext);
registry.register(new Scheme("https", setupSSLSocketFactory(mContext,
mPrivateKey, mCertificate, acceptAnyCertificate), 443));
mPrivateKey, mCertificate, acceptAnyCertificate), 443));
}
catch (Exception e) {
IOException ie = new IOException("unable to create keystore");
Expand Down Expand Up @@ -242,7 +242,7 @@ private static final class BlackholeSSLSocketFactory extends SSLSocketFactory {
SSLContext sslContext = SSLContext.getInstance("TLS");

public BlackholeSSLSocketFactory(KeyStore keystore, String keystorePassword, KeyStore truststore)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
super(keystore, keystorePassword, truststore);

TrustManager tm = new X509TrustManager() {
Expand Down
68 changes: 34 additions & 34 deletions src/org/kontalk/client/KontalkConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ public class KontalkConnection extends XMPPTCPConnection {
protected EndpointServer mServer;

public KontalkConnection(EndpointServer server,
boolean acceptAnyCertificate, KeyStore trustStore)
throws XMPPException {
boolean acceptAnyCertificate, KeyStore trustStore)
throws XMPPException {

this(server, null, null, acceptAnyCertificate, trustStore);
}

public KontalkConnection(EndpointServer server,
PrivateKey privateKey, X509Certificate bridgeCert,
boolean acceptAnyCertificate, KeyStore trustStore) throws XMPPException {
PrivateKey privateKey, X509Certificate bridgeCert,
boolean acceptAnyCertificate, KeyStore trustStore) throws XMPPException {

super(new AndroidConnectionConfiguration
(server.getHost(),
Expand Down Expand Up @@ -83,49 +83,49 @@ private void setupSSL(PrivateKey privateKey, X509Certificate bridgeCert, boolean

KeyManager[] km = null;
if (privateKey != null && bridgeCert != null) {
// in-memory keystore
KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
keystore.load(null, null);
keystore.setKeyEntry("private", privateKey, null, new Certificate[] { bridgeCert });
// in-memory keystore
KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
keystore.load(null, null);
keystore.setKeyEntry("private", privateKey, null, new Certificate[] { bridgeCert });

// key managers
KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmFactory.init(keystore, null);
// key managers
KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmFactory.init(keystore, null);

km = kmFactory.getKeyManagers();
km = kmFactory.getKeyManagers();
}

// trust managers
TrustManager[] tm;

if (acceptAnyCertificate) {
tm = new TrustManager[] {
new X509TrustManager() {
@Override
public X509Certificate[] getAcceptedIssuers() {
return null;
}

@Override
public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
}

@Override
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
}
}
};
tm = new TrustManager[] {
new X509TrustManager() {
@Override
public X509Certificate[] getAcceptedIssuers() {
return null;
}

@Override
public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
}

@Override
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
}
}
};
}

else {
// builtin keystore
TrustManagerFactory tmFactory = TrustManagerFactory
.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmFactory.init(trustStore);
TrustManagerFactory tmFactory = TrustManagerFactory
.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmFactory.init(trustStore);

tm = tmFactory.getTrustManagers();
tm = tmFactory.getTrustManagers();
}

ctx.init(km, tm, null);
Expand Down
34 changes: 17 additions & 17 deletions src/org/kontalk/client/NumberValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void run() {
XMPPConnection conn = mConnector.getConnection();
conn.addPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
int reason = 0;
int reason = 0;
IQ iq = (IQ) packet;

if (iq.getType() == IQ.Type.RESULT) {
Expand All @@ -219,29 +219,29 @@ public void processPacket(Packet packet) {
}

else if (iq.getType() == IQ.Type.ERROR) {
XMPPError error = iq.getError();
XMPPError error = iq.getError();

if (XMPPError.Condition.service_unavailable.toString()
.equals(error.getCondition())) {
if (XMPPError.Condition.service_unavailable.toString()
.equals(error.getCondition())) {

if (error.getType() == XMPPError.Type.WAIT) {
reason = ERROR_THROTTLING;
if (error.getType() == XMPPError.Type.WAIT) {
reason = ERROR_THROTTLING;

}
}

else {
mListener.onServerCheckFailed(NumberValidator.this);
// onValidationFailed will not be called
reason = -1;
else {
mListener.onServerCheckFailed(NumberValidator.this);
// onValidationFailed will not be called
reason = -1;

}
}
}
}

}

// validation failed :(
if (reason >= 0)
mListener.onValidationFailed(NumberValidator.this, reason);
mListener.onValidationFailed(NumberValidator.this, reason);

mStep = STEP_INIT;
return;
Expand Down Expand Up @@ -364,8 +364,8 @@ public int getStep() {

private void initConnection() throws XMPPException, SmackException,
PGPException, KeyStoreException, NoSuchProviderException,
NoSuchAlgorithmException, CertificateException,
IOException {
NoSuchAlgorithmException, CertificateException,
IOException {

if (!mConnector.isConnected()) {
mConnector.setListener(this);
Expand Down Expand Up @@ -574,7 +574,7 @@ public void authenticated(XMPPConnection conn) {

@Override
public void authenticationFailed() {
// not used
// not used
}

}
20 changes: 10 additions & 10 deletions src/org/kontalk/crypto/Coder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ public abstract class Coder {

/** Decrypts a byte array which should content text. */
public abstract void decryptText(byte[] encrypted, boolean verify,
StringBuilder out, StringBuilder mime, List<DecryptException> errors)
throws GeneralSecurityException;
StringBuilder out, StringBuilder mime, List<DecryptException> errors)
throws GeneralSecurityException;


public abstract InputStream wrapInputStream(InputStream inputStream) throws GeneralSecurityException;
Expand All @@ -97,14 +97,14 @@ public abstract void decryptText(byte[] encrypted, boolean verify,

/** Returns true if the given security flags has some error bit on. */
public static boolean isError(int securityFlags) {
return (securityFlags & SECURITY_ERROR_INVALID_SIGNATURE) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_SENDER) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_RECIPIENT) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_TIMESTAMP) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_DATA) != 0 ||
(securityFlags & SECURITY_ERROR_DECRYPT_FAILED) != 0 ||
(securityFlags & SECURITY_ERROR_INTEGRITY_CHECK) != 0 ||
(securityFlags & SECURITY_ERROR_PUBLIC_KEY_UNAVAILABLE) != 0;
return (securityFlags & SECURITY_ERROR_INVALID_SIGNATURE) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_SENDER) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_RECIPIENT) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_TIMESTAMP) != 0 ||
(securityFlags & SECURITY_ERROR_INVALID_DATA) != 0 ||
(securityFlags & SECURITY_ERROR_DECRYPT_FAILED) != 0 ||
(securityFlags & SECURITY_ERROR_INTEGRITY_CHECK) != 0 ||
(securityFlags & SECURITY_ERROR_PUBLIC_KEY_UNAVAILABLE) != 0;
}

}
Loading

0 comments on commit 108e6eb

Please sign in to comment.