Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 18:55:52 +00:00
Code Issues Projects Releases Wiki Activity

Remove Java serialization from the ECKey hierarchy. It was broken for some time anyway (LazyECPoint).

Browse Source
This commit is contained in:
Andreas Schildbach 2015-07-22 14:21:34 +02:00
parent 230421484c
commit 12f3d2dbca
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/bitcoinj/core/ECKey.java
View File

@ -1,4 +1,4 @@
/** /*
* Copyright 2011 Google Inc. * Copyright 2011 Google Inc.
* Copyright 2014 Andreas Schildbach * Copyright 2014 Andreas Schildbach
* *
@ -48,7 +48,6 @@ import org.spongycastle.util.encoders.Base64;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.security.SecureRandom; import java.security.SecureRandom;
@ -89,7 +88,7 @@ import static com.google.common.base.Preconditions.*;
* this class so round-tripping preserves state. Unless you're working with old software or doing unusual things, you * this class so round-tripping preserves state. Unless you're working with old software or doing unusual things, you
* can usually ignore the compressed/uncompressed distinction.</p> * can usually ignore the compressed/uncompressed distinction.</p>
*/ */
public class ECKey implements EncryptableItem, Serializable { public class ECKey implements EncryptableItem {
private static final Logger log = LoggerFactory.getLogger(ECKey.class); private static final Logger log = LoggerFactory.getLogger(ECKey.class);
/** Sorts oldest keys first, newest last. */ /** Sorts oldest keys first, newest last. */
@ -127,7 +126,6 @@ public class ECKey implements EncryptableItem, Serializable {
public static final BigInteger HALF_CURVE_ORDER; public static final BigInteger HALF_CURVE_ORDER;
private static final SecureRandom secureRandom; private static final SecureRandom secureRandom;
private static final long serialVersionUID = -728224901792295832L;
static { static {
// Init proper random number generator, as some old Android installations have bugs that make it unsecure. // Init proper random number generator, as some old Android installations have bugs that make it unsecure.

5
core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
View File

@ -1,4 +1,4 @@
/** /*
* Copyright 2013 Matija Mazi. * Copyright 2013 Matija Mazi.
* Copyright 2014 Andreas Schildbach * Copyright 2014 Andreas Schildbach
* *
@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.bitcoinj.crypto; package org.bitcoinj.crypto;
import org.bitcoinj.core.*; import org.bitcoinj.core.*;
@ -51,8 +52,6 @@ public class DeterministicKey extends ECKey {
} }
}; };
private static final long serialVersionUID = 1L;
private final DeterministicKey parent; private final DeterministicKey parent;
private final ImmutableList<ChildNumber> childNumberPath; private final ImmutableList<ChildNumber> childNumberPath;
private final int depth; private final int depth;