From b1147568db6691aae79e65423e7591675666bdd3 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Sun, 27 Mar 2022 10:13:16 -0400 Subject: [PATCH 1/2] Swap asn1 package --- lib/attribute.js | 2 +- lib/controls/control.js | 2 +- lib/controls/entry_change_notification_control.js | 2 +- lib/controls/index.js | 2 +- lib/controls/paged_results_control.js | 2 +- lib/controls/persistent_search_control.js | 2 +- lib/controls/server_side_sorting_request_control.js | 2 +- lib/controls/server_side_sorting_response_control.js | 2 +- lib/controls/virtual_list_view_request_control.js | 2 +- lib/controls/virtual_list_view_response_control.js | 2 +- lib/filters/equality_filter.js | 2 +- lib/filters/index.js | 2 +- lib/messages/bind_request.js | 2 +- lib/messages/message.js | 2 +- lib/messages/parser.js | 2 +- lib/messages/result.js | 2 +- lib/messages/search_entry.js | 2 +- lib/messages/search_reference.js | 2 +- lib/messages/search_request.js | 2 +- lib/server.js | 2 +- package.json | 2 +- test/attribute.test.js | 2 +- test/change.test.js | 2 +- test/client.test.js | 4 ++-- test/controls/control.test.js | 2 +- test/controls/entry_change_notification_control.test.js | 2 +- test/controls/paged_results_control.test.js | 2 +- test/controls/persistent_search_control.test.js | 2 +- test/controls/server_side_sorting_control_request.test.js | 2 +- test/controls/server_side_sorting_control_response.test.js | 2 +- test/controls/virtual_list_view_request_control.test.js | 2 +- test/controls/virtual_list_view_response_control.test.js | 2 +- test/filters/approx.test.js | 2 +- test/filters/eq.test.js | 2 +- test/filters/ge.test.js | 2 +- test/filters/le.test.js | 2 +- test/filters/presence.test.js | 2 +- test/filters/substr.test.js | 2 +- test/messages/add_request.test.js | 2 +- test/messages/add_response.test.js | 2 +- test/messages/bind_request.test.js | 2 +- test/messages/bind_response.test.js | 2 +- test/messages/compare_request.test.js | 2 +- test/messages/compare_response.test.js | 2 +- test/messages/del_request.test.js | 2 +- test/messages/del_response.test.js | 2 +- test/messages/ext_request.test.js | 2 +- test/messages/ext_response.test.js | 2 +- test/messages/moddn_request.test.js | 2 +- test/messages/moddn_response.test.js | 2 +- test/messages/modify_request.test.js | 2 +- test/messages/modify_response.test.js | 2 +- test/messages/search_entry.test.js | 2 +- test/messages/search_request.test.js | 2 +- test/messages/search_response.test.js | 2 +- test/messages/unbind_request.test.js | 2 +- 56 files changed, 57 insertions(+), 57 deletions(-) diff --git a/lib/attribute.js b/lib/attribute.js index 6e89c4e6..27922965 100644 --- a/lib/attribute.js +++ b/lib/attribute.js @@ -2,7 +2,7 @@ const assert = require('assert') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Protocol = require('./protocol') diff --git a/lib/controls/control.js b/lib/controls/control.js index 188a8bd7..d162efbb 100644 --- a/lib/controls/control.js +++ b/lib/controls/control.js @@ -2,7 +2,7 @@ const assert = require('assert-plus') -// var asn1 = require('asn1') +// var asn1 = require('@ldapjs/asn1') // var Protocol = require('../protocol') diff --git a/lib/controls/entry_change_notification_control.js b/lib/controls/entry_change_notification_control.js index 68f82b29..76d51414 100644 --- a/lib/controls/entry_change_notification_control.js +++ b/lib/controls/entry_change_notification_control.js @@ -1,7 +1,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Control = require('./control') diff --git a/lib/controls/index.js b/lib/controls/index.js index 12e73574..7e283147 100644 --- a/lib/controls/index.js +++ b/lib/controls/index.js @@ -1,7 +1,7 @@ // Copyright 2011 Mark Cavage, Inc. All rights reserved. const assert = require('assert') -const Ber = require('asn1').Ber +const Ber = require('@ldapjs/asn1').Ber const Control = require('./control') const EntryChangeNotificationControl = diff --git a/lib/controls/paged_results_control.js b/lib/controls/paged_results_control.js index 4758014a..1f86669f 100644 --- a/lib/controls/paged_results_control.js +++ b/lib/controls/paged_results_control.js @@ -1,7 +1,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Control = require('./control') diff --git a/lib/controls/persistent_search_control.js b/lib/controls/persistent_search_control.js index b7a8bc8b..89f9f7a0 100644 --- a/lib/controls/persistent_search_control.js +++ b/lib/controls/persistent_search_control.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Control = require('./control') diff --git a/lib/controls/server_side_sorting_request_control.js b/lib/controls/server_side_sorting_request_control.js index c53e5451..293835d3 100644 --- a/lib/controls/server_side_sorting_request_control.js +++ b/lib/controls/server_side_sorting_request_control.js @@ -1,7 +1,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Control = require('./control') diff --git a/lib/controls/server_side_sorting_response_control.js b/lib/controls/server_side_sorting_response_control.js index 9d2aee15..0dfa19bd 100644 --- a/lib/controls/server_side_sorting_response_control.js +++ b/lib/controls/server_side_sorting_response_control.js @@ -1,7 +1,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Control = require('./control') const CODES = require('../errors/codes') diff --git a/lib/controls/virtual_list_view_request_control.js b/lib/controls/virtual_list_view_request_control.js index e589bbb2..6061bf31 100644 --- a/lib/controls/virtual_list_view_request_control.js +++ b/lib/controls/virtual_list_view_request_control.js @@ -1,7 +1,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Control = require('./control') diff --git a/lib/controls/virtual_list_view_response_control.js b/lib/controls/virtual_list_view_response_control.js index f887899c..35f6347b 100644 --- a/lib/controls/virtual_list_view_response_control.js +++ b/lib/controls/virtual_list_view_response_control.js @@ -1,7 +1,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const Control = require('./control') const CODES = require('../errors/codes') diff --git a/lib/filters/equality_filter.js b/lib/filters/equality_filter.js index 8395fb3f..e3a9b1fc 100644 --- a/lib/filters/equality_filter.js +++ b/lib/filters/equality_filter.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -const ASN1 = require('asn1').Ber +const ASN1 = require('@ldapjs/asn1').Ber const parents = require('ldap-filter') const Filter = require('./filter') diff --git a/lib/filters/index.js b/lib/filters/index.js index 34b1bdd2..6fd8d526 100644 --- a/lib/filters/index.js +++ b/lib/filters/index.js @@ -2,7 +2,7 @@ const assert = require('assert') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const parents = require('ldap-filter') diff --git a/lib/messages/bind_request.js b/lib/messages/bind_request.js index be5ff4c6..eb33e8f0 100644 --- a/lib/messages/bind_request.js +++ b/lib/messages/bind_request.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const LDAPMessage = require('./message') const Protocol = require('../protocol') diff --git a/lib/messages/message.js b/lib/messages/message.js index d2c2a1f6..cbdf4ff2 100644 --- a/lib/messages/message.js +++ b/lib/messages/message.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const logger = require('../logger') // var Control = require('../controls').Control diff --git a/lib/messages/parser.js b/lib/messages/parser.js index 5b4b2721..04ac82c5 100644 --- a/lib/messages/parser.js +++ b/lib/messages/parser.js @@ -4,7 +4,7 @@ const EventEmitter = require('events').EventEmitter const util = require('util') const assert = require('assert-plus') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') // var VError = require('verror').VError const logger = require('../logger') diff --git a/lib/messages/result.js b/lib/messages/result.js index 2739ab4a..3ae8b56a 100644 --- a/lib/messages/result.js +++ b/lib/messages/result.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -// var asn1 = require('asn1') +// var asn1 = require('@ldapjs/asn1') const dtrace = require('../dtrace') const LDAPMessage = require('./message') diff --git a/lib/messages/search_entry.js b/lib/messages/search_entry.js index 036a6630..7d24dbf3 100644 --- a/lib/messages/search_entry.js +++ b/lib/messages/search_entry.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -// var asn1 = require('asn1') +// var asn1 = require('@ldapjs/asn1') const LDAPMessage = require('./message') const Attribute = require('../attribute') diff --git a/lib/messages/search_reference.js b/lib/messages/search_reference.js index d9325d4d..6c9bad24 100644 --- a/lib/messages/search_reference.js +++ b/lib/messages/search_reference.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -// var asn1 = require('asn1') +// var asn1 = require('@ldapjs/asn1') const LDAPMessage = require('./message') const Protocol = require('../protocol') diff --git a/lib/messages/search_request.js b/lib/messages/search_request.js index 22986a7a..fb6c1b9b 100644 --- a/lib/messages/search_request.js +++ b/lib/messages/search_request.js @@ -3,7 +3,7 @@ const assert = require('assert-plus') const util = require('util') -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const LDAPMessage = require('./message') // var LDAPResult = require('./result') diff --git a/lib/server.js b/lib/server.js index c9f6aae6..99f21b3b 100644 --- a/lib/server.js +++ b/lib/server.js @@ -6,7 +6,7 @@ const net = require('net') const tls = require('tls') const util = require('util') -// var asn1 = require('asn1') +// var asn1 = require('@ldapjs/asn1') const VError = require('verror').VError const dn = require('./dn') diff --git a/package.json b/package.json index e7f00d03..5f2937ea 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,8 @@ "node": ">=10.13.0" }, "dependencies": { + "@ldapjs/asn1": "^1.0.0-rc.1", "abstract-logging": "^2.0.0", - "asn1": "^0.2.4", "assert-plus": "^1.0.0", "backoff": "^2.5.0", "ldap-filter": "^0.3.3", diff --git a/test/attribute.test.js b/test/attribute.test.js index 800529b8..505f461d 100644 --- a/test/attribute.test.js +++ b/test/attribute.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { Attribute } = require('../lib') test('new no args', function (t) { diff --git a/test/change.test.js b/test/change.test.js index acf9b0a8..cb1d1057 100644 --- a/test/change.test.js +++ b/test/change.test.js @@ -3,7 +3,7 @@ const fs = require('fs') const path = require('path') const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { Attribute, Change } = require('../lib') test('new no args', function (t) { diff --git a/test/client.test.js b/test/client.test.js index 0559f64b..032dc7ac 100644 --- a/test/client.test.js +++ b/test/client.test.js @@ -509,7 +509,7 @@ tap.test('add success with object', function (t) { }) tap.test('add buffer', function (t) { - const { BerReader } = require('asn1') + const { BerReader } = require('@ldapjs/asn1') const dn = `cn=add, ${SUFFIX}` const attribute = 'thumbnailPhoto' const binary = 0xa5 @@ -729,7 +729,7 @@ tap.test('modify DN excessive length (GH-480)', function (t) { }) tap.test('modify DN excessive superior length', function (t) { - const { BerReader, BerWriter } = require('asn1') + const { BerReader, BerWriter } = require('@ldapjs/asn1') const ModifyDNRequest = require('../lib/messages/moddn_request') const ber = new BerWriter() const entry = 'cn=Test User,ou=A Long OU ,ou=Another Long OU ,ou=Another Long OU ,dc=acompany,DC=io' diff --git a/test/controls/control.test.js b/test/controls/control.test.js index 6175974a..71f41126 100644 --- a/test/controls/control.test.js +++ b/test/controls/control.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { Control, getControl } = require('../../lib') test('new no args', function (t) { diff --git a/test/controls/entry_change_notification_control.test.js b/test/controls/entry_change_notification_control.test.js index c29a97bb..3293962e 100644 --- a/test/controls/entry_change_notification_control.test.js +++ b/test/controls/entry_change_notification_control.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { getControl, EntryChangeNotificationControl } = require('../../lib') test('new no args', function (t) { diff --git a/test/controls/paged_results_control.test.js b/test/controls/paged_results_control.test.js index f50eb768..e223bbb0 100644 --- a/test/controls/paged_results_control.test.js +++ b/test/controls/paged_results_control.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { getControl, PagedResultsControl } = require('../../lib') test('new no args', function (t) { diff --git a/test/controls/persistent_search_control.test.js b/test/controls/persistent_search_control.test.js index 6afad108..f4d9e919 100644 --- a/test/controls/persistent_search_control.test.js +++ b/test/controls/persistent_search_control.test.js @@ -2,7 +2,7 @@ const test = require('tap').test -const asn1 = require('asn1') +const asn1 = require('@ldapjs/asn1') const BerReader = asn1.BerReader const BerWriter = asn1.BerWriter diff --git a/test/controls/server_side_sorting_control_request.test.js b/test/controls/server_side_sorting_control_request.test.js index a2cd85c1..28501d89 100644 --- a/test/controls/server_side_sorting_control_request.test.js +++ b/test/controls/server_side_sorting_control_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { getControl, ServerSideSortingRequestControl: SSSRControl } = require('../../lib') test('new no args', function (t) { diff --git a/test/controls/server_side_sorting_control_response.test.js b/test/controls/server_side_sorting_control_response.test.js index 7b094f7f..5c7373d6 100644 --- a/test/controls/server_side_sorting_control_response.test.js +++ b/test/controls/server_side_sorting_control_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const ldap = require('../../lib') const { getControl, ServerSideSortingResponseControl: SSSResponseControl } = ldap const OID = '1.2.840.113556.1.4.474' diff --git a/test/controls/virtual_list_view_request_control.test.js b/test/controls/virtual_list_view_request_control.test.js index bcb83c61..7c6c7861 100644 --- a/test/controls/virtual_list_view_request_control.test.js +++ b/test/controls/virtual_list_view_request_control.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { getControl, VirtualListViewRequestControl: VLVRControl } = require('../../lib') test('VLV request - new no args', function (t) { diff --git a/test/controls/virtual_list_view_response_control.test.js b/test/controls/virtual_list_view_response_control.test.js index 14609596..da5f74cb 100644 --- a/test/controls/virtual_list_view_response_control.test.js +++ b/test/controls/virtual_list_view_response_control.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const ldap = require('../../lib') const { getControl, VirtualListViewResponseControl: VLVResponseControl } = require('../../lib') const OID = '2.16.840.1.113730.3.4.10' diff --git a/test/filters/approx.test.js b/test/filters/approx.test.js index e615e98e..d79851eb 100644 --- a/test/filters/approx.test.js +++ b/test/filters/approx.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { filters: { ApproximateFilter } } = require('../../lib') test('Construct no args', function (t) { diff --git a/test/filters/eq.test.js b/test/filters/eq.test.js index 402c0f40..9be5aac1 100644 --- a/test/filters/eq.test.js +++ b/test/filters/eq.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { filters: { EqualityFilter } } = require('../../lib') test('Construct no args', function (t) { diff --git a/test/filters/ge.test.js b/test/filters/ge.test.js index ecc0dd32..cd5e505d 100644 --- a/test/filters/ge.test.js +++ b/test/filters/ge.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { filters: { GreaterThanEqualsFilter } } = require('../../lib') test('Construct no args', function (t) { diff --git a/test/filters/le.test.js b/test/filters/le.test.js index 4f72fd66..54e8704f 100644 --- a/test/filters/le.test.js +++ b/test/filters/le.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { filters: { LessThanEqualsFilter } } = require('../../lib') test('Construct no args', function (t) { diff --git a/test/filters/presence.test.js b/test/filters/presence.test.js index 5d78dae2..2a075617 100644 --- a/test/filters/presence.test.js +++ b/test/filters/presence.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { filters: { PresenceFilter } } = require('../../lib') test('Construct no args', function (t) { diff --git a/test/filters/substr.test.js b/test/filters/substr.test.js index 0526a28c..e84ba2e6 100644 --- a/test/filters/substr.test.js +++ b/test/filters/substr.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { filters: { SubstringFilter } } = require('../../lib') test('Construct no args', function (t) { diff --git a/test/messages/add_request.test.js b/test/messages/add_request.test.js index 1c287ca6..aac24abe 100644 --- a/test/messages/add_request.test.js +++ b/test/messages/add_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { AddRequest, Attribute, dn } = require('../../lib') test('new no args', t => { diff --git a/test/messages/add_response.test.js b/test/messages/add_response.test.js index cb06d161..a22293cc 100644 --- a/test/messages/add_response.test.js +++ b/test/messages/add_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { AddResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/bind_request.test.js b/test/messages/bind_request.test.js index f0639c97..6e4f77e8 100644 --- a/test/messages/bind_request.test.js +++ b/test/messages/bind_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { BindRequest, dn } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/bind_response.test.js b/test/messages/bind_response.test.js index e9a8eddb..c44c5396 100644 --- a/test/messages/bind_response.test.js +++ b/test/messages/bind_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { BindResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/compare_request.test.js b/test/messages/compare_request.test.js index 06d35655..ca222a38 100644 --- a/test/messages/compare_request.test.js +++ b/test/messages/compare_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { CompareRequest, dn } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/compare_response.test.js b/test/messages/compare_response.test.js index 92ad3aff..fdf36d6d 100644 --- a/test/messages/compare_response.test.js +++ b/test/messages/compare_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { CompareResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/del_request.test.js b/test/messages/del_request.test.js index 9de2a6e1..a88511bb 100644 --- a/test/messages/del_request.test.js +++ b/test/messages/del_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { DeleteRequest, dn } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/del_response.test.js b/test/messages/del_response.test.js index b45e13f6..4fbdb632 100644 --- a/test/messages/del_response.test.js +++ b/test/messages/del_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { DeleteResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/ext_request.test.js b/test/messages/ext_request.test.js index 46703f40..2885a6f5 100644 --- a/test/messages/ext_request.test.js +++ b/test/messages/ext_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { ExtendedRequest } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/ext_response.test.js b/test/messages/ext_response.test.js index 00f22726..99640007 100644 --- a/test/messages/ext_response.test.js +++ b/test/messages/ext_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { ExtendedResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/moddn_request.test.js b/test/messages/moddn_request.test.js index 5d6035a2..82a9ab18 100644 --- a/test/messages/moddn_request.test.js +++ b/test/messages/moddn_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { ModifyDNRequest, dn } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/moddn_response.test.js b/test/messages/moddn_response.test.js index 162df1b7..c7db8013 100644 --- a/test/messages/moddn_response.test.js +++ b/test/messages/moddn_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { ModifyDNResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/modify_request.test.js b/test/messages/modify_request.test.js index 22e8d1fd..a13a30e7 100644 --- a/test/messages/modify_request.test.js +++ b/test/messages/modify_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { ModifyRequest, Attribute, Change, dn } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/modify_response.test.js b/test/messages/modify_response.test.js index 37e0b227..11f4940a 100644 --- a/test/messages/modify_response.test.js +++ b/test/messages/modify_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { ModifyResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/search_entry.test.js b/test/messages/search_entry.test.js index e732edcc..19d5d631 100644 --- a/test/messages/search_entry.test.js +++ b/test/messages/search_entry.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { SearchEntry, Attribute, dn } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/search_request.test.js b/test/messages/search_request.test.js index d1e44d44..298a817b 100644 --- a/test/messages/search_request.test.js +++ b/test/messages/search_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { SearchRequest, EqualityFilter, dn } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/search_response.test.js b/test/messages/search_response.test.js index dbfdb905..49c48d20 100644 --- a/test/messages/search_response.test.js +++ b/test/messages/search_response.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { SearchResponse } = require('../../lib') test('new no args', function (t) { diff --git a/test/messages/unbind_request.test.js b/test/messages/unbind_request.test.js index 5834a61b..5f8068e2 100644 --- a/test/messages/unbind_request.test.js +++ b/test/messages/unbind_request.test.js @@ -1,7 +1,7 @@ 'use strict' const { test } = require('tap') -const { BerReader, BerWriter } = require('asn1') +const { BerReader, BerWriter } = require('@ldapjs/asn1') const { UnbindRequest } = require('../../lib') test('new no args', function (t) { From 18b8fc1b83f6fc4ee075b6447f6b8931eadf7b5b Mon Sep 17 00:00:00 2001 From: James Sumners Date: Sun, 27 Mar 2022 11:38:08 -0400 Subject: [PATCH 2/2] Use asn1@1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f2937ea..e2f81376 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "node": ">=10.13.0" }, "dependencies": { - "@ldapjs/asn1": "^1.0.0-rc.1", + "@ldapjs/asn1": "^1.0.0", "abstract-logging": "^2.0.0", "assert-plus": "^1.0.0", "backoff": "^2.5.0",