Kaynağa Gözat

move public method up, add doc

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 7 yıl önce
ebeveyn
işleme
a6eae2396e

+ 18 - 9
src/main/java/com/owncloud/android/utils/CsrHelper.java

@@ -30,11 +30,28 @@ import java.security.KeyPair;
 
 public class CsrHelper {
 
+    /**
+     * Generate CSR with PEM encoding
+     *
+     * @param keyPair the KeyPair with private and public keys
+     * @param userId  userId of CSR owner
+     * @return PEM encoded CSR string
+     * @throws IOException               thrown if key cannot be created
+     * @throws OperatorCreationException thrown if contentSigner cannot be build
+     */
+    public static String generateCsrPemEncodedString(KeyPair keyPair, String userId)
+            throws IOException, OperatorCreationException {
+        PKCS10CertificationRequest csr = CsrHelper.generateCSR(keyPair, userId);
+        byte[] derCSR = csr.getEncoded();
+        return "-----BEGIN CERTIFICATE REQUEST-----\n" + android.util.Base64.encodeToString(derCSR,
+                android.util.Base64.NO_WRAP) + "\n-----END CERTIFICATE REQUEST-----";
+    }
+    
     /**
      * Create the certificate signing request (CSR) from private and public keys
      *
      * @param keyPair the KeyPair with private and public keys
-     * @param userId
+     * @param userId userId of CSR owner
      * @return PKCS10CertificationRequest with the certificate signing request (CSR) data
      * @throws IOException thrown if key cannot be created
      * @throws OperatorCreationException thrown if contentSigner cannot be build
@@ -55,12 +72,4 @@ public class CsrHelper {
 
         return csrBuilder.build(signer);
     }
-
-    public static String generateCsrPemEncodedString(KeyPair keyPair, String userId) 
-            throws IOException, OperatorCreationException {
-        PKCS10CertificationRequest csr = CsrHelper.generateCSR(keyPair, userId);
-        byte[] derCSR = csr.getEncoded();
-        return "-----BEGIN CERTIFICATE REQUEST-----\n" + android.util.Base64.encodeToString(derCSR,
-                android.util.Base64.NO_WRAP) + "\n-----END CERTIFICATE REQUEST-----";
-    }
 }