Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing various errors/warnings for windows. #21

Merged
merged 1 commit into from
Jan 9, 2017

Conversation

nmittler
Copy link
Contributor

@nmittler nmittler commented Jan 3, 2017

No description provided.

@nmittler
Copy link
Contributor Author

nmittler commented Jan 3, 2017

@kruton this gets us a lot closer to building on windows. Just a few misc items remain.

@@ -487,7 +492,7 @@ static bool throwExceptionIfNecessary(JNIEnv* env, const char* location __attri
}

ERR_clear_error();
return result;
return result != 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to change this too a bool instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup .. done.

@@ -9173,7 +9180,7 @@ static bool get_ocsp_single_responses(CBS *basic_response, CBS *single_responses
}

// Extract the list of SingleResponse.
return CBS_get_asn1(&response_data, single_responses, CBS_ASN1_SEQUENCE);
return CBS_get_asn1(&response_data, single_responses, CBS_ASN1_SEQUENCE) != 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like it more when we use "== 1" but that might be a holdout when OpenSSL returned a tri-state with 0 meaning not successful and -1 meaning error.

@@ -20,34 +20,39 @@

#define TO_STRING1(x) #x
#define TO_STRING(x) TO_STRING1(x)
#ifndef JNI_JARJAR_PREFIX
#ifdef JNI_JARJAR_PREFIX
#define CONSCRYPT_SYMBOL_PREFIX = TO_STRING(JNI_JARJAR_PREFIX)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, what does the = do here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oof ... fixed.

@nmittler
Copy link
Contributor Author

nmittler commented Jan 9, 2017

@kruton PTAL

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants