You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by be...@apache.org on 2006/05/13 16:32:45 UTC

svn commit: r406114 - /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties

Author: bernt
Date: Sat May 13 07:32:45 2006
New Revision: 406114

URL: http://svn.apache.org/viewcvs?rev=406114&view=rev
Log:
DERBY-324 Merged by svn merge -r 232996:232997 ../trunk/ Originally submitted by Olav Sandstaa

Modified:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties?rev=406114&r1=406113&r2=406114&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties Sat May 13 07:32:45 2006
@@ -7,5 +7,6 @@
 #   substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
 # No commas or semicolons can be allowed in the patterns/subsitutes.
 #------
-# ibm jvms have a slightly different message from sun jvms
-substitute=ERROR XJ001: Java exception: 'Keysize must;ERROR XJ001: Java exception: 'Wrong keysize: must
+# 1) ibm jvms have a slightly different message from sun jvms
+# 2) and 3) Jvms on Solaris 10 have a slightly different error message
+substitute=ERROR XJ001: Java exception: 'Keysize must;ERROR XJ001: Java exception: 'Wrong keysize: must,ERROR XJ001: Java exception: 'AES key length must be;ERROR XJ001: Java exception: 'Wrong keysize: must be equal to,192. or 256 bits;192 or 256