rename new parameter before release

Author: timlegge

lib/XML/Enc.pm

@@ -135,21 +135,23 @@ Used in encryption.  Optional.  Default method: aes256-cbc
 
 Specify the encryption method to be used for key transport.  Supported methods are:
 
-Used in encryption.  Optional.  Default method: rsa-1_5
+Used in encryption.  Optional.  Default method: rsa-oaep-mgf1p
 
 =over
 
 =item * L<rsa-1_5|https://www.w3.org/TR/2002/REC-xmlenc-core-20021210/Overview.html#rsa-1_5>
 
 =item * L<rsa-oaep-mgf1p|https://www.w3.org/TR/2002/REC-xmlenc-core-20021210/Overview.html#rsa-oaep-mgf1p>
 
-=item * L<rsa-oaep (Experimental)| http://www.w3.org/2009/xmlenc11#rsa-oaep>
+=item * L<rsa-oaep|http://www.w3.org/2009/xmlenc11#rsa-oaep>
 
 =back
 
-=item B<oaep_method>
+=item B<oaep_mgf_alg>
 
-Specify the Algorithm to be used for rsa-oaep.  Supported methods are:
+Specify the Algorithm to be used for rsa-oaep.  Supported algorithms are:
+
+Used in encryption.  Optional.  Default method: mgf1sha1
 
 =over
 
@@ -194,8 +196,8 @@ sub new {
     my $key_method = exists($params->{'key_transport'}) ? $params->{'key_transport'} : 'rsa-oaep-mgf1p ';
     $self->{'key_transport'} = $self->_setKeyEncryptionMethod($key_method);
 
-    my $oaep_method = exists($params->{'oaep_method'}) ? $params->{'oaep_method'} : 'http://www.w3.org/2009/xmlenc11#mgf1sha1';
-    $self->{'oaep_method'} = $self->_setOAEPAlgorithm($oaep_method);
+    my $oaep_mgf_alg = exists($params->{'oaep_mgf_alg'}) ? $params->{'oaep_mgf_alg'} : 'http://www.w3.org/2009/xmlenc11#mgf1sha1';
+    $self->{'oaep_mgf_alg'} = $self->_setOAEPAlgorithm($oaep_mgf_alg);
 
     $self->{'oaep_params'} = exists($params->{'oaep_params'}) ? $params->{'oaep_params'} : '';
 
@@ -558,7 +560,7 @@ sub _EncryptKey {
         ${$key} = $rsa_pub->encrypt(${$key}, 'oaep', 'SHA1', $self->{oaep_params});
     }
     elsif ($keymethod eq 'http://www.w3.org/2009/xmlenc11#rsa-oaep') {
-        ${$key} = $rsa_pub->encrypt(${$key}, 'oaep', $self->_getOAEPAlgorithm($self->{oaep_method}), $self->{oaep_params});
+        ${$key} = $rsa_pub->encrypt(${$key}, 'oaep', $self->_getOAEPAlgorithm($self->{oaep_mgf_alg}), $self->{oaep_params});
     } else {
         die "Unsupported Key Encryption Method";
     }
@@ -919,7 +921,7 @@ sub _create_encrypted_data_xml {
                             $kencmethod,
                             'xenc:MGF',
                             {
-                                Algorithm => $self->{oaep_method},
+                                Algorithm => $self->{oaep_mgf_alg},
                             }
                         );
     };

t/06-test-encryption-methods.t

@@ -14,7 +14,7 @@ XML
 
 my @key_methods     = qw/rsa-1_5 rsa-oaep-mgf1p/;
 my @data_methods    = qw/aes128-cbc aes192-cbc aes256-cbc tripledes-cbc aes128-gcm aes192-gcm aes256-gcm/;
-my @oaep_methods    = qw/mgf1sha1 mgf1sha224 mgf1sha256 mgf1sha384 mgf1sha512/;
+my @oaep_mgf_algs   = qw/mgf1sha1 mgf1sha224 mgf1sha256 mgf1sha384 mgf1sha512/;
 
 foreach my $km (@key_methods) {
     foreach my $dm (@data_methods) {
@@ -51,15 +51,15 @@ foreach my $km (@key_methods) {
     }
 }
 
-foreach my $om (@oaep_methods) {
+foreach my $om (@oaep_mgf_algs) {
     foreach my $dm (@data_methods) {
         my $encrypter = XML::Enc->new(
             {
                 key                 => 't/sign-private.pem',
                 cert                => 't/sign-certonly.pem',
                 data_enc_method     => $dm,
                 key_transport       => 'rsa-oaep',
-                oaep_method         => $om,
+                oaep_mgf_alg        => $om,
                 no_xml_declaration  => 1
             }
         );