moved low-level part to Crypt::Cryptoki::Raw

Author: mlarue

.gitignore

@@ -7,6 +7,6 @@ Build
 _build
 *.bak
 MYMETA.*
-lib/Crypt/Cryptoki.c
-src/Crypt-Cryptoki-FunctionList.c
+lib/Crypt/Cryptoki-Raw.c
+src/Crypt-Cryptoki-Raw-FunctionList.c
 blib

Build.PL

@@ -9,8 +9,8 @@ my $build_class = Module::Build->subclass(
 			my $self = shift;
 			require ExtUtils::ParseXS;
 			ExtUtils::ParseXS::process_file(
-				filename => 'src/Crypt-Cryptoki-FunctionList.xs',
-				output   => 'src/Crypt-Cryptoki-FunctionList.c'
+				filename => 'src/Crypt-Cryptoki-Raw-FunctionList.xs',
+				output   => 'src/Crypt-Cryptoki-Raw-FunctionList.c'
 			);
 			$self->SUPER::ACTION_code(@_);
 		}
@@ -33,12 +33,12 @@ my $build = Crypt::Cryptoki::Build->new(
 	},
 	extra_compiler_flags => ['-Wall'],
 	include_dirs => ['include'],
-	autosplit => 'lib/Crypt/Cryptoki.pm',
+	autosplit => 'lib/Crypt/Cryptoki/Raw.pm',
 	xs_files => {
-		'src/Crypt-Cryptoki.xs' => 'lib/Crypt/Cryptoki.xs'
+		'src/Crypt-Cryptoki-Raw.xs' => 'lib/Crypt/Cryptoki/Raw.xs'
 	},
 	c_source => ['src'],
-	test_files => [ 't/cryptoki.t' ],
+	test_files => [ 't/cryptoki.t', 't/cryptoki-raw.t' ],
 );
 
   my @names = (qw(

MANIFEST

@@ -7,12 +7,14 @@ include/cryptoki/pkcs11f.h
 include/cryptoki/pkcs11t.h
 include/ppport.h
 lib/Crypt/Cryptoki.pm
+lib/Crypt/Cryptoki/Raw.pm
 MANIFEST			This list of files
 META.json
 META.yml
 README.pod
-src/Crypt-Cryptoki-FunctionList.xs
-src/Crypt-Cryptoki.xs
+src/Crypt-Cryptoki-Raw-FunctionList.xs
+src/Crypt-Cryptoki-Raw.xs
+t/cryptoki-raw.t
 t/cryptoki.t
 t/softhsm.t
 typemap

lib/Crypt/Cryptoki.pm

@@ -3,136 +3,9 @@ package Crypt::Cryptoki;
 use 5.012005;
 use strict;
 use warnings;
-use Carp;
-
-require Exporter;
-use AutoLoader;
-
-our @ISA = qw(Exporter);
-
-our %EXPORT_TAGS = ( 'all' => [ qw(
-	rv_to_str
-
-	CK_NEED_ARG_LIST 
-
-	TRUE
-	NULL_PTR
-
-	CKR_OK 
-	CKR_PIN_INCORRECT
-	CKR_ARGUMENTS_BAD
-	CKR_ATTRIBUTE_READ_ONLY
-	CKR_ATTRIBUTE_TYPE_INVALID
-	CKR_ATTRIBUTE_VALUE_INVALID
-	CKR_CRYPTOKI_NOT_INITIALIZED
-	CKR_DEVICE_ERROR
-	CKR_DEVICE_MEMORY
-	CKR_DEVICE_REMOVED
-	CKR_DOMAIN_PARAMS_INVALID
-	CKR_FUNCTION_CANCELED
-	CKR_FUNCTION_FAILED
-	CKR_GENERAL_ERROR
-	CKR_HOST_MEMORY
-	CKR_MECHANISM_INVALID
-	CKR_MECHANISM_PARAM_INVALID
-	CKR_OPERATION_ACTIVE
-	CKR_OPERATION_NOT_INITIALIZED
-	CKR_PIN_EXPIRED
-	CKR_SESSION_CLOSED
-	CKR_SESSION_HANDLE_INVALID
-	CKR_SESSION_READ_ONLY
-	CKR_SESSION_READ_ONLY_EXISTS
-	CKR_TEMPLATE_INCOMPLETE
-	CKR_TEMPLATE_INCONSISTENT
-	CKR_TOKEN_WRITE_PROTECTED
-	CKR_USER_NOT_LOGGED_IN
-
-	CKF_SERIAL_SESSION 
-	CKF_RW_SESSION
-
-	CKU_USER 
-	CKU_SO
-
-    CKO_PRIVATE_KEY
-	CKO_PUBLIC_KEY
-
-	CKK_RSA
-
-	CKS_RO_PUBLIC_SESSION
-	CKS_RO_USER_FUNCTIONS
-	CKS_RW_PUBLIC_SESSION
-	CKS_RW_USER_FUNCTIONS
-	CKS_RW_SO_FUNCTIONS
-
-    CKA_CLASS
-    CKA_KEY_TYPE 
-    CKA_TOKEN
-    CKA_PRIVATE
-    CKA_SENSITIVE
-    CKA_DECRYPT
-    CKA_SIGN
-    CKA_UNWRAP
-    CKA_ENCRYPT
-    CKA_VERIFY
-    CKA_WRAP
-    CKA_MODULUS_BITS
-    CKA_PUBLIC_EXPONENT
-	CKA_LABEL
-	CKA_ID
-
-	CKM_RSA_PKCS_KEY_PAIR_GEN
-	CKM_RSA_PKCS
-	CKM_SHA256_RSA_PKCS
-	CKM_SHA512_RSA_PKCS
-	CKM_SHA256
-	CKM_SHA512
-) ] );
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 
 our $VERSION = '0.01_07';
 
-sub AUTOLOAD {
-    # This AUTOLOAD is used to 'autoload' constants from the constant()
-    # XS function.
-
-    my $constname;
-    our $AUTOLOAD;
-    ($constname = $AUTOLOAD) =~ s/.*:://;
-    croak "&Crypt::Cryptoki::constant not defined" if $constname eq 'constant';
-    my ($error, $val) = constant($constname);
-    if ($error) { croak $error; }
-    {
-	no strict 'refs';
-	# Fixed between 5.005_53 and 5.005_61
-#XXX	if ($] >= 5.00561) {
-#XXX	    *$AUTOLOAD = sub () { $val };
-#XXX	}
-#XXX	else {
-	    *$AUTOLOAD = sub { $val };
-#XXX	}
-    }
-    goto &$AUTOLOAD;
-}
-
-require XSLoader;
-XSLoader::load('Crypt::Cryptoki', $VERSION);
-
-# Preloaded methods go here.
-
-# Autoload methods go after =cut, and are processed by the autosplit program.
-
-my %rv_map;
-{
-	no strict 'refs';
-	%rv_map = map { $_->() => $_ } grep { /^CKR/ } @EXPORT_OK;
-}
-
-sub rv_to_str {
-	my ( $err_num ) = @_;
-	return $rv_map{$err_num} || 'n/a ('.$err_num.')';
-}
-
 1;
 __END__
 =head1 NAME