Skip to content

Commit

Permalink
apply clang-format to changed files
Browse files Browse the repository at this point in the history
  • Loading branch information
nmittler committed Jan 12, 2017
1 parent 14bb259 commit e033650
Show file tree
Hide file tree
Showing 9 changed files with 471 additions and 443 deletions.
38 changes: 19 additions & 19 deletions common/src/jni/main/cpp/JniConstants.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

using namespace conscrypt;

JavaVM* JniConstants::gJavaVM;
JavaVM *JniConstants::gJavaVM;
jclass JniConstants::cryptoUpcallsClass;
jclass JniConstants::openSslInputStreamClass;
jclass JniConstants::nativeRefClass;
Expand All @@ -44,30 +44,30 @@ jmethodID JniConstants::outputStream_flushMethod;
void JniConstants::init(JavaVM *vm, JNIEnv *env) {
gJavaVM = vm;

byteArrayClass = JniUtil::findClass(env, "[B");
calendarClass = JniUtil::findClass(env, "java/util/Calendar");
inputStreamClass = JniUtil::findClass(env, "java/io/InputStream");
integerClass = JniUtil::findClass(env, "java/lang/Integer");
objectClass = JniUtil::findClass(env, "java/lang/Object");
objectArrayClass = JniUtil::findClass(env, "[Ljava/lang/Object;");
outputStreamClass = JniUtil::findClass(env, "java/io/OutputStream");
stringClass = JniUtil::findClass(env, "java/lang/String");
byteArrayClass = JniUtil::findClass(env, "[B");
calendarClass = JniUtil::findClass(env, "java/util/Calendar");
inputStreamClass = JniUtil::findClass(env, "java/io/InputStream");
integerClass = JniUtil::findClass(env, "java/lang/Integer");
objectClass = JniUtil::findClass(env, "java/lang/Object");
objectArrayClass = JniUtil::findClass(env, "[Ljava/lang/Object;");
outputStreamClass = JniUtil::findClass(env, "java/io/OutputStream");
stringClass = JniUtil::findClass(env, "java/lang/String");

cryptoUpcallsClass = JniUtil::getGlobalRefToClass(env,
CONSCRYPT_SYMBOL_PREFIX "org/conscrypt/CryptoUpcalls");
nativeRefClass = JniUtil::getGlobalRefToClass(env,
CONSCRYPT_SYMBOL_PREFIX "org/conscrypt/NativeRef");
openSslInputStreamClass = JniUtil::getGlobalRefToClass(env,
CONSCRYPT_SYMBOL_PREFIX "org/conscrypt/OpenSSLBIOInputStream");
cryptoUpcallsClass = JniUtil::getGlobalRefToClass(
env, CONSCRYPT_SYMBOL_PREFIX "org/conscrypt/CryptoUpcalls");
nativeRefClass =
JniUtil::getGlobalRefToClass(env, CONSCRYPT_SYMBOL_PREFIX "org/conscrypt/NativeRef");
openSslInputStreamClass = JniUtil::getGlobalRefToClass(
env, CONSCRYPT_SYMBOL_PREFIX "org/conscrypt/OpenSSLBIOInputStream");

nativeRef_context = JniUtil::getFieldRef(env, nativeRefClass, "context", "J");

calendar_setMethod = JniUtil::getMethodRef(env, calendarClass, "set", "(IIIIII)V");
inputStream_readMethod = JniUtil::getMethodRef(env, inputStreamClass, "read", "([B)I");
integer_valueOfMethod = env->GetStaticMethodID(integerClass, "valueOf",
"(I)Ljava/lang/Integer;");
openSslInputStream_readLineMethod = JniUtil::getMethodRef(env, openSslInputStreamClass, "gets",
"([B)I");
integer_valueOfMethod =
env->GetStaticMethodID(integerClass, "valueOf", "(I)Ljava/lang/Integer;");
openSslInputStream_readLineMethod =
JniUtil::getMethodRef(env, openSslInputStreamClass, "gets", "([B)I");
outputStream_writeMethod = JniUtil::getMethodRef(env, outputStreamClass, "write", "([B)V");
outputStream_flushMethod = JniUtil::getMethodRef(env, outputStreamClass, "flush", "()V");
}
246 changes: 123 additions & 123 deletions common/src/jni/main/include/Errors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#include "Trace.h"

