Changeset 5ffefd2


Ignore:
Timestamp:
Aug 23, 2012 7:11:55 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
07c21c3
Parents:
e3e15850
Message:
  • Crypto: Rename bouncycastle HMAC libs so they don't conflict with older Android versions which bundle them
Files:
1 added
5 edited
5 moved

Legend:

Unmodified
Added
Removed
  • build.xml

    re3e15850 r5ffefd2  
    414414            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    415415            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    416             <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
     416            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
    417417            <group title="Streaming Library" packages="net.i2p.client.streaming" />
    418418            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
     
    483483            doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    484484            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    485             <group title="Core SDK" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
     485            <group title="Core SDK" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.gettext:org:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
    486486            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
    487487            <sourcepath>
  • core/java/src/net/i2p/crypto/HMAC256Generator.java

    re3e15850 r5ffefd2  
    55import net.i2p.I2PAppContext;
    66
    7 import org.bouncycastle.crypto.Digest;
    8 import org.bouncycastle.crypto.macs.I2PHMac;
     7import org.bouncycastle.oldcrypto.Digest;
     8import org.bouncycastle.oldcrypto.macs.I2PHMac;
    99
    1010/**
    1111 * Calculate the HMAC-SHA256 of a key+message.  All the good stuff occurs
    12  * in {@link org.bouncycastle.crypto.macs.I2PHMac} and
     12 * in {@link org.bouncycastle.oldcrypto.macs.I2PHMac} and
    1313 * {@link gnu.crypto.hash.Sha256Standalone}.
    1414 *
  • core/java/src/net/i2p/crypto/HMACGenerator.java

    re3e15850 r5ffefd2  
    1717import net.i2p.util.SimpleByteCache;
    1818
    19 import org.bouncycastle.crypto.digests.MD5Digest;
    20 import org.bouncycastle.crypto.macs.I2PHMac;
     19import org.bouncycastle.oldcrypto.digests.MD5Digest;
     20import org.bouncycastle.oldcrypto.macs.I2PHMac;
    2121
    2222/**
    2323 * Calculate the HMAC-MD5-128 of a key+message.  All the good stuff occurs
    24  * in {@link org.bouncycastle.crypto.macs.I2PHMac} and
    25  * {@link org.bouncycastle.crypto.digests.MD5Digest}.
     24 * in {@link org.bouncycastle.oldcrypto.macs.I2PHMac} and
     25 * {@link org.bouncycastle.oldcrypto.digests.MD5Digest}.
    2626 *
    2727 * Keys are always 32 bytes.
  • core/java/src/org/bouncycastle/oldcrypto/Digest.java

    re3e15850 r5ffefd2  
    1 package org.bouncycastle.crypto;
     1package org.bouncycastle.oldcrypto;
    22/*
    33 * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
  • core/java/src/org/bouncycastle/oldcrypto/Mac.java

    re3e15850 r5ffefd2  
    1 package org.bouncycastle.crypto;
     1package org.bouncycastle.oldcrypto;
    22/*
    33 * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
  • core/java/src/org/bouncycastle/oldcrypto/digests/GeneralDigest.java

    re3e15850 r5ffefd2  
    1 package org.bouncycastle.crypto.digests;
     1package org.bouncycastle.oldcrypto.digests;
    22/*
    33 * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
     
    2727 */
    2828
    29 import org.bouncycastle.crypto.Digest;
     29import org.bouncycastle.oldcrypto.Digest;
    3030
    3131/**
  • core/java/src/org/bouncycastle/oldcrypto/digests/MD5Digest.java

    re3e15850 r5ffefd2  
    1 package org.bouncycastle.crypto.digests;
     1package org.bouncycastle.oldcrypto.digests;
    22
    33
  • core/java/src/org/bouncycastle/oldcrypto/macs/I2PHMac.java

    re3e15850 r5ffefd2  
    1 package org.bouncycastle.crypto.macs;
     1package org.bouncycastle.oldcrypto.macs;
    22/*
    33 * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
     
    3232import net.i2p.util.SimpleByteCache;
    3333
    34 import org.bouncycastle.crypto.Digest;
    35 import org.bouncycastle.crypto.Mac;
     34import org.bouncycastle.oldcrypto.Digest;
     35import org.bouncycastle.oldcrypto.Mac;
    3636
    3737/**
  • history.txt

    re3e15850 r5ffefd2  
     12012-08-23 zzz
     2 * Crypto: Rename bouncycastle HMAC libs so they don't conflict
     3   with older Android versions which bundle them
     4 * NTCP: Reduce lock contention
     5 * SSU:
     6   - Don't relay or introduce to/from privileged ports
     7   - Various spoof detections
     8
    192012-08-22 zzz
    210 * NetDB: Add hash collision detection
  • router/java/src/net/i2p/router/RouterVersion.java

    re3e15850 r5ffefd2  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 15;
     21    public final static long BUILD = 16;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.