Added PK11RSAPrivateKey.getModulus()

lib/jss.def

@@ -330,3 +330,9 @@ Java_org_mozilla_jss_pkcs11_PK11Store_importEncryptedPrivateKeyInfo;
 ;+    local:
 ;+       *;
 ;+};
+;+JSS_4.5 {       # JSS 4.5 release
+;+    global:
+Java_org_mozilla_jss_pkcs11_PK11RSAPrivateKey_getModulusByteArray;
+;+    local:
+;+       *;
+;+};

org/mozilla/jss/pkcs11/PK11Exception.java

@@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.jss.pkcs11;
+
+/**
+ * This is a generic PKCS #11 exception.
+ */
+public class PK11Exception extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public PK11Exception() {
+    }
+
+    public PK11Exception(String mesg) {
+        super(mesg);
+    }
+
+    public PK11Exception(Throwable cause) {
+        super(cause);
+    }
+
+    public PK11Exception(String mesg, Throwable cause) {
+        super(mesg, cause);
+    }
+}

org/mozilla/jss/pkcs11/PK11PrivKey.c

@@ -665,3 +665,67 @@ Java_org_mozilla_jss_pkcs11_PK11PrivKey_getDSAParamsNative
 
     return pqgArray;
 }
+
+/**********************************************************************
+ * PK11RSAPrivateKey.getModulusByteArray
+ */
+JNIEXPORT jbyteArray JNICALL
+Java_org_mozilla_jss_pkcs11_PK11RSAPrivateKey_getModulusByteArray
+    (JNIEnv *env, jobject this)
+{
+    SECKEYPrivateKey *privateKey = NULL;
+    SECKEYPublicKey *publicKey = NULL;
+    PK11SlotInfo *slot = NULL;
+    int rv;
+    jbyte *value = NULL;
+    jint length;
+    jbyteArray array = NULL;
+
+    PR_ASSERT(env!=NULL && this!=NULL);
+
+    // get private key
+    rv = JSS_PK11_getPrivKeyPtr(env, this, &privateKey);
+
+    // check return code
+    if (rv != PR_SUCCESS) {
+        char *message = PR_smprintf("Unable to get RSA private key (rc: %d)", rv);
+        JSS_throwMsg(env, PK11_EXCEPTION, message);
+        PR_smprintf_free(message);
+        goto finish;
+    }
+
+    // get slot from private key
+    slot = PK11_GetSlotFromPrivateKey(privateKey);
+    PR_ASSERT(slot!=NULL);
+
+    // login to token if necessary
+    PK11_Authenticate(slot, PR_TRUE, NULL);
+
+    // convert private key to public key
+    publicKey = SECKEY_ConvertToPublicKey(privateKey);
+
+    // get modulus from public key
+    value = (jbyte*)publicKey->u.rsa.modulus.data;
+    length = (jint)publicKey->u.rsa.modulus.len;
+
+    // create byte array
+    array = (*env)->NewByteArray(env, length);
+
+    // check byte array creation
+    if (array == NULL) {
+        JSS_throw(env, OUT_OF_MEMORY_ERROR);
+        goto finish;
+    }
+
+    // copy modulus into byte array
+    (*env)->SetByteArrayRegion(env, array, 0, length, value);
+
+finish:
+    if (publicKey) {
+        SECKEY_DestroyPublicKey(publicKey);
+    }
+    if (slot) {
+        PK11_FreeSlot(slot);
+    }
+    return array;
+}

org/mozilla/jss/pkcs11/PK11RSAPrivateKey.java

@@ -1,11 +1,15 @@
 package org.mozilla.jss.pkcs11;
 
-import org.mozilla.jss.crypto.PrivateKey;
 import java.math.BigInteger;
 
+import org.mozilla.jss.crypto.PrivateKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 class PK11RSAPrivateKey
     extends PK11PrivKey implements java.security.interfaces.RSAPrivateKey
 {
+    public static Logger logger = LoggerFactory.getLogger(PK11RSAPrivateKey.class);
 
     private static final long serialVersionUID = 1L;
 
@@ -20,10 +24,12 @@ public PrivateKey.Type getType() {
     }
 
     public BigInteger getModulus() {
-        // !!!
-        return null;
+        logger.debug("PK11RSAPrivateKey: getModulus()");
+        return new BigInteger(1, getModulusByteArray());
     }
 
+    native byte[] getModulusByteArray();
+
     public BigInteger getPrivateExponent() {
         // !!!
         return null;

org/mozilla/jss/util/jss_exceptions.h

@@ -79,6 +79,8 @@ PR_BEGIN_EXTERN_C
 
 #define OUT_OF_MEMORY_ERROR "java/lang/OutOfMemoryError"
 
+#define PK11_EXCEPTION "org/mozilla/jss/pkcs11/PK11Exception"
+
 #define PQG_PARAM_GEN_EXCEPTION "org/mozilla/jss/crypto/PQGParamGenException"
 
 /* This is a RuntimeException */