#include <errno.h>
#include <jni.h>
#include <openssl/ssl.h>
#include <errno.h>

namespace conscrypt {

Expand All @@ -34,7 +34,6 @@ class Errors {
~Errors() {}

public:

/**
* Throw an exception with the specified class and an optional message.
*
Expand Down Expand Up @@ -141,130 +140,129 @@ class Errors {
* Throws a ParsingException with the given string as a message.
*/
static int throwParsingException(JNIEnv* env, const char* message) {
return jniThrowException(
env,
CONSCRYPT_SYMBOL_PREFIX "org/conscrypt/OpenSSLX509CertificateFactory$ParsingException",
message);
return jniThrowException(env, CONSCRYPT_SYMBOL_PREFIX
"org/conscrypt/OpenSSLX509CertificateFactory$ParsingException",
message);
}

static int throwInvalidAlgorithmParameterException(JNIEnv* env, const char* message) {
JNI_TRACE("throwInvalidAlgorithmParameterException %s", message);
return jniThrowException(env, "java/security/InvalidAlgorithmParameterException", message);
}

static int throwForAsn1Error(JNIEnv* env, int reason, const char *message,
static int throwForAsn1Error(JNIEnv* env, int reason, const char* message,
int (*defaultThrow)(JNIEnv*, const char*)) {
switch (reason) {
case ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE:
#if defined(ASN1_R_UNABLE_TO_DECODE_RSA_KEY)
case ASN1_R_UNABLE_TO_DECODE_RSA_KEY:
#endif
#if defined(ASN1_R_WRONG_PUBLIC_KEY_TYPE)
case ASN1_R_WRONG_PUBLIC_KEY_TYPE:
#endif
#if defined(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY)
case ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY:
#endif
#if defined(ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE)
case ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE:
#endif
return throwInvalidKeyException(env, message);
break;
#if defined(ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM)
case ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM:
return throwNoSuchAlgorithmException(env, message);
break;
#endif
case ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE:
#if defined(ASN1_R_UNABLE_TO_DECODE_RSA_KEY)
case ASN1_R_UNABLE_TO_DECODE_RSA_KEY:
#endif
#if defined(ASN1_R_WRONG_PUBLIC_KEY_TYPE)
case ASN1_R_WRONG_PUBLIC_KEY_TYPE:
#endif
#if defined(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY)
case ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY:
#endif
#if defined(ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE)
case ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE:
#endif
return throwInvalidKeyException(env, message);
break;
#if defined(ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM)
case ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM:
return throwNoSuchAlgorithmException(env, message);
break;
#endif
}
return defaultThrow(env, message);
}

static int throwForCipherError(JNIEnv* env, int reason, const char *message,
static int throwForCipherError(JNIEnv* env, int reason, const char* message,
int (*defaultThrow)(JNIEnv*, const char*)) {
switch (reason) {
case CIPHER_R_BAD_DECRYPT:
return throwBadPaddingException(env, message);
break;
case CIPHER_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH:
case CIPHER_R_WRONG_FINAL_BLOCK_LENGTH:
return throwIllegalBlockSizeException(env, message);
break;
case CIPHER_R_AES_KEY_SETUP_FAILED:
case CIPHER_R_BAD_KEY_LENGTH:
case CIPHER_R_UNSUPPORTED_KEY_SIZE:
return throwInvalidKeyException(env, message);
break;
case CIPHER_R_BAD_DECRYPT:
return throwBadPaddingException(env, message);
break;
case CIPHER_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH:
case CIPHER_R_WRONG_FINAL_BLOCK_LENGTH:
return throwIllegalBlockSizeException(env, message);
break;
case CIPHER_R_AES_KEY_SETUP_FAILED:
case CIPHER_R_BAD_KEY_LENGTH:
case CIPHER_R_UNSUPPORTED_KEY_SIZE:
return throwInvalidKeyException(env, message);
break;
}
return defaultThrow(env, message);
}

static int throwForEvpError(JNIEnv* env, int reason, const char *message,
static int throwForEvpError(JNIEnv* env, int reason, const char* message,
int (*defaultThrow)(JNIEnv*, const char*)) {
switch (reason) {
case EVP_R_MISSING_PARAMETERS:
return throwInvalidKeyException(env, message);
break;
case EVP_R_UNSUPPORTED_ALGORITHM:
#if defined(EVP_R_X931_UNSUPPORTED)
case EVP_R_X931_UNSUPPORTED:
#endif
return throwNoSuchAlgorithmException(env, message);
break;
#if defined(EVP_R_WRONG_PUBLIC_KEY_TYPE)
case EVP_R_WRONG_PUBLIC_KEY_TYPE:
return throwInvalidKeyException(env, message);
break;
#endif
#if defined(EVP_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM)
case EVP_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM:
return throwNoSuchAlgorithmException(env, message);
break;
#endif
default:
return defaultThrow(env, message);
break;
case EVP_R_MISSING_PARAMETERS:
return throwInvalidKeyException(env, message);
break;
case EVP_R_UNSUPPORTED_ALGORITHM:
#if defined(EVP_R_X931_UNSUPPORTED)
case EVP_R_X931_UNSUPPORTED:
#endif
return throwNoSuchAlgorithmException(env, message);
break;
#if defined(EVP_R_WRONG_PUBLIC_KEY_TYPE)
case EVP_R_WRONG_PUBLIC_KEY_TYPE:
return throwInvalidKeyException(env, message);
break;
#endif
#if defined(EVP_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM)
case EVP_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM:
return throwNoSuchAlgorithmException(env, message);
break;
#endif
default:
return defaultThrow(env, message);
break;
}
}

static int throwForRsaError(JNIEnv* env, int reason, const char *message,
static int throwForRsaError(JNIEnv* env, int reason, const char* message,
int (*defaultThrow)(JNIEnv*, const char*)) {
switch (reason) {
case RSA_R_BLOCK_TYPE_IS_NOT_01:
case RSA_R_PKCS_DECODING_ERROR:
#if defined(RSA_R_BLOCK_TYPE_IS_NOT_02)
case RSA_R_BLOCK_TYPE_IS_NOT_02:
#endif
return throwBadPaddingException(env, message);
break;
case RSA_R_BAD_SIGNATURE:
case RSA_R_DATA_TOO_LARGE_FOR_MODULUS:
case RSA_R_INVALID_MESSAGE_LENGTH:
case RSA_R_WRONG_SIGNATURE_LENGTH:
return throwSignatureException(env, message);
break;
case RSA_R_UNKNOWN_ALGORITHM_TYPE:
return throwNoSuchAlgorithmException(env, message);
break;
case RSA_R_MODULUS_TOO_LARGE:
case RSA_R_NO_PUBLIC_EXPONENT:
return throwInvalidKeyException(env, message);
break;
case RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE:
return throwIllegalBlockSizeException(env, message);
break;
case RSA_R_BLOCK_TYPE_IS_NOT_01:
case RSA_R_PKCS_DECODING_ERROR:
#if defined(RSA_R_BLOCK_TYPE_IS_NOT_02)
case RSA_R_BLOCK_TYPE_IS_NOT_02:
#endif
return throwBadPaddingException(env, message);
break;
case RSA_R_BAD_SIGNATURE:
case RSA_R_DATA_TOO_LARGE_FOR_MODULUS:
case RSA_R_INVALID_MESSAGE_LENGTH:
case RSA_R_WRONG_SIGNATURE_LENGTH:
return throwSignatureException(env, message);
break;
case RSA_R_UNKNOWN_ALGORITHM_TYPE:
return throwNoSuchAlgorithmException(env, message);
break;
case RSA_R_MODULUS_TOO_LARGE:
case RSA_R_NO_PUBLIC_EXPONENT:
return throwInvalidKeyException(env, message);
break;
case RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE:
return throwIllegalBlockSizeException(env, message);
break;
}
return defaultThrow(env, message);
}

static int throwForX509Error(JNIEnv* env, int reason, const char *message,
static int throwForX509Error(JNIEnv* env, int reason, const char* message,
int (*defaultThrow)(JNIEnv*, const char*)) {
switch (reason) {
case X509_R_UNSUPPORTED_ALGORITHM:
return throwNoSuchAlgorithmException(env, message);
break;
default:
return defaultThrow(env, message);
break;
case X509_R_UNSUPPORTED_ALGORITHM:
return throwNoSuchAlgorithmException(env, message);
break;
default:
return defaultThrow(env, message);
break;
}
}

Expand All @@ -274,7 +272,8 @@ class Errors {
*
* @return true if an exception was thrown, false if not.
*/
static bool throwExceptionIfNecessary(JNIEnv* env, const char* location CONSCRYPT_ATTRIBUTE_1 ((unused)),
static bool throwExceptionIfNecessary(
JNIEnv* env, const char* location CONSCRYPT_ATTRIBUTE_1((unused)),
int (*defaultThrow)(JNIEnv*, const char*) = jniThrowRuntimeException) {
const char* file;
int line;
Expand All @@ -288,31 +287,31 @@ class Errors {
ERR_error_string_n(error, message, sizeof(message));
int library = ERR_GET_LIB(error);
int reason = ERR_GET_REASON(error);
JNI_TRACE("OpenSSL error in %s error=%lx library=%x reason=%x (%s:%d): %s %s",
location, error, library, reason, file, line, message,
JNI_TRACE("OpenSSL error in %s error=%lx library=%x reason=%x (%s:%d): %s %s", location,
error, library, reason, file, line, message,
(flags & ERR_TXT_STRING) ? data : "(no data)");
switch (library) {
case ERR_LIB_RSA:
throwForRsaError(env, reason, message, defaultThrow);
break;
case ERR_LIB_ASN1:
throwForAsn1Error(env, reason, message, defaultThrow);
break;
case ERR_LIB_CIPHER:
throwForCipherError(env, reason, message, defaultThrow);
break;
case ERR_LIB_EVP:
throwForEvpError(env, reason, message, defaultThrow);
break;
case ERR_LIB_X509:
throwForX509Error(env, reason, message, defaultThrow);
break;
case ERR_LIB_DSA:
throwInvalidKeyException(env, message);
break;
default:
defaultThrow(env, message);
break;
case ERR_LIB_RSA:
throwForRsaError(env, reason, message, defaultThrow);
break;
case ERR_LIB_ASN1:
throwForAsn1Error(env, reason, message, defaultThrow);
break;
case ERR_LIB_CIPHER:
throwForCipherError(env, reason, message, defaultThrow);
break;
case ERR_LIB_EVP:
throwForEvpError(env, reason, message, defaultThrow);
break;
case ERR_LIB_X509:
throwForX509Error(env, reason, message, defaultThrow);
break;
case ERR_LIB_DSA:
throwInvalidKeyException(env, message);
break;
default:
defaultThrow(env, message);
break;
}
result = true;
}
Expand Down Expand Up @@ -363,8 +362,9 @@ class Errors {
* SSL_ERROR_NONE to probe with ERR_get_error
* @param message null-ok; general error message
*/
static int throwSSLExceptionWithSslErrors(JNIEnv* env, SSL* ssl, int sslErrorCode,
const char* message, int (*actualThrow)(JNIEnv*, const char*) = throwSSLExceptionStr) {
static int throwSSLExceptionWithSslErrors(
JNIEnv* env, SSL* ssl, int sslErrorCode, const char* message,
int (*actualThrow)(JNIEnv*, const char*) = throwSSLExceptionStr) {
if (message == nullptr) {
message = "SSL error";
}
Expand Down Expand Up @@ -446,13 +446,13 @@ class Errors {
free(allocStr);
allocStr = str;
}
// For errors during system calls, errno might be our friend.
// For errors during system calls, errno might be our friend.
} else if (sslErrorCode == SSL_ERROR_SYSCALL) {
if (asprintf(&str, "%s, %s", allocStr, strerror(errno)) >= 0) {
free(allocStr);
allocStr = str;
}
// If the error code is invalid, print it.
// If the error code is invalid, print it.
} else if (sslErrorCode > SSL_ERROR_WANT_ACCEPT) {
if (asprintf(&str, ", error code is %d", sslErrorCode) >= 0) {
free(allocStr);
Expand All @@ -474,6 +474,6 @@ class Errors {
}
};

} // namespace conscrypt
} // namespace conscrypt

#endif // CONSCRYPT_ERRORS_H_
Loading

0 comments on commit e033650

Please sign in to comment.