Rename method and use static keys

Author: anakinj

ext/openssl/ossl_pkey.c

@@ -450,12 +450,12 @@ pkey_generate(int argc, VALUE *argv, VALUE self, int genparam)
 #include <openssl/param_build.h>
 #include <openssl/core_names.h>
 
-struct pkey_from_parameters_alias {
+struct pkey_from_data_alias {
     char alias[10];
     char param_name[20];
 };
 
-static const struct pkey_from_parameters_alias rsa_aliases[] = {
+static const struct pkey_from_data_alias rsa_aliases[] = {
     { "p",    OSSL_PKEY_PARAM_RSA_FACTOR1 },
     { "q",    OSSL_PKEY_PARAM_RSA_FACTOR2 },
     { "dmp1", OSSL_PKEY_PARAM_RSA_EXPONENT1 },
@@ -464,16 +464,16 @@ static const struct pkey_from_parameters_alias rsa_aliases[] = {
     { "", "" }
 };
 
-static const struct pkey_from_parameters_alias fcc_aliases[] = {
+static const struct pkey_from_data_alias fcc_aliases[] = {
     { "pub_key",  OSSL_PKEY_PARAM_PUB_KEY },
     { "priv_key", OSSL_PKEY_PARAM_PRIV_KEY },
     { "", "" }
 };
 
-struct pkey_from_parameters_arg {
+struct pkey_from_data_arg {
     OSSL_PARAM_BLD *param_bld;
     const OSSL_PARAM *settable_params;
-    const struct pkey_from_parameters_alias *aliases;
+    const struct pkey_from_data_alias *aliases;
 };
 
 static int
@@ -485,7 +485,7 @@ add_parameter_to_builder(VALUE key, VALUE value, VALUE arg) {
         key = rb_sym2str(key);
 
     const char *key_ptr = StringValueCStr(key);
-    const struct pkey_from_parameters_arg *params = (const struct pkey_from_parameters_arg *) arg;
+    const struct pkey_from_data_arg *params = (const struct pkey_from_data_arg *) arg;
 
     for(int i = 0; strlen(params->aliases[i].alias) > 0; i++) {
         if(strcmp(params->aliases[i].alias, key_ptr) == 0) {
@@ -552,7 +552,7 @@ add_parameter_to_builder(VALUE key, VALUE value, VALUE arg) {
 }
 
 static VALUE
-pkey_from_parameters(int argc, VALUE *argv, VALUE self)
+pkey_from_data(int argc, VALUE *argv, VALUE self)
 {
     VALUE alg, options;
     rb_scan_args(argc, argv, "11", &alg, &options);
@@ -564,31 +564,31 @@ pkey_from_parameters(int argc, VALUE *argv, VALUE self)
     if (ctx == NULL)
         ossl_raise(ePKeyError, "EVP_PKEY_CTX_new_from_name");
 
-    struct pkey_from_parameters_arg from_params_args = { 0 };
+    struct pkey_from_data_arg from_data_args = { 0 };
 
-    from_params_args.param_bld = OSSL_PARAM_BLD_new();
+    from_data_args.param_bld = OSSL_PARAM_BLD_new();
 
-    if (from_params_args.param_bld == NULL) {
+    if (from_data_args.param_bld == NULL) {
         EVP_PKEY_CTX_free(ctx);
         ossl_raise(ePKeyError, "OSSL_PARAM_BLD_new");
     }
 
-    from_params_args.settable_params = EVP_PKEY_fromdata_settable(ctx, EVP_PKEY_KEYPAIR);
+    from_data_args.settable_params = EVP_PKEY_fromdata_settable(ctx, EVP_PKEY_KEYPAIR);
 
-    if (from_params_args.settable_params == NULL) {
+    if (from_data_args.settable_params == NULL) {
         EVP_PKEY_CTX_free(ctx);
         ossl_raise(ePKeyError, "EVP_PKEY_fromdata_settable");
     }
 
     if (strcmp("RSA", algorithm) == 0)
-        from_params_args.aliases = rsa_aliases;
+        from_data_args.aliases = rsa_aliases;
     else
-        from_params_args.aliases = fcc_aliases;
+        from_data_args.aliases = fcc_aliases;
 
-    rb_hash_foreach(options, &add_parameter_to_builder, (VALUE) &from_params_args);
+    rb_hash_foreach(options, &add_parameter_to_builder, (VALUE) &from_data_args);
 
-    OSSL_PARAM *params = OSSL_PARAM_BLD_to_param(from_params_args.param_bld);
-    OSSL_PARAM_BLD_free(from_params_args.param_bld);
+    OSSL_PARAM *params = OSSL_PARAM_BLD_to_param(from_data_args.param_bld);
+    OSSL_PARAM_BLD_free(from_data_args.param_bld);
 
     if (params == NULL) {
         EVP_PKEY_CTX_free(ctx);
@@ -668,7 +668,7 @@ ossl_pkey_s_generate_key(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    OpenSSL::PKey.from_parameters(algo_name, parameters) -> pkey
+ *    OpenSSL::PKey.from_data(algo_name, parameters) -> pkey
  *
  * Generates a new key based on given key parameters.
  * NOTE: Requires OpenSSL 3.0 or later.
@@ -679,17 +679,17 @@ ossl_pkey_s_generate_key(int argc, VALUE *argv, VALUE self)
  * For details algorithms and parameters see https://www.openssl.org/docs/man3.0/man3/EVP_PKEY_fromdata.html
  *
  * == Example
- *   pkey = OpenSSL::PKey.from_parameters("RSA", n: 3161751493, e: 65537, d: 2064855961)
+ *   pkey = OpenSSL::PKey.from_data("RSA", n: 3161751493, e: 65537, d: 2064855961)
  *   pkey.private? #=> true
  *   pkey.public_key #=> #<OpenSSL::PKey::RSA...
  */
 static VALUE
-ossl_pkey_s_from_parameters(int argc, VALUE *argv, VALUE self)
+ossl_pkey_s_from_data(int argc, VALUE *argv, VALUE self)
 {
     #if OSSL_OPENSSL_PREREQ(3, 0, 0)
-    return pkey_from_parameters(argc, argv, self);
+    return pkey_from_data(argc, argv, self);
     #else
-    rb_raise(ePKeyError, "OpenSSL::PKey.from_parameters requires OpenSSL 3.0 or later");
+    rb_raise(ePKeyError, "OpenSSL::PKey.from_data requires OpenSSL 3.0 or later");
     #endif
 }
 
@@ -1946,7 +1946,7 @@ Init_ossl_pkey(void)
     rb_define_module_function(mPKey, "read", ossl_pkey_new_from_data, -1);
     rb_define_module_function(mPKey, "generate_parameters", ossl_pkey_s_generate_parameters, -1);
     rb_define_module_function(mPKey, "generate_key", ossl_pkey_s_generate_key, -1);
-    rb_define_module_function(mPKey, "from_parameters", ossl_pkey_s_from_parameters, -1);
+    rb_define_module_function(mPKey, "from_data", ossl_pkey_s_from_data, -1);
 
 #ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
     rb_define_module_function(mPKey, "new_raw_private_key", ossl_pkey_new_raw_private_key, 2);

test/openssl/fixtures/pkey/ec-prime256v1.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIF82EiQBDw+pE6VW1bVeIj1YhBE2PnQvBwTWbtGVDikZoAoGCCqGSM49
+AwEHoUQDQgAE4A8HPRtiQXvN6O2vRqd11flrUppec9Q16vXkHZeW/otceOW8KsvL
+D4Lf77woXqaPBrgLg98MfnG/fkWApqRttA==
+-----END EC PRIVATE KEY-----

test/openssl/fixtures/pkey/ec-secp384r1.pem

@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBpl+EijPemKAT8htq593YwZkdWQZXQHsZO1sGPtdqxdAg4zuExTw0V
+4CpES/2PlkmgBwYFK4EEACKhZANiAAQaHsTYFFUAoM3aDfdgGKu6joaYfopoiMBF
+vfreMsl8rQYRx8D6ZR9039W/OyTwa6kgFSUGdJQgrDArJWk+mc3f9AK03L1aeRVm
+PqI4vldF5qeFmxRkMbvsjOw7Ww7ZYS8=
+-----END EC PRIVATE KEY-----

test/openssl/fixtures/pkey/ec-secp521r1.pem

@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHcAgEBBEIBaJnA94w7oe13yZbz3AAklIooPMz30CowSYWiiN8MvSLda+WB+qNk
+yjDTELtPSf/DpE3sVpvRKpOpwP6gc05G1DGgBwYFK4EEACOhgYkDgYYABAGGDZbR
+j3ewwvEEL7tXFuckJ5ScFa666sPwfthAJmIWZimK/uYX+d/BfAio6/2FxhlvNO7N
+R0YW0YogrxhyYDaQXQCMHTa2OLlQ3+FUY7a/zV0+RnK57DvC5hyTElQnN7doA0zW
+v8YJM3Ph5fzq4RQ9OiNEVRarcz4CKtPE/4P8qFbCiw==
+-----END EC PRIVATE KEY-----