[commons-crypto] branch master updated: Align comparable methods; more docs

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e499d4  Align comparable methods; more docs
3e499d4 is described below

commit 3e499d49f8e411bc6e5fef3047042d8742085361
Author: Sebb <s...@apache.org>
AuthorDate: Wed Jun 29 12:32:23 2022 +0100

    Align comparable methods; more docs
    
    [skip ci]
---
 .../commons/crypto/jna/OpenSsl10XNativeJna.java    |  4 +++-
 .../commons/crypto/jna/OpenSsl11XNativeJna.java    | 24 +++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java 
b/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
index 70e20c4..7cfef2f 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
@@ -46,9 +46,11 @@ class OpenSsl10XNativeJna {
         }
     }
 
+    // Try to keep methods aligned across versions
+
     /**
      * @see <a 
href="https://www.openssl.org/docs/man1.0.2/man3/SSLeay.html";>Version Number</a>
-     *
+     * (does not appear to be used yet)
      * @return OPENSSL_VERSION_NUMBER which is a numeric release version 
identifier
      */
     public static native NativeLong SSLeay();
diff --git 
a/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java 
b/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
index 6c3a4e1..19c1e09 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
@@ -46,6 +46,19 @@ class OpenSsl11XNativeJna {
         }
     }
 
+    // Try to keep methods aligned across versions
+
+    /**
+     * Retrieves version/build information about OpenSSL library.
+     *
+     * @see <a 
href="https://www.openssl.org/docs/man1.1.1/man3/OpenSSL_version.html";>OpenSSL_version</a>
+     * @param type
+     *            type can be OPENSSL_VERSION, OPENSSL_CFLAGS, 
OPENSSL_BUILT_ON...
+     * @return A pointer to a constant string describing the version of the 
OpenSSL library or
+     *         giving information about the library build.
+     */
+
+     public static native String OpenSSL_version(int type);
     /**
      * @return the earliest error code from the thread's error queue without 
modifying it.
      */
@@ -54,7 +67,7 @@ class OpenSsl11XNativeJna {
     /**
      * Generates a human-readable string representing the error code e.
      *
-     * @see <a 
href="https://www.openssl.org/docs/man1.1.0/man3/ERR_error_string.html";>ERR_error_string</a>
+     * @see <a 
href="https://www.openssl.org/docs/man1.1.1/man3/ERR_error_string.html";>ERR_error_string</a>
      *
      * @param err
      *            the error code
@@ -248,13 +261,4 @@ class OpenSsl11XNativeJna {
      */
     public static native PointerByReference ENGINE_by_id(String id);
 
-    /**
-     * Retrieves version/build information about OpenSSL library.
-     *
-     * @param type
-     *            type can be OPENSSL_VERSION, OPENSSL_CFLAGS, 
OPENSSL_BUILT_ON...
-     * @return A pointer to a constant string describing the version of the 
OpenSSL library or
-     *         giving information about the library build.
-     */
-    public static native String OpenSSL_version(int type);
 }