diff --git a/security/jss/org/mozilla/jss/util/java_ids.h b/security/jss/org/mozilla/jss/util/java_ids.h index 87b9eb48b438..e5121f30276a 100644 --- a/security/jss/org/mozilla/jss/util/java_ids.h +++ b/security/jss/org/mozilla/jss/util/java_ids.h @@ -73,6 +73,18 @@ PR_BEGIN_EXTERN_C #define DEBUG_TRACE_NAME "trace" #define DEBUG_TRACE_SIG "(ILjava/lang/String;)V" +/* + * InetAddress + */ +#define GET_ADDR_NAME "getAddress" +#define GET_ADDR_SIG "()[B" + +/* + * InputStream + */ +#define ISTREAM_READ_NAME "read" +#define ISTREAM_READ_SIG "([B)I" + /* * KeyPair */ @@ -117,6 +129,12 @@ PR_BEGIN_EXTERN_C #define NSSINIT_ISINITIALIZED_NAME "isInitialized" #define NSSINIT_ISINITIALIZED_SIG "()Z" +/* + * OutputStream + */ +#define OSTREAM_WRITE_NAME "write" +#define OSTREAM_WRITE_SIG "([BII)V" + /* * Password */ @@ -246,6 +264,21 @@ PR_BEGIN_EXTERN_C #define SIG_CONTEXT_PROXY_CONSTRUCTOR_NAME "" #define SIG_CONTEXT_PROXY_CONSTRUCTOR_SIG "([B)V" +/* + * Socket + */ +#define SOCKET_GET_OUTPUT_STREAM_NAME "getOutputStream" +#define SOCKET_GET_OUTPUT_STREAM_SIG "()Ljava/io/OutputStream;" + +#define SOCKET_GET_INPUT_STREAM_NAME "getInputStream" +#define SOCKET_GET_INPUT_STREAM_SIG "()Ljava/io/InputStream;" + +#define GET_INET_ADDR_NAME "getInetAddress" +#define GET_INET_ADDR_SIG "()Ljava/net/InetAddress;" + +#define GET_PORT_NAME "getPort" +#define GET_PORT_SIG "()I" + /* * SSLCertificateApprovalCallback */ @@ -267,6 +300,13 @@ PR_BEGIN_EXTERN_C #define SSLSOCKET_PROXY_FIELD "sockProxy" #define SSLSOCKET_PROXY_SIG "Lorg/mozilla/jss/ssl/SocketProxy;" +/* + * StringBuffer + */ +#define STRING_BUFFER_NAME "java/lang/StringBuffer" +#define STRING_BUFFER_APPEND_NAME "append" +#define STRING_BUFFER_APPEND_SIG "(Ljava/lang/String;)Ljava/lang/StringBuffer;" + /* * ValidityStatus */ @@ -283,6 +323,13 @@ PR_BEGIN_EXTERN_C #define SYM_KEY_PROXY_FIELD "keyProxy" #define SYM_KEY_PROXY_SIG "Lorg/mozilla/jss/pkcs11/SymKeyProxy;" +/* + * Throwable + */ +#define THROWABLE_NAME "java/lang/Throwable" +#define THROWABLE_TO_STRING_NAME "toString" +#define THROWABLE_TO_STRING_SIG "()Ljava/lang/String;" + /* * TokenCallbackInfo */ diff --git a/security/jss/org/mozilla/jss/util/jss_exceptions.h b/security/jss/org/mozilla/jss/util/jss_exceptions.h index d370bfe1f1f1..1bf5b2bc077d 100644 --- a/security/jss/org/mozilla/jss/util/jss_exceptions.h +++ b/security/jss/org/mozilla/jss/util/jss_exceptions.h @@ -80,6 +80,8 @@ PR_BEGIN_EXTERN_C #define NICKNAME_CONFLICT_EXCEPTION "org/mozilla/jss/CryptoManager$NicknameConflictException" +#define NO_SUCH_ALG_EXCEPTION "java/security/NoSuchAlgorithmException" + #define NO_SUCH_ITEM_ON_TOKEN_EXCEPTION "org/mozilla/jss/crypto/NoSuchItemOnTokenException" #define NO_SUCH_TOKEN_EXCEPTION "org/mozilla/jss/NoSuchTokenException"