Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2fd5a52501fa
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a42b1b9dcf8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 7, 2014

  1. Copy the full SHA
    2f39afa View commit details
  2. Merge pull request #2144 from cheald/clean_bubblebabble

    Add direct BubbleBabble port from OpenSSH
    headius committed Nov 7, 2014
    Copy the full SHA
    5a42b1b View commit details
Showing with 88 additions and 0 deletions.
  1. +73 −0 core/src/main/java/org/jruby/ext/digest/BubbleBabble.java
  2. +15 −0 core/src/main/java/org/jruby/ext/digest/RubyDigest.java
73 changes: 73 additions & 0 deletions core/src/main/java/org/jruby/ext/digest/BubbleBabble.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package org.jruby.ext.digest;

/**
* Ported from OpenSSH (https://github.com/openssh/openssh-portable/blob/957fbceb0f3166e41b76fdb54075ab3b9cc84cba/sshkey.c#L942-L987)
*
* OpenSSH License Notice
*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
* Copyright (c) 2010,2011 Damien Miller. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

public class BubbleBabble {

public static String bubblebabble(byte[] digestRaw) {
char[] vowels = new char[]{'a', 'e', 'i', 'o', 'u', 'y'};
char[] consonants = new char[]{'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm',
'n', 'p', 'r', 's', 't', 'v', 'z', 'x'};

int seed = 1;

StringBuffer retval = new StringBuffer();
int rawLen = digestRaw.length;

int rounds = (rawLen / 2) + 1;
retval.append('x');
for (int i = 0; i < rounds; i++) {
int idx0, idx1, idx2, idx3, idx4;

if ((i + 1 < rounds) || (rawLen % 2 != 0)) {
idx0 = (((((int) (digestRaw[2 * i])) >> 6) & 3) + seed) % 6;
idx1 = (((int) (digestRaw[2 * i])) >> 2) & 15;
idx2 = ((((int) (digestRaw[2 * i])) & 3) + (seed / 6)) % 6;
retval.append(vowels[idx0]);
retval.append(consonants[idx1]);
retval.append(vowels[idx2]);
if ((i + 1) < rounds) {
idx3 = (((int) (digestRaw[(2 * i) + 1])) >> 4) & 15;
idx4 = (((int) (digestRaw[(2 * i) + 1]))) & 15;
retval.append(consonants[idx3]);
retval.append('-');
retval.append(consonants[idx4]);
seed = ((seed * 5) +
((((int) (digestRaw[2 * i])) * 7) +
((int) (digestRaw[(2 * i) + 1])))) % 36;
}
}
}
retval.append('x');

return retval.toString();
}
}
15 changes: 15 additions & 0 deletions core/src/main/java/org/jruby/ext/digest/RubyDigest.java
Original file line number Diff line number Diff line change
@@ -155,6 +155,10 @@ public static IRubyObject s_hexencode(IRubyObject recv, IRubyObject arg) {
return toHexString(recv.getRuntime(), arg.convertToString().getBytes());
}

@JRubyMethod(name = "bubblebabble", required = 1, meta = true)
public static IRubyObject bubblebabble(IRubyObject recv, IRubyObject arg) {
return RubyString.newString(recv.getRuntime(), BubbleBabble.bubblebabble(arg.convertToString().getBytes()));
}

private static class Metadata {

@@ -329,6 +333,12 @@ public static IRubyObject hexdigest_bang(ThreadContext context, IRubyObject self
return toHexString(context.runtime, digest_bang(context, self).convertToString().getBytes());
}

@JRubyMethod(name = "bubblebabble", required = 1, optional = 1, meta = true)
public static IRubyObject bubblebabble(ThreadContext ctx, IRubyObject recv, IRubyObject[] args, Block unusedBlock) {
byte[] digest = recv.callMethod(ctx, "digest", args, Block.NULL_BLOCK).convertToString().getBytes();
return RubyString.newString(recv.getRuntime(), BubbleBabble.bubblebabble(digest));
}

@JRubyMethod()
public static IRubyObject to_s(ThreadContext context, IRubyObject self) {
return self.callMethod(context, "hexdigest");
@@ -468,6 +478,11 @@ public IRubyObject reset() {
return this;
}

@JRubyMethod()
public IRubyObject bubblebabble() {
return RubyString.newString(getRuntime(), BubbleBabble.bubblebabble(algo.digest()));
}

private void setAlgorithm(Metadata metadata) throws NoSuchAlgorithmException {
this.algo = createMessageDigest(getRuntime(), metadata.getName());
this.blockLength = metadata.getBlockLength();