From 0fbdf68038e98eb7499f12464ebebfba2de84cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sat, 11 Jan 2014 14:30:06 +0100
Subject: [PATCH] Crypto.RSA: pkcs_algorithm_id() ==>
pkcs_signature_algorithm_id()
Renamed the function above in Crypto.RSA and Crypto.DSA to
avoid confusion with the similar algorithm_identifier().
---
lib/modules/Crypto.pmod/DSA.pike | 2 +-
lib/modules/Crypto.pmod/RSA.pike | 2 +-
lib/modules/Standards.pmod/X509.pmod | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/modules/Crypto.pmod/DSA.pike b/lib/modules/Crypto.pmod/DSA.pike
index 1901b1c20a..96a8185a99 100644
--- a/lib/modules/Crypto.pmod/DSA.pike
+++ b/lib/modules/Crypto.pmod/DSA.pike
@@ -226,7 +226,7 @@ variant this_program generate_key()
//! Calls @[Standards.PKCS.DSA.signatue_algorithm_id] with the
//! provided @[hash].
-Sequence pkcs_algorithm_id(.Hash hash)
+Sequence pkcs_signature_algorithm_id(.Hash hash)
{
return [object(Sequence)]Standards.PKCS.DSA->signature_algorithm_id(hash);
}
diff --git a/lib/modules/Crypto.pmod/RSA.pike b/lib/modules/Crypto.pmod/RSA.pike
index a1ce804223..3aea1f1ad3 100644
--- a/lib/modules/Crypto.pmod/RSA.pike
+++ b/lib/modules/Crypto.pmod/RSA.pike
@@ -243,7 +243,7 @@ variant __deprecated__ this_program generate_key(int(128..) bits,
//! Calls @[Standards.PKCS.RSA.signatue_algorithm_id] with the
//! provided @[hash].
-Sequence pkcs_algorithm_id(.Hash hash)
+Sequence pkcs_signature_algorithm_id(.Hash hash)
{
return [object(Sequence)]Standards.PKCS.RSA->signature_algorithm_id(hash);
}
diff --git a/lib/modules/Standards.pmod/X509.pmod b/lib/modules/Standards.pmod/X509.pmod
index bb39fb613d..91d94ed8a1 100644
--- a/lib/modules/Standards.pmod/X509.pmod
+++ b/lib/modules/Standards.pmod/X509.pmod
@@ -128,13 +128,13 @@ Sequence make_tbs(Sequence issuer, Sequence algorithm,
string sign_key(Sequence issuer, Crypto.RSA|Crypto.DSA c, Crypto.Hash h,
Sequence subject, int serial, int ttl, array|void extensions)
{
- Sequence algorithm_id = c->pkcs_algorithm_id(h);
+ Sequence algorithm_id = c->pkcs_signature_algorithm_id(h);
if(!algorithm_id) error("Can't use %O for %O.\n", h, c);
Sequence tbs = make_tbs(issuer, algorithm_id,
subject, c->pkcs_public_key(),
Integer(serial), ttl, extensions);
- return Sequence(({ tbs, c->pkcs_algorithm_id(h),
+ return Sequence(({ tbs, c->pkcs_signature_algorithm_id(h),
BitString(c->pkcs_sign(tbs->get_der(), h))
}))->get_der();
}
--
GitLab