cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/3] cxf git commit: Updating STS keys to be 2048 bits
Date Fri, 06 Nov 2015 18:06:21 GMT
Updating STS keys to be 2048 bits

Conflicts:
	distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks
	distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks
	rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/feb7612e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/feb7612e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/feb7612e

Branch: refs/heads/3.0.x-fixes
Commit: feb7612e40a9d7d1d5c8d727b2d5b5d054cbec6a
Parents: 3019590
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Nov 6 18:02:04 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Nov 6 18:05:35 2015 +0000

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/servicestore.jks     | Bin 0 -> 3475 bytes
 .../src/main/webapp/WEB-INF/servicestore.jks     | Bin 0 -> 3475 bytes
 .../release/samples/sts/keys/clientstore.jks     | Bin 4436 -> 4559 bytes
 .../release/samples/sts/keys/servicestore.jks    | Bin 3350 -> 3475 bytes
 .../main/release/samples/sts/keys/stsstore.jks   | Bin 3978 -> 4557 bytes
 .../rs/security/jose/common/JoseConstants.java   |   8 ++++++++
 .../sts-core/src/test/resources/clientstore.jks  | Bin 0 -> 4559 bytes
 .../sts-core/src/test/resources/servicestore.jks | Bin 3350 -> 3475 bytes
 .../sts/sts-core/src/test/resources/stsstore.jks | Bin 3978 -> 4557 bytes
 .../sts/sts-war/src/main/resources/stsstore.jks  | Bin 3978 -> 4557 bytes
 .../advanced/src/test/resources/clientstore.jks  | Bin 4436 -> 4559 bytes
 .../cxf/systest/sts/realms/stsstore_realms.jks   | Bin 5394 -> 4557 bytes
 .../advanced/src/test/resources/servicestore.jks | Bin 3350 -> 3475 bytes
 .../advanced/src/test/resources/stsstore.jks     | Bin 3978 -> 4557 bytes
 .../basic/src/test/resources/clientstore.jks     | Bin 4436 -> 4559 bytes
 .../basic/src/test/resources/servicestore.jks    | Bin 3350 -> 3475 bytes
 .../basic/src/test/resources/stsstore.jks        | Bin 3978 -> 4557 bytes
 .../src/test/resources/clientstore.jks           | Bin 4436 -> 4559 bytes
 .../sts-osgi/src/main/resources/stsstore.jks     | Bin 3978 -> 4557 bytes
 .../kerberos/src/test/resources/clientstore.jks  | Bin 4436 -> 4559 bytes
 .../kerberos/src/test/resources/servicestore.jks | Bin 3350 -> 3475 bytes
 .../kerberos/src/test/resources/stsstore.jks     | Bin 3978 -> 4557 bytes
 22 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks
