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

Changing types in parse_key! call #72

Merged
merged 4 commits into from
Sep 29, 2016
Merged

Conversation

joshbode
Copy link
Contributor

Change Void pointers to Cuchar pointers in line with the signature
of mbedtls_pk_parse_key

Addressing issue #71

change `Void` pointers to `Cuchar` pointers in line with the signature
of [`mbedtls_pk_parse_key`](https://tls.mbed.org/api/pk_8h.html#a072d27dc4143bfd600786232f9417e08)
@malmaud
Copy link
Contributor

malmaud commented Sep 29, 2016

Looks like it failed CI.

@codecov-io
Copy link

codecov-io commented Sep 29, 2016

Current coverage is 73.02% (diff: 50.00%)

Merging #72 into master will increase coverage by 2.25%

@@             master        #72   diff @@
==========================================
  Files            10         10          
  Lines           390        393     +3   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits            276        287    +11   
+ Misses          114        106     -8   
  Partials          0          0          

Powered by Codecov. Last update 4a92329...5dc0fb6

@joshbode
Copy link
Contributor Author

Strange - it's building fine for Linux/OS X. Windows build is failing with:

ERROR: LoadError: ccall: could not find function mbedtls_pk_parse_key in library C:\projects\julia\bin\libmbedtls.DLL

@joshbode
Copy link
Contributor Author

OK - that last commit seems to have done the trick: changed MBED_TLS -> MBED_CRYPTO for the call.
Not sure why it didn't affect the Linux/OS X build, but they're both working.

@malmaud
Copy link
Contributor

malmaud commented Sep 29, 2016

Thanks!

@malmaud malmaud merged commit 72de358 into JuliaLang:master Sep 29, 2016
@joshbode joshbode deleted the parse_key branch September 29, 2016 22:53
@joshbode
Copy link
Contributor Author

Thanks for that :)

Guessing this is why the build wasn't failing on OS X at least (libmbedtls.dylib depends on libmbedcrypto.dylib anyway):

    $ otool -L /Users/josh/.julia/v0.5/Homebrew/deps/usr/lib/libmbedtls.dylib
    /Users/josh/.julia/v0.5/Homebrew/deps/usr/lib/libmbedtls.dylib:
        /Users/josh/.julia/v0.5/Homebrew/deps/usr/opt/mbedtls/lib/libmbedtls.10.dylib (compatibility version 10.0.0, current version 2.3.0)
        @loader_path/libmbedx509.0.dylib (compatibility version 0.0.0, current version 2.3.0)
        @loader_path/libmbedcrypto.0.dylib (compatibility version 0.0.0, current version 2.3.0)
        /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1226.10.1)

@joshbode
Copy link
Contributor Author

Could you please tag a release with this code if you have a chance?

@@ -4,7 +4,7 @@ os:
- linux
- osx
julia:
- 0.4
- 0.5
Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't drop testing of a version of julia unless you also drop support for it in REQUIRE. Turning off testing alone is a very bad idea.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point - sorry, I missed that.
Looks Like @quinnj cleaned it up subequently in e8f789d

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, but he also merged several other changes and included a "last 0.4-supporting tag" which did not go through CI on 0.4

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.

None yet

4 participants