Skip to content

Replace Broken Base32 Encoder/Decoder #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bombe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace Broken Base32 Encoder/Decoder #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 0 additions & 165 deletions src/main/java/org/archive/util/Base32.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/org/freenetproject/freemail/AccountManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
import java.util.Map;
import java.util.TimeZone;

import org.archive.util.Base32;
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
import org.bouncycastle.crypto.digests.MD5Digest;
import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
import org.bouncycastle.crypto.params.RSAKeyParameters;
import org.bouncycastle.util.encoders.Hex;
import org.freenetproject.freemail.utils.Base32;
import org.freenetproject.freemail.utils.EmailAddress;
import org.freenetproject.freemail.utils.Logger;
import org.freenetproject.freemail.utils.PropsFile;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/freenetproject/freemail/FreemailAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import java.io.File;
import java.util.Locale;

import org.archive.util.Base32;
import org.freenetproject.freemail.fcp.HighLevelFCPClientFactory;
import org.freenetproject.freemail.transport.MessageHandler;
import org.freenetproject.freemail.utils.Base32;
import org.freenetproject.freemail.utils.PropsFile;

import freenet.support.Base64;
Expand Down Expand Up @@ -68,7 +68,7 @@ public String getIdentity() {

public String getDomain() {
try {
return Base32.encode(Base64.decode(identity)).toLowerCase(Locale.ROOT) + ".freemail";
return Base32.encodeWithoutPadding(Base64.decode(identity)).toLowerCase(Locale.ROOT) + ".freemail";
} catch(IllegalBase64Exception e) {
//This would mean that WoT has changed the encoding of the identity string
throw new AssertionError("Got IllegalBase64Exception when decoding " + identity);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/freenetproject/freemail/HashSlotManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.freenetproject.freemail;

import org.archive.util.Base32;
import org.freenetproject.freemail.utils.Base32;

import org.bouncycastle.crypto.digests.SHA256Digest;

Expand All @@ -35,6 +35,6 @@ protected String incSlot(String slot) {
sha256.update(buf, 0, buf.length);
sha256.doFinal(buf, 0);

return Base32.encode(buf);
return Base32.encodeWithoutPadding(buf);
}
}
2 changes: 1 addition & 1 deletion src/main/java/org/freenetproject/freemail/imap/IMAPHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
import java.util.Date;
import java.util.concurrent.TimeUnit;

import org.archive.util.Base32;
import org.freenetproject.freemail.AccountManager;
import org.freenetproject.freemail.FreemailAccount;
import org.freenetproject.freemail.MailMessage;
import org.freenetproject.freemail.MessageBank;
import org.freenetproject.freemail.ServerHandler;
import org.freenetproject.freemail.utils.Base32;
import org.freenetproject.freemail.utils.EmailAddress;
import org.freenetproject.freemail.utils.Logger;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/freenetproject/freemail/smtp/SMTPHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
import freenet.support.api.Bucket;
import freenet.support.io.FileBucket;

import org.archive.util.Base32;
import org.bouncycastle.util.encoders.Base64;
import org.freenetproject.freemail.AccountManager;
import org.freenetproject.freemail.Freemail;
import org.freenetproject.freemail.FreemailAccount;
import org.freenetproject.freemail.ServerHandler;
import org.freenetproject.freemail.transport.MessageHandler;
import org.freenetproject.freemail.utils.Base32;
import org.freenetproject.freemail.utils.Logger;
import org.freenetproject.freemail.wot.Identity;
import org.freenetproject.freemail.wot.IdentityMatcher;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/freenetproject/freemail/transport/Channel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;

import org.archive.util.Base32;
import org.bouncycastle.crypto.AsymmetricBlockCipher;
import org.bouncycastle.crypto.InvalidCipherTextException;
import org.bouncycastle.crypto.digests.SHA256Digest;
Expand All @@ -66,6 +65,7 @@
import org.freenetproject.freemail.fcp.FCPPutFailedException;
import org.freenetproject.freemail.fcp.HighLevelFCPClient;
import org.freenetproject.freemail.fcp.SSKKeyPair;
import org.freenetproject.freemail.utils.Base32;
import org.freenetproject.freemail.utils.DateStringFactory;
import org.freenetproject.freemail.utils.Logger;
import org.freenetproject.freemail.utils.PropsFile;
Expand Down Expand Up @@ -593,14 +593,14 @@ boolean canSendMessages() {

private String calculateNextSlot(String slot) {
byte[] buf = Base32.decode(slot);
return Base32.encode(SHA256.digest(buf));
return Base32.encodeWithoutPadding(SHA256.digest(buf));
}

private String generateRandomSlot() {
SHA256Digest sha256 = new SHA256Digest();
byte[] buf = new byte[sha256.getDigestSize()];
Freemail.getRNG().nextBytes(buf);
return Base32.encode(buf);
return Base32.encodeWithoutPadding(buf);
}

private class Fetcher implements Runnable {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/freenetproject/freemail/transport/MessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.TimeUnit;

import org.archive.util.Base32;
import org.freenetproject.freemail.Freemail;
import org.freenetproject.freemail.Freemail.TaskType;
import org.freenetproject.freemail.FreemailAccount;
Expand All @@ -48,6 +47,7 @@
import org.freenetproject.freemail.Postman;
import org.freenetproject.freemail.fcp.HighLevelFCPClientFactory;
import org.freenetproject.freemail.transport.Channel.ChannelEventCallback;
import org.freenetproject.freemail.utils.Base32;
import org.freenetproject.freemail.utils.EmailAddress;
import org.freenetproject.freemail.utils.Logger;
import org.freenetproject.freemail.utils.PropsFile;
Expand Down Expand Up @@ -550,7 +550,7 @@ private class AckCallback extends Postman implements ChannelEventCallback {
private AckCallback(String remoteId) {
assert (remoteId != null);
try {
this.remoteId = Base32.encode(Base64.decode(remoteId)).toLowerCase(Locale.ROOT);
this.remoteId = Base32.encodeWithoutPadding(Base64.decode(remoteId)).toLowerCase(Locale.ROOT);
} catch (IllegalBase64Exception e) {
throw new AssertionError();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/freenetproject/freemail/ui/web/OutboxToadlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
import java.util.List;
import java.util.concurrent.TimeUnit;

import org.archive.util.Base32;
import org.freenetproject.freemail.AccountManager;
import org.freenetproject.freemail.FreemailAccount;
import org.freenetproject.freemail.FreemailPlugin;
import org.freenetproject.freemail.l10n.FreemailL10n;
import org.freenetproject.freemail.transport.MessageHandler.OutboxMessage;
import org.freenetproject.freemail.utils.Base32;
import org.freenetproject.freemail.utils.Logger;
import org.freenetproject.freemail.utils.Timer;
import org.freenetproject.freemail.wot.Identity;
Expand Down Expand Up @@ -101,7 +101,7 @@ HTTPResponse makeWebPageGet(URI uri, HTTPRequest req, ToadletContext ctx, PageNo
//Fall back to showing the address without the nickname
String id;
try {
id = Base32.encode(Base64.decode(message.recipient));
id = Base32.encodeWithoutPadding(Base64.decode(message.recipient));
} catch (IllegalBase64Exception e) {
//This should never happen since we couldn't possibly have sent the message if
//the id couldn't be decoded
Expand Down
Loading