Skip to content

Fix issues preventing proper packaging of OpenSSL module #76

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix issues preventing proper packaging of OpenSSL module #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
697703a
Add license information to META6.json
niner Feb 3, 2020
9cfe618
Add native dependencies to META6.json
niner Feb 3, 2020
81c60d8
Try to load library by explicitly stated (known to work) version first
niner Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion META6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
{
"meta-version": 1,
"perl" : "6.*",
"name" : "OpenSSL",
"version" : "0.1.23",
"author" : "github:sergot",
"license" : "MIT",
"description" : "OpenSSL bindings",
"depends" : [],
"depends" : {
Copy link
Member

@ugexe ugexe Feb 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

This has some issues.

The this-or-that method of declaring a dependency using array notation is not implemented "depends":[ "Foo", ["Bar:auth<foo>", "Bar:auth<baz>"]]. Last time I mentioned going this route you seemed to have some reservations about it, although I don't remember why -- only that I was in favor of it (just nobody got around to implementing).

The hash form of declaration doesn't accept the string form of names. So using "linux" : "ssl:from<native>:ver<1.1>" probably isn't going to work.

The format of depends is off. Unimportantly I would recommend using the array-of-hash format, but if not then this is still missing a level (we specced runtime etc). More importantly is there is no less-redundant way to properly express what you want (yet). Theoretically it could be like

    "depends" : [
        {
            "from" : "native",
            "name" : {
                "by-kernel.name": {
                    "win32": "ssleay32",
                    "" : "ssl"
                }
            }
        },
        {
            "from" : "native",
            "name" : {
                "by-kernel.name": {
                    "win32": "libeay32",
                    "":"ssl"
                }
            }
        }
    ]

but note how we currently have to declare a dependency -- i.e. ssl is listed in the second dependency block even though it is redundant against the first block.

Copy link
Author

@niner niner Feb 3, 2020

Choose a reason for hiding this comment

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

Oddly zef didn't seem to care about the dependencies when I tried. But maybe I just screwed up my tests. Was a bit distracted by being at FOSDEM and all.

I can't remember what my reservations were about the array notation. Actually I first thought we overlooked this use case and was pleasantly surprised when I found it it S22: "To indicate alternatives, it is possible to specify a list of use strings, instead of just a single use string". If I were asked to review the spec right now, I'd probably not like the implicitness. Usually when you see a list, it's ANDed. You wouldn't assume that your shopping list means "buy beer OR burgers". But then, why would you put a nested list into your list of dependencies? We could spell it {"alternatives": [...]} instead to make it more self documenting. If we could think of another combinator besides AND and OR, that'd make more sense. Or are there other reasonable search strategies besides "the first of these you can find"? If there are, that'd would be an argument for the more elaborate version.

The depends block I specified actually is in array-of-hash format. On e.g. Linux it will collapse to

"depends": [
    ["ssl:from<native>:ver<1.1>", "ssl:from<native>:ver<1.0>"],
    ["crypto:from<native>:ver<1.1>", "crypto:from<native>:ver<1.0>"]
]

At least if zef applies system-collapse to the depends value directly.

If you're OK with it I can implement the missing bits in zef. At this point I'm already so many layers deep into yak shaving that one more won't matter ;) We have already done all the hard work. It's about time we reap the benefits and get this stuff used.

Copy link
Member

@ugexe ugexe Feb 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

The depends block I specified actually is in array-of-hash format. On e.g. Linux it will collapse to

I'm not sure this (assumption?) is correct. Collapse does not occur on the top level itself AFAIK. See Inline::Python example and Zef's implementation. If what you did actually collapses as you say then that would seem like a coincidence (if you look at the zef implementation linked is it not some well-designed alternative, but rather some quick make-it-work transformation logic and hence why I suggest using the array-of-hash).

Copy link
Member

@ugexe ugexe Feb 3, 2020

Choose a reason for hiding this comment

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

I imagine the issue with alternative syntax was how does one then do both AND and OR

"depends" : ["Foo1", ["Foo2", { { Foo::MaybeThis => 1 }, { Foo::MaybeThat => 1 }}]

"by-kernel.name": {
"win32": ["ssleay32", "libeay32"],
"": [
{"any": [{"name":"ssl", "from": "native", "ver": "1.1"}, {"name":"ssl", "from": "native", "ver": "1.0"}]},
{"any": [{"name":"crypto", "from": "native", "ver": "1.1"}, {"name":"crypto", "from": "native", "ver": "1.0"}]}
]
}
},
"provides" : {
"OpenSSL" : "lib/OpenSSL.pm6",
"OpenSSL::Bio" : "lib/OpenSSL/Bio.pm6",
Expand Down
10 changes: 5 additions & 5 deletions lib/OpenSSL/Bio.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class BIO is repr('CStruct') {
has int32 $.dummy;
}

our sub BIO_new_bio_pair(CArray[OpaquePointer], long, CArray[OpaquePointer], long --> int32) is native(&gen-lib) { ... }
our sub BIO_free(OpaquePointer) is native(&gen-lib) { ... }
our sub BIO_read(OpaquePointer, Blob, long --> int32) is native(&gen-lib) { ... }
our sub BIO_write(OpaquePointer, Blob, long --> int32) is native(&gen-lib) { ... }
our sub BIO_new_mem_buf(Blob, long --> OpaquePointer) is native(&gen-lib) { ... }
our sub BIO_new_bio_pair(CArray[OpaquePointer], long, CArray[OpaquePointer], long --> int32) is native(gen-lib) { ... }
our sub BIO_free(OpaquePointer) is native(gen-lib) { ... }
our sub BIO_read(OpaquePointer, Blob, long --> int32) is native(gen-lib) { ... }
our sub BIO_write(OpaquePointer, Blob, long --> int32) is native(gen-lib) { ... }
our sub BIO_new_mem_buf(Blob, long --> OpaquePointer) is native(gen-lib) { ... }
18 changes: 9 additions & 9 deletions lib/OpenSSL/Ctx.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ class SSL_CTX is repr('CStruct') {
has OpenSSL::Method::SSL_METHOD $.method;
}

our sub SSL_CTX_new(OpenSSL::Method::SSL_METHOD) returns SSL_CTX is native(&ssl-lib) { ... }
our sub SSL_CTX_free(SSL_CTX) is native(&ssl-lib) { ... }
our sub SSL_CTX_ctrl(SSL_CTX, int32, long, Pointer) returns long is native(&ssl-lib) { ... }
our sub SSL_CTX_new(OpenSSL::Method::SSL_METHOD) returns SSL_CTX is native(ssl-lib) { ... }
our sub SSL_CTX_free(SSL_CTX) is native(ssl-lib) { ... }
our sub SSL_CTX_ctrl(SSL_CTX, int32, long, Pointer) returns long is native(ssl-lib) { ... }

our sub SSL_CTX_use_certificate(SSL_CTX, Pointer) returns int32 is native(&ssl-lib) { ... }
our sub SSL_CTX_use_certificate_file(SSL_CTX, Str, int32) returns int32 is native(&ssl-lib) { ... }
our sub SSL_CTX_use_certificate_chain_file(SSL_CTX, Str) returns int32 is native(&ssl-lib) { ... }
our sub SSL_CTX_use_PrivateKey(SSL_CTX, Pointer) returns int32 is native(&ssl-lib) { ... }
our sub SSL_CTX_use_PrivateKey_file(SSL_CTX, Str, int32) returns int32 is native(&ssl-lib) { ... }
our sub SSL_CTX_check_private_key(SSL_CTX) returns int32 is native(&ssl-lib) { ... }
our sub SSL_CTX_use_certificate(SSL_CTX, Pointer) returns int32 is native(ssl-lib) { ... }
our sub SSL_CTX_use_certificate_file(SSL_CTX, Str, int32) returns int32 is native(ssl-lib) { ... }
our sub SSL_CTX_use_certificate_chain_file(SSL_CTX, Str) returns int32 is native(ssl-lib) { ... }
our sub SSL_CTX_use_PrivateKey(SSL_CTX, Pointer) returns int32 is native(ssl-lib) { ... }
our sub SSL_CTX_use_PrivateKey_file(SSL_CTX, Str, int32) returns int32 is native(ssl-lib) { ... }
our sub SSL_CTX_check_private_key(SSL_CTX) returns int32 is native(ssl-lib) { ... }
10 changes: 5 additions & 5 deletions lib/OpenSSL/Digest.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ our constant SHA256_DIGEST_LENGTH = 32;
our constant SHA384_DIGEST_LENGTH = 48;
our constant SHA512_DIGEST_LENGTH = 64;

sub MD5( Blob, size_t, Blob ) is native(&gen-lib) { ... }
sub SHA1( Blob, size_t, Blob ) is native(&gen-lib) { ... }
sub SHA256( Blob, size_t, Blob ) is native(&gen-lib) { ... }
sub SHA384( Blob, size_t, Blob ) is native(&gen-lib) { ... }
sub SHA512( Blob, size_t, Blob ) is native(&gen-lib) { ... }
sub MD5( Blob, size_t, Blob ) is native(gen-lib) { ... }
sub SHA1( Blob, size_t, Blob ) is native(gen-lib) { ... }
sub SHA256( Blob, size_t, Blob ) is native(gen-lib) { ... }
sub SHA384( Blob, size_t, Blob ) is native(gen-lib) { ... }
sub SHA512( Blob, size_t, Blob ) is native(gen-lib) { ... }

sub md5(Blob $msg) is export {
my $digest = buf8.allocate(MD5_DIGEST_LENGTH);
Expand Down
6 changes: 3 additions & 3 deletions lib/OpenSSL/Digest/MD5.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ class OpenSSL::Digest::MD5
{
has $!context;

sub MD5_Init(Blob) returns int32 is native(&gen-lib) { * }
sub MD5_Update(Blob, Blob, size_t) returns int32 is native(&gen-lib) { * }
sub MD5_Final(Blob, Blob) returns int32 is native(&gen-lib) { * }
sub MD5_Init(Blob) returns int32 is native(gen-lib) { * }
sub MD5_Update(Blob, Blob, size_t) returns int32 is native(gen-lib) { * }
sub MD5_Final(Blob, Blob) returns int32 is native(gen-lib) { * }

submethod BUILD() {
$!context = buf8.allocate(MD5-CTX-SIZE);
Expand Down
26 changes: 13 additions & 13 deletions lib/OpenSSL/EVP.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ unit module OpenSSL::EVP;
use OpenSSL::NativeLib;
use NativeCall;

our sub EVP_PKEY_get1_RSA(OpaquePointer --> OpaquePointer) is native(&gen-lib) { ... }
our sub EVP_PKEY_free(OpaquePointer) is native(&gen-lib) { ... }
our sub EVP_PKEY_get1_RSA(OpaquePointer --> OpaquePointer) is native(gen-lib) { ... }
our sub EVP_PKEY_free(OpaquePointer) is native(gen-lib) { ... }

our sub EVP_CIPHER_CTX_new(--> OpaquePointer) is native(&gen-lib) { ... }
our sub EVP_CIPHER_CTX_free(OpaquePointer) is native(&gen-lib) { ... }
our sub EVP_CIPHER_CTX_new(--> OpaquePointer) is native(gen-lib) { ... }
our sub EVP_CIPHER_CTX_free(OpaquePointer) is native(gen-lib) { ... }

our sub EVP_EncryptInit(OpaquePointer, OpaquePointer, Blob, Blob --> int32) is native(&gen-lib) { ... }
our sub EVP_EncryptUpdate(OpaquePointer, Blob, CArray[int32], Blob, int32 --> int32) is native(&gen-lib) { ... }
our sub EVP_EncryptFinal(OpaquePointer, Blob, CArray[int32] --> int32) is native(&gen-lib) { ... }
our sub EVP_EncryptInit(OpaquePointer, OpaquePointer, Blob, Blob --> int32) is native(gen-lib) { ... }
our sub EVP_EncryptUpdate(OpaquePointer, Blob, CArray[int32], Blob, int32 --> int32) is native(gen-lib) { ... }
our sub EVP_EncryptFinal(OpaquePointer, Blob, CArray[int32] --> int32) is native(gen-lib) { ... }

our sub EVP_DecryptInit(OpaquePointer, OpaquePointer, Blob, Blob --> int32) is native(&gen-lib) { ... }
our sub EVP_DecryptUpdate(OpaquePointer, Blob, CArray[int32], Blob, int32 --> int32) is native(&gen-lib) { ... }
our sub EVP_DecryptFinal(OpaquePointer, Blob, CArray[int32] --> int32) is native(&gen-lib) { ... }
our sub EVP_DecryptInit(OpaquePointer, OpaquePointer, Blob, Blob --> int32) is native(gen-lib) { ... }
our sub EVP_DecryptUpdate(OpaquePointer, Blob, CArray[int32], Blob, int32 --> int32) is native(gen-lib) { ... }
our sub EVP_DecryptFinal(OpaquePointer, Blob, CArray[int32] --> int32) is native(gen-lib) { ... }

class evp_cipher_st is repr('CStruct') {
has int32 $.nid;
Expand All @@ -34,6 +34,6 @@ class evp_cipher_st is repr('CStruct') {
}

# ciphers
our sub EVP_aes_128_cbc( --> OpaquePointer) is native(&gen-lib) { ... }
our sub EVP_aes_192_cbc( --> OpaquePointer) is native(&gen-lib) { ... }
our sub EVP_aes_256_cbc( --> OpaquePointer) is native(&gen-lib) { ... }
our sub EVP_aes_128_cbc( --> OpaquePointer) is native(gen-lib) { ... }
our sub EVP_aes_192_cbc( --> OpaquePointer) is native(gen-lib) { ... }
our sub EVP_aes_256_cbc( --> OpaquePointer) is native(gen-lib) { ... }
4 changes: 2 additions & 2 deletions lib/OpenSSL/Err.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ unit module OpenSSL::Err;
use OpenSSL::NativeLib;
use NativeCall;

our sub ERR_error_string(int32 $e, Str $ret) returns Str is native(&gen-lib) { ... };
our sub ERR_error_string(int32 $e, Str $ret) returns Str is native(gen-lib) { ... };

our sub ERR_get_error() returns ulonglong is native(&gen-lib) { ... };
our sub ERR_get_error() returns ulonglong is native(gen-lib) { ... };
42 changes: 21 additions & 21 deletions lib/OpenSSL/Method.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ class SSL_METHOD is repr('CStruct') {
has int32 $.version;
}

our sub SSLv2_client_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv2_server_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv2_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv3_client_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv3_server_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv3_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv23_client_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv23_server_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv23_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLS_client_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLS_server_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLS_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_client_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_server_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_1_client_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_1_server_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_1_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_2_client_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_2_server_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub TLSv1_2_method() returns SSL_METHOD is native(&ssl-lib) { ... }
our sub SSLv2_client_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv2_server_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv2_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv3_client_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv3_server_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv3_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv23_client_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv23_server_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub SSLv23_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLS_client_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLS_server_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLS_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_client_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_server_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_1_client_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_1_server_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_1_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_2_client_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_2_server_method() returns SSL_METHOD is native(ssl-lib) { ... }
our sub TLSv1_2_method() returns SSL_METHOD is native(ssl-lib) { ... }
54 changes: 47 additions & 7 deletions lib/OpenSSL/NativeLib.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,61 @@
unit module OpenSSL::NativeLib;

use NativeCall;

my $version;

sub ssl-lib is export {
state $lib = $*DISTRO.is-win
state @lib = $*DISTRO.is-win
?? dll-resource('ssleay32.dll')
!! $*VM.platform-library-name('ssl'.IO).Str;
!! ('ssl', version)
}

sub gen-lib-unversioned() {
$*DISTRO.is-win
?? dll-resource('libeay32.dll')
!! 'ssl'
}

sub gen-lib-version($v) {
@ = $*DISTRO.is-win
?? dll-resource('libeay32.dll')
!! ('ssl', $v)
}

sub gen-lib is export {
state $lib = $*DISTRO.is-win
sub gen-lib() is export {
state @lib = $*DISTRO.is-win
?? dll-resource('libeay32.dll')
!! $*VM.platform-library-name('ssl'.IO).Str;
!! ('ssl', version)
}

sub crypto-lib is export {
state $lib = $*DISTRO.is-win
state @lib = $*DISTRO.is-win
?? dll-resource('libeay32.dll')
!! $*VM.platform-library-name('crypto'.IO).Str;
!! ('crypto', version)
}

sub version() {
unless defined $version {
for (v1.1, v1.0, v1.0.0) -> $v {
try {
my sub EVP_aes_128_cbc( --> Pointer) { };
trait_mod:<is>(&EVP_aes_128_cbc, :native(gen-lib-version($v)));
EVP_aes_128_cbc();
$version = $v;
}
last if $version;
}

try {
my sub EVP_aes_128_cbc( --> Pointer) { };
trait_mod:<is>(&EVP_aes_128_cbc, :native(gen-lib-unversioned()));
EVP_aes_128_cbc();
$version = '';
}

die "Did not find {$*VM.platform-library-name('ssl'.IO)}" unless defined $version;
}
$version
}

# Windows only
Expand Down
8 changes: 4 additions & 4 deletions lib/OpenSSL/PEM.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ unit module OpenSSL::PEM;
use OpenSSL::NativeLib;
use NativeCall;

our sub PEM_read_bio_RSAPrivateKey(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(&gen-lib) { ... }
our sub PEM_read_bio_RSAPublicKey(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(&gen-lib) { ... }
our sub PEM_read_bio_RSA_PUBKEY(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(&gen-lib) { ... }
our sub PEM_read_bio_X509(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(&gen-lib) { ... }
our sub PEM_read_bio_RSAPrivateKey(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(gen-lib) { ... }
our sub PEM_read_bio_RSAPublicKey(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(gen-lib) { ... }
our sub PEM_read_bio_RSA_PUBKEY(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(gen-lib) { ... }
our sub PEM_read_bio_X509(OpaquePointer, OpaquePointer, OpaquePointer, OpaquePointer --> OpaquePointer) is native(gen-lib) { ... }
8 changes: 4 additions & 4 deletions lib/OpenSSL/RSA.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ unit module OpenSSL::RSA;
use OpenSSL::NativeLib;
use NativeCall;

our sub RSA_sign(int32, Blob, int32, Blob, CArray, OpaquePointer --> int32) is native(&gen-lib) { ... }
our sub RSA_verify(int32, Blob, int32, Blob, int32, OpaquePointer --> int32) is native(&gen-lib) { ... }
our sub RSA_sign(int32, Blob, int32, Blob, CArray, OpaquePointer --> int32) is native(gen-lib) { ... }
our sub RSA_verify(int32, Blob, int32, Blob, int32, OpaquePointer --> int32) is native(gen-lib) { ... }

our sub RSA_size(OpaquePointer --> int32) is native(&gen-lib) { ... }
our sub RSA_free(OpaquePointer) is native(&gen-lib) { ... }
our sub RSA_size(OpaquePointer --> int32) is native(gen-lib) { ... }
our sub RSA_free(OpaquePointer) is native(gen-lib) { ... }
44 changes: 22 additions & 22 deletions lib/OpenSSL/SSL.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,27 @@ class SSL is repr('CStruct') {
has int32 $.rstate;
}

our sub SSL_library_init() is native(&ssl-lib) { ... }
our sub OPENSSL_init_ssl(uint64, OpaquePointer) is native(&ssl-lib) { ... }
our sub SSL_load_error_strings() is native(&ssl-lib) { ... }

our sub SSL_new(OpenSSL::Ctx::SSL_CTX) returns SSL is native(&ssl-lib) { ... }
our sub SSL_set_fd(SSL, int32) returns int32 is native(&ssl-lib) { ... }
our sub SSL_shutdown(SSL) returns int32 is native(&ssl-lib) { ... }
our sub SSL_free(SSL) is native(&ssl-lib) { ... }
our sub SSL_get_error(SSL, int32) returns int32 is native(&ssl-lib) { ... }
our sub SSL_accept(SSL) returns int32 is native(&ssl-lib) { ... }
our sub SSL_connect(SSL) returns int32 is native(&ssl-lib) { ... }
our sub SSL_read(SSL, Blob, int32) returns int32 is native(&ssl-lib) { ... }
our sub SSL_write(SSL, Blob, int32) returns int32 is native(&ssl-lib) { ... }
our sub SSL_set_connect_state(SSL) is native(&ssl-lib) { ... }
our sub SSL_set_accept_state(SSL) is native(&ssl-lib) { ... }

our sub SSL_set_bio(SSL, OpaquePointer, OpaquePointer) returns int32 is native(&ssl-lib) { ... }

our sub SSL_load_client_CA_file(CArray[uint8]) returns OpenSSL::Stack is native(&ssl-lib) { ... };
our sub SSL_get_client_CA_list(SSL) returns OpenSSL::Stack is native(&ssl-lib) { ... };
our sub SSL_set_client_CA_list(SSL, OpenSSL::Stack) is native(&ssl-lib) { ... };
our sub SSL_library_init() is native(ssl-lib) { ... }
our sub OPENSSL_init_ssl(uint64, OpaquePointer) is native(ssl-lib) { ... }
our sub SSL_load_error_strings() is native(ssl-lib) { ... }

our sub SSL_new(OpenSSL::Ctx::SSL_CTX) returns SSL is native(ssl-lib) { ... }
our sub SSL_set_fd(SSL, int32) returns int32 is native(ssl-lib) { ... }
our sub SSL_shutdown(SSL) returns int32 is native(ssl-lib) { ... }
our sub SSL_free(SSL) is native(ssl-lib) { ... }
our sub SSL_get_error(SSL, int32) returns int32 is native(ssl-lib) { ... }
our sub SSL_accept(SSL) returns int32 is native(ssl-lib) { ... }
our sub SSL_connect(SSL) returns int32 is native(ssl-lib) { ... }
our sub SSL_read(SSL, Blob, int32) returns int32 is native(ssl-lib) { ... }
our sub SSL_write(SSL, Blob, int32) returns int32 is native(ssl-lib) { ... }
our sub SSL_set_connect_state(SSL) is native(ssl-lib) { ... }
our sub SSL_set_accept_state(SSL) is native(ssl-lib) { ... }

our sub SSL_set_bio(SSL, OpaquePointer, OpaquePointer) returns int32 is native(ssl-lib) { ... }

our sub SSL_load_client_CA_file(CArray[uint8]) returns OpenSSL::Stack is native(ssl-lib) { ... };
our sub SSL_get_client_CA_list(SSL) returns OpenSSL::Stack is native(ssl-lib) { ... };
our sub SSL_set_client_CA_list(SSL, OpenSSL::Stack) is native(ssl-lib) { ... };

# long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg)
our sub SSL_ctrl(SSL, int32, long, Str ) returns long is native(&ssl-lib) { ... }
our sub SSL_ctrl(SSL, int32, long, Str ) returns long is native(ssl-lib) { ... }
6 changes: 3 additions & 3 deletions lib/OpenSSL/Stack.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ my sub real_symbol(Str $sym) returns Str {
return $v >= 0x10100000 && !$is_libressl ?? "OPENSSL_$sym" !! $sym;
}

our sub sk_num(OpenSSL::Stack) returns int32 is native(&gen-lib) is symbol(real_symbol('sk_num')) { ... }
our sub sk_value(OpenSSL::Stack, int32) returns Pointer is native(&gen-lib) is symbol(real_symbol('sk_value')) { ... }
our sub sk_free(OpenSSL::Stack) is native(&gen-lib) is symbol(real_symbol('sk_free')) { ... }
our sub sk_num(OpenSSL::Stack) returns int32 is native(gen-lib) is symbol(real_symbol('sk_num')) { ... }
our sub sk_value(OpenSSL::Stack, int32) returns Pointer is native(gen-lib) is symbol(real_symbol('sk_value')) { ... }
our sub sk_free(OpenSSL::Stack) is native(gen-lib) is symbol(real_symbol('sk_free')) { ... }
4 changes: 2 additions & 2 deletions lib/OpenSSL/Version.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ our int32 constant DIR = 4;
our int32 constant ENGINES_DIR = 5;

our sub version_num returns Int {
my sub OpenSSL_version_num returns ulong is native(&gen-lib) { ... }
my sub OpenSSL_version_num returns ulong is native(gen-lib) { ... }
return try { OpenSSL_version_num() } // 0;
}

our sub version(int32 $type = VERSION) returns Str {
my sub OpenSSL_version(int32) returns Str is native(&gen-lib) { ... }
my sub OpenSSL_version(int32) returns Str is native(gen-lib) { ... }
return try { OpenSSL_version($type) } // '';
}
4 changes: 2 additions & 2 deletions lib/OpenSSL/X509.pm6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ our sub dump_x509_stack(OpenSSL::Stack $stack, :$FH = $*ERR) {
}
}

our sub X509_get_pubkey(OpaquePointer --> OpaquePointer) is native(&crypto-lib) { ... }
our sub X509_free(OpaquePointer) is native(&crypto-lib) { ... }
our sub X509_get_pubkey(OpaquePointer --> OpaquePointer) is native(crypto-lib) { ... }
our sub X509_free(OpaquePointer) is native(crypto-lib) { ... }