diff --git a/.gitattributes b/.gitattributes index 99fcf53bc9db7211859acb9dd7299a3528974855..8db85ffe81c4b55fca801a542dc41e30c017bbda 100644 --- a/.gitattributes +++ b/.gitattributes @@ -105,10 +105,12 @@ testfont binary /lib/modules/Sql.pmod/sql_result.pike foreign_ident /lib/modules/Sql.pmod/sql_util.pmod foreign_ident /lib/modules/Sql.pmod/sybase.pike foreign_ident +/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod foreign_ident /lib/modules/Stdio.pmod foreign_ident /lib/modules/Stdio.pmod/Readline.pike foreign_ident /lib/modules/Stdio.pmod/Terminfo.pmod foreign_ident /lib/modules/Stdio.pmod/module.pmod foreign_ident +/lib/modules/Tools.pmod/X509.pmod foreign_ident /lib/modules/Yabu.pmod/module.pmod foreign_ident /lib/modules/_Image.pmod/module.pmod foreign_ident /lib/modules/error.pmod foreign_ident diff --git a/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod b/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod index c4a9176ae27c153a2b589f8128f383eb058efea7..b7f059d177db69df6294f944cbbc7a8bd8daa746 100644 --- a/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod +++ b/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod @@ -1,4 +1,5 @@ -/* Types.pmod +/* + * $Id: Types.pmod,v 1.14 2000/05/25 20:20:31 sigge Exp $ * * Encodes various asn.1 objects according to the Distinguished * Encoding Rules (DER) */ @@ -35,7 +36,7 @@ class asn1_object int get_cls() { return cls; } int get_tag() { return tag; } - int get_combinded_tag() + int get_combined_tag() { return make_combined_tag(get_tag(), get_cls()); } string der; diff --git a/lib/modules/Tools.pmod/X509.pmod b/lib/modules/Tools.pmod/X509.pmod index 19461ae090735ce3ab9f0830f3fc84941b993273..2d0ca0e859b7511c7241ba81c2dec67199f0a434 100644 --- a/lib/modules/Tools.pmod/X509.pmod +++ b/lib/modules/Tools.pmod/X509.pmod @@ -1,4 +1,5 @@ -/* X509.pmod +/* + * $Id: X509.pmod,v 1.9 2000/05/25 20:20:31 sigge Exp $ * * Some random functions for creating RFC-2459 style X.509 certificates. * @@ -298,7 +299,7 @@ class TBSCertificate { /* The optional version field must be present */ if (!a[0]->constructed - || (a[0]->get_combinded_tag() != make_combined_tag(2, 0)) + || (a[0]->get_combined_tag() != make_combined_tag(2, 0)) || (sizeof(a[0]->elements) != 1) || (a[0]->elements[0]->type_name != "INTEGER")) return 0;