diff options
author | Anders Broman <anders.broman@ericsson.com> | 2007-11-01 19:36:39 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2007-11-01 19:36:39 +0000 |
commit | 94927006087e484617e5c4159ca1ba5d41fcd7c5 (patch) | |
tree | b1ce12550022c858eb2b486f7b4cd318fd494ca2 /asn1/pkcs12 | |
parent | 3161b47b4924492921e2e8ab0d1b2af07330e394 (diff) |
Change:
get_oid_str_name() -> oid_resolved_from_string()
get_oid_name() -> oid_resolved_from_encoded()
svn path=/trunk/; revision=23331
Diffstat (limited to 'asn1/pkcs12')
-rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 6b03980d84..24d4e617f6 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -88,7 +88,7 @@ static void append_oid(proto_tree *tree, const char *oid) { const char *name = NULL; - name = get_oid_str_name(oid); + name = oid_resolved_from_string(oid); proto_item_append_text(tree, " (%s)", name ? name : oid); } @@ -364,7 +364,7 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t tvb_set_free_cb(clear_tvb, g_free); name = g_string_new(""); - oidname = get_oid_str_name(object_identifier_id); + oidname = oid_resolved_from_string(object_identifier_id); g_string_sprintf(name, "Decrypted %s", oidname ? oidname : object_identifier_id); /* add it as a new source */ |