From 32e1c9617eb610994808375a577bbeb2191ad089 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 22 Sep 2016 17:10:50 +0000
Subject: [PATCH] EdDSA: throw IllegalStateException instead of NPE if field
 not set

---
 .../bigint/BigIntegerLittleEndianEncoding.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/java/src/net/i2p/crypto/eddsa/math/bigint/BigIntegerLittleEndianEncoding.java b/core/java/src/net/i2p/crypto/eddsa/math/bigint/BigIntegerLittleEndianEncoding.java
index e3088daca..3924b5b68 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/bigint/BigIntegerLittleEndianEncoding.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/bigint/BigIntegerLittleEndianEncoding.java
@@ -29,8 +29,11 @@ public class BigIntegerLittleEndianEncoding extends Encoding implements Serializ
      *  Constant time.
      *
      *  @return array of length b/8
+     *  @throws IllegalStateException if field not set
      */
     public byte[] encode(BigInteger x) {
+        if (f == null)
+            throw new IllegalStateException("field not set");
         byte[] in = x.toByteArray();
         byte[] out = new byte[f.getb()/8];
         for (int i = 0; i < in.length; i++) {
@@ -42,7 +45,18 @@ public class BigIntegerLittleEndianEncoding extends Encoding implements Serializ
         return out;
     }
 
+    /**
+     *  Decode a FieldElement from its (b-1)-bit encoding.
+     *  The highest bit is masked out.
+     *
+     *  @param in the (b-1)-bit encoding of a FieldElement.
+     *  @return the FieldElement represented by 'val'.
+     *  @throws IllegalStateException if field not set
+     *  @throws IllegalArgumentException if encoding is invalid
+     */
     public FieldElement decode(byte[] in) {
+        if (f == null)
+            throw new IllegalStateException("field not set");
         if (in.length != f.getb()/8)
             throw new IllegalArgumentException("Not a valid encoding");
         return new BigIntegerFieldElement(f, toBigInteger(in).and(mask));