Skip to content

Commit c8be7a0

Browse files
authored
Merge pull request #5 from timlegge/main
Release 0.11
2 parents a32ff18 + 9eccdd7 commit c8be7a0

File tree

7 files changed

+21
-14
lines changed

7 files changed

+21
-14
lines changed

Changes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ Revision history for Crypt-OpenSSL-SignCSR.
22

33
{{$NEXT}}
44

5+
0.11 -- Tue Jul 18 19:27:54 ADT 2023
6+
7+
- daa5dd9 Increment version for release
8+
- 3a09798 Remove undocumented sigopts from sign()
9+
- 4295e6b Better regex for more openssl versions
10+
- a32ff18 Find out the version of OpenSSL
11+
- 2a21fa4 v0.10
12+
513
0.10 -- Sat Jul 08 21:24:27 ADT 2023
614

715
- 7272fa3 Increment the version for a release

Makefile.PL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ my %WriteMakefileArgs = (
7070
"File::Slurper" => "0.012",
7171
"File::Which" => 0
7272
},
73-
"VERSION" => "0.10",
73+
"VERSION" => "0.11",
7474
"test" => {
7575
"TESTS" => "t/*.t"
7676
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ my $signer = Crypt::OpenSSL::SignCSR->new(
1515
format => $format, # Output format "text" or "pem" (default)
1616
});
1717
my $cert = $signer->sign(
18-
$request, # CRS in PEM format
18+
$request, # CSR in PEM format
1919
);
2020

2121
my $ret = $signer->set_days(3650);
2222
my $ret = $signer->set_format("text");
2323
my $ret = $signer->set_days("SHA512");
2424

25-
$cert = $signer->sign( $request ); # CRS in PEM format
25+
$cert = $signer->sign( $request ); # CSR in PEM format
2626
```
2727

2828
# DESCRIPTION

SignCSR.xs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,13 +552,12 @@ IV set_days(self, IV days)
552552

553553
RETVAL
554554

555-
SV * sign(self, request_SV, sigopts)
555+
SV * sign(self, request_SV)
556556
HV * self;
557557
SV * request_SV;
558558

559559
PREINIT:
560560
EVP_MD_CTX *mctx;
561-
STACK_OF(OPENSSL_STRING) *sigopts = NULL;
562561

563562
CODE:
564563

@@ -752,9 +751,9 @@ SV * sign(self, request_SV, sigopts)
752751

753752
// Sign the new certificate
754753
#if OPENSSL_API_COMPAT >= 30101
755-
if (mctx != NULL && do_sign_init(mctx, private_key, digestname, sigopts) > 0)
754+
if (mctx != NULL && do_sign_init(mctx, private_key, digestname, NULL) > 0)
756755
#else
757-
if (mctx != NULL && do_sign_init(mctx, private_key, md, sigopts) > 0)
756+
if (mctx != NULL && do_sign_init(mctx, private_key, md, NULL) > 0)
758757
#endif
759758
rv = (X509_sign_ctx(x, mctx) > 0);
760759

lib/Crypt/OpenSSL/SignCSR.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use warnings;
77

88
require Exporter;
99

10-
our $VERSION = "0.10";
10+
our $VERSION = "0.11";
1111

1212
our @ISA = qw(Exporter);
1313

@@ -43,14 +43,14 @@ Crypt::OpenSSL::SignCSR - Sign a Certificate Signing Request in XS.
4343
format => $format, # Output format "text" or "pem" (default)
4444
});
4545
my $cert = $signer->sign(
46-
$request, # CRS in PEM format
46+
$request, # CSR in PEM format
4747
);
4848
4949
my $ret = $signer->set_days(3650);
5050
my $ret = $signer->set_format("text");
5151
my $ret = $signer->set_days("SHA512");
5252
53-
$cert = $signer->sign( $request ); # CRS in PEM format
53+
$cert = $signer->sign( $request ); # CSR in PEM format
5454
5555
=head1 DESCRIPTION
5656

t/002-create-cert-from-csr.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bczN2A==
7272
-----END CERTIFICATE REQUEST-----
7373
CERTREQUEST
7474

75-
my $cert = $signer->sign($request, '');
75+
my $cert = $signer->sign($request);
7676

7777
my $certfile = tempfile();
7878
my ($certfh, $certfilename) = tempfile();
@@ -85,7 +85,7 @@ eval {
8585
$result = `$openssl x509 -in $certfilename -text`;
8686
};
8787

88-
like($result, qr/Issuer: C = CA, O = XML::Sig, OU = perl/, "Certificate - Issuer OK");
88+
like($result, qr/Issuer:.*XML::Sig.*perl/, "Certificate - Issuer OK");
8989
like($result, qr/Signature Algorithm: sha512WithRSAEncryption/, "Certificate - Signature OK");
9090

9191
ok($signer->get_days() eq 365, "Days were set successfully");

t/003-openssl-crypt-pkcs10.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ my $signer = Crypt::OpenSSL::SignCSR->new(
7272

7373
isa_ok($signer, "Crypt::OpenSSL::SignCSR");
7474

75-
my $cert = $signer->sign($request, '');
75+
my $cert = $signer->sign($request);
7676

7777
my $certfile = tempfile();
7878
my ($certfh, $certfilename) = tempfile();
@@ -88,7 +88,7 @@ eval {
8888

8989
unlink $certfilename;
9090

91-
like($result, qr/Issuer: C = CA, ST = New Brunswick, O = XML::Sig, OU = perl/, "Certificate - Issuer OK");
91+
like($result, qr/Issuer:.*XML::Sig.*perl/, "Certificate - Issuer OK");
9292
like($result, qr/Signature Algorithm: sha512WithRSAEncryption/, "Certificate - Signature OK");
9393

9494
done_testing

0 commit comments

Comments
 (0)