Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replacing UUID code and removing plexus dependency

This commit is contained in:
Martin Stockhammer 2019-10-16 21:06:08 +02:00
parent 020f5597f1
commit d34894de79
3 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redback-keys/redback-keys-api/pom.xml
View File

@ -34,16 +34,6 @@
<name>Redback :: Key Management API</name>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>

51
redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
View File

@ -16,17 +16,12 @@ package org.apache.archiva.redback.keys;
* limitations under the License.
*/
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
import java.util.TimeZone;
import org.codehaus.plexus.digest.Hex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.SecureRandom;
import java.util.*;
/**
* AbstractKeyManager
*
@ -58,45 +53,7 @@ public abstract class AbstractKeyManager
protected String generateUUID()
throws KeyManagerException
{
byte vfour[] = new byte[KEY_LENGTH];
if ( isRandomMode() == SECURE )
{
if ( secureRandom == null )
{
try
{
secureRandom = SecureRandom.getInstance( "SHA1PRNG" );
}
catch ( NoSuchAlgorithmException e )
{
setRandomMode( !SECURE );
log.warn( "Unable to use SecureRandom", e );
}
}
if ( isRandomMode() == SECURE )
{
secureRandom.nextBytes( vfour );
}
}
if ( isRandomMode() != SECURE )
{
if ( random == null )
{
random = new Random();
}
random.nextBytes( vfour );
}
vfour[6] &= 0x0F;
vfour[6] |= ( 4 << 4 );
vfour[8] &= 0x3F;
vfour[8] |= 0x80;
return Hex.encode( vfour );
return UUID.randomUUID().toString();
}
/**

2
redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
View File

@ -16,8 +16,6 @@ package org.apache.archiva.redback.keys;
* limitations under the License.
*/
import org.apache.archiva.redback.keys.KeyManagerException;
/**
* KeyNotFoundException
*