Raise max RSA keysize (WIP)

@@ -191,25 +191,31 @@
         {8, ARCFOUR_MAX_KEY_BITS, CKF_GENERATE }, /* CKM_RC4_KEY_GEN; in bits */
         {512, 1024, CKF_SIGN|CKF_VERIFY},       /* CKM_DSA; in bits */
         {512, 1024, CKF_SIGN|CKF_VERIFY},       /* CKM_DSA_SHA1; in bits */
         {512, 1024, CKF_GENERATE_KEY_PAIR},     /* CKM_DSA_KEY_PAIR_GEN; */
                                                 /* in bits */
-        {256, 4096, CKF_ENCRYPT|CKF_DECRYPT|
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN, CKF_ENCRYPT|CKF_DECRYPT|
                 CKF_SIGN|CKF_SIGN_RECOVER|
                 CKF_WRAP|CKF_UNWRAP|
                 CKF_VERIFY|CKF_VERIFY_RECOVER}, /* CKM_RSA_PKCS; in bits */
-        {256, 4096, CKF_GENERATE_KEY_PAIR},     /* CKM_RSA_PKCS_KEY_PAIR_GEN; */
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN,
+                CKF_GENERATE_KEY_PAIR}, /* CKM_RSA_PKCS_KEY_PAIR_GEN; */
                                                 /* in bits */
-        {256, 4096, CKF_ENCRYPT|CKF_DECRYPT|
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN, CKF_ENCRYPT|CKF_DECRYPT|
                 CKF_SIGN|CKF_SIGN_RECOVER|
                 CKF_WRAP|CKF_UNWRAP|
                 CKF_VERIFY|CKF_VERIFY_RECOVER}, /* CKM_RSA_X_509 in bits */
-        {256, 4096, CKF_SIGN|CKF_VERIFY},       /* CKM_MD5_RSA_PKCS in bits */
-        {256, 4096, CKF_SIGN|CKF_VERIFY},       /* CKM_SHA1_RSA_PKCS in bits */
-        {256, 4096, CKF_SIGN|CKF_VERIFY}, /* CKM_SHA256_RSA_PKCS in bits */
-        {256, 4096, CKF_SIGN|CKF_VERIFY}, /* CKM_SHA384_RSA_PKCS in bits */
-        {256, 4096, CKF_SIGN|CKF_VERIFY}, /* CKM_SHA512_RSA_PKCS in bits */
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN,
+                        CKF_SIGN|CKF_VERIFY},   /* CKM_MD5_RSA_PKCS in bits */
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN,
+                CKF_SIGN|CKF_VERIFY},   /* CKM_SHA1_RSA_PKCS in bits */
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN,
+                CKF_SIGN|CKF_VERIFY}, /* CKM_SHA256_RSA_PKCS in bits */
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN,
+                CKF_SIGN|CKF_VERIFY}, /* CKM_SHA384_RSA_PKCS in bits */
+        {RSA_MIN_KEY_LEN, RSA_MAX_KEY_LEN,
+                CKF_SIGN|CKF_VERIFY}, /* CKM_SHA512_RSA_PKCS in bits */
         {DH_MIN_KEY_LEN, DH_MAX_KEY_LEN, CKF_GENERATE_KEY_PAIR},
                                                 /* CKM_DH_PKCS_KEY_PAIR_GEN */
                                                 /* in bits */
         {DH_MIN_KEY_LEN, DH_MAX_KEY_LEN, CKF_DERIVE},
                                                 /* CKM_DH_PKCS_DERIVE; */