Skip to content

Commit

Permalink
Cleanup Whitespace and Add Editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
@leonard84
leonard84 committed Jul 25, 2016
1 parent 0d94b61 commit 47b2fe0
Show file tree
Hide file tree
Showing 6 changed files with 319 additions and 309 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# See http://editorconfig.org/
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{java,xml}]
indent_style = space
indent_size = 4
225 changes: 113 additions & 112 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,121 +1,122 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.mitre</groupId>
<artifactId>json-web-key-generator</artifactId>
<version>0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<groupId>org.mitre</groupId>
<artifactId>json-web-key-generator</artifactId>
<version>0.3-SNAPSHOT</version>
<packaging>jar</packaging>

<name>json-web-key-generator</name>
<url>http://maven.apache.org</url>
<name>json-web-key-generator</name>
<url>http://maven.apache.org</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<profiles>
<profile>
<!-- Turn off strict javadoc when building on 1.8 -->
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
<profiles>
<profile>
<!-- Turn off strict javadoc when building on 1.8 -->
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>

<scm>
<connection>scm:git:https://github.com/mitreid-connect/json-web-key-generator.git</connection>
<developerConnection>scm:git:git@github.com:mitreid-connect/json-web-key-generator.git</developerConnection>
<url>https://github.com/mitreid-connect/json-web-key-generator.git</url>
<tag>HEAD</tag>
</scm>
<scm>
<connection>scm:git:https://github.com/mitreid-connect/json-web-key-generator.git</connection>
<developerConnection>scm:git:git@github.com:mitreid-connect/json-web-key-generator.git</developerConnection>
<url>https://github.com/mitreid-connect/json-web-key-generator.git</url>
<tag>HEAD</tag>
</scm>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>org.mitre.jose.jwk.Launcher</mainClass>
<packageName>org.mitre.jose.jwk</packageName>
</manifest>
<manifestEntries>
<mode>development</mode>
<url>${pom.url}</url>
</manifestEntries>
</archive>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>org.mitre.jose.jwk.Launcher</mainClass>
<packageName>org.mitre.jose.jwk</packageName>
</manifest>
<manifestEntries>
<mode>development</mode>
<url>${pom.url}</url>
</manifestEntries>
</archive>

</configuration>
<executions>
<execution>
<id>assemble-all</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.2</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3</version>
</dependency>
</dependencies>
</configuration>
<executions>
<execution>
<id>assemble-all</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.2</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3</version>
</dependency>
</dependencies>
</project>
69 changes: 34 additions & 35 deletions src/main/java/org/mitre/jose/jwk/ECKeyMaker.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
*
*
*/
package org.mitre.jose.jwk;

Expand All @@ -18,47 +18,46 @@

/**
* @author jricher
*
*/
public class ECKeyMaker {

/**
* @param keySize
* @param keyUse
* @param keyAlg
* @param kid
* @return
*/
/**
* @param crv
* @param keyUse
* @param keyAlg
* @param kid
* @return
*/
public static ECKey make(Curve crv, KeyUse keyUse, Algorithm keyAlg, String kid) {

try {
ECParameterSpec ecSpec = crv.toECParameterSpec();

KeyPairGenerator generator = KeyPairGenerator.getInstance("EC");
generator.initialize(ecSpec);

KeyPair kp = generator.generateKeyPair();

ECPublicKey pub = (ECPublicKey) kp.getPublic();
ECPrivateKey priv = (ECPrivateKey) kp.getPrivate();

ECKey ecKey = new ECKey.Builder(crv, pub)
.privateKey(priv)
.keyID(kid)
.algorithm(keyAlg)
.keyUse(keyUse)
.build();
try {
ECParameterSpec ecSpec = crv.toECParameterSpec();

KeyPairGenerator generator = KeyPairGenerator.getInstance("EC");
generator.initialize(ecSpec);

KeyPair kp = generator.generateKeyPair();

return ecKey;
} catch (InvalidAlgorithmParameterException e) {
e.printStackTrace();
return null;
} catch (NoSuchAlgorithmException e) {
// TODO Auto-generated catch block
e.printStackTrace();
return null;
ECPublicKey pub = (ECPublicKey) kp.getPublic();
ECPrivateKey priv = (ECPrivateKey) kp.getPrivate();

ECKey ecKey = new ECKey.Builder(crv, pub)
.privateKey(priv)
.keyID(kid)
.algorithm(keyAlg)
.keyUse(keyUse)
.build();

return ecKey;
} catch (InvalidAlgorithmParameterException e) {
e.printStackTrace();
return null;
} catch (NoSuchAlgorithmException e) {
// TODO Auto-generated catch block
e.printStackTrace();
return null;
}

}

}
Loading

0 comments on commit 47b2fe0

Please sign in to comment.