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

Fix naked pointer in cipher function #144

Merged
merged 7 commits into from Jul 23, 2023

Conversation

Firgeis
Copy link
Contributor

@Firgeis Firgeis commented Jun 12, 2023

Fixes #143

@anmonteiro
Copy link
Collaborator

CI isn't too happy:

ssl_stubs.c: In function 'ocaml_ssl_get_current_cipher':
ssl_stubs.c:1083:43: error: invalid application of 'sizeof' to incomplete type 'SSL_CIPHER' {aka 'struct ssl_cipher_st'}
 1083 |   value vcipher = caml_alloc_small(sizeof(SSL_CIPHER), Abstract_tag);
      |                                           ^~~~~~~~~~
ssl_stubs.c:1084:47: error: lvalue required as left operand of assignment
 1084 |   *((SSL_CIPHER *) Data_abstract_val(vcipher) = cipher);
      |                                               ^

@Firgeis
Copy link
Contributor Author

Firgeis commented Jun 15, 2023

Seems to me the tests are passing but there is some issue with building the ssl dependency

@anmonteiro
Copy link
Collaborator

Seems to me the tests are passing but there is some issue with building the ssl dependency

I don't think so. There are 5 cipher tests, but I only see 4 in the CI output. I suspect it's segfaulting.

@Firgeis
Copy link
Contributor Author

Firgeis commented Jul 23, 2023

@anmonteiro should be good to go

Copy link
Collaborator

@anmonteiro anmonteiro left a comment

Choose a reason for hiding this comment

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

LGTM. Could you add an entry to the change log please?

@anmonteiro anmonteiro merged commit 6df24e2 into savonet:master Jul 23, 2023
9 checks passed
@anmonteiro
Copy link
Collaborator

Thanks!

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

Successfully merging this pull request may close these issues.

Naked pointer - ocaml_ssl_get_current_cipher
2 participants