From b5388eb752434d9cf9d77c50c85bc7c128fb6dcd Mon Sep 17 00:00:00 2001 From: afernandes Date: Tue, 18 Dec 2018 05:51:38 -0500 Subject: [PATCH] Remove okio dependency --- README.md | 2 +- alice/build.gradle | 4 +- .../main/java/com/rockaport/alice/Alice.java | 9 +- docs/allclasses-frame.html | 4 +- docs/allclasses-noframe.html | 4 +- docs/com/rockaport/alice/Alice.html | 61 +- .../alice/AliceContext.Algorithm.html | 62 +- .../alice/AliceContext.GcmTagLength.html | 64 +- .../alice/AliceContext.KeyLength.html | 62 +- .../alice/AliceContext.MacAlgorithm.html | 62 +- .../rockaport/alice/AliceContext.Mode.html | 62 +- .../rockaport/alice/AliceContext.Padding.html | 62 +- .../rockaport/alice/AliceContext.Pbkdf.html | 62 +- docs/com/rockaport/alice/AliceContext.html | 51 +- .../rockaport/alice/AliceContextBuilder.html | 51 +- docs/com/rockaport/alice/package-frame.html | 4 +- docs/com/rockaport/alice/package-summary.html | 47 +- docs/com/rockaport/alice/package-tree.html | 73 +- docs/constant-values.html | 47 +- docs/deprecated-list.html | 47 +- docs/help-doc.html | 47 +- docs/index-all.html | 50 +- docs/index.html | 88 +-- docs/overview-tree.html | 69 +- docs/script.js | 16 +- docs/stylesheet.css | 711 ++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 27 files changed, 943 insertions(+), 880 deletions(-) diff --git a/README.md b/README.md index e78b284..80b324d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ CI](https://circleci.com/gh/rockaport/alice.svg?style=shield)](https://circleci. [![codecov](https://codecov.io/gh/rockaport/alice/branch/master/graph/badge.svg)](https://codecov.io/gh/rockaport/alice) # alice -Alice is a Java AES encryption library for working with byte arrays, files, and streams. Various key lengths, block modes, padding schemes, key deriviation functions, and Message Authentication Codes (MAC) are available. See the [javadoc](https://rockaport.github.io/alice) for more information. +Alice is a Java AES/DES encryption library for working with byte arrays, files, and streams. Various key lengths, block modes, padding schemes, key deriviation functions, and Message Authentication Codes (MAC) are available. See the [javadoc](https://rockaport.github.io/alice) for more information. Alice provides an easy wrapper around the javax.crypto cipher suite for symmetric key encryption. if a MAC algorithm is selected, additional [Authenticated Encryption](https://en.wikipedia.org/wiki/Authenticated_encryption) is performed using an [encrypt-then-mac](https://en.wikipedia.org/wiki/Authenticated_encryption#Encrypt-then-MAC_.28EtM.29) scheme. diff --git a/alice/build.gradle b/alice/build.gradle index aaed01c..2681427 100644 --- a/alice/build.gradle +++ b/alice/build.gradle @@ -8,8 +8,6 @@ sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 dependencies { - compile 'com.squareup.okio:okio:1.11.0' - compile "org.codehaus.groovy:groovy-all:2.4.1" testCompile 'org.spockframework:spock-core:1.1-groovy-2.4-rc-3' @@ -33,7 +31,7 @@ task codeCoverageReport(type: JacocoReport) { reports { xml.enabled true - xml.destination "${buildDir}/reports/jacoco/report.xml" + xml.destination file("${buildDir}/reports/jacoco/report.xml") html.enabled true csv.enabled false } diff --git a/alice/src/main/java/com/rockaport/alice/Alice.java b/alice/src/main/java/com/rockaport/alice/Alice.java index 16f3fbe..935ec18 100644 --- a/alice/src/main/java/com/rockaport/alice/Alice.java +++ b/alice/src/main/java/com/rockaport/alice/Alice.java @@ -1,7 +1,5 @@ package com.rockaport.alice; -import okio.Buffer; - import javax.crypto.*; import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.IvParameterSpec; @@ -159,9 +157,10 @@ private Mac getMac(AliceContext.MacAlgorithm macAlgorithm, char[] password) thro * @param password the password * @return an encrypted byte array * @throws GeneralSecurityException if initialization or encryption fails + * @throws IOException if there's a problem constructing the result */ @SuppressWarnings("WeakerAccess") - public synchronized byte[] encrypt(byte[] input, char[] password) throws GeneralSecurityException { + public synchronized byte[] encrypt(byte[] input, char[] password) throws GeneralSecurityException, IOException { if (input == null || input.length == 0) { throw new IllegalArgumentException("Input is either null or empty"); } @@ -182,7 +181,7 @@ public synchronized byte[] encrypt(byte[] input, char[] password) throws General byte[] encryptedBytes = cipher.doFinal(input); // construct the output (IV || CIPHER) - Buffer output = new Buffer(); + ByteArrayOutputStream output = new ByteArrayOutputStream(); output.write(cipher.getIV()); output.write(encryptedBytes); @@ -192,7 +191,7 @@ public synchronized byte[] encrypt(byte[] input, char[] password) throws General output.write(getMac(context.getMacAlgorithm(), password).doFinal(encryptedBytes)); } - return output.readByteArray(); + return output.toByteArray(); } /** diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index 7540caf..303612b 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes (alice 0.5 API) - + diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index aa52346..7f3073c 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes (alice 0.5 API) - + diff --git a/docs/com/rockaport/alice/Alice.html b/docs/com/rockaport/alice/Alice.html index 6e380ab..b16db20 100644 --- a/docs/com/rockaport/alice/Alice.html +++ b/docs/com/rockaport/alice/Alice.html @@ -2,24 +2,28 @@ - + Alice (alice 0.5 API) - +
@@ -313,7 +315,8 @@

generateKey

encrypt

public byte[] encrypt(byte[] input,
                       char[] password)
-               throws java.security.GeneralSecurityException
+ throws java.security.GeneralSecurityException, + java.io.IOException
Encrypts a byte array using the supplied password
Parameters:
@@ -325,6 +328,8 @@

encrypt

java.security.GeneralSecurityException - if initialization or encryption fails
+
java.io.IOException - if there's a problem constructing the result +
@@ -498,15 +503,13 @@

decrypt

diff --git a/docs/com/rockaport/alice/AliceContext.Algorithm.html b/docs/com/rockaport/alice/AliceContext.Algorithm.html index e8f6b4a..cd2c9e0 100644 --- a/docs/com/rockaport/alice/AliceContext.Algorithm.html +++ b/docs/com/rockaport/alice/AliceContext.Algorithm.html @@ -2,24 +2,28 @@ - + AliceContext.Algorithm (alice 0.5 API) - +
@@ -102,7 +104,8 @@

Enum AliceContext.Algorith
    • java.lang.Enum<AliceContext.Algorithm>
    • + title="enum in com.rockaport.alice">AliceContext.Algorithm> +
      • com.rockaport.alice.AliceContext.Algorithm
      • @@ -118,7 +121,8 @@

        Enum AliceContext.Algorith
        All Implemented Interfaces:
        java.io.Serializable, java.lang.Comparable<AliceContext.Algorithm>
        + title="enum in com.rockaport.alice">AliceContext.Algorithm> +
        Enclosing class:
        @@ -418,15 +422,13 @@

        toString

      diff --git a/docs/com/rockaport/alice/AliceContext.GcmTagLength.html b/docs/com/rockaport/alice/AliceContext.GcmTagLength.html index 0c24746..5e437e5 100644 --- a/docs/com/rockaport/alice/AliceContext.GcmTagLength.html +++ b/docs/com/rockaport/alice/AliceContext.GcmTagLength.html @@ -2,24 +2,28 @@ - + AliceContext.GcmTagLength (alice 0.5 API) - +
      @@ -103,7 +105,8 @@

      Enum AliceContext.GcmTa
      • java.lang.Enum<AliceContext.GcmTagLength>
      • + title="enum in com.rockaport.alice">AliceContext.GcmTagLength> +
        • com.rockaport.alice.AliceContext.GcmTagLength
        • @@ -119,7 +122,8 @@

          Enum AliceContext.GcmTa
          All Implemented Interfaces:
          java.io.Serializable, java.lang.Comparable<AliceContext.GcmTagLength>
          + title="enum in com.rockaport.alice">AliceContext.GcmTagLength> +
          Enclosing class:
          @@ -427,15 +431,13 @@

          bits

        diff --git a/docs/com/rockaport/alice/AliceContext.KeyLength.html b/docs/com/rockaport/alice/AliceContext.KeyLength.html index e5c496a..ba16be2 100644 --- a/docs/com/rockaport/alice/AliceContext.KeyLength.html +++ b/docs/com/rockaport/alice/AliceContext.KeyLength.html @@ -2,24 +2,28 @@ - + AliceContext.KeyLength (alice 0.5 API) - +
        @@ -102,7 +104,8 @@

        Enum AliceContext.KeyLengt
        • java.lang.Enum<AliceContext.KeyLength>
        • + title="enum in com.rockaport.alice">AliceContext.KeyLength> +
          • com.rockaport.alice.AliceContext.KeyLength
          • @@ -118,7 +121,8 @@

            Enum AliceContext.KeyLengt
            All Implemented Interfaces:
            java.io.Serializable, java.lang.Comparable<AliceContext.KeyLength>
            + title="enum in com.rockaport.alice">AliceContext.KeyLength> +
            Enclosing class:
            @@ -417,15 +421,13 @@

            bytes

          diff --git a/docs/com/rockaport/alice/AliceContext.MacAlgorithm.html b/docs/com/rockaport/alice/AliceContext.MacAlgorithm.html index 6d5172d..9a78c99 100644 --- a/docs/com/rockaport/alice/AliceContext.MacAlgorithm.html +++ b/docs/com/rockaport/alice/AliceContext.MacAlgorithm.html @@ -2,24 +2,28 @@ - + AliceContext.MacAlgorithm (alice 0.5 API) - +
          @@ -103,7 +105,8 @@

          Enum AliceContext.MacAl
          • java.lang.Enum<AliceContext.MacAlgorithm>
          • + title="enum in com.rockaport.alice">AliceContext.MacAlgorithm> +
            • com.rockaport.alice.AliceContext.MacAlgorithm
            • @@ -119,7 +122,8 @@

              Enum AliceContext.MacAl
              All Implemented Interfaces:
              java.io.Serializable, java.lang.Comparable<AliceContext.MacAlgorithm>
              + title="enum in com.rockaport.alice">AliceContext.MacAlgorithm> +
              Enclosing class:
              @@ -432,15 +436,13 @@

              toString

            diff --git a/docs/com/rockaport/alice/AliceContext.Mode.html b/docs/com/rockaport/alice/AliceContext.Mode.html index faca273..0a0196f 100644 --- a/docs/com/rockaport/alice/AliceContext.Mode.html +++ b/docs/com/rockaport/alice/AliceContext.Mode.html @@ -2,24 +2,28 @@ - + AliceContext.Mode (alice 0.5 API) - +
            @@ -102,7 +104,8 @@

            Enum AliceContext.Mode

            • java.lang.Enum<AliceContext.Mode>
            • + title="enum in com.rockaport.alice">AliceContext.Mode> +
              • com.rockaport.alice.AliceContext.Mode
              • @@ -118,7 +121,8 @@

                Enum AliceContext.Mode

                All Implemented Interfaces:
                java.io.Serializable, java.lang.Comparable<AliceContext.Mode>
                + title="enum in com.rockaport.alice">AliceContext.Mode> +
                Enclosing class:
                @@ -410,15 +414,13 @@

                toString

              diff --git a/docs/com/rockaport/alice/AliceContext.Padding.html b/docs/com/rockaport/alice/AliceContext.Padding.html index b9e3793..c1837fc 100644 --- a/docs/com/rockaport/alice/AliceContext.Padding.html +++ b/docs/com/rockaport/alice/AliceContext.Padding.html @@ -2,24 +2,28 @@ - + AliceContext.Padding (alice 0.5 API) - +
              @@ -102,7 +104,8 @@

              Enum AliceContext.Padding
              • java.lang.Enum<AliceContext.Padding>
              • + title="enum in com.rockaport.alice">AliceContext.Padding> +
                • com.rockaport.alice.AliceContext.Padding
                • @@ -118,7 +121,8 @@

                  Enum AliceContext.PaddingAll Implemented Interfaces:
                  java.io.Serializable, java.lang.Comparable<AliceContext.Padding>
                  + title="enum in com.rockaport.alice">AliceContext.Padding> +
                  Enclosing class:
                  @@ -384,15 +388,13 @@

                  toString

                diff --git a/docs/com/rockaport/alice/AliceContext.Pbkdf.html b/docs/com/rockaport/alice/AliceContext.Pbkdf.html index 9a39516..cf48eec 100644 --- a/docs/com/rockaport/alice/AliceContext.Pbkdf.html +++ b/docs/com/rockaport/alice/AliceContext.Pbkdf.html @@ -2,24 +2,28 @@ - + AliceContext.Pbkdf (alice 0.5 API) - +
                @@ -102,7 +104,8 @@

                Enum AliceContext.Pbkdf

                • java.lang.Enum<AliceContext.Pbkdf>
                • + title="enum in com.rockaport.alice">AliceContext.Pbkdf> +
                  • com.rockaport.alice.AliceContext.Pbkdf
                  • @@ -118,7 +121,8 @@

                    Enum AliceContext.Pbkdf

                    All Implemented Interfaces:
                    java.io.Serializable, java.lang.Comparable<AliceContext.Pbkdf>
                    + title="enum in com.rockaport.alice">AliceContext.Pbkdf> +
                    Enclosing class:
                    @@ -546,15 +550,13 @@

                    toString

                  diff --git a/docs/com/rockaport/alice/AliceContext.html b/docs/com/rockaport/alice/AliceContext.html index 30dd053..c6fcc5d 100644 --- a/docs/com/rockaport/alice/AliceContext.html +++ b/docs/com/rockaport/alice/AliceContext.html @@ -2,24 +2,23 @@ - + AliceContext (alice 0.5 API) - +
                  @@ -546,15 +543,13 @@

                  getIterations

                diff --git a/docs/com/rockaport/alice/AliceContextBuilder.html b/docs/com/rockaport/alice/AliceContextBuilder.html index 0ca4ba8..2d2f01d 100644 --- a/docs/com/rockaport/alice/AliceContextBuilder.html +++ b/docs/com/rockaport/alice/AliceContextBuilder.html @@ -2,24 +2,23 @@ - + AliceContextBuilder (alice 0.5 API) - +
                @@ -571,15 +568,13 @@

                build

              diff --git a/docs/com/rockaport/alice/package-frame.html b/docs/com/rockaport/alice/package-frame.html index 354a98a..4a7d1e4 100644 --- a/docs/com/rockaport/alice/package-frame.html +++ b/docs/com/rockaport/alice/package-frame.html @@ -2,9 +2,9 @@ - + com.rockaport.alice (alice 0.5 API) - + diff --git a/docs/com/rockaport/alice/package-summary.html b/docs/com/rockaport/alice/package-summary.html index 8b9f232..9950efe 100644 --- a/docs/com/rockaport/alice/package-summary.html +++ b/docs/com/rockaport/alice/package-summary.html @@ -2,21 +2,20 @@ - + com.rockaport.alice (alice 0.5 API) - +

            @@ -217,15 +214,13 @@

            Package com.rockaport.alice

          diff --git a/docs/com/rockaport/alice/package-tree.html b/docs/com/rockaport/alice/package-tree.html index f32f0d4..0fcfb9b 100644 --- a/docs/com/rockaport/alice/package-tree.html +++ b/docs/com/rockaport/alice/package-tree.html @@ -2,21 +2,20 @@ - + com.rockaport.alice Class Hierarchy (alice 0.5 API) - +
        @@ -95,14 +92,6 @@

        Enum Hierarchy

      • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
      • title="enum in com.rockaport.alice">AliceContext.GcmTagLength
      • com.rockaport.alice.AliceContext.Pbkdf + href="../../../com/rockaport/alice/AliceContext.KeyLength.html" + title="enum in com.rockaport.alice">AliceContext.KeyLength
      • +
      • com.rockaport.alice.AliceContext.MacAlgorithm
      • +
      • com.rockaport.alice.AliceContext.Mode
      • com.rockaport.alice.AliceContext.Padding
      • com.rockaport.alice.AliceContext.KeyLength
      • + href="../../../com/rockaport/alice/AliceContext.Pbkdf.html" + title="enum in com.rockaport.alice">AliceContext.Pbkdf +
    @@ -160,15 +157,13 @@

    Enum Hierarchy

    diff --git a/docs/constant-values.html b/docs/constant-values.html index d68e274..6af9246 100644 --- a/docs/constant-values.html +++ b/docs/constant-values.html @@ -2,21 +2,20 @@ - + Constant Field Values (alice 0.5 API) - +
  • + href="#I:V">V  +
    @@ -562,15 +560,13 @@

    V

    diff --git a/docs/index.html b/docs/index.html index a2456c2..5da1450 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,61 +2,61 @@ - + alice 0.5 API diff --git a/docs/overview-tree.html b/docs/overview-tree.html index 66d6aae..531a371 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -2,21 +2,20 @@ - + Class Hierarchy (alice 0.5 API) - +