b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks
new file mode 100644
index 0000000..999ee82
Binary files /dev/null and b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/webapp/WEB-INF/servicestore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks
new file mode 100644
index 0000000..999ee82
Binary files /dev/null and b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/servicestore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/sts/keys/clientstore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/keys/clientstore.jks b/distribution/src/main/release/samples/sts/keys/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/distribution/src/main/release/samples/sts/keys/clientstore.jks and b/distribution/src/main/release/samples/sts/keys/clientstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/sts/keys/servicestore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/keys/servicestore.jks b/distribution/src/main/release/samples/sts/keys/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/distribution/src/main/release/samples/sts/keys/servicestore.jks and b/distribution/src/main/release/samples/sts/keys/servicestore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/distribution/src/main/release/samples/sts/keys/stsstore.jks
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/keys/stsstore.jks b/distribution/src/main/release/samples/sts/keys/stsstore.jks
index e805906..51f131f 100644
Binary files a/distribution/src/main/release/samples/sts/keys/stsstore.jks and b/distribution/src/main/release/samples/sts/keys/stsstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
index cc990b5..a46c28c 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
@@ -95,6 +95,14 @@ public final class JoseConstants {
     public static final String RSSEC_KEY_STORE_FILE = "rs.security.keystore.file";
     
     /**
+<<<<<<< HEAD
+=======
+     * The KeyStore Object.
+     */
+    public static final String RSSEC_KEY_STORE = "rs.security.keystore";
+    
+    /**
+>>>>>>> 9245fcb... Updating STS keys to be 2048 bits
      * A reference to a PrivateKeyPasswordProvider instance used to retrieve passwords to
access keys.
      */
     public static final String RSSEC_KEY_PSWD_PROVIDER = "rs.security.key.password.provider";

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-core/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/resources/clientstore.jks b/services/sts/sts-core/src/test/resources/clientstore.jks
new file mode 100644
index 0000000..f734f87
Binary files /dev/null and b/services/sts/sts-core/src/test/resources/clientstore.jks differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-core/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/resources/servicestore.jks b/services/sts/sts-core/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/services/sts/sts-core/src/test/resources/servicestore.jks and b/services/sts/sts-core/src/test/resources/servicestore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-core/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/resources/stsstore.jks b/services/sts/sts-core/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/sts-core/src/test/resources/stsstore.jks and b/services/sts/sts-core/src/test/resources/stsstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/sts-war/src/main/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/resources/stsstore.jks b/services/sts/sts-war/src/main/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/sts-war/src/main/resources/stsstore.jks and b/services/sts/sts-war/src/main/resources/stsstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/clientstore.jks b/services/sts/systests/advanced/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/services/sts/systests/advanced/src/test/resources/clientstore.jks and b/services/sts/systests/advanced/src/test/resources/clientstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks
index 73c35d3..51f131f 100644
Binary files a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks
and b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/servicestore.jks b/services/sts/systests/advanced/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/services/sts/systests/advanced/src/test/resources/servicestore.jks and b/services/sts/systests/advanced/src/test/resources/servicestore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/advanced/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/stsstore.jks b/services/sts/systests/advanced/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/systests/advanced/src/test/resources/stsstore.jks and b/services/sts/systests/advanced/src/test/resources/stsstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/basic/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/clientstore.jks b/services/sts/systests/basic/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/services/sts/systests/basic/src/test/resources/clientstore.jks and b/services/sts/systests/basic/src/test/resources/clientstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/basic/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/servicestore.jks b/services/sts/systests/basic/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/services/sts/systests/basic/src/test/resources/servicestore.jks and b/services/sts/systests/basic/src/test/resources/servicestore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/basic/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/stsstore.jks b/services/sts/systests/basic/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/systests/basic/src/test/resources/stsstore.jks and b/services/sts/systests/basic/src/test/resources/stsstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/sts-itests/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-itests/src/test/resources/clientstore.jks b/services/sts/systests/sts-itests/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/services/sts/systests/sts-itests/src/test/resources/clientstore.jks and b/services/sts/systests/sts-itests/src/test/resources/clientstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks b/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks and b/services/sts/systests/sts-osgi/src/main/resources/stsstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/systests/kerberos/src/test/resources/clientstore.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/clientstore.jks b/systests/kerberos/src/test/resources/clientstore.jks
index 23168a9..f734f87 100644
Binary files a/systests/kerberos/src/test/resources/clientstore.jks and b/systests/kerberos/src/test/resources/clientstore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/systests/kerberos/src/test/resources/servicestore.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/servicestore.jks b/systests/kerberos/src/test/resources/servicestore.jks
index 0dfa206..999ee82 100644
Binary files a/systests/kerberos/src/test/resources/servicestore.jks and b/systests/kerberos/src/test/resources/servicestore.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/feb7612e/systests/kerberos/src/test/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/stsstore.jks b/systests/kerberos/src/test/resources/stsstore.jks
index e805906..51f131f 100644
Binary files a/systests/kerberos/src/test/resources/stsstore.jks and b/systests/kerberos/src/test/resources/stsstore.jks
differ


Mime
View raw message