From f478ac22e3adb0706fde5f5852d79cb790e144a8 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 8 Nov 2018 10:44:43 -0800 Subject: [PATCH 01/82] explicitly remove transport.@close listeners from closing consumers and producers --- lib/Consumer.js | 16 ++++++++++++---- lib/Producer.js | 18 ++++++++++++++++-- package.json | 9 +++++++-- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index 0362d126a3..be73cc8c61 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -29,6 +29,7 @@ class Consumer extends EnhancedEventEmitter // - .kind // - .peer (just if this Consumer belongs to a Peer) // - .transport + // - .transportCallback // - .rtpParameters // - .source this._data = data; @@ -222,6 +223,14 @@ class Consumer extends EnhancedEventEmitter // Remove notification subscriptions. this._channel.removeAllListeners(this._internal.consumerId); + // Remove previously registered listener for transport's @close so that closed Consumer object can be picked up by GC + // while a Transport object it used to reffer to still stays alive + if (this._data.transport && this._data.transportCallback && !this._data.transport.closed) + this._data.transport.removeListener( '@close', this._data.transportCallback); + + this._data.transportCallback = undefined; + this._data.transport = undefined; + if (notifyChannel) { this._channel.request('consumer.close', this._internal) @@ -340,14 +349,14 @@ class Consumer extends EnhancedEventEmitter this.safeEmit('handled'); - transport.on('@close', () => + this._data.transportCallback = () => { this._internal.transportId = undefined; this._data.transport = undefined; this.safeEmit('unhandled'); - }); - + } + transport.on('@close', this._data.transportCallback); return; }) .catch((error) => @@ -717,7 +726,6 @@ class Consumer extends EnhancedEventEmitter if (typeof interval !== 'number') { - logger.error('enableStats() | invalid interval provided'); return; } diff --git a/lib/Producer.js b/lib/Producer.js index 97e285037a..b9e5c892bf 100644 --- a/lib/Producer.js +++ b/lib/Producer.js @@ -28,6 +28,7 @@ class Producer extends EnhancedEventEmitter // - .kind // - .peer // - .transport + // -.transportCallback // - .rtpParameters // - .consumableRtpParameters this._data = data; @@ -184,6 +185,13 @@ class Producer extends EnhancedEventEmitter this.emit('@notify', 'producerClosed', data); } + // Remove previously registered listener for transport's @close so that closed Producer object can be picked up by GC + // while a Transport object it used to reffer to still stays alive + if (this.transport && !this.transport.closed && this._data.transportCallback) + this.transport.removeListener( '@close', this._data.transportCallback); + this._data.transportCallback = undefined; + this._data.transport = undefined; + this.emit('@close'); this.safeEmit('close', 'local', appData); @@ -214,6 +222,11 @@ class Producer extends EnhancedEventEmitter clearInterval(this._statsInterval); } + if (this.transport && !this.transport.closed && this._data.transportCallback) + this.transport.removeListener( '@close', this._data.transportCallback); + this._data.transportCallback = undefined; + this._data.transport = undefined; + this.emit('@close'); this.safeEmit('close', 'remote', appData); @@ -624,11 +637,12 @@ class Producer extends EnhancedEventEmitter { // On closure, the worker Transport closes all its Producers and the client // side gets producer.on('unhandled'). - this.transport.on('@close', () => + this._data.transportCallback = () => { if (!this._closed) this.close(undefined, false); - }); + } + this.transport.on('@close', this._data.transportCallback); } _handleWorkerNotifications() diff --git a/package.json b/package.json index 175282abab..14fdb2d3e2 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "mediasoup", + "name": "@livelyvideo/mediasoup", "version": "2.3.2", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", @@ -8,9 +8,14 @@ ], "homepage": "https://mediasoup.org", "license": "ISC", + "publishConfig": { + "always-auth": true, + "registry": "https://npm.livelyvideo.tv" + }, "repository": { "type": "git", - "url": "https://github.com/versatica/mediasoup.git" + "private": true, + "url": "https://github.com/LivelyVideo/mediasoup.git" }, "keywords": [ "webrtc", From 46c7dc4a56538d4d2834b7206117781d9589f863 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 9 Nov 2018 07:26:01 -0800 Subject: [PATCH 02/82] package json versioning and minor changes in code --- lib/Consumer.js | 2 +- lib/Producer.js | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index be73cc8c61..e432db6a83 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -225,7 +225,7 @@ class Consumer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Consumer object can be picked up by GC // while a Transport object it used to reffer to still stays alive - if (this._data.transport && this._data.transportCallback && !this._data.transport.closed) + if (this._data.transport && this._data.transportCallback) this._data.transport.removeListener( '@close', this._data.transportCallback); this._data.transportCallback = undefined; diff --git a/lib/Producer.js b/lib/Producer.js index b9e5c892bf..1485734ddf 100644 --- a/lib/Producer.js +++ b/lib/Producer.js @@ -187,7 +187,7 @@ class Producer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Producer object can be picked up by GC // while a Transport object it used to reffer to still stays alive - if (this.transport && !this.transport.closed && this._data.transportCallback) + if (this.transport && !this.transport.closed) this.transport.removeListener( '@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -222,7 +222,7 @@ class Producer extends EnhancedEventEmitter clearInterval(this._statsInterval); } - if (this.transport && !this.transport.closed && this._data.transportCallback) + if (this.transport && !this.transport.closed) this.transport.removeListener( '@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; diff --git a/package.json b/package.json index 14fdb2d3e2..bdb661cadb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2", + "version": "2.3.2-lv", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 750cd4c88e1e8dfbed8c0205f6353f9b0e8ff973 Mon Sep 17 00:00:00 2001 From: artushin Date: Thu, 13 Dec 2018 11:28:28 -0600 Subject: [PATCH 03/82] cpu percentage --- lib/Consumer.js | 5 ++-- lib/Producer.js | 6 ++-- lib/Room.js | 5 ++++ lib/Worker.js | 79 ++++++++++++++++++++++++++++++++++++------------- package.json | 2 +- 5 files changed, 70 insertions(+), 27 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index e432db6a83..4c7f0ccf5f 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -226,7 +226,7 @@ class Consumer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Consumer object can be picked up by GC // while a Transport object it used to reffer to still stays alive if (this._data.transport && this._data.transportCallback) - this._data.transport.removeListener( '@close', this._data.transportCallback); + this._data.transport.removeListener('@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -355,8 +355,9 @@ class Consumer extends EnhancedEventEmitter this._data.transport = undefined; this.safeEmit('unhandled'); - } + }; transport.on('@close', this._data.transportCallback); + return; }) .catch((error) => diff --git a/lib/Producer.js b/lib/Producer.js index 1485734ddf..7a867a2481 100644 --- a/lib/Producer.js +++ b/lib/Producer.js @@ -188,7 +188,7 @@ class Producer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Producer object can be picked up by GC // while a Transport object it used to reffer to still stays alive if (this.transport && !this.transport.closed) - this.transport.removeListener( '@close', this._data.transportCallback); + this.transport.removeListener('@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -223,7 +223,7 @@ class Producer extends EnhancedEventEmitter } if (this.transport && !this.transport.closed) - this.transport.removeListener( '@close', this._data.transportCallback); + this.transport.removeListener('@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -641,7 +641,7 @@ class Producer extends EnhancedEventEmitter { if (!this._closed) this.close(undefined, false); - } + }; this.transport.on('@close', this._data.transportCallback); } diff --git a/lib/Room.js b/lib/Room.js index 21ce2919e4..58b7c7dd05 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -48,6 +48,11 @@ class Room extends EnhancedEventEmitter return this._internal.routerId; } + get cpuPercentage() + { + return this._internal.getCpuPercentage(); + } + get closed() { return this._closed; diff --git a/lib/Worker.js b/lib/Worker.js index 8ff36cb499..ec1f3f2447 100644 --- a/lib/Worker.js +++ b/lib/Worker.js @@ -1,5 +1,6 @@ const path = require('path'); const spawn = require('child_process').spawn; +const fs = require('fs'); const process = require('process'); const EventEmitter = require('events').EventEmitter; const Logger = require('./Logger'); @@ -11,6 +12,18 @@ const CHANNEL_FD = 3; const logger = new Logger('Worker'); +const getCpuUsage = function(pid, cb) +{ + fs.readFile(`/proc/${ pid }/stat`, function(err, data) + { + const elems = data.toString().split(' '); + const utime = parseInt(elems[13]); + const stime = parseInt(elems[14]); + + cb(utime + stime); + }); +}; + let workerPath; // If env MEDIASOUP_WORKER_PATH is given, use it. @@ -22,13 +35,13 @@ if (process.env.MEDIASOUP_WORKER_PATH) else if (process.env.MEDIASOUP_BUILDTYPE === 'Debug') { workerPath = - path.join(__dirname, '..', 'worker', 'out', 'Debug', 'mediasoup-worker'); + path.join(__dirname, '..', 'worker', 'out', 'Debug', 'mediasoup-worker'); } // Otherwise use 'Release'. else { workerPath = - path.join(__dirname, '..', 'worker', 'out', 'Release', 'mediasoup-worker'); + path.join(__dirname, '..', 'worker', 'out', 'Release', 'mediasoup-worker'); } // Set environtment variable for the worker. @@ -45,18 +58,18 @@ class Worker extends EventEmitter const spawnArgs = [ id ].concat(parameters); const spawnOptions = - { - detached : false, - - /* - * fd 0 (stdin) : Just ignore it. - * fd 1 (stdout) : Pipe it for 3rd libraries in the worker. - * that log their own stuff. - * fd 2 (stderr) : Same as stdout. - * fd 3 (channel) : Channel fd. - */ - stdio : [ 'ignore', 'pipe', 'pipe', 'pipe' ] - }; + { + detached : false, + + /* + * fd 0 (stdin) : Just ignore it. + * fd 1 (stdout) : Pipe it for 3rd libraries in the worker. + * that log their own stuff. + * fd 2 (stderr) : Same as stdout. + * fd 3 (channel) : Channel fd. + */ + stdio : [ 'ignore', 'pipe', 'pipe', 'pipe' ] + }; // Create the mediasoup-worker child process. this._child = spawn(workerPath, spawnArgs, spawnOptions); @@ -108,6 +121,26 @@ class Worker extends EventEmitter this._child = null; this.close(); }); + + this._cpuInterval = setInterval(() => + { + getCpuUsage((startTime) => + { + setTimeout(() => + { + getCpuUsage((endTime) => + { + const delta = endTime - startTime; + const percentage = 100 * (delta / 10000); + + if (percentage > 20) + { + this._cpuPercentage; + } + }); + }, 1000); + }); + }, 1000); } close() @@ -119,8 +152,8 @@ class Worker extends EventEmitter // Kill mediasoup-worker process. if (this._child) { - // Remove event listeners but leave a fake 'error' hander - // to avoid propagation. + // Remove event listeners but leave a fake 'error' hander + // to avoid propagation. this._child.removeAllListeners('exit'); this._child.removeAllListeners('error'); this._child.on('error', () => null); @@ -175,17 +208,21 @@ class Worker extends EventEmitter } /** - * Create a Room instance. - * - * @return {Room} - */ + * Create a Room instance. + * + * @return {Room} + */ Room(data) { logger.debug('Room()'); const internal = { - routerId : utils.randomNumber() + routerId : utils.randomNumber(), + getCpuPercentage : () => + { + return this._cpuPercentage; + } }; const room = new Room(internal, data, this._channel); diff --git a/package.json b/package.json index bdb661cadb..dab77e000a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2-lv", + "version": "2.3.2-lv2", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From b5d7f76edfe670e6bd93b2c6405c90a2260cf561 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 8 Nov 2018 10:44:43 -0800 Subject: [PATCH 04/82] explicitly remove transport.@close listeners from closing consumers and producers --- lib/Consumer.js | 16 ++++++++++++---- lib/Producer.js | 18 ++++++++++++++++-- package.json | 9 +++++++-- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index bf04ca01c8..b36853ea1d 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -31,6 +31,7 @@ class Consumer extends EnhancedEventEmitter // - .kind // - .peer (just if this Consumer belongs to a Peer) // - .transport + // - .transportCallback // - .rtpParameters // - .source this._data = data; @@ -224,6 +225,14 @@ class Consumer extends EnhancedEventEmitter // Remove notification subscriptions. this._channel.removeAllListeners(this._internal.consumerId); + // Remove previously registered listener for transport's @close so that closed Consumer object can be picked up by GC + // while a Transport object it used to reffer to still stays alive + if (this._data.transport && this._data.transportCallback && !this._data.transport.closed) + this._data.transport.removeListener( '@close', this._data.transportCallback); + + this._data.transportCallback = undefined; + this._data.transport = undefined; + if (notifyChannel) { this._channel.request('consumer.close', this._internal) @@ -342,14 +351,14 @@ class Consumer extends EnhancedEventEmitter this.safeEmit('handled'); - transport.on('@close', () => + this._data.transportCallback = () => { this._internal.transportId = undefined; this._data.transport = undefined; this.safeEmit('unhandled'); - }); - + } + transport.on('@close', this._data.transportCallback); return; }) .catch((error) => @@ -719,7 +728,6 @@ class Consumer extends EnhancedEventEmitter if (typeof interval !== 'number') { - logger.error('enableStats() | invalid interval provided'); return; } diff --git a/lib/Producer.js b/lib/Producer.js index 1747f2a29d..2a411c73c3 100644 --- a/lib/Producer.js +++ b/lib/Producer.js @@ -30,6 +30,7 @@ class Producer extends EnhancedEventEmitter // - .kind // - .peer // - .transport + // -.transportCallback // - .rtpParameters // - .consumableRtpParameters this._data = data; @@ -186,6 +187,13 @@ class Producer extends EnhancedEventEmitter this.emit('@notify', 'producerClosed', data); } + // Remove previously registered listener for transport's @close so that closed Producer object can be picked up by GC + // while a Transport object it used to reffer to still stays alive + if (this.transport && !this.transport.closed && this._data.transportCallback) + this.transport.removeListener( '@close', this._data.transportCallback); + this._data.transportCallback = undefined; + this._data.transport = undefined; + this.emit('@close'); this.safeEmit('close', 'local', appData); @@ -216,6 +224,11 @@ class Producer extends EnhancedEventEmitter clearInterval(this._statsInterval); } + if (this.transport && !this.transport.closed && this._data.transportCallback) + this.transport.removeListener( '@close', this._data.transportCallback); + this._data.transportCallback = undefined; + this._data.transport = undefined; + this.emit('@close'); this.safeEmit('close', 'remote', appData); @@ -626,11 +639,12 @@ class Producer extends EnhancedEventEmitter { // On closure, the worker Transport closes all its Producers and the client // side gets producer.on('unhandled'). - this.transport.on('@close', () => + this._data.transportCallback = () => { if (!this._closed) this.close(undefined, false); - }); + } + this.transport.on('@close', this._data.transportCallback); } _handleWorkerNotifications() diff --git a/package.json b/package.json index 175282abab..14fdb2d3e2 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "mediasoup", + "name": "@livelyvideo/mediasoup", "version": "2.3.2", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", @@ -8,9 +8,14 @@ ], "homepage": "https://mediasoup.org", "license": "ISC", + "publishConfig": { + "always-auth": true, + "registry": "https://npm.livelyvideo.tv" + }, "repository": { "type": "git", - "url": "https://github.com/versatica/mediasoup.git" + "private": true, + "url": "https://github.com/LivelyVideo/mediasoup.git" }, "keywords": [ "webrtc", From 6f22cb511d47d5d6b8a32b232ec48b7d9489059f Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 9 Nov 2018 07:26:01 -0800 Subject: [PATCH 05/82] package json versioning and minor changes in code --- lib/Consumer.js | 2 +- lib/Producer.js | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index b36853ea1d..05592e5a95 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -227,7 +227,7 @@ class Consumer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Consumer object can be picked up by GC // while a Transport object it used to reffer to still stays alive - if (this._data.transport && this._data.transportCallback && !this._data.transport.closed) + if (this._data.transport && this._data.transportCallback) this._data.transport.removeListener( '@close', this._data.transportCallback); this._data.transportCallback = undefined; diff --git a/lib/Producer.js b/lib/Producer.js index 2a411c73c3..87ce1b6d07 100644 --- a/lib/Producer.js +++ b/lib/Producer.js @@ -189,7 +189,7 @@ class Producer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Producer object can be picked up by GC // while a Transport object it used to reffer to still stays alive - if (this.transport && !this.transport.closed && this._data.transportCallback) + if (this.transport && !this.transport.closed) this.transport.removeListener( '@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -224,7 +224,7 @@ class Producer extends EnhancedEventEmitter clearInterval(this._statsInterval); } - if (this.transport && !this.transport.closed && this._data.transportCallback) + if (this.transport && !this.transport.closed) this.transport.removeListener( '@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; diff --git a/package.json b/package.json index 14fdb2d3e2..bdb661cadb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2", + "version": "2.3.2-lv", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 3f62f0c5c737d1f8df17043a8562758fcb455a00 Mon Sep 17 00:00:00 2001 From: artushin Date: Thu, 13 Dec 2018 11:28:28 -0600 Subject: [PATCH 06/82] cpu percentage --- lib/Consumer.js | 5 ++-- lib/Producer.js | 6 ++-- lib/Room.js | 5 ++++ lib/Worker.js | 79 ++++++++++++++++++++++++++++++++++++------------- package.json | 2 +- 5 files changed, 70 insertions(+), 27 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index 05592e5a95..c56d285eb7 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -228,7 +228,7 @@ class Consumer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Consumer object can be picked up by GC // while a Transport object it used to reffer to still stays alive if (this._data.transport && this._data.transportCallback) - this._data.transport.removeListener( '@close', this._data.transportCallback); + this._data.transport.removeListener('@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -357,8 +357,9 @@ class Consumer extends EnhancedEventEmitter this._data.transport = undefined; this.safeEmit('unhandled'); - } + }; transport.on('@close', this._data.transportCallback); + return; }) .catch((error) => diff --git a/lib/Producer.js b/lib/Producer.js index 87ce1b6d07..9711616fee 100644 --- a/lib/Producer.js +++ b/lib/Producer.js @@ -190,7 +190,7 @@ class Producer extends EnhancedEventEmitter // Remove previously registered listener for transport's @close so that closed Producer object can be picked up by GC // while a Transport object it used to reffer to still stays alive if (this.transport && !this.transport.closed) - this.transport.removeListener( '@close', this._data.transportCallback); + this.transport.removeListener('@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -225,7 +225,7 @@ class Producer extends EnhancedEventEmitter } if (this.transport && !this.transport.closed) - this.transport.removeListener( '@close', this._data.transportCallback); + this.transport.removeListener('@close', this._data.transportCallback); this._data.transportCallback = undefined; this._data.transport = undefined; @@ -643,7 +643,7 @@ class Producer extends EnhancedEventEmitter { if (!this._closed) this.close(undefined, false); - } + }; this.transport.on('@close', this._data.transportCallback); } diff --git a/lib/Room.js b/lib/Room.js index 3e236adb90..a5ff1767a4 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -50,6 +50,11 @@ class Room extends EnhancedEventEmitter return this._internal.routerId; } + get cpuPercentage() + { + return this._internal.getCpuPercentage(); + } + get closed() { return this._closed; diff --git a/lib/Worker.js b/lib/Worker.js index 4569ee031e..3949c15567 100644 --- a/lib/Worker.js +++ b/lib/Worker.js @@ -2,6 +2,7 @@ const path = require('path'); const spawn = require('child_process').spawn; +const fs = require('fs'); const process = require('process'); const EventEmitter = require('events').EventEmitter; const Logger = require('./Logger'); @@ -13,6 +14,18 @@ const CHANNEL_FD = 3; const logger = new Logger('Worker'); +const getCpuUsage = function(pid, cb) +{ + fs.readFile(`/proc/${ pid }/stat`, function(err, data) + { + const elems = data.toString().split(' '); + const utime = parseInt(elems[13]); + const stime = parseInt(elems[14]); + + cb(utime + stime); + }); +}; + let workerPath; // If env MEDIASOUP_WORKER_PATH is given, use it. @@ -24,13 +37,13 @@ if (process.env.MEDIASOUP_WORKER_PATH) else if (process.env.MEDIASOUP_BUILDTYPE === 'Debug') { workerPath = - path.join(__dirname, '..', 'worker', 'out', 'Debug', 'mediasoup-worker'); + path.join(__dirname, '..', 'worker', 'out', 'Debug', 'mediasoup-worker'); } // Otherwise use 'Release'. else { workerPath = - path.join(__dirname, '..', 'worker', 'out', 'Release', 'mediasoup-worker'); + path.join(__dirname, '..', 'worker', 'out', 'Release', 'mediasoup-worker'); } // Set environtment variable for the worker. @@ -47,18 +60,18 @@ class Worker extends EventEmitter const spawnArgs = [ id ].concat(parameters); const spawnOptions = - { - detached : false, - - /* - * fd 0 (stdin) : Just ignore it. - * fd 1 (stdout) : Pipe it for 3rd libraries in the worker. - * that log their own stuff. - * fd 2 (stderr) : Same as stdout. - * fd 3 (channel) : Channel fd. - */ - stdio : [ 'ignore', 'pipe', 'pipe', 'pipe' ] - }; + { + detached : false, + + /* + * fd 0 (stdin) : Just ignore it. + * fd 1 (stdout) : Pipe it for 3rd libraries in the worker. + * that log their own stuff. + * fd 2 (stderr) : Same as stdout. + * fd 3 (channel) : Channel fd. + */ + stdio : [ 'ignore', 'pipe', 'pipe', 'pipe' ] + }; // Create the mediasoup-worker child process. this._child = spawn(workerPath, spawnArgs, spawnOptions); @@ -110,6 +123,26 @@ class Worker extends EventEmitter this._child = null; this.close(); }); + + this._cpuInterval = setInterval(() => + { + getCpuUsage((startTime) => + { + setTimeout(() => + { + getCpuUsage((endTime) => + { + const delta = endTime - startTime; + const percentage = 100 * (delta / 10000); + + if (percentage > 20) + { + this._cpuPercentage; + } + }); + }, 1000); + }); + }, 1000); } close() @@ -121,8 +154,8 @@ class Worker extends EventEmitter // Kill mediasoup-worker process. if (this._child) { - // Remove event listeners but leave a fake 'error' hander - // to avoid propagation. + // Remove event listeners but leave a fake 'error' hander + // to avoid propagation. this._child.removeAllListeners('exit'); this._child.removeAllListeners('error'); this._child.on('error', () => null); @@ -177,17 +210,21 @@ class Worker extends EventEmitter } /** - * Create a Room instance. - * - * @return {Room} - */ + * Create a Room instance. + * + * @return {Room} + */ Room(data) { logger.debug('Room()'); const internal = { - routerId : utils.randomNumber() + routerId : utils.randomNumber(), + getCpuPercentage : () => + { + return this._cpuPercentage; + } }; const room = new Room(internal, data, this._channel); diff --git a/package.json b/package.json index bdb661cadb..dab77e000a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2-lv", + "version": "2.3.2-lv2", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 9f27ed1d9efc99c6fa45c18e9536e826cfdc3fbe Mon Sep 17 00:00:00 2001 From: artushin Date: Thu, 13 Dec 2018 18:34:36 -0600 Subject: [PATCH 07/82] cpu fixes --- lib/Consumer.js | 3 --- lib/Server.js | 5 ++++- lib/Worker.js | 33 +++++++++++++++++---------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index c56d285eb7..a76ede027b 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -358,9 +358,6 @@ class Consumer extends EnhancedEventEmitter this.safeEmit('unhandled'); }; - transport.on('@close', this._data.transportCallback); - - return; }) .catch((error) => { diff --git a/lib/Server.js b/lib/Server.js index 1fc1f8b3e5..47081d7143 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -55,6 +55,9 @@ class Server extends EnhancedEventEmitter // Remove numWorkers. delete options.numWorkers; + const workerOptions = options.worker; + delete options.worker; + // Normalize some options. if (!check.array(options.logTags)) @@ -141,7 +144,7 @@ class Server extends EnhancedEventEmitter // Create a Worker instance (do it in a separate method to avoid creating // a callback function within a loop). - this._addWorker(new Worker(workerId, workerParameters)); + this._addWorker(new Worker(workerId, workerParameters, workerOptions)); } } diff --git a/lib/Worker.js b/lib/Worker.js index 3949c15567..132b428c9d 100644 --- a/lib/Worker.js +++ b/lib/Worker.js @@ -51,7 +51,7 @@ process.env.MEDIASOUP_CHANNEL_FD = String(CHANNEL_FD); class Worker extends EventEmitter { - constructor(id, parameters) + constructor(id, parameters, options = {}) { super(); this.setMaxListeners(Infinity); @@ -124,25 +124,24 @@ class Worker extends EventEmitter this.close(); }); - this._cpuInterval = setInterval(() => - { - getCpuUsage((startTime) => + this._cpuPercentage = null; + if (options.monitorCpu) { + this._cpuInterval = setInterval(() => { - setTimeout(() => + getCpuUsage((this._child.pid, startTime) => { - getCpuUsage((endTime) => + setTimeout(() => { - const delta = endTime - startTime; - const percentage = 100 * (delta / 10000); - - if (percentage > 20) + getCpuUsage((this._child.pid, endTime) => { - this._cpuPercentage; - } - }); - }, 1000); - }); - }, 1000); + const delta = endTime - startTime; + const percentage = 100 * (delta / 10000); + this._cpuPercentage = percentage; + }); + }, 1000); + }); + }, 1000); + } } close() @@ -218,6 +217,8 @@ class Worker extends EventEmitter { logger.debug('Room()'); + clearInterval(this._cpuInterval); + const internal = { routerId : utils.randomNumber(), From 54419d5fbc37f79f304d4b4b705e8dd1616152e8 Mon Sep 17 00:00:00 2001 From: artushin Date: Fri, 14 Dec 2018 10:59:43 -0600 Subject: [PATCH 08/82] cpu fix --- lib/Room.js | 6 ++++-- lib/Worker.js | 24 +++++++++--------------- package.json | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index a5ff1767a4..ab37579cee 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -14,7 +14,7 @@ const logger = new Logger('Room'); class Room extends EnhancedEventEmitter { - constructor(internal, data, channel) + constructor(internal, data, channel, getCpuPercentage) { super(logger); @@ -27,6 +27,8 @@ class Room extends EnhancedEventEmitter // - .routerId this._internal = internal; + this._getCpuPercentage = getCpuPercentage; + // Room data. // - .rtpCapabilities this._data = data; @@ -52,7 +54,7 @@ class Room extends EnhancedEventEmitter get cpuPercentage() { - return this._internal.getCpuPercentage(); + return this._getCpuPercentage(); } get closed() diff --git a/lib/Worker.js b/lib/Worker.js index 132b428c9d..82757d3007 100644 --- a/lib/Worker.js +++ b/lib/Worker.js @@ -126,14 +126,10 @@ class Worker extends EventEmitter this._cpuPercentage = null; if (options.monitorCpu) { - this._cpuInterval = setInterval(() => - { - getCpuUsage((this._child.pid, startTime) => - { - setTimeout(() => - { - getCpuUsage((this._child.pid, endTime) => - { + this._cpuInterval = setInterval(() => { + getCpuUsage(this._child.pid, (startTime) => { + setTimeout(() => { + getCpuUsage(this._child.pid, (endTime) => { const delta = endTime - startTime; const percentage = 100 * (delta / 10000); this._cpuPercentage = percentage; @@ -148,6 +144,8 @@ class Worker extends EventEmitter { logger.debug('close()'); + clearInterval(this._cpuInterval); + this.emit('@close'); // Kill mediasoup-worker process. @@ -217,18 +215,14 @@ class Worker extends EventEmitter { logger.debug('Room()'); - clearInterval(this._cpuInterval); - const internal = { routerId : utils.randomNumber(), - getCpuPercentage : () => - { - return this._cpuPercentage; - } }; - const room = new Room(internal, data, this._channel); + const room = new Room(internal, data, this._channel, () => { + return this._cpuPercentage; + }); // Store the Room instance and remove it when closed. this._rooms.add(room); diff --git a/package.json b/package.json index dab77e000a..c136b69f84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2-lv2", + "version": "2.3.2-lv4", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 41e628e1fa470d01f15895098e7b409f4a93c25b Mon Sep 17 00:00:00 2001 From: artushin Date: Mon, 17 Dec 2018 09:28:11 -0600 Subject: [PATCH 09/82] fix interval --- lib/Room.js | 6 ++++-- lib/Worker.js | 13 ++++++------- package.json | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index 266c7493e0..72835bd561 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -12,7 +12,7 @@ const logger = new Logger('Room'); class Room extends EnhancedEventEmitter { - constructor(internal, data, channel) + constructor(internal, data, channel, getCpuPercentage) { super(logger); @@ -25,6 +25,8 @@ class Room extends EnhancedEventEmitter // - .routerId this._internal = internal; + this._getCpuPercentage = getCpuPercentage; + // Room data. // - .rtpCapabilities this._data = data; @@ -50,7 +52,7 @@ class Room extends EnhancedEventEmitter get cpuPercentage() { - return this._internal.getCpuPercentage(); + return this._getCpuPercentage(); } get closed() diff --git a/lib/Worker.js b/lib/Worker.js index 6683eb2eb7..ec19b6da76 100644 --- a/lib/Worker.js +++ b/lib/Worker.js @@ -113,6 +113,7 @@ class Worker extends EventEmitter logger.error( 'child process exited [id:%s, code:%s, signal:%s]', id, code, signal); + clearInterval(this._cpuInterval); this._child = null; this.close(); }); @@ -121,6 +122,7 @@ class Worker extends EventEmitter { logger.error('child process error [id:%s, error:%s]', id, error); + clearInterval(this._cpuInterval); this._child = null; this.close(); }); @@ -152,8 +154,6 @@ class Worker extends EventEmitter if (this._closed) return; - clearInterval(this._cpuInterval); - this._closed = true; this.emit('@close'); @@ -163,6 +163,7 @@ class Worker extends EventEmitter { // Remove event listeners but leave a fake 'error' hander // to avoid propagation. + clearInterval(this._cpuInterval); this._child.removeAllListeners('exit'); this._child.removeAllListeners('error'); this._child.on('error', () => null); @@ -228,13 +229,11 @@ class Worker extends EventEmitter const internal = { routerId : utils.randomNumber(), - getCpuPercentage : () => - { - return this._cpuPercentage; - } }; - const room = new Room(internal, data, this._channel); + const room = new Room(internal, data, this._channel, () => { + return this._cpuPercentage; + }); // Store the Room instance and remove it when closed. this._rooms.add(room); diff --git a/package.json b/package.json index 3f2fe81374..b6fc5a492a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.5.6-lv8", + "version": "2.5.6-lv10", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 113c11cd5d3c65851558bd63b9cf67846a771ffd Mon Sep 17 00:00:00 2001 From: artushin Date: Wed, 2 Jan 2019 13:56:12 -0600 Subject: [PATCH 10/82] clear intervals --- lib/Worker.js | 27 ++++++++++++++++----------- package.json | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/Worker.js b/lib/Worker.js index 82757d3007..796df193e7 100644 --- a/lib/Worker.js +++ b/lib/Worker.js @@ -112,6 +112,7 @@ class Worker extends EventEmitter logger.error( 'child process exited [id:%s, code:%s, signal:%s]', id, code, signal); + clearInterval(this._cpuInterval); this._child = null; this.close(); }); @@ -120,6 +121,7 @@ class Worker extends EventEmitter { logger.error('child process error [id:%s, error:%s]', id, error); + clearInterval(this._cpuInterval); this._child = null; this.close(); }); @@ -127,15 +129,19 @@ class Worker extends EventEmitter this._cpuPercentage = null; if (options.monitorCpu) { this._cpuInterval = setInterval(() => { - getCpuUsage(this._child.pid, (startTime) => { - setTimeout(() => { - getCpuUsage(this._child.pid, (endTime) => { - const delta = endTime - startTime; - const percentage = 100 * (delta / 10000); - this._cpuPercentage = percentage; - }); - }, 1000); - }); + if (this._child) { + getCpuUsage(this._child.pid, (startTime) => { + setTimeout(() => { + if (this._child) { + getCpuUsage(this._child.pid, (endTime) => { + const delta = endTime - startTime; + const percentage = 100 * (delta / 10000); + this._cpuPercentage = percentage; + }); + } + }, 1000); + }); + } }, 1000); } } @@ -144,8 +150,6 @@ class Worker extends EventEmitter { logger.debug('close()'); - clearInterval(this._cpuInterval); - this.emit('@close'); // Kill mediasoup-worker process. @@ -153,6 +157,7 @@ class Worker extends EventEmitter { // Remove event listeners but leave a fake 'error' hander // to avoid propagation. + clearInterval(this._cpuInterval); this._child.removeAllListeners('exit'); this._child.removeAllListeners('error'); this._child.on('error', () => null); diff --git a/package.json b/package.json index c136b69f84..2c1223722f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2-lv4", + "version": "2.3.2-lv6", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From a3c3af4154a8730e6f8076f00b96a7d4fe17dd25 Mon Sep 17 00:00:00 2001 From: artushin Date: Wed, 2 Jan 2019 14:29:46 -0600 Subject: [PATCH 11/82] worker cpu --- lib/Room.js | 6 ++++++ lib/Server.js | 26 +++++++++++++++++++++++--- lib/Worker.js | 8 ++++++++ package.json | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index ab37579cee..1de1f994b5 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -24,6 +24,7 @@ class Room extends EnhancedEventEmitter this._closed = false; // Internal data. + // - .workerId // - .routerId this._internal = internal; @@ -52,6 +53,11 @@ class Room extends EnhancedEventEmitter return this._internal.routerId; } + get workerId() + { + return this._internal.workerId; + } + get cpuPercentage() { return this._getCpuPercentage(); diff --git a/lib/Server.js b/lib/Server.js index 47081d7143..cd4d00e15e 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -247,7 +247,7 @@ class Server extends EnhancedEventEmitter // This may throw. const rtpCapabilities = ortc.generateRoomRtpCapabilities(mediaCodecs); - const worker = this._getRandomWorker(); + const worker = this._getWorker(); const room = worker.Room({ rtpCapabilities }); this.safeEmit('newroom', room); @@ -273,11 +273,31 @@ class Server extends EnhancedEventEmitter }); } - _getRandomWorker() + _getWorker() { const array = Array.from(this._workers); - return array[array.length * Math.random() << 0]; + let lowestCpu; + let lowestCpuIndex; + const zeroCpus = []; + for (let i = array.length - 1; i >= 0; i--) { + const worker = array[i]; + const wcpu = worker.cpuPercentage; + if (wcpu) { + if (!lowestCpu || wcpu < lowestCpu) { + lowestCpu = wcpu; + lowestCpuIndex = i; + } + } else { + zeroCpus.push(worker); + } + } + + if (zeroCpus) { + const rand = Math.floor(Math.random() * Math.floor(zeroCpus.length)); + return zeroCpus[rand]; + } + return array[lowestCpuIndex]; } } diff --git a/lib/Worker.js b/lib/Worker.js index 796df193e7..003984c420 100644 --- a/lib/Worker.js +++ b/lib/Worker.js @@ -144,6 +144,13 @@ class Worker extends EventEmitter } }, 1000); } + + this._id = id; + } + + get cpuPercentage() + { + return this._cpuPercentage; } close() @@ -222,6 +229,7 @@ class Worker extends EventEmitter const internal = { + workerId : this._id, routerId : utils.randomNumber(), }; diff --git a/package.json b/package.json index 2c1223722f..767077ecd1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2-lv6", + "version": "2.3.2-lv7", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From eaafef774c81c1fb27997e771d968905faf2c241 Mon Sep 17 00:00:00 2001 From: artushin Date: Wed, 2 Jan 2019 18:03:30 -0600 Subject: [PATCH 12/82] fix --- lib/Server.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Server.js b/lib/Server.js index cd4d00e15e..c6a93862e8 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -293,7 +293,7 @@ class Server extends EnhancedEventEmitter } } - if (zeroCpus) { + if (zeroCpus.length) { const rand = Math.floor(Math.random() * Math.floor(zeroCpus.length)); return zeroCpus[rand]; } diff --git a/package.json b/package.json index 767077ecd1..dff4a44df7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.3.2-lv7", + "version": "2.3.2-lv8", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From f0bcaecd990d24882f053c3e64c07a4b1d2bbfe7 Mon Sep 17 00:00:00 2001 From: artushin Date: Mon, 7 Jan 2019 10:15:44 -0600 Subject: [PATCH 13/82] merge upstream master --- .github/ISSUE_TEMPLATE/Bug_Report.md | 5 +- .gitignore | 7 + CHANGELOG.md | 18 + Makefile | 58 - README.md | 4 +- doc/Building.md | 55 +- doc/Fuzzer.md | 77 + doc/RTCP.md | 77 +- doc/index.md | 1 + gulpfile.js | 4 +- lib/PlainRtpTransport.js | 2 + lib/supportedRtpCapabilities.js | 25 - package.json | 8 +- worker/Dockerfile.fuzzer | 24 + worker/Makefile | 82 + worker/common.gypi | 27 +- worker/deps/libuv/.gitignore | 2 +- worker/deps/libuv/AUTHORS | 6 + worker/deps/libuv/CMakeLists.txt | 8 +- worker/deps/libuv/ChangeLog | 35 +- worker/deps/libuv/Makefile.am | 3 + worker/deps/libuv/README.md | 3 +- worker/deps/libuv/configure.ac | 2 +- worker/deps/libuv/docs/src/handle.rst | 2 + worker/deps/libuv/include/uv/version.h | 2 +- worker/deps/libuv/include/uv/win.h | 1 + worker/deps/libuv/src/inet.c | 11 +- worker/deps/libuv/src/strscpy.c | 17 + worker/deps/libuv/src/strscpy.h | 18 + worker/deps/libuv/src/timer.c | 2 +- worker/deps/libuv/src/unix/aix.c | 32 +- worker/deps/libuv/src/unix/darwin-proctitle.c | 3 +- worker/deps/libuv/src/unix/fs.c | 42 +- worker/deps/libuv/src/unix/linux-core.c | 3 + worker/deps/libuv/src/unix/linux-inotify.c | 6 +- worker/deps/libuv/src/unix/netbsd.c | 3 +- worker/deps/libuv/src/unix/os390.c | 6 +- worker/deps/libuv/src/unix/pipe.c | 6 +- worker/deps/libuv/src/unix/sunos.c | 3 +- worker/deps/libuv/src/uv-common.c | 2 +- worker/deps/libuv/src/uv-common.h | 1 + .../deps/libuv/src/uv-data-getter-setters.c | 16 +- worker/deps/libuv/src/win/dl.c | 8 +- worker/deps/libuv/src/win/fs-event.c | 8 +- worker/deps/libuv/src/win/fs.c | 49 +- worker/deps/libuv/src/win/pipe.c | 6 +- worker/deps/libuv/src/win/poll.c | 4 +- worker/deps/libuv/src/win/process.c | 6 +- worker/deps/libuv/src/win/tty.c | 5 +- worker/deps/libuv/src/win/winapi.h | 3 + worker/deps/libuv/test/run-tests.c | 8 +- worker/deps/libuv/test/runner-win.c | 7 +- worker/deps/libuv/test/runner-win.h | 2 + worker/deps/libuv/test/test-close-fd.c | 6 +- worker/deps/libuv/test/test-condvar.c | 2 +- worker/deps/libuv/test/test-emfile.c | 16 +- worker/deps/libuv/test/test-fork.c | 3 + worker/deps/libuv/test/test-fs.c | 56 +- worker/deps/libuv/test/test-ip4-addr.c | 7 +- worker/deps/libuv/test/test-ip6-addr.c | 2 +- worker/deps/libuv/test/test-list.h | 4 + .../test/test-pipe-close-stdout-read-stdin.c | 4 + worker/deps/libuv/test/test-platform-output.c | 2 +- .../test-poll-close-doesnt-corrupt-stack.c | 2 +- worker/deps/libuv/test/test-poll-oob.c | 5 + .../test/test-process-title-threadsafe.c | 3 +- worker/deps/libuv/test/test-process-title.c | 4 +- .../libuv/test/test-signal-multiple-loops.c | 6 +- worker/deps/libuv/test/test-spawn.c | 8 +- worker/deps/libuv/test/test-strscpy.c | 53 + .../deps/libuv/test/test-tcp-close-accept.c | 6 +- worker/deps/libuv/test/test-tcp-oob.c | 7 +- .../libuv/test/test-tcp-write-after-connect.c | 6 +- worker/deps/libuv/test/test-tty.c | 2 - worker/deps/libuv/test/test.gyp | 3 +- worker/deps/libuv/uv.gyp | 2 + worker/deps/openssl/config/README.md | 26 +- .../config/archs/BSD-x86_64/asm/configdata.pm | 880 +--- .../BSD-x86_64/asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/aes/aesni-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/bn/rsaz-avx2.s | 2 +- .../BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s | 2 +- .../BSD-x86_64/asm/crypto/bn/x86_64-mont.s | 81 +- .../BSD-x86_64/asm/crypto/bn/x86_64-mont5.s | 19 +- .../archs/BSD-x86_64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../BSD-x86_64/asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s | 2 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/sha/sha256-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/sha/sha512-x86_64.s | 2 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../archs/BSD-x86_64/asm/crypto/x86_64cpuid.s | 2 +- .../BSD-x86_64/asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/BSD-x86_64/asm/openssl.gypi | 3 + .../archs/BSD-x86_64/no-asm/configdata.pm | 880 +--- .../archs/BSD-x86_64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/BSD-x86_64/no-asm/openssl.gypi | 3 + .../config/archs/VC-WIN32/asm/configdata.pm | 568 +-- .../archs/VC-WIN32/asm/crypto/bf/bf-586.asm | 70 +- .../archs/VC-WIN32/asm/crypto/bn/bn-586.asm | 30 +- .../archs/VC-WIN32/asm/crypto/bn/x86-mont.asm | 16 +- .../archs/VC-WIN32/asm/crypto/buildinf.h | 2 +- .../VC-WIN32/asm/crypto/des/crypt586.asm | 46 +- .../archs/VC-WIN32/asm/crypto/des/des-586.asm | 86 +- .../asm/crypto/ec/ecp_nistz256-x86.asm | 2 +- .../asm/crypto/include/internal/dso_conf.h | 2 +- .../archs/VC-WIN32/asm/crypto/md5/md5-586.asm | 8 +- .../VC-WIN32/asm/crypto/ripemd/rmd-586.asm | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/VC-WIN32/asm/openssl.gypi | 3 + .../archs/VC-WIN32/no-asm/configdata.pm | 570 +-- .../archs/VC-WIN32/no-asm/crypto/buildinf.h | 2 +- .../no-asm/crypto/include/internal/dso_conf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../config/archs/VC-WIN32/no-asm/openssl.gypi | 3 + .../config/archs/VC-WIN64A/asm/configdata.pm | 568 +-- .../VC-WIN64A/asm/crypto/bn/x86_64-mont.asm | 79 +- .../VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm | 17 +- .../archs/VC-WIN64A/asm/crypto/buildinf.h | 2 +- .../asm/crypto/include/internal/dso_conf.h | 2 +- .../VC-WIN64A/asm/crypto/x86_64cpuid.asm | 1 + .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/VC-WIN64A/asm/openssl.gypi | 3 + .../archs/VC-WIN64A/no-asm/configdata.pm | 568 +-- .../archs/VC-WIN64A/no-asm/crypto/buildinf.h | 2 +- .../no-asm/crypto/include/internal/dso_conf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/VC-WIN64A/no-asm/openssl.gypi | 3 + .../config/archs/aix-gcc/asm/configdata.pm | 894 +--- .../archs/aix-gcc/asm/crypto/aes/aes-ppc.s | 20 +- .../archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s | 64 +- .../archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s | 35 +- .../archs/aix-gcc/asm/crypto/bn/bn-ppc.s | 22 +- .../archs/aix-gcc/asm/crypto/bn/ppc-mont.s | 15 +- .../archs/aix-gcc/asm/crypto/bn/ppc64-mont.s | 23 +- .../archs/aix-gcc/asm/crypto/buildinf.h | 2 +- .../aix-gcc/asm/crypto/chacha/chacha-ppc.s | 14 +- .../aix-gcc/asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/aix-gcc/asm/crypto/ppccpuid.s | 27 +- .../archs/aix-gcc/asm/crypto/sha/sha1-ppc.s | 4 +- .../archs/aix-gcc/asm/crypto/sha/sha256-ppc.s | 6 +- .../aix-gcc/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../archs/aix-gcc/asm/crypto/sha/sha512-ppc.s | 6 +- .../aix-gcc/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../aix-gcc/asm/include/openssl/opensslconf.h | 18 +- .../config/archs/aix-gcc/asm/openssl.gypi | 3 + .../config/archs/aix-gcc/no-asm/configdata.pm | 562 +- .../archs/aix-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../config/archs/aix-gcc/no-asm/openssl.gypi | 3 + .../config/archs/aix64-gcc/asm/configdata.pm | 880 +--- .../archs/aix64-gcc/asm/crypto/aes/aes-ppc.s | 20 +- .../aix64-gcc/asm/crypto/aes/aesp8-ppc.s | 64 +- .../aix64-gcc/asm/crypto/aes/vpaes-ppc.s | 35 +- .../archs/aix64-gcc/asm/crypto/bn/bn-ppc.s | 22 +- .../archs/aix64-gcc/asm/crypto/bn/ppc-mont.s | 13 +- .../aix64-gcc/asm/crypto/bn/ppc64-mont.s | 18 +- .../archs/aix64-gcc/asm/crypto/buildinf.h | 2 +- .../aix64-gcc/asm/crypto/chacha/chacha-ppc.s | 14 +- .../aix64-gcc/asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/aix64-gcc/asm/crypto/ppccpuid.s | 27 +- .../archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s | 4 +- .../aix64-gcc/asm/crypto/sha/sha256-ppc.s | 6 +- .../aix64-gcc/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../aix64-gcc/asm/crypto/sha/sha512-ppc.s | 6 +- .../aix64-gcc/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/aix64-gcc/asm/openssl.gypi | 3 + .../archs/aix64-gcc/no-asm/configdata.pm | 562 +- .../archs/aix64-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/aix64-gcc/no-asm/openssl.gypi | 3 + .../archs/darwin-i386-cc/asm/configdata.pm | 562 +- .../darwin-i386-cc/asm/crypto/bf/bf-586.s | 78 +- .../darwin-i386-cc/asm/crypto/bn/bn-586.s | 242 +- .../darwin-i386-cc/asm/crypto/bn/co-586.s | 432 +- .../darwin-i386-cc/asm/crypto/bn/x86-mont.s | 16 +- .../darwin-i386-cc/asm/crypto/buildinf.h | 2 +- .../darwin-i386-cc/asm/crypto/des/crypt586.s | 36 +- .../darwin-i386-cc/asm/crypto/des/des-586.s | 104 +- .../asm/crypto/ec/ecp_nistz256-x86.s | 2 +- .../darwin-i386-cc/asm/crypto/md5/md5-586.s | 136 +- .../asm/crypto/ripemd/rmd-586.s | 320 +- .../darwin-i386-cc/asm/crypto/sha/sha1-586.s | 160 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/darwin-i386-cc/asm/openssl.gypi | 3 + .../archs/darwin-i386-cc/no-asm/configdata.pm | 880 +--- .../darwin-i386-cc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/darwin-i386-cc/no-asm/openssl.gypi | 3 + .../darwin64-x86_64-cc/asm/configdata.pm | 562 +- .../asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 3 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 3 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 3 +- .../asm/crypto/aes/aesni-x86_64.s | 2 +- .../asm/crypto/aes/bsaes-x86_64.s | 3 +- .../asm/crypto/aes/vpaes-x86_64.s | 3 +- .../asm/crypto/bn/rsaz-avx2.s | 2 +- .../asm/crypto/bn/rsaz-x86_64.s | 2 +- .../asm/crypto/bn/x86_64-gf2m.s | 2 +- .../asm/crypto/bn/x86_64-mont.s | 81 +- .../asm/crypto/bn/x86_64-mont5.s | 19 +- .../darwin64-x86_64-cc/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 3 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 5 +- .../asm/crypto/md5/md5-x86_64.s | 3 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 3 +- .../asm/crypto/rc4/rc4-x86_64.s | 3 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha256-x86_64.s | 3 +- .../asm/crypto/sha/sha512-x86_64.s | 3 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../asm/crypto/x86_64cpuid.s | 3 +- .../asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/darwin64-x86_64-cc/asm/openssl.gypi | 3 + .../darwin64-x86_64-cc/no-asm/configdata.pm | 880 +--- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../darwin64-x86_64-cc/no-asm/openssl.gypi | 3 + .../archs/linux-aarch64/asm/configdata.pm | 880 +--- .../archs/linux-aarch64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-armv8.S | 18 +- .../asm/crypto/modes/ghashv8-armx.S | 2 + .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-aarch64/asm/openssl.gypi | 3 + .../archs/linux-aarch64/no-asm/configdata.pm | 562 +- .../linux-aarch64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-aarch64/no-asm/openssl.gypi | 3 + .../archs/linux-armv4/asm/configdata.pm | 880 +--- .../archs/linux-armv4/asm/crypto/armv4cpuid.S | 2 +- .../linux-armv4/asm/crypto/bn/armv4-mont.S | 15 +- .../archs/linux-armv4/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-armv4.S | 10 +- .../asm/crypto/modes/ghash-armv4.S | 7 +- .../asm/crypto/modes/ghashv8-armx.S | 2 + .../asm/crypto/poly1305/poly1305-armv4.S | 3 +- .../linux-armv4/asm/crypto/sha/sha256-armv4.S | 4 +- .../linux-armv4/asm/crypto/sha/sha512-armv4.S | 8 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-armv4/asm/openssl.gypi | 3 + .../archs/linux-armv4/no-asm/configdata.pm | 880 +--- .../linux-armv4/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-armv4/no-asm/openssl.gypi | 3 + .../config/archs/linux-elf/asm/configdata.pm | 880 +--- .../archs/linux-elf/asm/crypto/bn/x86-mont.s | 16 +- .../archs/linux-elf/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-x86.s | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-elf/asm/openssl.gypi | 3 + .../archs/linux-elf/no-asm/configdata.pm | 562 +- .../archs/linux-elf/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-elf/no-asm/openssl.gypi | 3 + .../config/archs/linux-ppc/asm/configdata.pm | 880 +--- .../archs/linux-ppc/asm/crypto/aes/aes-ppc.s | 20 +- .../linux-ppc/asm/crypto/aes/aesp8-ppc.s | 64 +- .../linux-ppc/asm/crypto/aes/vpaes-ppc.s | 34 +- .../archs/linux-ppc/asm/crypto/bn/bn-ppc.s | 22 +- .../archs/linux-ppc/asm/crypto/bn/ppc-mont.s | 15 +- .../linux-ppc/asm/crypto/bn/ppc64-mont.s | 23 +- .../archs/linux-ppc/asm/crypto/buildinf.h | 2 +- .../linux-ppc/asm/crypto/chacha/chacha-ppc.s | 14 +- .../linux-ppc/asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/linux-ppc/asm/crypto/ppccpuid.s | 26 +- .../archs/linux-ppc/asm/crypto/sha/sha1-ppc.s | 4 +- .../linux-ppc/asm/crypto/sha/sha256-ppc.s | 6 +- .../linux-ppc/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../linux-ppc/asm/crypto/sha/sha512-ppc.s | 6 +- .../linux-ppc/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-ppc/asm/openssl.gypi | 3 + .../archs/linux-ppc/no-asm/configdata.pm | 562 +- .../archs/linux-ppc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc/no-asm/openssl.gypi | 3 + .../archs/linux-ppc64/asm/configdata.pm | 562 +- .../linux-ppc64/asm/crypto/aes/aes-ppc.s | 20 +- .../linux-ppc64/asm/crypto/aes/aesp8-ppc.s | 64 +- .../linux-ppc64/asm/crypto/aes/vpaes-ppc.s | 34 +- .../archs/linux-ppc64/asm/crypto/bn/bn-ppc.s | 22 +- .../linux-ppc64/asm/crypto/bn/ppc-mont.s | 13 +- .../linux-ppc64/asm/crypto/bn/ppc64-mont.s | 18 +- .../archs/linux-ppc64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/chacha/chacha-ppc.s | 14 +- .../asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/linux-ppc64/asm/crypto/ppccpuid.s | 26 +- .../linux-ppc64/asm/crypto/sha/sha1-ppc.s | 4 +- .../linux-ppc64/asm/crypto/sha/sha256-ppc.s | 6 +- .../linux-ppc64/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../linux-ppc64/asm/crypto/sha/sha512-ppc.s | 6 +- .../linux-ppc64/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-ppc64/asm/openssl.gypi | 3 + .../archs/linux-ppc64/no-asm/configdata.pm | 880 +--- .../linux-ppc64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc64/no-asm/openssl.gypi | 3 + .../archs/linux-ppc64le/asm/configdata.pm | 880 +--- .../linux-ppc64le/asm/crypto/aes/aes-ppc.s | 20 +- .../linux-ppc64le/asm/crypto/aes/aesp8-ppc.s | 58 +- .../linux-ppc64le/asm/crypto/aes/vpaes-ppc.s | 34 +- .../linux-ppc64le/asm/crypto/bn/bn-ppc.s | 22 +- .../linux-ppc64le/asm/crypto/bn/ppc-mont.s | 13 +- .../linux-ppc64le/asm/crypto/bn/ppc64-mont.s | 18 +- .../archs/linux-ppc64le/asm/crypto/buildinf.h | 2 +- .../asm/crypto/chacha/chacha-ppc.s | 14 +- .../asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/linux-ppc64le/asm/crypto/ppccpuid.s | 26 +- .../linux-ppc64le/asm/crypto/sha/sha1-ppc.s | 4 +- .../linux-ppc64le/asm/crypto/sha/sha256-ppc.s | 6 +- .../asm/crypto/sha/sha256p8-ppc.s | 4 +- .../linux-ppc64le/asm/crypto/sha/sha512-ppc.s | 6 +- .../asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc64le/asm/openssl.gypi | 3 + .../archs/linux-ppc64le/no-asm/configdata.pm | 880 +--- .../linux-ppc64le/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc64le/no-asm/openssl.gypi | 3 + .../config/archs/linux-x32/asm/configdata.pm | 880 +--- .../linux-x32/asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../linux-x32/asm/crypto/aes/aesni-x86_64.s | 2 +- .../linux-x32/asm/crypto/aes/bsaes-x86_64.s | 2 +- .../linux-x32/asm/crypto/aes/vpaes-x86_64.s | 2 +- .../archs/linux-x32/asm/crypto/bn/rsaz-avx2.s | 2 +- .../linux-x32/asm/crypto/bn/rsaz-x86_64.s | 2 +- .../linux-x32/asm/crypto/bn/x86_64-gf2m.s | 2 +- .../linux-x32/asm/crypto/bn/x86_64-mont.s | 81 +- .../linux-x32/asm/crypto/bn/x86_64-mont5.s | 19 +- .../archs/linux-x32/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../linux-x32/asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../linux-x32/asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../linux-x32/asm/crypto/rc4/rc4-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha256-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha512-x86_64.s | 2 +- .../linux-x32/asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../archs/linux-x32/asm/crypto/x86_64cpuid.s | 2 +- .../linux-x32/asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-x32/asm/openssl.gypi | 3 + .../archs/linux-x32/no-asm/configdata.pm | 880 +--- .../archs/linux-x32/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-x32/no-asm/openssl.gypi | 3 + .../archs/linux-x86_64/asm/configdata.pm | 562 +- .../linux-x86_64/asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../asm/crypto/aes/aesni-x86_64.s | 2 +- .../asm/crypto/aes/bsaes-x86_64.s | 2 +- .../asm/crypto/aes/vpaes-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/bn/rsaz-avx2.s | 2 +- .../linux-x86_64/asm/crypto/bn/rsaz-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/bn/x86_64-gf2m.s | 2 +- .../linux-x86_64/asm/crypto/bn/x86_64-mont.s | 81 +- .../linux-x86_64/asm/crypto/bn/x86_64-mont5.s | 19 +- .../archs/linux-x86_64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../linux-x86_64/asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/rc4/rc4-x86_64.s | 2 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha256-x86_64.s | 2 +- .../asm/crypto/sha/sha512-x86_64.s | 2 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/x86_64cpuid.s | 2 +- .../asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-x86_64/asm/openssl.gypi | 3 + .../archs/linux-x86_64/no-asm/configdata.pm | 880 +--- .../linux-x86_64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-x86_64/no-asm/openssl.gypi | 3 + .../archs/linux32-s390x/asm/configdata.pm | 880 +--- .../linux32-s390x/asm/crypto/aes/aes-s390x.S | 16 +- .../linux32-s390x/asm/crypto/bn/s390x-mont.S | 14 +- .../archs/linux32-s390x/asm/crypto/buildinf.h | 2 +- .../asm/crypto/modes/ghash-s390x.S | 2 +- .../asm/crypto/sha/sha256-s390x.S | 2 +- .../asm/crypto/sha/sha512-s390x.S | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux32-s390x/asm/openssl.gypi | 3 + .../archs/linux32-s390x/no-asm/configdata.pm | 562 +- .../linux32-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux32-s390x/no-asm/openssl.gypi | 3 + .../archs/linux64-s390x/asm/configdata.pm | 562 +- .../linux64-s390x/asm/crypto/aes/aes-s390x.S | 16 +- .../linux64-s390x/asm/crypto/bn/s390x-gf2m.s | 2 +- .../linux64-s390x/asm/crypto/bn/s390x-mont.S | 40 +- .../archs/linux64-s390x/asm/crypto/buildinf.h | 2 +- .../asm/crypto/modes/ghash-s390x.S | 2 +- .../asm/crypto/sha/sha256-s390x.S | 2 +- .../asm/crypto/sha/sha512-s390x.S | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux64-s390x/asm/openssl.gypi | 3 + .../archs/linux64-s390x/no-asm/configdata.pm | 880 +--- .../linux64-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux64-s390x/no-asm/openssl.gypi | 3 + .../archs/solaris-x86-gcc/asm/configdata.pm | 880 +--- .../solaris-x86-gcc/asm/crypto/bn/x86-mont.s | 16 +- .../solaris-x86-gcc/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-x86.s | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/solaris-x86-gcc/asm/openssl.gypi | 3 + .../solaris-x86-gcc/no-asm/configdata.pm | 880 +--- .../solaris-x86-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/solaris-x86-gcc/no-asm/openssl.gypi | 3 + .../solaris64-x86_64-gcc/asm/configdata.pm | 880 +--- .../asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../asm/crypto/aes/aesni-x86_64.s | 2 +- .../asm/crypto/aes/bsaes-x86_64.s | 2 +- .../asm/crypto/aes/vpaes-x86_64.s | 2 +- .../asm/crypto/bn/rsaz-avx2.s | 2 +- .../asm/crypto/bn/rsaz-x86_64.s | 2 +- .../asm/crypto/bn/x86_64-gf2m.s | 2 +- .../asm/crypto/bn/x86_64-mont.s | 81 +- .../asm/crypto/bn/x86_64-mont5.s | 19 +- .../asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-x86_64.s | 2 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha256-x86_64.s | 2 +- .../asm/crypto/sha/sha512-x86_64.s | 2 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../asm/crypto/x86_64cpuid.s | 2 +- .../asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../solaris64-x86_64-gcc/asm/openssl.gypi | 3 + .../solaris64-x86_64-gcc/no-asm/configdata.pm | 880 +--- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../solaris64-x86_64-gcc/no-asm/openssl.gypi | 3 + worker/deps/openssl/openssl.gyp | 3 - worker/deps/openssl/openssl/.travis.yml | 12 +- worker/deps/openssl/openssl/CHANGES | 122 +- worker/deps/openssl/openssl/CONTRIBUTING | 67 +- .../Configurations/00-base-templates.conf | 8 +- .../openssl/Configurations/10-main.conf | 53 +- .../openssl/Configurations/90-team.conf | 112 - .../Configurations/INTERNALS.Configure | 1 + .../openssl/openssl/Configurations/README | 6 +- .../openssl/Configurations/README.design | 8 +- .../openssl/Configurations/descrip.mms.tmpl | 53 +- .../openssl/openssl/Configurations/dist.conf | 12 + .../openssl/Configurations/unix-Makefile.tmpl | 33 +- .../openssl/Configurations/windows-checker.pm | 2 +- .../Configurations/windows-makefile.tmpl | 107 +- worker/deps/openssl/openssl/Configure | 64 +- worker/deps/openssl/openssl/INSTALL | 11 +- worker/deps/openssl/openssl/NEWS | 10 + worker/deps/openssl/openssl/NOTES.DJGPP | 4 +- worker/deps/openssl/openssl/NOTES.VMS | 2 +- worker/deps/openssl/openssl/README | 4 +- worker/deps/openssl/openssl/README.ECC | 55 +- .../openssl/openssl/VMS/openssl_ivp.com.in | 2 +- worker/deps/openssl/openssl/apps/apps.c | 19 +- worker/deps/openssl/openssl/apps/asn1pars.c | 22 +- worker/deps/openssl/openssl/apps/ca.c | 29 +- worker/deps/openssl/openssl/apps/cms.c | 2 +- .../deps/openssl/openssl/apps/ct_log_list.cnf | 1 + worker/deps/openssl/openssl/apps/dh1024.pem | 2 +- worker/deps/openssl/openssl/apps/dh2048.pem | 4 +- worker/deps/openssl/openssl/apps/dh4096.pem | 4 +- worker/deps/openssl/openssl/apps/dhparam.c | 11 +- worker/deps/openssl/openssl/apps/dsaparam.c | 29 +- worker/deps/openssl/openssl/apps/ocsp.c | 3 +- worker/deps/openssl/openssl/apps/pkey.c | 48 +- worker/deps/openssl/openssl/apps/rehash.c | 20 +- worker/deps/openssl/openssl/apps/req.c | 5 +- worker/deps/openssl/openssl/apps/s_client.c | 10 +- worker/deps/openssl/openssl/apps/s_server.c | 25 +- worker/deps/openssl/openssl/apps/smime.c | 2 +- worker/deps/openssl/openssl/apps/speed.c | 233 +- worker/deps/openssl/openssl/apps/verify.c | 3 +- worker/deps/openssl/openssl/appveyor.yml | 2 +- worker/deps/openssl/openssl/config | 5 +- .../openssl/crypto/aes/asm/vpaes-armv8.pl | 8 +- worker/deps/openssl/openssl/crypto/arm_arch.h | 4 +- worker/deps/openssl/openssl/crypto/armcap.c | 3 +- .../deps/openssl/openssl/crypto/armv4cpuid.pl | 4 +- .../openssl/openssl/crypto/asn1/a_object.c | 23 +- .../openssl/openssl/crypto/asn1/a_strex.c | 77 +- .../openssl/openssl/crypto/asn1/ameth_lib.c | 12 + .../openssl/openssl/crypto/asn1/asn1_err.c | 2 + .../openssl/openssl/crypto/asn1/asn_mime.c | 8 +- .../openssl/openssl/crypto/asn1/p5_scrypt.c | 4 +- .../openssl/openssl/crypto/asn1/tasn_enc.c | 4 +- .../openssl/openssl/crypto/asn1/tasn_utl.c | 4 +- .../openssl/openssl/crypto/asn1/x_int64.c | 1 + .../openssl/crypto/async/arch/async_null.c | 1 + .../openssl/crypto/async/arch/async_posix.h | 3 +- .../deps/openssl/openssl/crypto/async/async.c | 76 +- .../openssl/openssl/crypto/async/async_locl.h | 1 + .../deps/openssl/openssl/crypto/bio/b_addr.c | 11 +- .../deps/openssl/openssl/crypto/bio/b_print.c | 6 +- .../deps/openssl/openssl/crypto/bio/b_sock.c | 6 +- .../deps/openssl/openssl/crypto/bio/bio_lcl.h | 1 + .../openssl/openssl/crypto/bio/bio_meth.c | 17 +- .../deps/openssl/openssl/crypto/bio/bss_log.c | 9 +- .../deps/openssl/openssl/crypto/bio/bss_mem.c | 4 +- .../openssl/crypto/bn/asm/alpha-mont.pl | 11 +- .../openssl/crypto/bn/asm/armv4-mont.pl | 17 +- .../openssl/crypto/bn/asm/ia64-mont.pl | 20 +- .../openssl/crypto/bn/asm/mips-mont.pl | 14 +- .../openssl/crypto/bn/asm/parisc-mont.pl | 30 +- .../openssl/openssl/crypto/bn/asm/ppc-mont.pl | 15 +- .../openssl/crypto/bn/asm/ppc64-mont.pl | 43 +- .../openssl/crypto/bn/asm/rsaz-avx2.pl | 4 +- .../openssl/crypto/bn/asm/s390x-mont.pl | 16 +- .../openssl/crypto/bn/asm/sparct4-mont.pl | 26 +- .../openssl/crypto/bn/asm/sparcv9-mont.pl | 15 +- .../openssl/openssl/crypto/bn/asm/via-mont.pl | 15 +- .../openssl/crypto/bn/asm/vis3-mont.pl | 18 +- .../openssl/openssl/crypto/bn/asm/x86-mont.pl | 24 +- .../openssl/crypto/bn/asm/x86_64-gcc.c | 8 +- .../openssl/crypto/bn/asm/x86_64-mont.pl | 85 +- .../openssl/crypto/bn/asm/x86_64-mont5.pl | 21 +- .../deps/openssl/openssl/crypto/bn/bn_blind.c | 90 +- .../deps/openssl/openssl/crypto/bn/bn_div.c | 3 +- .../deps/openssl/openssl/crypto/bn/bn_exp.c | 69 +- .../deps/openssl/openssl/crypto/bn/bn_gcd.c | 11 +- .../deps/openssl/openssl/crypto/bn/bn_gf2m.c | 34 +- .../openssl/openssl/crypto/bn/bn_intern.c | 12 +- .../deps/openssl/openssl/crypto/bn/bn_lcl.h | 23 +- .../deps/openssl/openssl/crypto/bn/bn_lib.c | 107 +- .../deps/openssl/openssl/crypto/bn/bn_mod.c | 134 +- .../deps/openssl/openssl/crypto/bn/bn_mont.c | 92 +- .../deps/openssl/openssl/crypto/bn/bn_mul.c | 14 +- .../deps/openssl/openssl/crypto/bn/bn_prime.h | 512 +- .../deps/openssl/openssl/crypto/bn/bn_sqr.c | 22 +- .../deps/openssl/openssl/crypto/bn/bn_x931p.c | 6 +- worker/deps/openssl/openssl/crypto/build.info | 3 +- .../openssl/crypto/cast/asm/cast-586.pl | 2 +- .../openssl/crypto/chacha/asm/chacha-armv4.pl | 4 +- .../openssl/crypto/chacha/asm/chacha-armv8.pl | 4 +- .../openssl/crypto/chacha/asm/chacha-ppc.pl | 4 +- .../openssl/crypto/chacha/asm/chacha-x86.pl | 4 +- .../deps/openssl/openssl/crypto/cms/cms_env.c | 3 +- .../openssl/openssl/crypto/cms/cms_smime.c | 3 +- .../openssl/openssl/crypto/conf/build.info | 2 +- .../openssl/openssl/crypto/conf/conf_api.c | 13 +- .../openssl/openssl/crypto/conf/conf_err.c | 9 +- .../openssl/openssl/crypto/conf/conf_lcl.h | 11 + .../openssl/openssl/crypto/conf/conf_mall.c | 4 +- .../openssl/openssl/crypto/conf/conf_mod.c | 5 +- .../openssl/openssl/crypto/conf/conf_ssl.c | 178 + worker/deps/openssl/openssl/crypto/cryptlib.c | 112 +- .../deps/openssl/openssl/crypto/ct/ct_log.c | 4 +- .../deps/openssl/openssl/crypto/dh/dh_key.c | 2 +- .../deps/openssl/openssl/crypto/dh/dh_lib.c | 12 +- .../deps/openssl/openssl/crypto/dh/dh_meth.c | 4 +- worker/deps/openssl/openssl/crypto/dllmain.c | 1 + .../deps/openssl/openssl/crypto/dsa/dsa_err.c | 3 +- .../deps/openssl/openssl/crypto/dsa/dsa_gen.c | 15 +- .../deps/openssl/openssl/crypto/dsa/dsa_lib.c | 12 +- .../openssl/openssl/crypto/dsa/dsa_meth.c | 4 +- .../openssl/openssl/crypto/dsa/dsa_ossl.c | 129 +- .../openssl/openssl/crypto/dsa/dsa_pmeth.c | 28 +- .../openssl/openssl/crypto/dso/dso_dlfcn.c | 83 +- .../crypto/ec/asm/ecp_nistz256-armv4.pl | 12 +- .../crypto/ec/asm/ecp_nistz256-armv8.pl | 20 +- .../crypto/ec/asm/ecp_nistz256-avx2.pl | 4 +- .../crypto/ec/asm/ecp_nistz256-sparcv9.pl | 12 +- .../openssl/crypto/ec/asm/ecp_nistz256-x86.pl | 6 +- .../crypto/ec/asm/ecp_nistz256-x86_64.pl | 4 +- .../deps/openssl/openssl/crypto/ec/ec2_smpl.c | 6 +- .../deps/openssl/openssl/crypto/ec/ec_ameth.c | 13 +- .../deps/openssl/openssl/crypto/ec/ec_curve.c | 6 +- .../deps/openssl/openssl/crypto/ec/ec_err.c | 4 +- .../deps/openssl/openssl/crypto/ec/ec_key.c | 4 +- .../deps/openssl/openssl/crypto/ec/ec_kmeth.c | 4 +- .../deps/openssl/openssl/crypto/ec/ec_lcl.h | 23 +- .../deps/openssl/openssl/crypto/ec/ec_lib.c | 69 +- .../deps/openssl/openssl/crypto/ec/ec_mult.c | 263 +- .../deps/openssl/openssl/crypto/ec/ec_oct.c | 10 +- .../openssl/openssl/crypto/ec/ecdsa_ossl.c | 132 +- .../deps/openssl/openssl/crypto/ec/ecp_mont.c | 5 +- .../deps/openssl/openssl/crypto/ec/ecp_nist.c | 5 +- .../openssl/openssl/crypto/ec/ecp_nistp224.c | 5 +- .../openssl/openssl/crypto/ec/ecp_nistp521.c | 5 +- .../openssl/openssl/crypto/ec/ecp_nistz256.c | 37 +- .../deps/openssl/openssl/crypto/ec/ecp_smpl.c | 59 +- .../openssl/openssl/crypto/engine/eng_lib.c | 11 +- .../openssl/openssl/crypto/engine/eng_list.c | 4 +- .../openssl/crypto/engine/eng_openssl.c | 1 + .../openssl/openssl/crypto/engine/tb_asnmth.c | 5 +- worker/deps/openssl/openssl/crypto/err/err.c | 61 +- .../openssl/openssl/crypto/evp/cmeth_lib.c | 1 + .../deps/openssl/openssl/crypto/evp/evp_err.c | 3 + .../deps/openssl/openssl/crypto/evp/p_seal.c | 21 +- .../openssl/openssl/crypto/evp/pmeth_lib.c | 46 +- .../deps/openssl/openssl/crypto/evp/scrypt.c | 25 +- worker/deps/openssl/openssl/crypto/ex_data.c | 5 +- worker/deps/openssl/openssl/crypto/getenv.c | 31 + .../internal/__DECC_INCLUDE_EPILOGUE.H | 16 + .../internal/__DECC_INCLUDE_PROLOGUE.H | 20 + .../crypto/include/internal/asn1_int.h | 4 +- .../openssl/crypto/include/internal/async.h | 4 +- .../openssl/crypto/include/internal/bn_int.h | 25 +- .../crypto/include/internal/cryptlib.h | 6 +- .../crypto/include/internal/cryptlib_int.h | 4 +- .../openssl/crypto/include/internal/err_int.h | 4 +- .../openssl/crypto/include/internal/lhash.h | 15 + .../crypto/include/internal/x509_int.h | 3 +- worker/deps/openssl/openssl/crypto/init.c | 141 +- worker/deps/openssl/openssl/crypto/kdf/hkdf.c | 10 +- .../deps/openssl/openssl/crypto/lhash/lhash.c | 27 +- .../openssl/openssl/crypto/lhash/lhash_lcl.h | 2 +- worker/deps/openssl/openssl/crypto/mem_sec.c | 16 +- .../openssl/crypto/modes/asm/ghash-armv4.pl | 9 +- .../openssl/crypto/modes/asm/ghashv8-armx.pl | 4 +- .../openssl/openssl/crypto/modes/modes_lcl.h | 17 +- .../openssl/openssl/crypto/modes/ocb128.c | 123 +- worker/deps/openssl/openssl/crypto/o_fopen.c | 20 +- worker/deps/openssl/openssl/crypto/o_time.c | 6 +- .../openssl/openssl/crypto/objects/o_names.c | 37 +- .../openssl/crypto/objects/objects.txt | 1 + .../openssl/openssl/crypto/ocsp/ocsp_cl.c | 12 +- .../deps/openssl/openssl/crypto/pem/pem_lib.c | 55 +- .../deps/openssl/openssl/crypto/pem/pem_pk8.c | 4 +- .../openssl/openssl/crypto/pem/pem_pkey.c | 4 +- .../deps/openssl/openssl/crypto/pem/pvkfmt.c | 13 +- .../openssl/openssl/crypto/perlasm/readme | 3 +- .../openssl/openssl/crypto/pkcs12/p12_asn.c | 4 +- .../openssl/openssl/crypto/pkcs12/p12_init.c | 5 +- .../openssl/openssl/crypto/pkcs12/p12_mutl.c | 34 +- .../openssl/openssl/crypto/pkcs7/pk7_lib.c | 3 +- .../crypto/poly1305/asm/poly1305-armv4.pl | 5 +- .../crypto/poly1305/asm/poly1305-mips.pl | 1 + .../crypto/poly1305/asm/poly1305-x86.pl | 4 +- .../openssl/openssl/crypto/rand/md_rand.c | 12 +- .../openssl/openssl/crypto/rand/randfile.c | 11 +- .../openssl/crypto/rc4/asm/rc4-c64xplus.pl | 2 +- .../deps/openssl/openssl/crypto/rsa/rsa_gen.c | 2 + .../deps/openssl/openssl/crypto/rsa/rsa_lib.c | 6 +- .../openssl/openssl/crypto/rsa/rsa_meth.c | 9 +- .../openssl/openssl/crypto/rsa/rsa_oaep.c | 73 +- .../openssl/openssl/crypto/rsa/rsa_ossl.c | 174 +- .../deps/openssl/openssl/crypto/rsa/rsa_pk1.c | 41 +- .../deps/openssl/openssl/crypto/rsa/rsa_pss.c | 4 +- .../deps/openssl/openssl/crypto/rsa/rsa_ssl.c | 10 +- .../openssl/crypto/sha/asm/sha1-586.pl | 4 +- .../openssl/crypto/sha/asm/sha256-586.pl | 4 +- .../openssl/crypto/sha/asm/sha256-armv4.pl | 4 +- .../openssl/crypto/sha/asm/sha512-armv4.pl | 6 +- .../deps/openssl/openssl/crypto/threads_win.c | 23 +- .../deps/openssl/openssl/crypto/ts/ts_lib.c | 5 +- .../openssl/openssl/crypto/ts/ts_rsp_sign.c | 7 +- .../openssl/openssl/crypto/ts/ts_rsp_verify.c | 2 +- .../openssl/openssl/crypto/ui/ui_openssl.c | 27 +- .../openssl/openssl/crypto/x509/build.info | 2 +- .../deps/openssl/openssl/crypto/x509/by_dir.c | 7 +- .../openssl/openssl/crypto/x509/by_file.c | 4 +- .../openssl/openssl/crypto/x509/x509_cmp.c | 4 +- .../openssl/openssl/crypto/x509/x509_err.c | 3 +- .../openssl/openssl/crypto/x509/x509_lcl.h | 6 +- .../openssl/openssl/crypto/x509/x509_lu.c | 124 +- .../openssl/openssl/crypto/x509/x509_meth.c | 166 + .../openssl/openssl/crypto/x509/x509_vfy.c | 192 +- .../openssl/openssl/crypto/x509/x509_vpm.c | 7 +- .../openssl/openssl/crypto/x509/x509name.c | 10 +- .../deps/openssl/openssl/crypto/x509/x_name.c | 4 +- .../openssl/openssl/crypto/x509v3/v3_enum.c | 2 +- .../openssl/openssl/crypto/x509v3/v3_ncons.c | 137 +- .../openssl/openssl/crypto/x509v3/v3_purp.c | 34 +- .../openssl/openssl/crypto/x509v3/v3_skey.c | 2 +- .../openssl/openssl/crypto/x509v3/v3_tlsf.c | 9 +- .../openssl/openssl/demos/bio/descrip.mms | 2 +- .../deps/openssl/openssl/demos/certs/README | 5 +- .../openssl/openssl/demos/certs/apps/apps.cnf | 2 + .../openssl/demos/certs/apps/mkxcerts.sh | 2 +- .../openssl/openssl/demos/certs/mkcerts.sh | 3 +- .../deps/openssl/openssl/demos/evp/Makefile | 2 +- .../deps/openssl/openssl/demos/evp/aesgcm.c | 2 +- worker/deps/openssl/openssl/doc/apps/ca.pod | 6 +- worker/deps/openssl/openssl/doc/apps/cms.pod | 18 +- .../deps/openssl/openssl/doc/apps/config.pod | 4 +- worker/deps/openssl/openssl/doc/apps/crl.pod | 4 +- .../deps/openssl/openssl/doc/apps/genpkey.pod | 157 +- .../deps/openssl/openssl/doc/apps/rehash.pod | 8 +- worker/deps/openssl/openssl/doc/apps/req.pod | 9 +- .../openssl/openssl/doc/apps/s_client.pod | 10 +- .../doc/crypto/ASN1_INTEGER_get_int64.pod | 6 +- .../openssl/doc/crypto/BIO_meth_new.pod | 18 +- .../openssl/openssl/doc/crypto/BN_add.pod | 6 +- .../openssl/openssl/doc/crypto/BN_bn2bin.pod | 6 +- .../openssl/doc/crypto/BN_generate_prime.pod | 14 +- .../openssl/doc/crypto/CMS_encrypt.pod | 7 +- .../doc/crypto/CMS_get0_SignerInfos.pod | 4 +- .../doc/crypto/CMS_get1_ReceiptRequest.pod | 4 +- .../openssl/doc/crypto/DH_meth_new.pod | 4 +- .../openssl/doc/crypto/DSA_meth_new.pod | 4 +- .../openssl/openssl/doc/crypto/DSA_sign.pod | 15 +- .../openssl/doc/crypto/ECDSA_SIG_new.pod | 4 +- .../openssl/doc/crypto/EVP_DigestInit.pod | 53 +- .../openssl/doc/crypto/EVP_DigestSignInit.pod | 57 +- .../doc/crypto/EVP_DigestVerifyInit.pod | 11 +- .../doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod | 4 +- .../crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod | 4 +- .../doc/crypto/EVP_PKEY_asn1_get_count.pod | 2 +- .../openssl/doc/crypto/OBJ_nid2obj.pod | 4 +- .../doc/crypto/OCSP_resp_find_status.pod | 44 +- .../doc/crypto/OPENSSL_VERSION_NUMBER.pod | 12 +- .../doc/crypto/OPENSSL_init_crypto.pod | 10 +- .../openssl/doc/crypto/OPENSSL_malloc.pod | 6 +- .../doc/crypto/PEM_read_bio_PrivateKey.pod | 15 +- .../openssl/doc/crypto/RSA_meth_new.pod | 8 +- .../openssl/doc/crypto/SMIME_read_PKCS7.pod | 4 +- .../openssl/openssl/doc/crypto/UI_STRING.pod | 1 + .../doc/crypto/X509_LOOKUP_hash_dir.pod | 3 +- .../doc/crypto/X509_LOOKUP_meth_new.pod | 189 + .../crypto/X509_VERIFY_PARAM_set_flags.pod | 33 +- .../openssl/doc/crypto/X509_check_host.pod | 9 +- .../openssl/doc/crypto/X509_cmp_time.pod | 39 + .../deps/openssl/openssl/doc/crypto/bio.pod | 1 + .../deps/openssl/openssl/doc/fingerprints.txt | 5 +- .../openssl/openssl/doc/openssl-c-indent.el | 1 + .../openssl/openssl/doc/ssl/SSL_CONF_cmd.pod | 4 - .../doc/ssl/SSL_CTX_set_ctlog_list_file.pod | 2 +- .../doc/ssl/SSL_CTX_use_certificate.pod | 9 +- .../openssl/doc/ssl/SSL_get_ciphers.pod | 36 +- .../openssl/doc/ssl/SSL_get_session.pod | 7 +- .../openssl/doc/ssl/SSL_get_version.pod | 8 +- .../openssl/openssl/doc/ssl/SSL_set1_host.pod | 4 +- worker/deps/openssl/openssl/doc/ssl/ssl.pod | 8 +- .../openssl/engines/asm/e_padlock-x86.pl | 6 +- .../openssl/engines/asm/e_padlock-x86_64.pl | 2 +- worker/deps/openssl/openssl/engines/e_capi.c | 30 +- .../external/perl/Text-Template-1.46/INSTALL | 2 +- .../external/perl/Text-Template-1.46/README | 61 +- .../Text-Template-1.46/lib/Text/Template.pm | 146 +- .../lib/Text/Template/Preprocess.pm | 9 +- .../perl/Text-Template-1.46/t/00-version.t | 1 + .../perl/Text-Template-1.46/t/01-basic.t | 14 +- .../perl/Text-Template-1.46/t/02-hash.t | 9 +- .../perl/Text-Template-1.46/t/03-out.t | 3 +- .../perl/Text-Template-1.46/t/04-safe.t | 5 +- .../perl/Text-Template-1.46/t/05-safe2.t | 5 +- .../perl/Text-Template-1.46/t/06-ofh.t | 1 + .../perl/Text-Template-1.46/t/07-safe3.t | 1 + .../perl/Text-Template-1.46/t/08-exported.t | 9 +- .../perl/Text-Template-1.46/t/09-error.t | 5 +- .../perl/Text-Template-1.46/t/10-delimiters.t | 9 +- .../perl/Text-Template-1.46/t/11-prepend.t | 14 +- .../perl/Text-Template-1.46/t/12-preprocess.t | 6 +- .../perl/Text-Template-1.46/t/13-taint.t | 5 +- .../perl/Text-Template-1.46/t/14-broken.t | 3 +- .../external/perl/transfer/Text/Template.pm | 5 +- .../deps/openssl/openssl/fuzz/test-corpus.c | 87 +- .../internal/__DECC_INCLUDE_EPILOGUE.H | 16 + .../internal/__DECC_INCLUDE_PROLOGUE.H | 20 + .../openssl/include/internal/numbers.h | 1 + .../openssl/include/internal/sslconf.h | 20 + .../openssl/openssl/include/openssl/asn1.h | 2 + .../openssl/openssl/include/openssl/bio.h | 16 +- .../deps/openssl/openssl/include/openssl/bn.h | 89 +- .../openssl/openssl/include/openssl/conf.h | 7 +- .../openssl/openssl/include/openssl/crypto.h | 6 +- .../deps/openssl/openssl/include/openssl/dh.h | 4 +- .../openssl/openssl/include/openssl/dsa.h | 13 +- .../deps/openssl/openssl/include/openssl/ec.h | 3 +- .../openssl/openssl/include/openssl/evp.h | 31 +- .../openssl/openssl/include/openssl/lhash.h | 4 +- .../openssl/openssl/include/openssl/ocsp.h | 7 +- .../openssl/include/openssl/opensslconf.h.in | 18 +- .../openssl/include/openssl/opensslv.h | 11 +- .../openssl/openssl/include/openssl/pem.h | 5 +- .../openssl/openssl/include/openssl/rsa.h | 8 +- .../openssl/openssl/include/openssl/ssl.h | 6 +- .../openssl/openssl/include/openssl/ssl3.h | 12 +- .../openssl/include/openssl/symhacks.h | 17 +- .../openssl/openssl/include/openssl/tls1.h | 10 +- .../openssl/openssl/include/openssl/x509.h | 5 +- .../openssl/include/openssl/x509_vfy.h | 78 +- worker/deps/openssl/openssl/ms/uplink-x86.pl | 4 +- .../openssl/openssl/ssl/record/rec_layer_d1.c | 64 +- .../openssl/openssl/ssl/record/rec_layer_s3.c | 2 +- .../openssl/openssl/ssl/record/ssl3_record.c | 14 +- worker/deps/openssl/openssl/ssl/s3_enc.c | 10 +- worker/deps/openssl/openssl/ssl/ssl_ciph.c | 5 +- worker/deps/openssl/openssl/ssl/ssl_conf.c | 5 +- worker/deps/openssl/openssl/ssl/ssl_init.c | 13 +- worker/deps/openssl/openssl/ssl/ssl_lib.c | 41 +- worker/deps/openssl/openssl/ssl/ssl_locl.h | 9 +- worker/deps/openssl/openssl/ssl/ssl_mcnf.c | 142 +- worker/deps/openssl/openssl/ssl/ssl_sess.c | 8 +- worker/deps/openssl/openssl/ssl/ssl_txt.c | 16 +- worker/deps/openssl/openssl/ssl/statem/README | 1 + .../deps/openssl/openssl/ssl/statem/statem.c | 4 +- .../openssl/openssl/ssl/statem/statem_clnt.c | 17 +- .../openssl/openssl/ssl/statem/statem_dtls.c | 3 +- .../openssl/openssl/ssl/statem/statem_lib.c | 25 + .../openssl/openssl/ssl/statem/statem_srvr.c | 45 +- worker/deps/openssl/openssl/ssl/t1_lib.c | 50 +- worker/deps/openssl/openssl/ssl/t1_trce.c | 17 +- worker/deps/openssl/openssl/test/README | 18 +- .../deps/openssl/openssl/test/bioprinttest.c | 2 + worker/deps/openssl/openssl/test/build.info | 24 +- .../openssl/openssl/test/certs/alt1-cert.pem | 39 +- .../openssl/openssl/test/certs/alt1-key.pem | 52 +- .../openssl/test/certs/badalt6-cert.pem | 35 +- .../openssl/test/certs/badalt6-key.pem | 52 +- .../openssl/test/certs/badalt7-cert.pem | 33 +- .../openssl/test/certs/badalt7-key.pem | 52 +- .../openssl/test/certs/badcn1-cert.pem | 20 + .../openssl/openssl/test/certs/badcn1-key.pem | 28 + .../openssl/test/certs/goodcn1-cert.pem | 22 + .../openssl/test/certs/goodcn1-key.pem | 28 + .../deps/openssl/openssl/test/certs/setup.sh | 25 +- .../openssl/openssl/test/ct/log_list.conf | 1 + worker/deps/openssl/openssl/test/ct_test.c | 6 +- worker/deps/openssl/openssl/test/danetest.in | 2 +- worker/deps/openssl/openssl/test/errtest.c | 40 + .../openssl/openssl/test/evp_extra_test.c | 48 +- worker/deps/openssl/openssl/test/evp_test.c | 11 +- worker/deps/openssl/openssl/test/r160test.c | 1 + .../openssl/test/recipes/04-test_err.t | 12 + .../cert-trailingwhitespace.pem | 52 +- .../dsa-trailingwhitespace.pem | 36 +- .../openssl/test/recipes/15-test_genrsa.t | 39 +- .../openssl/test/recipes/25-test_verify.t | 10 +- .../openssl/test/recipes/30-test_evp.t | 17 +- .../test/recipes/30-test_evp_data/evpcase.txt | 47 + .../test/recipes/30-test_evp_data/evpciph.txt | 2270 +++++++++ .../recipes/30-test_evp_data/evpdigest.txt | 224 + .../recipes/30-test_evp_data/evpencod.txt | 192 + .../test/recipes/30-test_evp_data/evpkdf.txt | 138 + .../test/recipes/30-test_evp_data/evpmac.txt | 150 + .../test/recipes/30-test_evp_data/evppbe.txt | 251 + .../30-test_evp_data/evppkey.txt} | 3171 +----------- .../recipes/30-test_evp_data/evppkey_ecc.txt | 4534 +++++++++++++++++ .../test/recipes/60-test_x509_dup_cert.t | 19 + .../openssl/test/recipes/60-test_x509_time.t | 12 + .../openssl/openssl/test/recipes/80-test_ca.t | 1 + .../openssl/test/recipes/80-test_cipherlist.t | 9 +- .../openssl/test/recipes/80-test_x509aux.t | 2 +- .../openssl/test/recipes/90-test_fuzz.t | 12 +- .../openssl/test/recipes/90-test_shlibload.t | 34 +- .../openssl/test/recipes/tconversion.pl | 2 +- worker/deps/openssl/openssl/test/run_tests.pl | 2 +- worker/deps/openssl/openssl/test/secmemtest.c | 46 +- .../deps/openssl/openssl/test/shlibloadtest.c | 58 +- .../openssl/test/ssl-tests/01-simple.conf | 2 + .../test/ssl-tests/02-protocol-version.conf | 2 + .../test/ssl-tests/03-custom_verify.conf | 2 + .../test/ssl-tests/04-client_auth.conf | 2 + .../test/ssl-tests/04-client_auth.conf.in | 2 +- .../openssl/test/ssl-tests/05-sni.conf | 2 + .../openssl/test/ssl-tests/06-sni-ticket.conf | 2 + .../ssl-tests/07-dtls-protocol-version.conf | 2 + .../openssl/test/ssl-tests/08-npn.conf | 2 + .../openssl/test/ssl-tests/08-npn.conf.in | 2 +- .../openssl/test/ssl-tests/09-alpn.conf | 2 + .../openssl/test/ssl-tests/09-alpn.conf.in | 2 +- .../openssl/test/ssl-tests/10-resumption.conf | 2 + .../test/ssl-tests/11-dtls_resumption.conf | 2 + .../openssl/openssl/test/ssl-tests/12-ct.conf | 2 + .../test/ssl-tests/13-fragmentation.conf | 2 + .../openssl/test/ssl-tests/14-curves.conf | 2 + .../openssl/test/ssl-tests/15-certstatus.conf | 2 + .../test/ssl-tests/16-dtls-certstatus.conf | 2 + .../test/ssl-tests/17-renegotiate.conf | 2 + .../test/ssl-tests/18-dtls-renegotiate.conf | 2 + .../test/ssl-tests/19-mac-then-encrypt.conf | 2 + .../deps/openssl/openssl/test/ssl_test.tmpl | 10 +- worker/deps/openssl/openssl/test/sslapitest.c | 56 + .../openssl/openssl/test/verify_extra_test.c | 44 +- worker/deps/openssl/openssl/test/versions.c | 20 + .../openssl/openssl/test/x509_dup_cert_test.c | 70 + .../openssl/openssl/test/x509_time_test.c | 212 + worker/deps/openssl/openssl/util/copy.pl | 12 +- worker/deps/openssl/openssl/util/dofile.pl | 6 +- worker/deps/openssl/openssl/util/echo.pl | 12 + worker/deps/openssl/openssl/util/fipslink.pl | 6 +- worker/deps/openssl/openssl/util/incore | 6 +- .../deps/openssl/openssl/util/libcrypto.num | 33 +- .../openssl/openssl/util/local_shlib.com.in | 2 +- worker/deps/openssl/openssl/util/mkdef.pl | 13 +- worker/deps/openssl/openssl/util/mkrc.pl | 4 +- .../openssl/openssl/util/perl/OpenSSL/Test.pm | 29 +- .../openssl/util/perl/TLSProxy/Message.pm | 4 +- .../openssl/util/perl/TLSProxy/Record.pm | 2 +- .../openssl/util/perl/TLSProxy/ServerHello.pm | 4 +- .../util/perl/TLSProxy/ServerKeyExchange.pm | 2 +- .../openssl/util/perl/with_fallback.pm | 8 +- .../deps/openssl/openssl/util/process_docs.pl | 32 +- .../openssl/openssl/util/shlib_wrap.sh.in | 28 +- worker/fuzzer/corpora/COPYRIGHT.txt | 3 + .../785b96587d0eb44dd5d75b7a886f37e2ac504511 | Bin 0 -> 24 bytes worker/fuzzer/corpora/rtcp-corpus/0.rtcp | Bin 0 -> 72 bytes worker/fuzzer/corpora/rtcp-corpus/1.rtcp | Bin 0 -> 24 bytes worker/fuzzer/corpora/rtcp-corpus/10.rtcp | Bin 0 -> 76 bytes worker/fuzzer/corpora/rtcp-corpus/11.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/12.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtcp-corpus/13.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/14.rtcp | Bin 0 -> 40 bytes worker/fuzzer/corpora/rtcp-corpus/15.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/16.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtcp-corpus/17.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/18.rtcp | Bin 0 -> 28 bytes worker/fuzzer/corpora/rtcp-corpus/19.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/2.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/20.rtcp | Bin 0 -> 8 bytes worker/fuzzer/corpora/rtcp-corpus/21.rtcp | Bin 0 -> 8 bytes worker/fuzzer/corpora/rtcp-corpus/22.rtcp | Bin 0 -> 8 bytes worker/fuzzer/corpora/rtcp-corpus/23.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/24.rtcp | Bin 0 -> 8 bytes worker/fuzzer/corpora/rtcp-corpus/25.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/26.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/27.rtcp | Bin 0 -> 8 bytes worker/fuzzer/corpora/rtcp-corpus/28.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/29.rtcp | Bin 0 -> 56 bytes worker/fuzzer/corpora/rtcp-corpus/3.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/30.rtcp | Bin 0 -> 28 bytes worker/fuzzer/corpora/rtcp-corpus/31.rtcp | Bin 0 -> 28 bytes worker/fuzzer/corpora/rtcp-corpus/32.rtcp | Bin 0 -> 8 bytes worker/fuzzer/corpora/rtcp-corpus/33.rtcp | Bin 0 -> 32 bytes worker/fuzzer/corpora/rtcp-corpus/34.rtcp | Bin 0 -> 32 bytes worker/fuzzer/corpora/rtcp-corpus/35.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtcp-corpus/36.rtcp | Bin 0 -> 52 bytes worker/fuzzer/corpora/rtcp-corpus/37.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/38.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/39.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/4.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/40.rtcp | Bin 0 -> 24 bytes worker/fuzzer/corpora/rtcp-corpus/41.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/42.rtcp | Bin 0 -> 11 bytes worker/fuzzer/corpora/rtcp-corpus/43.rtcp | Bin 0 -> 36 bytes worker/fuzzer/corpora/rtcp-corpus/44.rtcp | Bin 0 -> 32 bytes worker/fuzzer/corpora/rtcp-corpus/45.rtcp | Bin 0 -> 32 bytes worker/fuzzer/corpora/rtcp-corpus/46.rtcp | Bin 0 -> 32 bytes worker/fuzzer/corpora/rtcp-corpus/47.rtcp | 1 + worker/fuzzer/corpora/rtcp-corpus/48.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtcp-corpus/49.rtcp | Bin 0 -> 24 bytes worker/fuzzer/corpora/rtcp-corpus/5.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/50.rtcp | Bin 0 -> 4 bytes worker/fuzzer/corpora/rtcp-corpus/51.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/52.rtcp | Bin 0 -> 32 bytes worker/fuzzer/corpora/rtcp-corpus/53.rtcp | Bin 0 -> 4 bytes worker/fuzzer/corpora/rtcp-corpus/54.rtcp | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtcp-corpus/55.rtcp | 0 worker/fuzzer/corpora/rtcp-corpus/56.rtcp | Bin 0 -> 8 bytes worker/fuzzer/corpora/rtcp-corpus/57.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/58.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/59.rtcp | Bin 0 -> 4 bytes worker/fuzzer/corpora/rtcp-corpus/6.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtcp-corpus/60.rtcp | Bin 0 -> 28 bytes worker/fuzzer/corpora/rtcp-corpus/61.rtcp | Bin 0 -> 44 bytes worker/fuzzer/corpora/rtcp-corpus/62.rtcp | Bin 0 -> 4 bytes worker/fuzzer/corpora/rtcp-corpus/63.rtcp | Bin 0 -> 40 bytes worker/fuzzer/corpora/rtcp-corpus/64.rtcp | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtcp-corpus/65.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtcp-corpus/66.rtcp | Bin 0 -> 4 bytes worker/fuzzer/corpora/rtcp-corpus/7.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtcp-corpus/8.rtcp | Bin 0 -> 4 bytes worker/fuzzer/corpora/rtcp-corpus/9.rtcp | Bin 0 -> 16 bytes worker/fuzzer/corpora/rtp-corpus/rtp-0 | Bin 0 -> 12 bytes worker/fuzzer/corpora/rtp-corpus/rtp-1 | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtp-corpus/rtp-2 | Bin 0 -> 24 bytes worker/fuzzer/corpora/rtp-corpus/rtp-3 | Bin 0 -> 43 bytes worker/fuzzer/corpora/rtp-corpus/rtp-4 | Bin 0 -> 20 bytes worker/fuzzer/corpora/rtp-corpus/rtp-5 | Bin 0 -> 261774 bytes worker/fuzzer/corpora/rtp-corpus/rtp-6 | Bin 0 -> 261774 bytes worker/fuzzer/corpora/rtp-corpus/rtp-7 | Bin 0 -> 58 bytes worker/fuzzer/corpora/stun-corpus/0.stun | Bin 0 -> 32 bytes worker/fuzzer/corpora/stun-corpus/1.stun | Bin 0 -> 32 bytes worker/fuzzer/corpora/stun-corpus/10.stun | Bin 0 -> 44 bytes worker/fuzzer/corpora/stun-corpus/11.stun | Bin 0 -> 32 bytes worker/fuzzer/corpora/stun-corpus/12.stun | Bin 0 -> 32 bytes worker/fuzzer/corpora/stun-corpus/13.stun | Bin 0 -> 28 bytes worker/fuzzer/corpora/stun-corpus/14.stun | Bin 0 -> 40 bytes worker/fuzzer/corpora/stun-corpus/15.stun | Bin 0 -> 32 bytes worker/fuzzer/corpora/stun-corpus/16.stun | Bin 0 -> 40 bytes worker/fuzzer/corpora/stun-corpus/17.stun | Bin 0 -> 44 bytes worker/fuzzer/corpora/stun-corpus/2.stun | Bin 0 -> 44 bytes worker/fuzzer/corpora/stun-corpus/3.stun | Bin 0 -> 44 bytes worker/fuzzer/corpora/stun-corpus/4.stun | Bin 0 -> 44 bytes worker/fuzzer/corpora/stun-corpus/5.stun | Bin 0 -> 108 bytes worker/fuzzer/corpora/stun-corpus/6.stun | Bin 0 -> 80 bytes worker/fuzzer/corpora/stun-corpus/7.stun | Bin 0 -> 92 bytes worker/fuzzer/corpora/stun-corpus/8.stun | Bin 0 -> 116 bytes worker/fuzzer/corpora/stun-corpus/9.stun | Bin 0 -> 32 bytes .../stun-corpus/validator-crash-1.stun | Bin 0 -> 80 bytes worker/fuzzer/include/RTC/FuzzerRtpPacket.hpp | 17 + .../fuzzer/include/RTC/FuzzerStunMessage.hpp | 17 + .../fuzzer/include/RTC/RTCP/FuzzerPacket.hpp | 20 + worker/fuzzer/new-corpus/.placeholder | 0 worker/fuzzer/reports/.placeholder | 0 worker/fuzzer/src/RTC/FuzzerRtpPacket.cpp | 68 + worker/fuzzer/src/RTC/FuzzerStunMessage.cpp | 45 + worker/fuzzer/src/RTC/RTCP/FuzzerPacket.cpp | 23 + worker/fuzzer/src/fuzzer.cpp | 89 + worker/include/Channel/UnixStreamSocket.hpp | 3 - worker/include/LogLevel.hpp | 7 +- worker/include/Logger.hpp | 97 +- worker/include/RTC/Consumer.hpp | 3 - worker/include/RTC/DtlsTransport.hpp | 7 - worker/include/RTC/IceServer.hpp | 1 - worker/include/RTC/Producer.hpp | 8 +- worker/include/RTC/RTCP/FeedbackPs.hpp | 9 +- worker/include/RTC/RTCP/FeedbackRtp.hpp | 9 +- worker/include/RTC/Router.hpp | 5 - worker/include/RTC/SrtpSession.hpp | 3 - worker/include/RTC/TcpConnection.hpp | 3 - worker/include/RTC/TcpServer.hpp | 5 +- worker/include/RTC/Transport.hpp | 9 +- worker/include/RTC/UdpSocket.hpp | 5 +- worker/include/RTC/WebRtcTransport.hpp | 4 +- worker/include/Settings.hpp | 2 +- worker/include/Utils.hpp | 10 + worker/include/handles/SignalsHandler.hpp | 8 +- worker/include/handles/TcpConnection.hpp | 14 +- worker/include/handles/TcpServer.hpp | 16 +- worker/include/handles/Timer.hpp | 7 +- worker/include/handles/UdpSocket.hpp | 8 +- worker/include/handles/UnixStreamSocket.hpp | 14 +- worker/mediasoup-worker.gyp | 108 +- worker/scripts/get-dep.sh | 28 +- worker/src/Channel/UnixStreamSocket.cpp | 14 +- worker/src/RTC/Codecs/H264.cpp | 6 +- worker/src/RTC/Codecs/VP8.cpp | 36 +- worker/src/RTC/Consumer.cpp | 8 - worker/src/RTC/DtlsTransport.cpp | 42 +- worker/src/RTC/IceServer.cpp | 7 - worker/src/RTC/NackGenerator.cpp | 2 +- worker/src/RTC/PlainRtpTransport.cpp | 10 +- worker/src/RTC/Producer.cpp | 43 +- worker/src/RTC/RTCP/Bye.cpp | 8 +- worker/src/RTC/RTCP/CompoundPacket.cpp | 4 +- worker/src/RTC/RTCP/Feedback.cpp | 8 +- worker/src/RTC/RTCP/FeedbackPs.cpp | 4 +- worker/src/RTC/RTCP/FeedbackPsAfb.cpp | 9 +- worker/src/RTC/RTCP/FeedbackPsFir.cpp | 8 +- worker/src/RTC/RTCP/FeedbackPsLei.cpp | 6 +- worker/src/RTC/RTCP/FeedbackPsPli.cpp | 4 +- worker/src/RTC/RTCP/FeedbackPsRemb.cpp | 55 +- worker/src/RTC/RTCP/FeedbackPsRpsi.cpp | 10 +- worker/src/RTC/RTCP/FeedbackPsSli.cpp | 10 +- worker/src/RTC/RTCP/FeedbackPsTst.cpp | 10 +- worker/src/RTC/RTCP/FeedbackPsVbcm.cpp | 12 +- worker/src/RTC/RTCP/FeedbackRtp.cpp | 4 +- worker/src/RTC/RTCP/FeedbackRtpEcn.cpp | 18 +- worker/src/RTC/RTCP/FeedbackRtpNack.cpp | 8 +- worker/src/RTC/RTCP/FeedbackRtpSrReq.cpp | 4 +- worker/src/RTC/RTCP/FeedbackRtpTllei.cpp | 8 +- worker/src/RTC/RTCP/FeedbackRtpTmmb.cpp | 10 +- worker/src/RTC/RTCP/ReceiverReport.cpp | 35 +- worker/src/RTC/RTCP/Sdes.cpp | 24 +- worker/src/RTC/RTCP/SenderReport.cpp | 22 +- .../AimdRateControl.cpp | 24 + worker/src/RTC/Router.cpp | 43 +- worker/src/RTC/RtpMonitor.cpp | 12 +- worker/src/RTC/RtpPacket.cpp | 55 +- worker/src/RTC/RtpStream.cpp | 4 +- worker/src/RTC/SrtpSession.cpp | 7 - worker/src/RTC/StunMessage.cpp | 109 +- worker/src/RTC/TcpConnection.cpp | 7 +- worker/src/RTC/TcpServer.cpp | 44 +- worker/src/RTC/Transport.cpp | 66 +- worker/src/RTC/TransportTuple.cpp | 12 +- worker/src/RTC/UdpSocket.cpp | 36 +- worker/src/RTC/WebRtcTransport.cpp | 46 +- worker/src/Settings.cpp | 78 +- worker/src/Utils/IP.cpp | 2 + worker/src/Utils/IP.rl | 2 + worker/src/Worker.cpp | 30 +- worker/src/handles/SignalsHandler.cpp | 39 +- worker/src/handles/TcpConnection.cpp | 136 +- worker/src/handles/TcpServer.cpp | 117 +- worker/src/handles/Timer.cpp | 30 +- worker/src/handles/UdpSocket.cpp | 76 +- worker/src/handles/UnixStreamSocket.cpp | 80 +- worker/src/main.cpp | 1 + worker/test/include/helpers.hpp | 2 +- worker/test/{ => src}/RTC/Codecs/TestVP8.cpp | 0 worker/test/{ => src}/RTC/RTCP/TestBye.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsAfb.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsFir.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsLei.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsPli.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsRemb.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsRpsi.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsSli.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsTst.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackPsVbcm.cpp | 0 .../{ => src}/RTC/RTCP/TestFeedbackRtpEcn.cpp | 0 .../RTC/RTCP/TestFeedbackRtpNack.cpp | 0 .../RTC/RTCP/TestFeedbackRtpSrReq.cpp | 0 .../RTC/RTCP/TestFeedbackRtpTllei.cpp | 0 .../RTC/RTCP/TestFeedbackRtpTmmb.cpp | 0 worker/test/{ => src}/RTC/RTCP/TestPacket.cpp | 0 .../{ => src}/RTC/RTCP/TestReceiverReport.cpp | 0 worker/test/{ => src}/RTC/RTCP/TestSdes.cpp | 0 .../{ => src}/RTC/RTCP/TestSenderReport.cpp | 0 .../test/{ => src}/RTC/TestNackGenerator.cpp | 0 .../test/{ => src}/RTC/TestRtpDataCounter.cpp | 0 worker/test/{ => src}/RTC/TestRtpMonitor.cpp | 0 worker/test/{ => src}/RTC/TestRtpPacket.cpp | 0 .../test/{ => src}/RTC/TestRtpStreamRecv.cpp | 0 .../test/{ => src}/RTC/TestRtpStreamSend.cpp | 0 worker/test/{ => src}/RTC/TestSeqManager.cpp | 0 worker/test/{ => src}/tests.cpp | 4 +- 1174 files changed, 27762 insertions(+), 30466 deletions(-) delete mode 100644 Makefile create mode 100644 doc/Fuzzer.md create mode 100644 worker/Dockerfile.fuzzer create mode 100644 worker/Makefile create mode 100644 worker/deps/libuv/src/strscpy.c create mode 100644 worker/deps/libuv/src/strscpy.h create mode 100644 worker/deps/libuv/test/test-strscpy.c delete mode 100644 worker/deps/openssl/openssl/Configurations/90-team.conf create mode 100644 worker/deps/openssl/openssl/Configurations/dist.conf create mode 100644 worker/deps/openssl/openssl/crypto/conf/conf_lcl.h create mode 100644 worker/deps/openssl/openssl/crypto/conf/conf_ssl.c create mode 100644 worker/deps/openssl/openssl/crypto/getenv.c create mode 100644 worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H create mode 100644 worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H create mode 100644 worker/deps/openssl/openssl/crypto/include/internal/lhash.h create mode 100644 worker/deps/openssl/openssl/crypto/x509/x509_meth.c create mode 100644 worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_meth_new.pod create mode 100644 worker/deps/openssl/openssl/doc/crypto/X509_cmp_time.pod create mode 100644 worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_EPILOGUE.H create mode 100644 worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_PROLOGUE.H create mode 100644 worker/deps/openssl/openssl/include/internal/sslconf.h create mode 100644 worker/deps/openssl/openssl/test/certs/badcn1-cert.pem create mode 100644 worker/deps/openssl/openssl/test/certs/badcn1-key.pem create mode 100644 worker/deps/openssl/openssl/test/certs/goodcn1-cert.pem create mode 100644 worker/deps/openssl/openssl/test/certs/goodcn1-key.pem create mode 100644 worker/deps/openssl/openssl/test/errtest.c create mode 100644 worker/deps/openssl/openssl/test/recipes/04-test_err.t create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpcase.txt create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph.txt create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpdigest.txt create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpencod.txt create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf.txt create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac.txt create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evppbe.txt rename worker/deps/openssl/openssl/test/{evptests.txt => recipes/30-test_evp_data/evppkey.txt} (75%) create mode 100644 worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evppkey_ecc.txt create mode 100644 worker/deps/openssl/openssl/test/recipes/60-test_x509_dup_cert.t create mode 100644 worker/deps/openssl/openssl/test/recipes/60-test_x509_time.t create mode 100644 worker/deps/openssl/openssl/test/versions.c create mode 100644 worker/deps/openssl/openssl/test/x509_dup_cert_test.c create mode 100644 worker/deps/openssl/openssl/test/x509_time_test.c create mode 100644 worker/deps/openssl/openssl/util/echo.pl create mode 100644 worker/fuzzer/corpora/COPYRIGHT.txt create mode 100644 worker/fuzzer/corpora/pseudotcp-corpus/785b96587d0eb44dd5d75b7a886f37e2ac504511 create mode 100644 worker/fuzzer/corpora/rtcp-corpus/0.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/1.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/10.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/11.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/12.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/13.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/14.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/15.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/16.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/17.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/18.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/19.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/2.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/20.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/21.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/22.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/23.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/24.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/25.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/26.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/27.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/28.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/29.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/3.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/30.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/31.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/32.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/33.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/34.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/35.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/36.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/37.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/38.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/39.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/4.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/40.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/41.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/42.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/43.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/44.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/45.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/46.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/47.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/48.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/49.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/5.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/50.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/51.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/52.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/53.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/54.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/55.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/56.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/57.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/58.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/59.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/6.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/60.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/61.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/62.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/63.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/64.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/65.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/66.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/7.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/8.rtcp create mode 100644 worker/fuzzer/corpora/rtcp-corpus/9.rtcp create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-0 create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-1 create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-2 create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-3 create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-4 create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-5 create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-6 create mode 100644 worker/fuzzer/corpora/rtp-corpus/rtp-7 create mode 100644 worker/fuzzer/corpora/stun-corpus/0.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/1.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/10.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/11.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/12.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/13.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/14.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/15.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/16.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/17.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/2.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/3.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/4.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/5.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/6.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/7.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/8.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/9.stun create mode 100644 worker/fuzzer/corpora/stun-corpus/validator-crash-1.stun create mode 100644 worker/fuzzer/include/RTC/FuzzerRtpPacket.hpp create mode 100644 worker/fuzzer/include/RTC/FuzzerStunMessage.hpp create mode 100644 worker/fuzzer/include/RTC/RTCP/FuzzerPacket.hpp create mode 100644 worker/fuzzer/new-corpus/.placeholder create mode 100644 worker/fuzzer/reports/.placeholder create mode 100644 worker/fuzzer/src/RTC/FuzzerRtpPacket.cpp create mode 100644 worker/fuzzer/src/RTC/FuzzerStunMessage.cpp create mode 100644 worker/fuzzer/src/RTC/RTCP/FuzzerPacket.cpp create mode 100644 worker/fuzzer/src/fuzzer.cpp rename worker/test/{ => src}/RTC/Codecs/TestVP8.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestBye.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsAfb.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsFir.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsLei.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsPli.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsRemb.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsRpsi.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsSli.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsTst.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackPsVbcm.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackRtpEcn.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackRtpNack.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackRtpSrReq.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackRtpTllei.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestFeedbackRtpTmmb.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestPacket.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestReceiverReport.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestSdes.cpp (100%) rename worker/test/{ => src}/RTC/RTCP/TestSenderReport.cpp (100%) rename worker/test/{ => src}/RTC/TestNackGenerator.cpp (100%) rename worker/test/{ => src}/RTC/TestRtpDataCounter.cpp (100%) rename worker/test/{ => src}/RTC/TestRtpMonitor.cpp (100%) rename worker/test/{ => src}/RTC/TestRtpPacket.cpp (100%) rename worker/test/{ => src}/RTC/TestRtpStreamRecv.cpp (100%) rename worker/test/{ => src}/RTC/TestRtpStreamSend.cpp (100%) rename worker/test/{ => src}/RTC/TestSeqManager.cpp (100%) rename worker/test/{ => src}/tests.cpp (88%) diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md index 0051c00cb4..8d85a598a7 100644 --- a/.github/ISSUE_TEMPLATE/Bug_Report.md +++ b/.github/ISSUE_TEMPLATE/Bug_Report.md @@ -3,14 +3,13 @@ name: 🐍 Bug Report about: Report a bug in mediasoup --- +## Bug Report + **IMPORTANT:** Do NOT open an issue here if you have problems or questions regarding mediasoup. Use the mediasoup public mailing list instead: > > https://groups.google.com/forum/#!forum/mediasoup -> -## Bug Report - ### Your environment - Operating system: diff --git a/.gitignore b/.gitignore index d88dd0f890..5eea871e53 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,13 @@ /worker/out/ /worker/**/*.xcodeproj/ +# clang+fuzzer stuff is too big. +/worker/deps/clang-fuzzer + +# Ignore all fuzzer generated test inputs. +/worker/fuzzer/new-corpus/* +!/worker/fuzzer/new-corpus/.placeholder + # Vim temporal files. *.swp *.swo diff --git a/CHANGELOG.md b/CHANGELOG.md index b63f60d04c..5695219c6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ # Changelog +### 2.6.2 + +* C++: Remove all `Destroy()` class methods and no longer do `delete this`. +* Update libuv to 1.24.1. +* Update OpenSSL to 1.1.0g. + + +### 2.6.1 + +* worker: Internal refactor and code cleanup. +* Remove announced support for certain RTCP feedback types that mediasoup does nothing with (and avoid forwarding them to the remote RTP sender). +* fuzzer: fix some wrong memory access in `RtpPacket::Dump()` and `StunMessage::Dump()` (just used during development). + +### 2.6.0 + +* Integrate [libFuzzer](http://llvm.org/docs/LibFuzzer.html) into mediasoup (documentation in the `doc` folder). Extensive testing done. Several heap-buffer-overflow and memory leaks fixed. + + ### 2.5.6 * `Producer.cpp`: Remove `UpdateRtpParameters()`. It was broken since Consumers diff --git a/Makefile b/Makefile deleted file mode 100644 index 96c4dbcfd6..0000000000 --- a/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# -# make tasks for mediasoup-worker. -# - -# Best effort to get Python 2 executable and also allow custom PYTHON -# environment variable set by the user. -PYTHON ?= $(shell command -v python2 2> /dev/null || echo python) - -.PHONY: default Release Debug test test-Release test-Debug xcode clean clean-all - -default: -ifeq ($(MEDIASOUP_BUILDTYPE),Debug) - make Debug -else - make Release -endif - -Release: - cd worker && $(PYTHON) ./scripts/configure.py -R mediasoup-worker - $(MAKE) BUILDTYPE=Release -C worker/out - -Debug: - cd worker && $(PYTHON) ./scripts/configure.py -R mediasoup-worker - $(MAKE) BUILDTYPE=Debug -C worker/out - -test: -ifeq ($(MEDIASOUP_BUILDTYPE),Debug) - make test-Debug -else - make test-Release -endif - -test-Release: - cd worker && $(PYTHON) ./scripts/configure.py -R mediasoup-worker-test - $(MAKE) BUILDTYPE=Release -C worker/out - -test-Debug: - cd worker && $(PYTHON) ./scripts/configure.py -R mediasoup-worker-test - $(MAKE) BUILDTYPE=Debug -C worker/out - -xcode: - cd worker && $(PYTHON) ./scripts/configure.py --format=xcode - -clean: - $(RM) -rf worker/out/Release/mediasoup-worker - $(RM) -rf worker/out/Release/obj.target/mediasoup-worker - $(RM) -rf worker/out/Release/mediasoup-worker-test - $(RM) -rf worker/out/Release/obj.target/mediasoup-worker-test - $(RM) -rf worker/out/Debug/mediasoup-worker - $(RM) -rf worker/out/Debug/obj.target/mediasoup-worker - $(RM) -rf worker/out/Debug/mediasoup-worker-test - $(RM) -rf worker/out/Debug/obj.target/mediasoup-worker-test - -clean-all: - $(RM) -rf worker/out - $(RM) -rf worker/mediasoup-worker.xcodeproj - $(RM) -rf worker/mediasoup-worker-test.xcodeproj - $(RM) -rf worker/deps/*/*.xcodeproj diff --git a/README.md b/README.md index b794adac47..f0f07ad721 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,8 @@ You can support **mediasoup** by making a donation [here][paypal-url]. Thanks! [mediasoup-banner]: https://raw.githubusercontent.com/versatica/mediasoup-website/master/_art/mediasoup_banner.png [mediasoup-demo-screenshot]: https://raw.githubusercontent.com/versatica/mediasoup-website/master/_art/mediasoup-opensips-summit-2017.jpg [mediasoup-website]: https://mediasoup.org -[travis-ci-shield-mediasoup]: https://img.shields.io/travis/versatica/mediasoup/master.svg -[travis-ci-mediasoup]: http://travis-ci.org/versatica/mediasoup +[travis-ci-shield-mediasoup]: https://travis-ci.com/versatica/mediasoup.svg?branch=master +[travis-ci-mediasoup]: https://travis-ci.com/versatica/mediasoup [npm-shield-mediasoup]: https://img.shields.io/npm/v/mediasoup.svg [npm-mediasoup]: https://npmjs.org/package/mediasoup [codacy-grade-shield-mediasoup]: https://img.shields.io/codacy/grade/3c8b9efc83674b6189707ab4188cfb2b.svg diff --git a/doc/Building.md b/doc/Building.md index 196fa847f5..629831de77 100644 --- a/doc/Building.md +++ b/doc/Building.md @@ -5,16 +5,19 @@ This document is intended for **mediasoup** developers. ## Makefile -The root folder of the project contains a `Makefile` to build the mediasoup worker subproject (under the `worker/` folder). +The `worker` folder contains a `Makefile` to build the mediasoup worker subproject. + ### `make` The default task runs the `Release` task unless the environment `MEDIASOUP_BUILDTYPE` is set to `Debug` (if so it runs the `Debug` task). + ### `make Release` Builds the production ready mediasoup worker binary at `worker/out/Release/`. This is the binary used in production when installing the **mediasoup** NPM module with `npm install mediasoup`. + ### `make Debug` Builds a more verbose and non optimized mediasoup worker binary at `worker/out/Debug/` with some C flags enabled (such as `-O0`) and some macros defined (such as `DEBUG`, `MS_LOG_TRACE` and `MS_LOG_FILE_LINE`). @@ -27,26 +30,60 @@ In order to instruct the **mediasoup** Node.js module to use the `Debug` mediaso $ MEDIASOUP_BUILDTYPE=Debug node myapp.js ``` + ### `make test` Runs the `test-Release` task unless the environment `MEDIASOUP_BUILDTYPE` is set to `Debug` (if so it runs the `test-Debug` task). + ### `make test-Release` Builds the `mediasoup-worker-test` test unit binary at `worker/out/Release/`. + ### `make test-Debug` Builds the `mediasoup-worker-test` test unit binary in `Debug` mode at `worker/out/Debug/`. + +### `fuzzer` + +Builds the `mediasoup-worker-fuzzer` target (which uses [libFuzzer](http://llvm.org/docs/LibFuzzer.html)) and generates the `worker/out/Release/mediasoup-worker-fuzzer` binary. + +* Linux is required with `fuzzer` capable `clang++`. +* `CC` environment variable must point to `clang`. +* `CXX` environment variable must point to `clang++`. + +Read the [Fuzzer](Fuzzer.md) documentation to run the fuzzer binary. + + +### `fuzzer-docker-build` + +Builds a Linux image with `fuzzer` capable `clang++`. + +**NOTE:** Before running this command, a specific version of Linux `clang` must be downloaded. To get it, run: + +```bash +$ cd worker +$ ./scripts/get-dep.sh clang-fuzzer +``` + + +### `fuzzer-docker-run` + +Runs a container of the Docker image created with `fuzzer-docker-build`. It automatically executes a `bash` session in the `/mediasoup/worker` directory, which is a Docker volume that points to the real `mediasoup/worker` directory (so we can do `make fuzzer`, etc). + + ### `make xcode` Builds a Xcode project for the mediasoup worker subproject. + ### `make clean` Cleans objects and binaries related to the mediasoup worker. + ### `make clean-all` Cleans all the objects and binaries, including those generated for library dependencies (such as libuv, openssl and libsrtp). @@ -62,38 +99,43 @@ In order to tun these tasks, `gulp-cli` (version >= 1.2.2) must be globally inst $ npm install -g gulp-cli ``` + ### `gulp` The default task runs the `gulp:lint` and `gulp:test` tasks. -### `gulp rtpcapabilities` - -Reads **mediasoup** [supported RTP capabilities](https://github.com/versatica/mediasoup/blob/master/lib/supportedRtpCapabilities.js) and inserts them into the worker C++ code. After that, `make Release` and/or `make Debug` must be called. ### `gulp lint` Runs both the `lint:node` and `lint:worker` gulp tasks. + ### `gulp lint:node` Validates the Node.js JavaScript code/syntax. + ### `gulp lint:worker` Validates the worker C++ code/syntax using [clang-format](https://clang.llvm.org/docs/ClangFormat.html) following `worker/.clang-format` rules. + ### `gulp format` Runs the `format:worker` gulp task. + ### `gulp format:worker` Rewrites worker source and include files using [clang-format](https://clang.llvm.org/docs/ClangFormat.html). + ### `gulp tidy` + Runs the `tidy:worker` gulp task. + ### `gulp tidy:worker` Performs C++ code check using [clang-tidy](http://clang.llvm.org/extra/clang-tidy/) following following `worker/.clang-tidy` rules. @@ -115,14 +157,16 @@ Replace the references of the current directory by the keywork 'PATH': $ sed -i "s|$PWD|PATH|g" compile_commands.json ``` -Edit the file and remove the entry related to Utils/IP.cpp compilation unit, which is automatically created and does not follow the clang-tidy rules. +Edit the file and remove the entry related to `Utils/IP.cpp` compilation unit, which is automatically created and does not follow the clang-tidy rules. *NOTE:* It just works on Linux and OSX. + ### `gulp test` Runs both the `test:node` and `test:worker` gulp tasks. + ### `gulp test:node` Runs the Node.js [test units](test/). Before it, it invokes the `make` command. @@ -133,6 +177,7 @@ In order to run the JavaScript test units with the mediasoup worker in `Debug` m $ MEDIASOUP_BUILDTYPE=Debug gulp test:node ``` + ### `gulp test:worker` Runs the mediasoup worker [test units](worker/test/). Before it, it invokes the `make test` command. diff --git a/doc/Fuzzer.md b/doc/Fuzzer.md new file mode 100644 index 0000000000..79375d01d3 --- /dev/null +++ b/doc/Fuzzer.md @@ -0,0 +1,77 @@ +# Fuzzer + +Once we have built the `mediasoup-worker-fuzzer` target in a Linux environment with `fuzzer` capable `clang` (see `make fuzzer` documentation in [Building](Building.md)) we can then execute the fuzzer binary at `worker/out/Release/mediasoup-worker-fuzzer`. + +*NOTE:* From now on, we assume we are in the mediasoup `worker` directory. + + +## Related documentation + +* [libFuzzer documentation](http://llvm.org/docs/LibFuzzer.html) +* [libFuzzer Tutorial](https://github.com/google/fuzzer-test-suite/blob/master/tutorial/libFuzzerTutorial.md) +* [webrtcH4cKS ~ Lets get better at fuzzing in 2019](https://webrtchacks.com/lets-get-better-at-fuzzing-in-2019-heres-how/) +* [OSS-Fuzz](https://github.com/google/oss-fuzz) - Continuous fuzzing of open source software ("fuzz for me") + + +## Corpus files + +The `fuzzer/corpora` directory has corpus directories taken from Chromium projects. They should be use to feed fuzzer with appropriate input. + +However, given how `libFuzzer` [works](http://llvm.org/docs/LibFuzzer.html#options), the first directory given as command line parameter is not just used for reading corpus files, but also to store newly generated ones. So, it's recommended to pass `fuzzer/new-corpus` as first directory. Such a directory is gitignored (for now). + + +## Crash reports + +When the fuzzer detects an issue it generates a crash report file which contains the bytes given as input. Those files can be individually used later (instead of passing corpus directories) to the fuzzer to verify that the issue has been fixed. + +The `fuzzer/reports` directory should be used to store those new crash reports. In order to use it, the following option must be given to the fuzzer executable: + +```bash +-artifact_prefix=fuzzer/reports/ +``` + +## Others + +It's recommended to (also) pass the following options to the fuzzer: + +* `-max_len=1400`: We don't need much more input size. + +For memory leak detection enable the following environment variable: + +* `LSAN_OPTIONS=verbosity=1:log_threads=1` + +The mediasoup-worker fuzzer reads some custom environment variables to decide which kind of fuzzing perform: + +* `MS_FUZZ_STUN=1`: Do STUN fuzzing. +* `MS_FUZZ_RTP=1`: Do RTP fuzzing. +* `MS_FUZZ_RTCP=1`: Do RTCP fuzzing. +* If none of them is given, then **all** fuzzers are enabled. + +The log level can also be set by setting the `MS_FUZZ_LOG_LEVEL` environment variable to "debug", "warn" or "error" (it is "none" if unset). + + +## Usage examples + +* Detect memory leaks and just fuzz STUN: + +```bash +$ MS_FUZZ_STUN=1 LSAN_OPTIONS=verbosity=1:log_threads=1 ./out/Release/mediasoup-worker-fuzzer -artifact_prefix=fuzzer/reports/ -max_len=1400 fuzzer/new-corpus fuzzer/corpora/stun-corpus +``` + +* Detect memory leaks and just fuzz RTCP: + +```bash +$ MS_FUZZ_RTCP=1 LSAN_OPTIONS=verbosity=1:log_threads=1 ./out/Release/mediasoup-worker-fuzzer -artifact_prefix=fuzzer/reports/ -max_len=1400 fuzzer/new-corpus fuzzer/corpora/rtcp-corpus +``` + +* Detect memory leaks and fuzz everything with log level "warn": + +```bash +$ MS_FUZZ_LOG_LEVEL=warn LSAN_OPTIONS=verbosity=1:log_threads=1 ./out/Release/mediasoup-worker-fuzzer -artifact_prefix=fuzzer/reports/ -max_len=1400 fuzzer/new-corpus fuzzer/corpora/stun-corpus fuzzer/corpora/rtcp-corpus fuzzer/corpora/rtp-corpus +``` + +* Verify that a specific crash is fixed: + +```bash +$ LSAN_OPTIONS=verbosity=1:log_threads=1 ./out/Release/mediasoup-worker-fuzzer fuzzer/reports/crash-f39771f7a03c0e7e539d4e52f48f7adad8976404 +``` diff --git a/doc/RTCP.md b/doc/RTCP.md index 28c12f628d..5d6bb2e3f3 100644 --- a/doc/RTCP.md +++ b/doc/RTCP.md @@ -1,14 +1,14 @@ # RTCP -This documentation describes how RTCP packets should be processed in *mediasoup*. +This documentation describes how RTCP packets are processed in *mediasoup*. -Being a SFU, some received RTCP packets must be just routed to its intended destination, others must be locally consumed, and others must be ignored. +Being a SFU, some received RTCP packets are locally consumed and others are ignored. -This document also describes which RTCP packets must be locally generated by *mediasoup*. +This document also describes which RTCP packets are locally generated by *mediasoup*. -*mediasoup* will not forward feedback information from a remote RTP receiver that could incur in the remote sender modifying the transmition rate in a way that it would affect the reception quality for the overall participants in a room. Ie: limiting the remote RTP sender transmition rate. +*mediasoup* does not forward feedback information from a remote RTP receiver, which could incur in the remote sender modifying the transmition rate in a way that it would affect the reception quality for the overall participants in a room. Ie: limiting the remote RTP sender transmition rate. -In order to get the best media quality from the remote RTP senders, *mediasoup* will focus on generating locally the reception information (RR, XR), so the remote RTP senders can adjust their transmission rate according to it. +In order to get the best media quality from the remote RTP senders, *mediasoup* focuses on generating locally the reception information (RR), so the remote RTP senders can adjust their transmission rate according to it. ### Sender Reports @@ -16,25 +16,25 @@ In order to get the best media quality from the remote RTP senders, *mediasoup* ### Receiver Reports -*mediasoup* locally generates the Receiver Reports of the streams it receives. At the same time, it will consume the Receiver Reports from every remote RTP receivers. +*mediasoup* locally generates the Receiver Reports of the streams it receives. At the same time, it consumes the Receiver Reports from every remote RTP receivers. -The combination of Sender and Receiver Reports will be used to determine the quality of each link. Information that will be available at the JavaScript API level in order to determine the quality of each participant in the room. +The combination of Sender and Receiver Reports are used to determine the quality of each link. Information that is available at the JavaScript API level in order to determine the quality of each participant in the room. ### SDES -SDES information is relayed from the remote RTP sender to the corresponding remote RTP receivers. +SDES information is locally consumed. ### BYE -BYE information will be relayed from the remote RTP sender to the corresponding remote RTP receivers. +This information is ignored. ### APP -App information will be relayed from the remote RTP sender to the corresponding remote RTP receivers. +This information is ignored. ### XR -The same logic is applied as to Receiver Reports. +The same logic should be applied as to Receiver Reports. ## RTP Feedback @@ -53,11 +53,12 @@ Stream Bit Rate Request (TMMBR, "timber") to request a sender to limit the maximum bit rate for a media stream (see section 2.2) to, or below, the provided value. ``` -As for now, we will not limit the bit rate for media streams, as we are relying on locally generated reception reports (RR, XR) to make the remote RTP senders adjust their transmition rates given such values. -### RTCP-SR-REQ +This information is ignored. + +As for now, we do not limit the bit rate for the media streams as we are relying on locally generated reception reports (RR) to make the remote RTP senders adjust their transmition rates given such values. -This information is to be bypassed from the remote RTP receiver to the corresponding remote RTP sender. +### RTCP-SR-REQ ``` RFC 6051: @@ -70,13 +71,15 @@ delay. This increase in delay can be unacceptable to some applications that use layered and/or multi-description codecs. ``` +This information is ignored. + ### RAMS -Applicable on multicast sessions. +This information is ignored. ### TLLEI -For now it can be just ignored. In future it could be useful when *mediasoup* generates **NACK** request, in order to ackonwledge remote RTP receivers about it and avoid them sending such requests, avoiding the so called "feedback storm" or "NACK storm". +This information is ignored. In future it could be useful to acknowledge remote RTP receivers when *mediasoup* generates **NACK** request in order to avoid them sending them, which could generate the so called "feedback storm" or "NACK storm". ``` RFC 6642: @@ -88,39 +91,39 @@ to send feedback to it regarding these packets. ### RTCP-ECN-FB -For now it can be just ignored. +This information is ignored. ### PAUSE-RESUME -Locally consume the pause-resume requests from remote RTP receivers in order to disable and enable the transmission for them independently. Applicable also in simulcast envirnments. +This information is ignored. ### Transport-wide Congestion Control (TCC) -Locally generate the RTP extension header on RTP packets sent by RTP transport, and consume the received RTCP Feedback to know exactly the state of received and lost packets on remote Peers. +This information is ignored. ## PS Feedback ### PLI -This information is to be bypassed from the remote RTP receiver to the corresponding RTP sender. -Also to be locally sent when a new participant joins the conference for a fast rendering by the rest of participants. +This information is locally consumed and generates a PLI request to the corresponding RTP sender. + +Also it is locally sent when required. Ie: a new participant joins the conference for a fast rendering by the rest of participants. ### SLI -This information is to be bypassed from the remote RTP receiver to the corresponding RTP sender. +This information is ignored. ### RPSI -This information is to be bypassed from the remote RTP receiver to the corresponding RTP sender. +This information is ignored. ### FIR -This information is to be bypassed from the remote RTP receiver to the corresponding RTP sender. -Also to be locally sent when a new participant joins the conference for a fast rendering by the rest of participants. +This information is locally consumed and generates a PLI request to the corresponding RTP sender. ### TSTR/TSTN -This information is to be ignored since it would affect the transmition rate of the remote RTP sender, affecting thus the overall participants of the room. +This information is ignored. ``` RFC 5104: @@ -132,21 +135,20 @@ desire for higher frame rate. ### VBCM -This information is to be ignored since different remote RTP receivers will potentially send different feedback for the same media stream. +This information is ignored. ### PSLEI Same applicability as **TLLEI**. -For now it can be just ignored. In future it could be useful when *mediasoup* generates PLI or FIR request, in order to ackonwledge remote RTP receivers about it and avoid them sending such requests, avoiding the so called "feedback storm". - ### AFB -Application information will be relayed from the remote RTP receiver to the corresponding remote RTP sender. +This information is ignored except for the REMB messages, which is locally consumed. + +### REMB -### REMB (for now a subtype of AFB) +This information is locally consumed. -In future, this information is to be consumed by the local RTP Senders in order to adapt their transmission rate to the availability of the remote RTP receivers. REMB RTCP is generated locally based on the remote bitrate estimation. @@ -157,22 +159,21 @@ REMB RTCP is generated locally based on the remote bitrate estimation. | | SR | RR | SDES | BYE | APP | | --------- | -- | -- | ---- | --- | --- | | Consumer | G | C | | | | -| Producer | C | G | B | B | B | +| Producer | C | G | C | I | I | ### RTP Feedback RTCP | | NACK | TMMBR | TMMBN | TLLEI | ECN-FB | PAUSE-RESUME | TCC | | --------- | ---- | ----- | ----- | ----- | ------ | ------------ | --- | -| Consumer | C | I | | | I | C | | +| Consumer | C | I | I | I | I | I | | | Producer | G | | I | I | | | | -| Transport | | | | | | | CG | ## PS Feedback RTCP -| | PLI | SLI | RPSI | FIR | TSTR | TSTN | VBCM | PSLI | ROI | REMB | +| | PLI | SLI | RPSI | FIR | TSTR | TSTN | VBCM | PSLI | AFB | REMB | | --------- | --- | --- | ---- | --- | ---- | ---- | ---- | ---- | --- | ---- | -| Consumer | B | B | B | B | I | | I | | | C | -| Producer | | | | | | I | | I | | | +| Consumer | C | I | I | C | I | | I | | I | C | +| Producer | G | | | | | I | | I | | | | Transport | | | | | | | | | | G | diff --git a/doc/index.md b/doc/index.md index 8cd5861158..ce3db870ab 100644 --- a/doc/index.md +++ b/doc/index.md @@ -3,6 +3,7 @@ Internal documentation for developming purposes. Get the **mediasoup** public documentation at [mediasoup.org](https://mediasoup.org). * [Building](Building.md) +* [Fuzzer](Fuzzer.md) * [RTCP](RTCP.md) * [Consumer](Consumer.md) * [Charts](Charts.md) diff --git a/gulpfile.js b/gulpfile.js index a6820119bb..e28be27729 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -100,7 +100,7 @@ gulp.task('tidy:worker', gulp.series('tidy:worker:prepare', 'tidy:worker:run')); gulp.task('test:node', shell.task( [ - 'if type make &> /dev/null; then make; fi', + 'if type make &> /dev/null; then make -C worker; fi', `tap --bail --color --reporter=spec ${nodeTests.join(' ')}` ], { @@ -112,7 +112,7 @@ gulp.task('test:node', shell.task( gulp.task('test:worker', shell.task( [ './worker/deps/lcov/bin/lcov --directory ./ --zerocounters', - 'if type make &> /dev/null; then make test; fi', + 'if type make &> /dev/null; then make test -C worker; fi', `cd worker && ./out/${process.env.MEDIASOUP_BUILDTYPE === 'Debug' ? 'Debug' : 'Release'}/mediasoup-worker-test --invisibles --use-colour=yes ` + `${process.env.MEDIASOUP_TEST_TAGS || ''}` diff --git a/lib/PlainRtpTransport.js b/lib/PlainRtpTransport.js index 8654060256..2526414074 100644 --- a/lib/PlainRtpTransport.js +++ b/lib/PlainRtpTransport.js @@ -193,7 +193,9 @@ class PlainRtpTransport extends EnhancedEventEmitter } default: + { logger.error('ignoring unknown event "%s"', event); + } } }); } diff --git a/lib/supportedRtpCapabilities.js b/lib/supportedRtpCapabilities.js index 379db89fa2..f8844013f6 100644 --- a/lib/supportedRtpCapabilities.js +++ b/lib/supportedRtpCapabilities.js @@ -153,12 +153,7 @@ const supportedRtpCapabilities = [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, - { type: 'nack', parameter: 'sli' }, - { type: 'nack', parameter: 'rpsi' }, - { type: 'nack', parameter: 'app' }, { type: 'ccm', parameter: 'fir' }, - { type: 'ack', parameter: 'rpsi' }, - { type: 'ack', parameter: 'app' }, { type: 'goog-remb' } ] }, @@ -171,12 +166,7 @@ const supportedRtpCapabilities = [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, - { type: 'nack', parameter: 'sli' }, - { type: 'nack', parameter: 'rpsi' }, - { type: 'nack', parameter: 'app' }, { type: 'ccm', parameter: 'fir' }, - { type: 'ack', parameter: 'rpsi' }, - { type: 'ack', parameter: 'app' }, { type: 'goog-remb' } ] }, @@ -193,12 +183,7 @@ const supportedRtpCapabilities = [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, - { type: 'nack', parameter: 'sli' }, - { type: 'nack', parameter: 'rpsi' }, - { type: 'nack', parameter: 'app' }, { type: 'ccm', parameter: 'fir' }, - { type: 'ack', parameter: 'rpsi' }, - { type: 'ack', parameter: 'app' }, { type: 'goog-remb' } ] }, @@ -215,12 +200,7 @@ const supportedRtpCapabilities = [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, - { type: 'nack', parameter: 'sli' }, - { type: 'nack', parameter: 'rpsi' }, - { type: 'nack', parameter: 'app' }, { type: 'ccm', parameter: 'fir' }, - { type: 'ack', parameter: 'rpsi' }, - { type: 'ack', parameter: 'app' }, { type: 'goog-remb' } ] }, @@ -233,12 +213,7 @@ const supportedRtpCapabilities = [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, - { type: 'nack', parameter: 'sli' }, - { type: 'nack', parameter: 'rpsi' }, - { type: 'nack', parameter: 'app' }, { type: 'ccm', parameter: 'fir' }, - { type: 'ack', parameter: 'rpsi' }, - { type: 'ack', parameter: 'app' }, { type: 'goog-remb' } ] } diff --git a/package.json b/package.json index b6fc5a492a..ef250dadd3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@livelyvideo/mediasoup", - "version": "2.5.6-lv10", + "name": "mediasoup", + "version": "2.6.2-lv1", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ @@ -41,7 +41,7 @@ "randomatic": "^3.1.1" }, "devDependencies": { - "eslint": "^5.10.0", + "eslint": "^5.11.1", "gulp": "^4.0.0", "gulp-clang-format": "^1.0.27", "gulp-eslint": "^5.0.0", @@ -57,6 +57,6 @@ "scripts": { "lint": "gulp lint", "test": "gulp test", - "postinstall": "make Release" + "postinstall": "make Release -C worker" } } diff --git a/worker/Dockerfile.fuzzer b/worker/Dockerfile.fuzzer new file mode 100644 index 0000000000..2675d899f9 --- /dev/null +++ b/worker/Dockerfile.fuzzer @@ -0,0 +1,24 @@ +FROM ubuntu:16.04 + +# Install dependencies. +RUN \ + set -x \ + && apt-get update \ + && apt-get install --yes \ + wget curl subversion screen gcc g++ cmake ninja-build golang autoconf \ + libtool apache2 python-dev pkg-config zlib1g-dev libgcrypt11-dev \ + libgss-dev libssl-dev libxml2-dev ragel nasm libarchive-dev make \ + automake libdbus-1-dev libboost-dev autoconf-archive bash-completion + +# Install clang 7.0.0. +COPY deps/clang-fuzzer/bin /usr/local/bin +COPY deps/clang-fuzzer/lib/clang /usr/local/lib/clang + +# Make CC and CXX point to clang/clang++ installed above. +ENV LANG="C.UTF-8" +ENV CC="clang" +ENV CXX="clang++" + +WORKDIR /mediasoup/worker + +CMD ["bash"] diff --git a/worker/Makefile b/worker/Makefile new file mode 100644 index 0000000000..e4aaa25d8a --- /dev/null +++ b/worker/Makefile @@ -0,0 +1,82 @@ +# +# make tasks for mediasoup-worker. +# + +# Best effort to get Python 2 executable and also allow custom PYTHON +# environment variable set by the user. +PYTHON ?= $(shell command -v python2 2> /dev/null || echo python) + +.PHONY: \ + default Release Debug test test-Release test-Debug fuzzer \ + fuzzer-docker-build fuzzer-docker-run xcode clean clean-all + +default: +ifeq ($(MEDIASOUP_BUILDTYPE),Debug) + make Debug +else + make Release +endif + +Release: + $(PYTHON) ./scripts/configure.py -R mediasoup-worker + $(MAKE) BUILDTYPE=Release -C out + +Debug: + $(PYTHON) ./scripts/configure.py -R mediasoup-worker + $(MAKE) BUILDTYPE=Debug -C out + +test: +ifeq ($(MEDIASOUP_BUILDTYPE),Debug) + make test-Debug +else + make test-Release +endif + +test-Release: + $(PYTHON) ./scripts/configure.py -R mediasoup-worker-test + $(MAKE) BUILDTYPE=Release -C out + +test-Debug: + $(PYTHON) ./scripts/configure.py -R mediasoup-worker-test + $(MAKE) BUILDTYPE=Debug -C out + +fuzzer: + $(PYTHON) ./scripts/configure.py -R mediasoup-worker-fuzzer + $(MAKE) BUILDTYPE=Release -C out + +fuzzer-docker-build: +ifeq ($(DOCKER_NO_CACHE),true) + docker build -f Dockerfile.fuzzer --no-cache --tag mediasoup/fuzzer:latest . +else + docker build -f Dockerfile.fuzzer --tag mediasoup/fuzzer:latest . +endif + +fuzzer-docker-run: + docker run \ + --name=mediasoupFuzzer -it --rm \ + --cap-add SYS_PTRACE \ + -v $(shell pwd):/mediasoup/worker \ + mediasoup/fuzzer:latest + +xcode: + $(PYTHON) ./scripts/configure.py --format=xcode + +clean: + $(RM) -rf out/Release/mediasoup-worker + $(RM) -rf out/Release/obj.target/mediasoup-worker + $(RM) -rf out/Release/mediasoup-worker-test + $(RM) -rf out/Release/obj.target/mediasoup-worker-test + $(RM) -rf out/Release/mediasoup-worker-fuzzer + $(RM) -rf out/Release/obj.target/mediasoup-worker-fuzzer + $(RM) -rf out/Debug/mediasoup-worker + $(RM) -rf out/Debug/obj.target/mediasoup-worker + $(RM) -rf out/Debug/mediasoup-worker-test + $(RM) -rf out/Debug/obj.target/mediasoup-worker-test + $(RM) -rf out/Debug/mediasoup-worker-fuzzer + $(RM) -rf out/Debug/obj.target/mediasoup-worker-fuzzer + +clean-all: + $(RM) -rf out + $(RM) -rf worker/mediasoup-worker.xcodeproj + $(RM) -rf worker/mediasoup-worker-test.xcodeproj + $(RM) -rf worker/deps/*/*.xcodeproj diff --git a/worker/common.gypi b/worker/common.gypi index bd38aa2c2f..15f55c3cc5 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -1,16 +1,16 @@ { 'variables': { - # libuv variables: + # libuv variables: 'uv_library%': 'static_library', # openssl variables: 'library%': 'static_library', + 'openssl_fips%': '', + 'openssl_no_asm%': 1, # Must be defined in OpenSSL >= 1.1.0g. + 'libopenssl': '<(PRODUCT_DIR)/libopenssl.a', # Others: - 'gcc_version%': 'unknown', - 'clang%': 1, - 'mediasoup_asan%': 'false', - 'openssl_fips%': 'false', - 'libopenssl': '<(PRODUCT_DIR)/libopenssl.a' + 'clang%': 0, + 'mediasoup_asan%': 'false' }, 'target_defaults': @@ -21,7 +21,7 @@ { 'Release': { - 'cflags': [ '-g' ] + 'cflags': [ '-g' ] }, 'Debug': { @@ -42,7 +42,7 @@ 'OTHER_CFLAGS': [ '-fstrict-aliasing', - '-g', + '-g' ], 'WARNING_CFLAGS': [ @@ -51,9 +51,10 @@ '-W', '-Wno-unused-parameter', '-Wundeclared-selector', - '-Wno-parentheses-equality', - ], + '-Wno-parentheses-equality' + ] }, + 'conditions': [ [ 'target_arch == "ia32"', { @@ -66,7 +67,7 @@ 'target_conditions': [ [ '_type == "static_library"', { - 'standalone_static_library': 1, # disable thin archive which needs binutils >= 2.19 + 'standalone_static_library': 1, # Disable thin archive which needs binutils >= 2.19 }] ], 'conditions': @@ -78,8 +79,8 @@ [ 'target_arch == "x64"', { 'cflags': [ '-m64' ], 'ldflags': [ '-m64' ] - }], - ], + }] + ] }] ] } diff --git a/worker/deps/libuv/.gitignore b/worker/deps/libuv/.gitignore index 7536abd549..c132987917 100644 --- a/worker/deps/libuv/.gitignore +++ b/worker/deps/libuv/.gitignore @@ -42,7 +42,7 @@ Makefile.in /android-toolchain /out/ -/build/gyp +/build/ /test/.libs/ /test/run-tests diff --git a/worker/deps/libuv/AUTHORS b/worker/deps/libuv/AUTHORS index 2f93bd8dff..a8b50f6209 100644 --- a/worker/deps/libuv/AUTHORS +++ b/worker/deps/libuv/AUTHORS @@ -356,3 +356,9 @@ hitesh Svante Signell Samuel Thibault Jeremy Studer +damon-kwok <563066990@qq.com> +Damon Kwok +Ashe Connor +Rick +Ivan Krylov +Michael Meier diff --git a/worker/deps/libuv/CMakeLists.txt b/worker/deps/libuv/CMakeLists.txt index 8cd862715a..9f1c0587a9 100644 --- a/worker/deps/libuv/CMakeLists.txt +++ b/worker/deps/libuv/CMakeLists.txt @@ -15,6 +15,7 @@ set(uv_sources src/fs-poll.c src/idna.c src/inet.c + src/strscpy.c src/threadpool.c src/timer.c src/uv-common.c @@ -116,6 +117,7 @@ set(uv_test_sources test/test-socket-buffer-size.c test/test-spawn.c test/test-stdio-over-pipes.c + test/test-strscpy.c test/test-tcp-alloc-cb-fail.c test/test-tcp-bind-error.c test/test-tcp-bind6-error.c @@ -208,7 +210,11 @@ if(WIN32) list(APPEND uv_test_sources src/win/snprintf.c test/runner-win.c) else() list(APPEND uv_defines _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE) - list(APPEND uv_libraries pthread) + if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android") + # Android has pthread as part of its c library, not as a separate + # libpthread.so. + list(APPEND uv_libraries pthread) + endif() list(APPEND uv_sources src/unix/async.c src/unix/core.c diff --git a/worker/deps/libuv/ChangeLog b/worker/deps/libuv/ChangeLog index b76a3f2479..45af87ef41 100644 --- a/worker/deps/libuv/ChangeLog +++ b/worker/deps/libuv/ChangeLog @@ -1,4 +1,37 @@ -2018.11.14, Version 1.24.0 (Stable) +2018.12.17, Version 1.24.1 (Stable) + +Changes since version 1.24.0: + +* test: fix platform_output test on cygwin (damon-kwok) + +* gitignore: ignore build/ directory (Damon Kwok) + +* unix: zero epoll_event before use (Ashe Connor) + +* darwin: use runtime check for file cloning (Ben Noordhuis) + +* doc: replace deprecated build command on macOS (Rick) + +* warnings: fix code that emits compiler warnings (Jameson Nash) + +* doc: clarify expected memory management strategy (Ivan Krylov) + +* test: add uv_inet_ntop(AF_INET) coverage (Ben Noordhuis) + +* unix: harden string copying, introduce strscpy() (Ben Noordhuis) + +* linux: get rid of strncpy() call (Ben Noordhuis) + +* aix: get rid of strcat() calls (Ben Noordhuis) + +* aix: fix data race in uv_fs_event_start() (Ben Noordhuis) + +* win: fs: fix `FILE_FLAG_NO_BUFFERING` for writes (Joran Dirk Greef) + +* build: don't link against -lpthread on Android (Michael Meier) + + +2018.11.14, Version 1.24.0 (Stable), 2d427ee0083d1baf995df4ebf79a3f8890e9a3e1 Changes since version 1.23.2: diff --git a/worker/deps/libuv/Makefile.am b/worker/deps/libuv/Makefile.am index 098d2f5793..f9c9c9a05d 100644 --- a/worker/deps/libuv/Makefile.am +++ b/worker/deps/libuv/Makefile.am @@ -32,6 +32,8 @@ libuv_la_SOURCES = src/fs-poll.c \ src/idna.c \ src/inet.c \ src/queue.h \ + src/strscpy.c \ + src/strscpy.h \ src/threadpool.c \ src/timer.c \ src/uv-data-getter-setters.c \ @@ -241,6 +243,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \ test/test-socket-buffer-size.c \ test/test-spawn.c \ test/test-stdio-over-pipes.c \ + test/test-strscpy.c \ test/test-tcp-alloc-cb-fail.c \ test/test-tcp-bind-error.c \ test/test-tcp-bind6-error.c \ diff --git a/worker/deps/libuv/README.md b/worker/deps/libuv/README.md index b24b722612..fb5971d3e3 100644 --- a/worker/deps/libuv/README.md +++ b/worker/deps/libuv/README.md @@ -262,8 +262,7 @@ Run: ```bash $ ./gyp_uv.py -f xcode -$ xcodebuild -ARCHS="x86_64" -project uv.xcodeproj \ - -configuration Release -target All +$ xcodebuild -ARCHS="x86_64" -project out/uv.xcodeproj -configuration Release -alltargets ``` Using Homebrew: diff --git a/worker/deps/libuv/configure.ac b/worker/deps/libuv/configure.ac index 68939c699e..35e7c1b749 100644 --- a/worker/deps/libuv/configure.ac +++ b/worker/deps/libuv/configure.ac @@ -13,7 +13,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_PREREQ(2.57) -AC_INIT([libuv], [1.24.0], [https://github.com/libuv/libuv/issues]) +AC_INIT([libuv], [1.24.1], [https://github.com/libuv/libuv/issues]) AC_CONFIG_MACRO_DIR([m4]) m4_include([m4/libuv-extra-automake-flags.m4]) m4_include([m4/as_case.m4]) diff --git a/worker/deps/libuv/docs/src/handle.rst b/worker/deps/libuv/docs/src/handle.rst index 86fa811d3f..544794db06 100644 --- a/worker/deps/libuv/docs/src/handle.rst +++ b/worker/deps/libuv/docs/src/handle.rst @@ -140,6 +140,8 @@ API Request handle to be closed. `close_cb` will be called asynchronously after this call. This MUST be called on each handle before memory is released. + Moreover, the memory can only be released in `close_cb` or after it has + returned. Handles that wrap file descriptors are closed immediately but `close_cb` will still be deferred to the next iteration of the event loop. diff --git a/worker/deps/libuv/include/uv/version.h b/worker/deps/libuv/include/uv/version.h index 105e9a2615..3bc023700e 100644 --- a/worker/deps/libuv/include/uv/version.h +++ b/worker/deps/libuv/include/uv/version.h @@ -32,7 +32,7 @@ #define UV_VERSION_MAJOR 1 #define UV_VERSION_MINOR 24 -#define UV_VERSION_PATCH 0 +#define UV_VERSION_PATCH 1 #define UV_VERSION_IS_RELEASE 1 #define UV_VERSION_SUFFIX "" diff --git a/worker/deps/libuv/include/uv/win.h b/worker/deps/libuv/include/uv/win.h index bb9477c834..edd2cc6eb9 100644 --- a/worker/deps/libuv/include/uv/win.h +++ b/worker/deps/libuv/include/uv/win.h @@ -25,6 +25,7 @@ #if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) typedef intptr_t ssize_t; +# define SSIZE_MAX INTPTR_MAX # define _SSIZE_T_ # define _SSIZE_T_DEFINED #endif diff --git a/worker/deps/libuv/src/inet.c b/worker/deps/libuv/src/inet.c index 4598ca1e9f..698ab232e5 100644 --- a/worker/deps/libuv/src/inet.c +++ b/worker/deps/libuv/src/inet.c @@ -59,8 +59,7 @@ static int inet_ntop4(const unsigned char *src, char *dst, size_t size) { if (l <= 0 || (size_t) l >= size) { return UV_ENOSPC; } - strncpy(dst, tmp, size); - dst[size - 1] = '\0'; + uv__strscpy(dst, tmp, size); return 0; } @@ -142,14 +141,8 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) { if (best.base != -1 && (best.base + best.len) == ARRAY_SIZE(words)) *tp++ = ':'; *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - if ((size_t)(tp - tmp) > size) { + if (UV_E2BIG == uv__strscpy(dst, tmp, size)) return UV_ENOSPC; - } - strcpy(dst, tmp); return 0; } diff --git a/worker/deps/libuv/src/strscpy.c b/worker/deps/libuv/src/strscpy.c new file mode 100644 index 0000000000..2a2bdce745 --- /dev/null +++ b/worker/deps/libuv/src/strscpy.c @@ -0,0 +1,17 @@ +#include "strscpy.h" +#include /* SSIZE_MAX */ + +ssize_t uv__strscpy(char* d, const char* s, size_t n) { + size_t i; + + for (i = 0; i < n; i++) + if ('\0' == (d[i] = s[i])) + return i > SSIZE_MAX ? UV_E2BIG : (ssize_t) i; + + if (i == 0) + return 0; + + d[--i] = '\0'; + + return UV_E2BIG; +} diff --git a/worker/deps/libuv/src/strscpy.h b/worker/deps/libuv/src/strscpy.h new file mode 100644 index 0000000000..fbe0a393f2 --- /dev/null +++ b/worker/deps/libuv/src/strscpy.h @@ -0,0 +1,18 @@ +#ifndef UV_STRSCPY_H_ +#define UV_STRSCPY_H_ + +/* Include uv.h for its definitions of size_t and ssize_t. + * size_t can be obtained directly from but ssize_t requires + * some hoop jumping on Windows that I didn't want to duplicate here. + */ +#include "uv.h" + +/* Copies up to |n-1| bytes from |d| to |s| and always zero-terminates + * the result, except when |n==0|. Returns the number of bytes copied + * or UV_E2BIG if |d| is too small. + * + * See https://www.kernel.org/doc/htmldocs/kernel-api/API-strscpy.html + */ +ssize_t uv__strscpy(char* d, const char* s, size_t n); + +#endif /* UV_STRSCPY_H_ */ diff --git a/worker/deps/libuv/src/timer.c b/worker/deps/libuv/src/timer.c index 2bf449a736..dd78bcbad9 100644 --- a/worker/deps/libuv/src/timer.c +++ b/worker/deps/libuv/src/timer.c @@ -152,7 +152,7 @@ int uv__next_timeout(const uv_loop_t* loop) { if (diff > INT_MAX) diff = INT_MAX; - return diff; + return (int) diff; } diff --git a/worker/deps/libuv/src/unix/aix.c b/worker/deps/libuv/src/unix/aix.c index baac8e6c00..44c9cf5b63 100644 --- a/worker/deps/libuv/src/unix/aix.c +++ b/worker/deps/libuv/src/unix/aix.c @@ -358,19 +358,15 @@ void uv_loadavg(double avg[3]) { #ifdef HAVE_SYS_AHAFS_EVPRODS_H -static char *uv__rawname(char *cp) { - static char rawbuf[FILENAME_MAX+1]; - char *dp = rindex(cp, '/'); +static char* uv__rawname(const char* cp, char (*dst)[FILENAME_MAX+1]) { + char* dp; + dp = rindex(cp, '/'); if (dp == 0) return 0; - *dp = 0; - strcpy(rawbuf, cp); - *dp = '/'; - strcat(rawbuf, "/r"); - strcat(rawbuf, dp+1); - return rawbuf; + snprintf(*dst, sizeof(*dst), "%.*s/r%s", (int) (dp - cp), cp, dp + 1); + return *dst; } @@ -399,6 +395,7 @@ static int uv__path_is_a_directory(char* filename) { * Returns 0 if AHAFS is mounted, or an error code < 0 on failure */ static int uv__is_ahafs_mounted(void){ + char rawbuf[FILENAME_MAX+1]; int rv, i = 2; struct vmount *p; int size_multiplier = 10; @@ -432,7 +429,7 @@ static int uv__is_ahafs_mounted(void){ obj = vmt2dataptr(vmt, VMT_OBJECT); /* device */ stub = vmt2dataptr(vmt, VMT_STUB); /* mount point */ - if (EQ(obj, dev) || EQ(uv__rawname(obj), dev) || EQ(stub, dev)) { + if (EQ(obj, dev) || EQ(uv__rawname(obj, &rawbuf), dev) || EQ(stub, dev)) { uv__free(p); /* Found a match */ return 0; } @@ -453,7 +450,8 @@ static int uv__makedir_p(const char *dir) { size_t len; int err; - snprintf(tmp, sizeof(tmp),"%s",dir); + /* TODO(bnoordhuis) Check uv__strscpy() return value. */ + uv__strscpy(tmp, dir, sizeof(tmp)); len = strlen(tmp); if (tmp[len - 1] == '/') tmp[len - 1] = 0; @@ -702,9 +700,9 @@ static void uv__ahafs_event(uv_loop_t* loop, uv__io_t* event_watch, unsigned int else p++; } - strncpy(fname, p, sizeof(fname) - 1); - /* Just in case */ - fname[sizeof(fname) - 1] = '\0'; + + /* TODO(bnoordhuis) Check uv__strscpy() return value. */ + uv__strscpy(fname, p, sizeof(fname)); handle->cb(handle, fname, events, 0); } @@ -735,7 +733,8 @@ int uv_fs_event_start(uv_fs_event_t* handle, /* Figure out whether filename is absolute or not */ if (filename[0] == '/') { /* We have absolute pathname */ - snprintf(absolute_path, sizeof(absolute_path), "%s", filename); + /* TODO(bnoordhuis) Check uv__strscpy() return value. */ + uv__strscpy(absolute_path, filename, sizeof(absolute_path)); } else { /* We have a relative pathname, compose the absolute pathname */ snprintf(cwd, sizeof(cwd), "/proc/%lu/cwd", (unsigned long) getpid()); @@ -986,7 +985,8 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { return UV_ENOMEM; } - strcpy(cpu_id.name, FIRST_CPU); + /* TODO(bnoordhuis) Check uv__strscpy() return value. */ + uv__strscpy(cpu_id.name, FIRST_CPU, sizeof(cpu_id.name)); result = perfstat_cpu(&cpu_id, ps_cpus, sizeof(perfstat_cpu_t), ncpus); if (result == -1) { uv__free(ps_cpus); diff --git a/worker/deps/libuv/src/unix/darwin-proctitle.c b/worker/deps/libuv/src/unix/darwin-proctitle.c index 92d46b7466..e505bdd23f 100644 --- a/worker/deps/libuv/src/unix/darwin-proctitle.c +++ b/worker/deps/libuv/src/unix/darwin-proctitle.c @@ -192,8 +192,7 @@ void uv__set_process_title(const char* title) { if (dynamic_pthread_setname_np != NULL) { char namebuf[64]; /* MAXTHREADNAMESIZE */ - strncpy(namebuf, title, sizeof(namebuf) - 1); - namebuf[sizeof(namebuf) - 1] = '\0'; + uv__strscpy(namebuf, title, sizeof(namebuf)); dynamic_pthread_setname_np(namebuf); } } diff --git a/worker/deps/libuv/src/unix/fs.c b/worker/deps/libuv/src/unix/fs.c index 9068d4b115..d22c70f0c2 100644 --- a/worker/deps/libuv/src/unix/fs.c +++ b/worker/deps/libuv/src/unix/fs.c @@ -61,6 +61,7 @@ #if defined(__APPLE__) # include +# include #elif defined(__linux__) && !defined(FICLONE) # include # define FICLONE _IOW(0x94, 9, int) @@ -70,6 +71,10 @@ # include #endif +#if defined(_AIX) && _XOPEN_SOURCE <= 600 +extern char *mkdtemp(char *template); /* See issue #740 on AIX < 7 */ +#endif + #define INIT(subtype) \ do { \ if (req == NULL) \ @@ -722,7 +727,7 @@ static ssize_t uv__fs_utime(uv_fs_t* req) { atr.att_atimechg = 1; atr.att_mtime = req->mtime; atr.att_atime = req->atime; - return __lchattr(req->path, &atr, sizeof(atr)); + return __lchattr((char*) req->path, &atr, sizeof(atr)); #else errno = ENOSYS; return -1; @@ -793,26 +798,41 @@ static ssize_t uv__fs_write(uv_fs_t* req) { static ssize_t uv__fs_copyfile(uv_fs_t* req) { #if defined(__APPLE__) && !TARGET_OS_IPHONE /* On macOS, use the native copyfile(3). */ + static int can_clone; copyfile_flags_t flags; + char buf[64]; + size_t len; + int major; flags = COPYFILE_ALL; if (req->flags & UV_FS_COPYFILE_EXCL) flags |= COPYFILE_EXCL; -#ifdef COPYFILE_CLONE - if (req->flags & UV_FS_COPYFILE_FICLONE) - flags |= COPYFILE_CLONE; -#endif - + /* Check OS version. Cloning is only supported on macOS >= 10.12. */ if (req->flags & UV_FS_COPYFILE_FICLONE_FORCE) { -#ifdef COPYFILE_CLONE_FORCE - flags |= COPYFILE_CLONE_FORCE; -#else - return UV_ENOSYS; -#endif + if (can_clone == 0) { + len = sizeof(buf); + if (sysctlbyname("kern.osrelease", buf, &len, NULL, 0)) + return UV__ERR(errno); + + if (1 != sscanf(buf, "%d", &major)) + abort(); + + can_clone = -1 + 2 * (major >= 16); /* macOS >= 10.12 */ + } + + if (can_clone < 0) + return UV_ENOSYS; } + /* copyfile() simply ignores COPYFILE_CLONE if it's not supported. */ + if (req->flags & UV_FS_COPYFILE_FICLONE) + flags |= 1 << 24; /* COPYFILE_CLONE */ + + if (req->flags & UV_FS_COPYFILE_FICLONE_FORCE) + flags |= 1 << 25; /* COPYFILE_CLONE_FORCE */ + return copyfile(req->path, req->new_path, NULL, flags); #else uv_fs_t fs_req; diff --git a/worker/deps/libuv/src/unix/linux-core.c b/worker/deps/libuv/src/unix/linux-core.c index 991d1c60ae..3341b94e1f 100644 --- a/worker/deps/libuv/src/unix/linux-core.c +++ b/worker/deps/libuv/src/unix/linux-core.c @@ -170,6 +170,7 @@ int uv__io_check_fd(uv_loop_t* loop, int fd) { struct epoll_event e; int rc; + memset(&e, 0, sizeof(e)); e.events = POLLIN; e.data.fd = -1; @@ -218,6 +219,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { return; } + memset(&e, 0, sizeof(e)); + while (!QUEUE_EMPTY(&loop->watcher_queue)) { q = QUEUE_HEAD(&loop->watcher_queue); QUEUE_REMOVE(q); diff --git a/worker/deps/libuv/src/unix/linux-inotify.c b/worker/deps/libuv/src/unix/linux-inotify.c index 7797f84252..9b26202fb3 100644 --- a/worker/deps/libuv/src/unix/linux-inotify.c +++ b/worker/deps/libuv/src/unix/linux-inotify.c @@ -278,6 +278,7 @@ int uv_fs_event_start(uv_fs_event_t* handle, const char* path, unsigned int flags) { struct watcher_list* w; + size_t len; int events; int err; int wd; @@ -306,12 +307,13 @@ int uv_fs_event_start(uv_fs_event_t* handle, if (w) goto no_insert; - w = uv__malloc(sizeof(*w) + strlen(path) + 1); + len = strlen(path) + 1; + w = uv__malloc(sizeof(*w) + len); if (w == NULL) return UV_ENOMEM; w->wd = wd; - w->path = strcpy((char*)(w + 1), path); + w->path = memcpy(w + 1, path, len); QUEUE_INIT(&w->watchers); w->iterating = 0; RB_INSERT(watcher_root, CAST(&handle->loop->inotify_watchers), w); diff --git a/worker/deps/libuv/src/unix/netbsd.c b/worker/deps/libuv/src/unix/netbsd.c index 4cfde1a586..a2a4e52154 100644 --- a/worker/deps/libuv/src/unix/netbsd.c +++ b/worker/deps/libuv/src/unix/netbsd.c @@ -87,7 +87,8 @@ int uv_exepath(char* buffer, size_t* size) { /* Copy string from the intermediate buffer to outer one with appropriate * length. */ - strlcpy(buffer, int_buf, *size); + /* TODO(bnoordhuis) Check uv__strscpy() return value. */ + uv__strscpy(buffer, int_buf, *size); /* Set new size. */ *size = strlen(buffer); diff --git a/worker/deps/libuv/src/unix/os390.c b/worker/deps/libuv/src/unix/os390.c index b43aebfc92..dc146e3110 100644 --- a/worker/deps/libuv/src/unix/os390.c +++ b/worker/deps/libuv/src/unix/os390.c @@ -229,15 +229,15 @@ static int getexe(const int pid, char* buf, size_t len) { assert(((Output_buf.Output_data.offsetPath >>24) & 0xFF) == 'A'); /* Get the offset from the lowest 3 bytes */ - Output_path = (char*)(&Output_buf) + - (Output_buf.Output_data.offsetPath & 0x00FFFFFF); + Output_path = (struct Output_path_type*) ((char*) (&Output_buf) + + (Output_buf.Output_data.offsetPath & 0x00FFFFFF)); if (Output_path->len >= len) { errno = ENOBUFS; return -1; } - strncpy(buf, Output_path->path, len); + uv__strscpy(buf, Output_path->path, len); return 0; } diff --git a/worker/deps/libuv/src/unix/pipe.c b/worker/deps/libuv/src/unix/pipe.c index e450a30e9c..d3b554cfc3 100644 --- a/worker/deps/libuv/src/unix/pipe.c +++ b/worker/deps/libuv/src/unix/pipe.c @@ -66,8 +66,7 @@ int uv_pipe_bind(uv_pipe_t* handle, const char* name) { sockfd = err; memset(&saddr, 0, sizeof saddr); - strncpy(saddr.sun_path, pipe_fname, sizeof(saddr.sun_path) - 1); - saddr.sun_path[sizeof(saddr.sun_path) - 1] = '\0'; + uv__strscpy(saddr.sun_path, pipe_fname, sizeof(saddr.sun_path)); saddr.sun_family = AF_UNIX; if (bind(sockfd, (struct sockaddr*)&saddr, sizeof saddr)) { @@ -186,8 +185,7 @@ void uv_pipe_connect(uv_connect_t* req, } memset(&saddr, 0, sizeof saddr); - strncpy(saddr.sun_path, name, sizeof(saddr.sun_path) - 1); - saddr.sun_path[sizeof(saddr.sun_path) - 1] = '\0'; + uv__strscpy(saddr.sun_path, name, sizeof(saddr.sun_path)); saddr.sun_family = AF_UNIX; do { diff --git a/worker/deps/libuv/src/unix/sunos.c b/worker/deps/libuv/src/unix/sunos.c index ec5ecd7d3c..2552a019eb 100644 --- a/worker/deps/libuv/src/unix/sunos.c +++ b/worker/deps/libuv/src/unix/sunos.c @@ -707,13 +707,14 @@ static int uv__set_phys_addr(uv_interface_address_t* address, struct sockaddr_dl* sa_addr; int sockfd; - int i; + size_t i; struct arpreq arpreq; /* This appears to only work as root */ sa_addr = (struct sockaddr_dl*)(ent->ifa_addr); memcpy(address->phys_addr, LLADDR(sa_addr), sizeof(address->phys_addr)); for (i = 0; i < sizeof(address->phys_addr); i++) { + /* Check that all bytes of phys_addr are zero. */ if (address->phys_addr[i] != 0) return 0; } diff --git a/worker/deps/libuv/src/uv-common.c b/worker/deps/libuv/src/uv-common.c index 71d100a162..952bde080c 100644 --- a/worker/deps/libuv/src/uv-common.c +++ b/worker/deps/libuv/src/uv-common.c @@ -162,7 +162,7 @@ static const char* uv__unknown_err_code(int err) { #define UV_ERR_NAME_GEN_R(name, _) \ case UV_## name: \ - snprintf(buf, buflen, "%s", #name); break; + uv__strscpy(buf, #name, buflen); break; char* uv_err_name_r(int err, char* buf, size_t buflen) { switch (err) { UV_ERRNO_MAP(UV_ERR_NAME_GEN_R) diff --git a/worker/deps/libuv/src/uv-common.h b/worker/deps/libuv/src/uv-common.h index 5555f83aee..15ac4d02c1 100644 --- a/worker/deps/libuv/src/uv-common.h +++ b/worker/deps/libuv/src/uv-common.h @@ -40,6 +40,7 @@ #include "uv.h" #include "uv/tree.h" #include "queue.h" +#include "strscpy.h" #if EDOM > 0 # define UV__ERR(x) (-(x)) diff --git a/worker/deps/libuv/src/uv-data-getter-setters.c b/worker/deps/libuv/src/uv-data-getter-setters.c index 533e4a2fe1..b7fcd4a7fd 100644 --- a/worker/deps/libuv/src/uv-data-getter-setters.c +++ b/worker/deps/libuv/src/uv-data-getter-setters.c @@ -3,11 +3,11 @@ const char* uv_handle_type_name(uv_handle_type type) { switch (type) { #define XX(uc,lc) case UV_##uc: return #lc; - UV_HANDLE_TYPE_MAP(XX) + UV_HANDLE_TYPE_MAP(XX) #undef XX - case UV_FILE: return "file"; - case UV_HANDLE_TYPE_MAX: - case UV_UNKNOWN_HANDLE: return NULL; + case UV_FILE: return "file"; + case UV_HANDLE_TYPE_MAX: + case UV_UNKNOWN_HANDLE: return NULL; } return NULL; } @@ -31,10 +31,12 @@ void uv_handle_set_data(uv_handle_t* handle, void* data) { const char* uv_req_type_name(uv_req_type type) { switch (type) { #define XX(uc,lc) case UV_##uc: return #lc; - UV_REQ_TYPE_MAP(XX) + UV_REQ_TYPE_MAP(XX) #undef XX - case UV_REQ_TYPE_MAX: - case UV_UNKNOWN_REQ: return NULL; + case UV_REQ_TYPE_MAX: + case UV_UNKNOWN_REQ: + default: /* UV_REQ_TYPE_PRIVATE */ + return NULL; } return NULL; } diff --git a/worker/deps/libuv/src/win/dl.c b/worker/deps/libuv/src/win/dl.c index 5b84555ca4..676be4dc7b 100644 --- a/worker/deps/libuv/src/win/dl.c +++ b/worker/deps/libuv/src/win/dl.c @@ -64,7 +64,8 @@ void uv_dlclose(uv_lib_t* lib) { int uv_dlsym(uv_lib_t* lib, const char* name, void** ptr) { - *ptr = (void*) GetProcAddress(lib->handle, name); + /* Cast though integer to suppress pedantic warning about forbidden cast. */ + *ptr = (void*)(uintptr_t) GetProcAddress(lib->handle, name); return uv__dlerror(lib, "", *ptr ? 0 : GetLastError()); } @@ -75,8 +76,9 @@ const char* uv_dlerror(const uv_lib_t* lib) { static void uv__format_fallback_error(uv_lib_t* lib, int errorno){ - DWORD_PTR args[1] = { (DWORD_PTR) errorno }; - LPSTR fallback_error = "error: %1!d!"; + static const CHAR fallback_error[] = "error: %1!d!"; + DWORD_PTR args[1]; + args[0] = (DWORD_PTR) errorno; FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY | diff --git a/worker/deps/libuv/src/win/fs-event.c b/worker/deps/libuv/src/win/fs-event.c index 25809ea4f2..1244967a78 100644 --- a/worker/deps/libuv/src/win/fs-event.c +++ b/worker/deps/libuv/src/win/fs-event.c @@ -215,11 +215,11 @@ int uv_fs_event_start(uv_fs_event_t* handle, uv__free(long_path); long_path = NULL; } - } - if (long_path) { - uv__free(pathw); - pathw = long_path; + if (long_path) { + uv__free(pathw); + pathw = long_path; + } } dir_to_watch = pathw; diff --git a/worker/deps/libuv/src/win/fs.c b/worker/deps/libuv/src/win/fs.c index 7ad0d077a6..0716ecca12 100644 --- a/worker/deps/libuv/src/win/fs.c +++ b/worker/deps/libuv/src/win/fs.c @@ -98,14 +98,17 @@ return; \ } +#define MILLIONu (1000U * 1000U) +#define BILLIONu (1000U * 1000U * 1000U) + #define FILETIME_TO_UINT(filetime) \ - (*((uint64_t*) &(filetime)) - 116444736000000000ULL) + (*((uint64_t*) &(filetime)) - (uint64_t) 116444736 * BILLIONu) #define FILETIME_TO_TIME_T(filetime) \ - (FILETIME_TO_UINT(filetime) / 10000000ULL) + (FILETIME_TO_UINT(filetime) / (10u * MILLIONu)) #define FILETIME_TO_TIME_NS(filetime, secs) \ - ((FILETIME_TO_UINT(filetime) - (secs * 10000000ULL)) * 100) + ((FILETIME_TO_UINT(filetime) - (secs * (uint64_t) 10 * MILLIONu)) * 100U) #define FILETIME_TO_TIMESPEC(ts, filetime) \ do { \ @@ -115,8 +118,8 @@ #define TIME_T_TO_FILETIME(time, filetime_ptr) \ do { \ - uint64_t bigtime = ((uint64_t) ((time) * 10000000ULL)) + \ - 116444736000000000ULL; \ + uint64_t bigtime = ((uint64_t) ((time) * (uint64_t) 10 * MILLIONu)) + \ + (uint64_t) 116444736 * BILLIONu; \ (filetime_ptr)->dwLowDateTime = bigtime & 0xFFFFFFFF; \ (filetime_ptr)->dwHighDateTime = bigtime >> 32; \ } while(0) @@ -507,6 +510,33 @@ void fs__open(uv_fs_t* req) { } if (flags & UV_FS_O_DIRECT) { + /* + * FILE_APPEND_DATA and FILE_FLAG_NO_BUFFERING are mutually exclusive. + * Windows returns 87, ERROR_INVALID_PARAMETER if these are combined. + * + * FILE_APPEND_DATA is included in FILE_GENERIC_WRITE: + * + * FILE_GENERIC_WRITE = STANDARD_RIGHTS_WRITE | + * FILE_WRITE_DATA | + * FILE_WRITE_ATTRIBUTES | + * FILE_WRITE_EA | + * FILE_APPEND_DATA | + * SYNCHRONIZE + * + * Note: Appends are also permitted by FILE_WRITE_DATA. + * + * In order for direct writes and direct appends to succeed, we therefore + * exclude FILE_APPEND_DATA if FILE_WRITE_DATA is specified, and otherwise + * fail if the user's sole permission is a direct append, since this + * particular combination is invalid. + */ + if (access & FILE_APPEND_DATA) { + if (access & FILE_WRITE_DATA) { + access &= ~FILE_APPEND_DATA; + } else { + goto einval; + } + } attributes |= FILE_FLAG_NO_BUFFERING; } @@ -788,9 +818,8 @@ void fs__unlink(uv_fs_t* req) { /* Remove read-only attribute */ FILE_BASIC_INFORMATION basic = { 0 }; - basic.FileAttributes = info.dwFileAttributes - & ~(FILE_ATTRIBUTE_READONLY) - | FILE_ATTRIBUTE_ARCHIVE; + basic.FileAttributes = (info.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY) | + FILE_ATTRIBUTE_ARCHIVE; status = pNtSetInformationFile(handle, &iosb, @@ -1201,7 +1230,7 @@ INLINE static int fs__stat_handle(HANDLE handle, uv_stat_t* statbuf, /* st_blocks contains the on-disk allocation size in 512-byte units. */ statbuf->st_blocks = - file_info.StandardInformation.AllocationSize.QuadPart >> 9ULL; + (uint64_t) file_info.StandardInformation.AllocationSize.QuadPart >> 9; statbuf->st_nlink = file_info.StandardInformation.NumberOfLinks; @@ -1958,7 +1987,7 @@ static void fs__readlink(uv_fs_t* req) { } -static size_t fs__realpath_handle(HANDLE handle, char** realpath_ptr) { +static ssize_t fs__realpath_handle(HANDLE handle, char** realpath_ptr) { int r; DWORD w_realpath_len; WCHAR* w_realpath_ptr = NULL; diff --git a/worker/deps/libuv/src/win/pipe.c b/worker/deps/libuv/src/win/pipe.c index 9a3cbc8a1e..e303cc8a23 100644 --- a/worker/deps/libuv/src/win/pipe.c +++ b/worker/deps/libuv/src/win/pipe.c @@ -1541,7 +1541,7 @@ int uv__pipe_write_ipc(uv_loop_t* loop, frame_header.flags |= UV__IPC_FRAME_HAS_SOCKET_XFER; break; default: - assert(0); // Unreachable. + assert(0); /* Unreachable. */ } /* Add xfer info buffer. */ bufs[buf_index++] = uv_buf_init((char*) &xfer_info, sizeof xfer_info); @@ -2141,7 +2141,7 @@ int uv_pipe_open(uv_pipe_t* pipe, uv_file file) { if (pipe->ipc) { assert(!(pipe->flags & UV_HANDLE_NON_OVERLAPPED_PIPE)); pipe->pipe.conn.ipc_remote_pid = uv_os_getppid(); - assert(pipe->pipe.conn.ipc_remote_pid != -1); + assert(pipe->pipe.conn.ipc_remote_pid != (DWORD) -1); } return 0; } @@ -2312,7 +2312,7 @@ uv_handle_type uv_pipe_pending_type(uv_pipe_t* handle) { } int uv_pipe_chmod(uv_pipe_t* handle, int mode) { - SID_IDENTIFIER_AUTHORITY sid_world = SECURITY_WORLD_SID_AUTHORITY; + SID_IDENTIFIER_AUTHORITY sid_world = { SECURITY_WORLD_SID_AUTHORITY }; PACL old_dacl, new_dacl; PSECURITY_DESCRIPTOR sd; EXPLICIT_ACCESS ea; diff --git a/worker/deps/libuv/src/win/poll.c b/worker/deps/libuv/src/win/poll.c index 77eb071c85..3c6678600e 100644 --- a/worker/deps/libuv/src/win/poll.c +++ b/worker/deps/libuv/src/win/poll.c @@ -75,7 +75,7 @@ static AFD_POLL_INFO* uv__get_afd_poll_info_dummy(void) { static void uv__fast_poll_submit_poll_req(uv_loop_t* loop, uv_poll_t* handle) { uv_req_t* req; AFD_POLL_INFO* afd_poll_info; - DWORD result; + int result; /* Find a yet unsubmitted req to submit. */ if (handle->submitted_events_1 == 0) { @@ -136,7 +136,7 @@ static void uv__fast_poll_submit_poll_req(uv_loop_t* loop, uv_poll_t* handle) { static int uv__fast_poll_cancel_poll_req(uv_loop_t* loop, uv_poll_t* handle) { AFD_POLL_INFO afd_poll_info; - DWORD result; + int result; afd_poll_info.Exclusive = TRUE; afd_poll_info.NumberOfHandles = 1; diff --git a/worker/deps/libuv/src/win/process.c b/worker/deps/libuv/src/win/process.c index e7cccd9c80..f9c53de0af 100644 --- a/worker/deps/libuv/src/win/process.c +++ b/worker/deps/libuv/src/win/process.c @@ -739,7 +739,7 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) { } } *ptr_copy = NULL; - assert(env_len == ptr - dst_copy); + assert(env_len == (size_t) (ptr - dst_copy)); /* sort our (UTF-16) copy */ qsort(env_copy, env_block_count-1, sizeof(wchar_t*), qsort_wcscmp); @@ -799,7 +799,7 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) { var_size = GetEnvironmentVariableW(required_vars[i].wide, ptr, (int) (env_len - (ptr - dst))); - if (var_size != len-1) { /* race condition? */ + if (var_size != (DWORD) (len - 1)) { /* TODO: handle race condition? */ uv_fatal_error(GetLastError(), "GetEnvironmentVariableW"); } } @@ -815,7 +815,7 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) { } /* Terminate with an extra NULL. */ - assert(env_len == (ptr - dst)); + assert(env_len == (size_t) (ptr - dst)); *ptr = L'\0'; uv__free(dst_copy); diff --git a/worker/deps/libuv/src/win/tty.c b/worker/deps/libuv/src/win/tty.c index 398288ec1d..45bbe9689a 100644 --- a/worker/deps/libuv/src/win/tty.c +++ b/worker/deps/libuv/src/win/tty.c @@ -791,8 +791,9 @@ void uv_process_tty_read_raw_req(uv_loop_t* loop, uv_tty_t* handle, if (KEV.uChar.UnicodeChar >= 0xDC00 && KEV.uChar.UnicodeChar < 0xE000) { /* UTF-16 surrogate pair */ - WCHAR utf16_buffer[2] = { handle->tty.rd.last_utf16_high_surrogate, - KEV.uChar.UnicodeChar}; + WCHAR utf16_buffer[2]; + utf16_buffer[0] = handle->tty.rd.last_utf16_high_surrogate; + utf16_buffer[1] = KEV.uChar.UnicodeChar; char_len = WideCharToMultiByte(CP_UTF8, 0, utf16_buffer, diff --git a/worker/deps/libuv/src/win/winapi.h b/worker/deps/libuv/src/win/winapi.h index cfbac52eb1..2a8adf6b26 100644 --- a/worker/deps/libuv/src/win/winapi.h +++ b/worker/deps/libuv/src/win/winapi.h @@ -4109,6 +4109,9 @@ #endif /* from winternl.h */ +#if !defined(__UNICODE_STRING_DEFINED) && defined(__MINGW32_) +#define __UNICODE_STRING_DEFINED +#endif typedef struct _UNICODE_STRING { USHORT Length; USHORT MaximumLength; diff --git a/worker/deps/libuv/test/run-tests.c b/worker/deps/libuv/test/run-tests.c index 42bde0bb96..2a699f46dc 100644 --- a/worker/deps/libuv/test/run-tests.c +++ b/worker/deps/libuv/test/run-tests.c @@ -142,11 +142,11 @@ static int maybe_run_test(int argc, char **argv) { if (strcmp(argv[1], "spawn_helper5") == 0) { const char out[] = "fourth stdio!\n"; notify_parent_process(); + { #ifdef _WIN32 - DWORD bytes; - WriteFile((HANDLE) _get_osfhandle(3), out, sizeof(out) - 1, &bytes, NULL); + DWORD bytes; + WriteFile((HANDLE) _get_osfhandle(3), out, sizeof(out) - 1, &bytes, NULL); #else - { ssize_t r; do @@ -154,8 +154,8 @@ static int maybe_run_test(int argc, char **argv) { while (r == -1 && errno == EINTR); fsync(3); - } #endif + } return 1; } diff --git a/worker/deps/libuv/test/runner-win.c b/worker/deps/libuv/test/runner-win.c index e3e91a7b69..f60c23df3e 100644 --- a/worker/deps/libuv/test/runner-win.c +++ b/worker/deps/libuv/test/runner-win.c @@ -194,7 +194,7 @@ int process_wait(process_info_t *vec, int n, int timeout) { result = WaitForMultipleObjects(n, handles, TRUE, timeout_api); - if (result >= WAIT_OBJECT_0 && result < WAIT_OBJECT_0 + n) { + if (result < WAIT_OBJECT_0 + n) { /* All processes are terminated. */ return 0; } @@ -268,7 +268,8 @@ int process_read_last_line(process_info_t *p, if (!ReadFile(p->stdio_out, buffer, buffer_len - 1, &read, &overlapped)) return -1; - for (start = read - 1; start >= 0; start--) { + start = read; + while (start-- > 0) { if (buffer[start] == '\n' || buffer[start] == '\r') break; } @@ -308,7 +309,7 @@ void process_cleanup(process_info_t *p) { } -static int clear_line() { +static int clear_line(void) { HANDLE handle; CONSOLE_SCREEN_BUFFER_INFO info; COORD coord; diff --git a/worker/deps/libuv/test/runner-win.h b/worker/deps/libuv/test/runner-win.h index 8cc4c16eb2..975eed7931 100644 --- a/worker/deps/libuv/test/runner-win.h +++ b/worker/deps/libuv/test/runner-win.h @@ -20,7 +20,9 @@ */ /* Don't complain about write(), fileno() etc. being deprecated. */ +#ifdef _MSC_VER #pragma warning(disable : 4996) +#endif #include diff --git a/worker/deps/libuv/test/test-close-fd.c b/worker/deps/libuv/test/test-close-fd.c index 93a7bd7c02..2ed9a10032 100644 --- a/worker/deps/libuv/test/test-close-fd.c +++ b/worker/deps/libuv/test/test-close-fd.c @@ -73,4 +73,8 @@ TEST_IMPL(close_fd) { return 0; } -#endif /* !defined(_WIN32) */ +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + +#endif /* !_WIN32 */ diff --git a/worker/deps/libuv/test/test-condvar.c b/worker/deps/libuv/test/test-condvar.c index 50f3c047c0..32abccc2e7 100644 --- a/worker/deps/libuv/test/test-condvar.c +++ b/worker/deps/libuv/test/test-condvar.c @@ -235,7 +235,7 @@ TEST_IMPL(condvar_5) { uint64_t elapsed; uint64_t timeout; - timeout = 100 * 1e6; /* 100 ms in ns */ + timeout = 100 * 1000 * 1000; /* 100 ms in ns */ /* Mostly irrelevant. We need cond and mutex initialized. */ worker_config_init(&wc, 0, NULL, NULL); diff --git a/worker/deps/libuv/test/test-emfile.c b/worker/deps/libuv/test/test-emfile.c index 8e44ac5c77..bc1fce5f55 100644 --- a/worker/deps/libuv/test/test-emfile.c +++ b/worker/deps/libuv/test/test-emfile.c @@ -38,6 +38,11 @@ static uv_tcp_t client_handle; TEST_IMPL(emfile) { + struct sockaddr_in addr; + struct rlimit limits; + uv_connect_t connect_req; + uv_loop_t* loop; + int first_fd; #if defined(_AIX) || defined(__MVS__) /* On AIX, if a 'accept' call fails ECONNRESET is set on the socket * which causes uv__emfile_trick to not work as intended and this test @@ -45,11 +50,6 @@ TEST_IMPL(emfile) { */ RETURN_SKIP("uv__emfile_trick does not work on this OS"); #endif - struct sockaddr_in addr; - struct rlimit limits; - uv_connect_t connect_req; - uv_loop_t* loop; - int first_fd; /* Lower the file descriptor limit and use up all fds save one. */ limits.rlim_cur = limits.rlim_max = maxfd + 1; @@ -114,4 +114,8 @@ static void connect_cb(uv_connect_t* req, int status) { uv_close((uv_handle_t*) &client_handle, NULL); } -#endif /* !defined(_WIN32) */ +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + +#endif /* !_WIN32 */ diff --git a/worker/deps/libuv/test/test-fork.c b/worker/deps/libuv/test/test-fork.c index f47ae3e656..9e4684f0e1 100644 --- a/worker/deps/libuv/test/test-fork.c +++ b/worker/deps/libuv/test/test-fork.c @@ -676,5 +676,8 @@ TEST_IMPL(fork_threadpool_queue_work_simple) { } #endif /* !__MVS__ */ +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ #endif /* !_WIN32 */ diff --git a/worker/deps/libuv/test/test-fs.c b/worker/deps/libuv/test/test-fs.c index 038d2dd615..5eed160de2 100644 --- a/worker/deps/libuv/test/test-fs.c +++ b/worker/deps/libuv/test/test-fs.c @@ -154,7 +154,7 @@ int uv_test_getiovmax(void) { static unsigned REPARSE_TAG = 0x9913; static GUID REPARSE_GUID = { 0x1bf6205f, 0x46ae, 0x4527, - 0xb1, 0x0c, 0xc5, 0x09, 0xb7, 0x55, 0x22, 0x80 }; + { 0xb1, 0x0c, 0xc5, 0x09, 0xb7, 0x55, 0x22, 0x80 }}; #endif static void check_permission(const char* filename, unsigned int mode) { @@ -2331,9 +2331,6 @@ TEST_IMPL(fs_stat_root) { TEST_IMPL(fs_futime) { -#if defined(_AIX) && !defined(_AIX71) - RETURN_SKIP("futime is not implemented for AIX versions below 7.1"); -#else utime_check_t checkme; const char* path = "test_file"; double atime; @@ -2341,6 +2338,9 @@ TEST_IMPL(fs_futime) { uv_file file; uv_fs_t req; int r; +#if defined(_AIX) && !defined(_AIX71) + RETURN_SKIP("futime is not implemented for AIX versions below 7.1"); +#endif /* Setup. */ loop = uv_default_loop(); @@ -2402,7 +2402,6 @@ TEST_IMPL(fs_futime) { MAKE_VALGRIND_HAPPY(); return 0; -#endif } @@ -3601,6 +3600,53 @@ TEST_IMPL(fs_exclusive_sharing_mode) { } #endif +#ifdef _WIN32 +TEST_IMPL(fs_file_flag_no_buffering) { + int r; + + /* Setup. */ + unlink("test_file"); + + ASSERT(UV_FS_O_APPEND > 0); + ASSERT(UV_FS_O_CREAT > 0); + ASSERT(UV_FS_O_DIRECT > 0); + ASSERT(UV_FS_O_RDWR > 0); + + /* FILE_APPEND_DATA must be excluded from FILE_GENERIC_WRITE: */ + r = uv_fs_open(NULL, + &open_req1, + "test_file", + UV_FS_O_RDWR | UV_FS_O_CREAT | UV_FS_O_DIRECT, + S_IWUSR | S_IRUSR, + NULL); + ASSERT(r >= 0); + ASSERT(open_req1.result >= 0); + uv_fs_req_cleanup(&open_req1); + + r = uv_fs_close(NULL, &close_req, open_req1.result, NULL); + ASSERT(r == 0); + ASSERT(close_req.result == 0); + uv_fs_req_cleanup(&close_req); + + /* FILE_APPEND_DATA and FILE_FLAG_NO_BUFFERING are mutually exclusive: */ + r = uv_fs_open(NULL, + &open_req2, + "test_file", + UV_FS_O_APPEND | UV_FS_O_DIRECT, + S_IWUSR | S_IRUSR, + NULL); + ASSERT(r == UV_EINVAL); + ASSERT(open_req2.result == UV_EINVAL); + uv_fs_req_cleanup(&open_req2); + + /* Cleanup */ + unlink("test_file"); + + MAKE_VALGRIND_HAPPY(); + return 0; +} +#endif + #ifdef _WIN32 int call_icacls(const char* command, ...) { char icacls_command[1024]; diff --git a/worker/deps/libuv/test/test-ip4-addr.c b/worker/deps/libuv/test/test-ip4-addr.c index 3d6e0cf286..c72f36a694 100644 --- a/worker/deps/libuv/test/test-ip4-addr.c +++ b/worker/deps/libuv/test/test-ip4-addr.c @@ -27,8 +27,13 @@ TEST_IMPL(ip4_addr) { - struct sockaddr_in addr; + char dst[16]; + + ASSERT(0 == uv_inet_ntop(AF_INET, "\xFF\xFF\xFF\xFF", dst, sizeof(dst))); + ASSERT(0 == strcmp(dst, "255.255.255.255")); + ASSERT(UV_ENOSPC == uv_inet_ntop(AF_INET, "\xFF\xFF\xFF\xFF", + dst, sizeof(dst) - 1)); ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr)); ASSERT(0 == uv_ip4_addr("255.255.255.255", TEST_PORT, &addr)); diff --git a/worker/deps/libuv/test/test-ip6-addr.c b/worker/deps/libuv/test/test-ip6-addr.c index 25570dcacd..bbf33a4854 100644 --- a/worker/deps/libuv/test/test-ip6-addr.c +++ b/worker/deps/libuv/test/test-ip6-addr.c @@ -83,7 +83,7 @@ TEST_IMPL(ip6_addr_link_local) { ASSERT(0 == r); #ifdef _WIN32 /* On Windows, the interface identifier is the numeric string of the index. */ - ASSERT(strtol(interface_id, NULL, 10) == iface_index); + ASSERT(strtoul(interface_id, NULL, 10) == iface_index); #else /* On Unix/Linux, the interface identifier is the interface device name. */ ASSERT(0 == strcmp(device_name, interface_id)); diff --git a/worker/deps/libuv/test/test-list.h b/worker/deps/libuv/test/test-list.h index 46db4b2710..cc37bc039b 100644 --- a/worker/deps/libuv/test/test-list.h +++ b/worker/deps/libuv/test/test-list.h @@ -349,9 +349,11 @@ TEST_DECLARE (fs_null_req) TEST_DECLARE (fs_read_dir) #ifdef _WIN32 TEST_DECLARE (fs_exclusive_sharing_mode) +TEST_DECLARE (fs_file_flag_no_buffering) TEST_DECLARE (fs_open_readonly_acl) TEST_DECLARE (fs_fchmod_archive_readonly) #endif +TEST_DECLARE (strscpy) TEST_DECLARE (threadpool_queue_work_simple) TEST_DECLARE (threadpool_queue_work_einval) TEST_DECLARE (threadpool_multiple_event_loops) @@ -904,11 +906,13 @@ TASK_LIST_START TEST_ENTRY (fs_read_dir) #ifdef _WIN32 TEST_ENTRY (fs_exclusive_sharing_mode) + TEST_ENTRY (fs_file_flag_no_buffering) TEST_ENTRY (fs_open_readonly_acl) TEST_ENTRY (fs_fchmod_archive_readonly) #endif TEST_ENTRY (get_osfhandle_valid_handle) TEST_ENTRY (open_osfhandle_valid_handle) + TEST_ENTRY (strscpy) TEST_ENTRY (threadpool_queue_work_simple) TEST_ENTRY (threadpool_queue_work_einval) TEST_ENTRY (threadpool_multiple_event_loops) diff --git a/worker/deps/libuv/test/test-pipe-close-stdout-read-stdin.c b/worker/deps/libuv/test/test-pipe-close-stdout-read-stdin.c index c8804b0e18..126be2cc46 100644 --- a/worker/deps/libuv/test/test-pipe-close-stdout-read-stdin.c +++ b/worker/deps/libuv/test/test-pipe-close-stdout-read-stdin.c @@ -105,4 +105,8 @@ TEST_IMPL(pipe_close_stdout_read_stdin) { return 0; } +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + #endif /* ifndef _WIN32 */ diff --git a/worker/deps/libuv/test/test-platform-output.c b/worker/deps/libuv/test/test-platform-output.c index 4025fba540..43ed119deb 100644 --- a/worker/deps/libuv/test/test-platform-output.c +++ b/worker/deps/libuv/test/test-platform-output.c @@ -49,7 +49,7 @@ TEST_IMPL(platform_output) { printf("uv_cwd: %s\n", buffer); err = uv_resident_set_memory(&rss); -#if defined(__CYGWIN__) || defined(__MSYS__) +#if defined(__MSYS__) ASSERT(err == UV_ENOSYS); #else ASSERT(err == 0); diff --git a/worker/deps/libuv/test/test-poll-close-doesnt-corrupt-stack.c b/worker/deps/libuv/test/test-poll-close-doesnt-corrupt-stack.c index 1dfc80e352..3393820fc4 100644 --- a/worker/deps/libuv/test/test-poll-close-doesnt-corrupt-stack.c +++ b/worker/deps/libuv/test/test-poll-close-doesnt-corrupt-stack.c @@ -49,7 +49,7 @@ static void poll_cb(uv_poll_t* h, int status, int events) { } -static void NO_INLINE close_socket_and_verify_stack() { +static void NO_INLINE close_socket_and_verify_stack(void) { const uint32_t MARKER = 0xDEADBEEF; const int VERIFY_AFTER = 10; /* ms */ int r; diff --git a/worker/deps/libuv/test/test-poll-oob.c b/worker/deps/libuv/test/test-poll-oob.c index 2a6da843c6..77ffe31e96 100644 --- a/worker/deps/libuv/test/test-poll-oob.c +++ b/worker/deps/libuv/test/test-poll-oob.c @@ -202,4 +202,9 @@ TEST_IMPL(poll_oob) { MAKE_VALGRIND_HAPPY(); return 0; } + +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + #endif diff --git a/worker/deps/libuv/test/test-process-title-threadsafe.c b/worker/deps/libuv/test/test-process-title-threadsafe.c index c0dee48a79..19098eda0c 100644 --- a/worker/deps/libuv/test/test-process-title-threadsafe.c +++ b/worker/deps/libuv/test/test-process-title-threadsafe.c @@ -70,7 +70,7 @@ TEST_IMPL(process_title_threadsafe) { #if defined(__sun) || defined(__CYGWIN__) || defined(__MSYS__) || \ defined(__MVS__) RETURN_SKIP("uv_(get|set)_process_title is not implemented."); -#else +#endif ASSERT(0 == uv_set_process_title(titles[0])); ASSERT(0 == uv_thread_create(&getter_thread, getter_thread_body, NULL)); @@ -82,5 +82,4 @@ TEST_IMPL(process_title_threadsafe) { ASSERT(0 == uv_thread_join(&setter_threads[i])); return 0; -#endif } diff --git a/worker/deps/libuv/test/test-process-title.c b/worker/deps/libuv/test/test-process-title.c index 886f83a7d3..efd48142b7 100644 --- a/worker/deps/libuv/test/test-process-title.c +++ b/worker/deps/libuv/test/test-process-title.c @@ -62,7 +62,8 @@ static void uv_get_process_title_edge_cases(void) { TEST_IMPL(process_title) { #if defined(__sun) || defined(__CYGWIN__) || defined(__MSYS__) RETURN_SKIP("uv_(get|set)_process_title is not implemented."); -#else +#endif + /* Check for format string vulnerabilities. */ set_title("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"); set_title("new title"); @@ -71,5 +72,4 @@ TEST_IMPL(process_title) { uv_get_process_title_edge_cases(); return 0; -#endif } diff --git a/worker/deps/libuv/test/test-signal-multiple-loops.c b/worker/deps/libuv/test/test-signal-multiple-loops.c index 79242fc9fa..4281d23d72 100644 --- a/worker/deps/libuv/test/test-signal-multiple-loops.c +++ b/worker/deps/libuv/test/test-signal-multiple-loops.c @@ -295,4 +295,8 @@ TEST_IMPL(signal_multiple_loops) { return 0; } -#endif /* !_WIN32 */ +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + +#endif /* !_WIN32 */ diff --git a/worker/deps/libuv/test/test-spawn.c b/worker/deps/libuv/test/test-spawn.c index 594a64c60b..05c76f6145 100644 --- a/worker/deps/libuv/test/test-spawn.c +++ b/worker/deps/libuv/test/test-spawn.c @@ -49,7 +49,9 @@ static char exepath[1024]; static size_t exepath_size = 1024; static char* args[5]; static int no_term_signal; +#ifndef _WIN32 static int timer_counter; +#endif static uv_tcp_t tcp_server; #define OUTPUT_SIZE 1024 @@ -138,10 +140,12 @@ static void on_read(uv_stream_t* tcp, ssize_t nread, const uv_buf_t* buf) { } +#ifndef _WIN32 static void on_read_once(uv_stream_t* tcp, ssize_t nread, const uv_buf_t* buf) { uv_read_stop(tcp); on_read(tcp, nread, buf); } +#endif static void write_cb(uv_write_t* req, int status) { @@ -173,9 +177,11 @@ static void timer_cb(uv_timer_t* handle) { } +#ifndef _WIN32 static void timer_counter_cb(uv_timer_t* handle) { ++timer_counter; } +#endif TEST_IMPL(spawn_fails) { @@ -1198,7 +1204,7 @@ TEST_IMPL(argument_escaping) { int make_program_env(char** env_block, WCHAR** dst_ptr); TEST_IMPL(environment_creation) { - int i; + size_t i; char* environment[] = { "FOO=BAR", "SYSTEM=ROOT", /* substring of a supplied var name */ diff --git a/worker/deps/libuv/test/test-strscpy.c b/worker/deps/libuv/test/test-strscpy.c new file mode 100644 index 0000000000..4e7db6ffec --- /dev/null +++ b/worker/deps/libuv/test/test-strscpy.c @@ -0,0 +1,53 @@ +/* Copyright libuv project contributors. All rights reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ + +#include "uv.h" +#include "task.h" +#include + +#include "../src/strscpy.h" +#include "../src/strscpy.c" + +TEST_IMPL(strscpy) { + char d[4]; + + ASSERT(0 == uv__strscpy(d, "", 0)); + ASSERT(0 == uv__strscpy(d, "x", 0)); + + memset(d, 0, sizeof(d)); + ASSERT(1 == uv__strscpy(d, "x", sizeof(d))); + ASSERT(0 == memcmp(d, "x\0\0", sizeof(d))); + + memset(d, 0, sizeof(d)); + ASSERT(2 == uv__strscpy(d, "xy", sizeof(d))); + ASSERT(0 == memcmp(d, "xy\0", sizeof(d))); + + ASSERT(3 == uv__strscpy(d, "xyz", sizeof(d))); + ASSERT(0 == memcmp(d, "xyz", sizeof(d))); + + ASSERT(UV_E2BIG == uv__strscpy(d, "xyzz", sizeof(d))); + ASSERT(0 == memcmp(d, "xyz", sizeof(d))); + + ASSERT(UV_E2BIG == uv__strscpy(d, "xyzzy", sizeof(d))); + ASSERT(0 == memcmp(d, "xyz", sizeof(d))); + + return 0; +} diff --git a/worker/deps/libuv/test/test-tcp-close-accept.c b/worker/deps/libuv/test/test-tcp-close-accept.c index e4878398c8..624262bcfe 100644 --- a/worker/deps/libuv/test/test-tcp-close-accept.c +++ b/worker/deps/libuv/test/test-tcp-close-accept.c @@ -191,4 +191,8 @@ TEST_IMPL(tcp_close_accept) { return 0; } -#endif /* !_WIN32 */ +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + +#endif /* !_WIN32 */ diff --git a/worker/deps/libuv/test/test-tcp-oob.c b/worker/deps/libuv/test/test-tcp-oob.c index ca2361f9bb..53f8231e83 100644 --- a/worker/deps/libuv/test/test-tcp-oob.c +++ b/worker/deps/libuv/test/test-tcp-oob.c @@ -138,4 +138,9 @@ TEST_IMPL(tcp_oob) { MAKE_VALGRIND_HAPPY(); return 0; } -#endif + +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + +#endif /* !_WIN32 */ diff --git a/worker/deps/libuv/test/test-tcp-write-after-connect.c b/worker/deps/libuv/test/test-tcp-write-after-connect.c index aa03228f13..8198e7e184 100644 --- a/worker/deps/libuv/test/test-tcp-write-after-connect.c +++ b/worker/deps/libuv/test/test-tcp-write-after-connect.c @@ -65,4 +65,8 @@ TEST_IMPL(tcp_write_after_connect) { return 0; } -#endif +#else + +typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */ + +#endif /* !_WIN32 */ diff --git a/worker/deps/libuv/test/test-tty.c b/worker/deps/libuv/test/test-tty.c index 979a6ec38d..688711e508 100644 --- a/worker/deps/libuv/test/test-tty.c +++ b/worker/deps/libuv/test/test-tty.c @@ -315,10 +315,8 @@ TEST_IMPL(tty_raw_cancel) { int r; int ttyin_fd; uv_tty_t tty_in; - uv_loop_t* loop; HANDLE handle; - loop = uv_default_loop(); /* Make sure we have an FD that refers to a tty */ handle = CreateFileA("conin$", GENERIC_READ | GENERIC_WRITE, diff --git a/worker/deps/libuv/test/test.gyp b/worker/deps/libuv/test/test.gyp index 098512208c..ae7dc0d628 100644 --- a/worker/deps/libuv/test/test.gyp +++ b/worker/deps/libuv/test/test.gyp @@ -34,6 +34,7 @@ 'test-fs.c', 'test-fs-copyfile.c', 'test-fs-event.c', + 'test-fs-poll.c', 'test-getters-setters.c', 'test-get-currentexe.c', 'test-get-memory.c', @@ -96,7 +97,7 @@ 'test-signal-multiple-loops.c', 'test-socket-buffer-size.c', 'test-spawn.c', - 'test-fs-poll.c', + 'test-strscpy.c', 'test-stdio-over-pipes.c', 'test-tcp-alloc-cb-fail.c', 'test-tcp-bind-error.c', diff --git a/worker/deps/libuv/uv.gyp b/worker/deps/libuv/uv.gyp index 746d1ed541..0836dd27f2 100644 --- a/worker/deps/libuv/uv.gyp +++ b/worker/deps/libuv/uv.gyp @@ -74,6 +74,8 @@ 'src/idna.h', 'src/inet.c', 'src/queue.h', + 'src/strscpy.c', + 'src/strscpy.h', 'src/threadpool.c', 'src/timer.c', 'src/uv-data-getter-setters.c', diff --git a/worker/deps/openssl/config/README.md b/worker/deps/openssl/config/README.md index 1453622844..45ca72b797 100644 --- a/worker/deps/openssl/config/README.md +++ b/worker/deps/openssl/config/README.md @@ -59,7 +59,7 @@ Currently, one floating patch is needed to build S390 asm files. Cherry pick it from the previous commit. ```sh -$ git cherry-pick 094465362758ebf967b33c84d5c96230b46a34b3 +$ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd ``` ### 3. Execute `make` in `deps/openssl/config` directory @@ -70,16 +70,6 @@ Just type `make` then it generates all platform dependent files into $ cd deps/openssl/config; make ``` -The commit message can be -``` - commit 8cb1de45c60f2d520551166610115531db673518 - Author: Shigeki Ohtsu - Date: Thu Mar 29 16:46:11 2018 +0900 - - deps: update archs files for OpenSSL-1.1.0 - - `cd deps/openssl/config; make` updates all archs dependant files. -``` ### 4. Check diffs Check diffs if updates are right. Even if no updates in openssl @@ -96,14 +86,18 @@ used for `nmake` command. The `make` command in the step 2 above uses created. When source files or build options are updated in Windows, it needs to change these two Makefiles by hand. If you are not sure, please ask @shigeki for details. + ### 5. Commit and make test Update all architecture dependent files. Do not forget to git add or remove -files if they are changed before commit. +files if they are changed before commit: ```sh -$ cd deps/openssl/openssl/config -$ git add archs -$ git commit archs +$ git add deps/openssl/config/archs +$ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h +$ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h +$ git add deps/openssl/openssl/include/openssl/opensslconf.h +$ git add deps/openssl/openssl/.gitignore +$ git commit ``` The commit message can be @@ -113,6 +107,8 @@ The commit message can be Date: Thu Mar 29 16:46:11 2018 +0900 deps: update archs files for OpenSSL-1.1.0 + + `cd deps/openssl/config; make` updates all archs dependant files. ``` Finally, build Node and run tests. diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index 7ebb1a0112..742741d586 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "BSD-x86_64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1076,6 +1076,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1242,10 +1246,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3992,6 +4008,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5133,6 +5155,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6330,6 +6358,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7329,6 +7363,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7434,6 +7472,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7501,8 +7543,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7523,10 +7565,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7682,6 +7737,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7706,6 +7762,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7722,7 +7779,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7789,709 +7849,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9255,6 +8874,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9999,6 +9622,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10735,6 +10362,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11272,6 +10903,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11458,6 +11090,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11642,6 +11275,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12647,6 +12281,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12847,6 +12490,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12996,6 +12647,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -13004,6 +12663,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s index aa7a1ea1cf..488ae6d781 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s index d493797832..3dcd55d3f5 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s index c7c53e8771..ca193ddb9e 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s index 70eed05b00..427a1c7d12 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s index cd8b00f259..e18f87c4e6 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s index 0fd201167f..c76c5a8afb 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s index bf7c2b0b6f..d193298940 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s index a2cccde636..ee619092c9 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s index b6797a6849..795cebe1d7 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s index f4e5337565..a0b78a0565 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s index d19d4662b4..3a78cd8440 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax - leaq (%rsp),%rsi movq %r9,%r15 - jmp .Lsub + .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsi,%r14,8),%rax + movq 8(%rsp,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax - movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx + movq %r9,(%rsp,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi + leaq -4(%r9),%r15 movq 0(%rsp),%rax - pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r9 + shrq $2,%r15 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,9 +585,7 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - leaq -1(%r9),%r15 - jmp .Lsub4x -.align 16 + .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -614,34 +612,35 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx - leaq -1(%r9),%r15 - orq %rcx,%rsi - - movdqu (%rsi),%xmm1 - movdqa %xmm0,(%rsp) - movdqu %xmm1,(%rdi) + pxor %xmm0,%xmm0 +.byte 102,72,15,110,224 + pcmpeqd %xmm5,%xmm5 + pshufd $0,%xmm4,%xmm4 + movq %r9,%r15 + pxor %xmm4,%xmm5 + shrq $2,%r15 + xorl %eax,%eax + jmp .Lcopy4x .align 16 .Lcopy4x: - movdqu 16(%rsi,%r14,1),%xmm2 - movdqu 32(%rsi,%r14,1),%xmm1 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) - movdqa %xmm0,32(%rsp,%r14,1) - movdqu %xmm1,32(%rdi,%r14,1) - leaq 32(%r14),%r14 + movdqa (%rsp,%rax,1),%xmm1 + movdqu (%rdi,%rax,1),%xmm2 + pand %xmm4,%xmm1 + pand %xmm5,%xmm2 + movdqa 16(%rsp,%rax,1),%xmm3 + movdqa %xmm0,(%rsp,%rax,1) + por %xmm2,%xmm1 + movdqu 16(%rdi,%rax,1),%xmm2 + movdqu %xmm1,(%rdi,%rax,1) + pand %xmm4,%xmm3 + pand %xmm5,%xmm2 + movdqa %xmm0,16(%rsp,%rax,1) + por %xmm2,%xmm3 + movdqu %xmm3,16(%rdi,%rax,1) + leaq 32(%rax),%rax decq %r15 jnz .Lcopy4x - - shlq $2,%r9 - movdqu 16(%rsi,%r14,1),%xmm2 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s index a2fccf088e..0dd53512f9 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,18 +393,19 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index 42960ff459..260e0eaac9 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Tue Apr 3 00:38:12 2018" +#define DATE "built on: Tue Nov 20 09:37:29 2018" diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s index 1117381f31..1dead91b17 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s index 044b8f031e..a9fed05fd7 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s index ce86d5d969..62a7ac611f 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s index 0aa90515d6..0defe666bb 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s index d1a1c895a3..21e49925f1 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s index 10f5987415..0116ef1c94 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s index 5662696481..8b2e361ea1 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s index 9c7110f4ef..aab3c6db13 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s index bdd0da3bd1..781b48b9eb 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s index d2857f3288..d266d776ec 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s index 195a148bb9..dbeebed9a0 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s index bd72a459ab..f2896b4d6e 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s index 23b932e1de..8264a7dbdf 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s index a1021c17a9..6f8488a38a 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s index f83130ea68..a4d55b6afc 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s index 5a109c6fd9..7e1f5e2740 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s index 3e5ab736fd..38c02c188e 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h index 9df0f86ed6..7dd2101053 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index 5c26facf11..2a14dbf50a 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -215,6 +215,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -572,6 +574,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index 0815b65b4c..ca660392e1 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "BSD-x86_64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1075,6 +1075,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1241,10 +1245,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3931,6 +3947,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5060,6 +5082,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6209,6 +6237,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7196,6 +7230,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7301,6 +7339,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7368,8 +7410,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7390,10 +7432,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7549,6 +7604,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7573,6 +7629,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7589,7 +7646,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7656,709 +7716,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9082,6 +8701,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9818,6 +9441,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10522,6 +10149,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11041,6 +10672,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11225,6 +10857,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11401,6 +11034,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12404,6 +12038,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12604,6 +12247,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12753,6 +12404,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12761,6 +12420,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index 9bcf65021a..f42029725c 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Tue Apr 3 00:38:16 2018" +#define DATE "built on: Tue Nov 20 09:37:38 2018" diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h index e20916814d..7b122bd86e 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi index f54f6ed68e..5605b604a4 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 77adc3e250..4b40a5a831 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "/usr/bin/makedepend", + makedepprog => "", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN32", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des-586.s crypt586.s", des_obj => "des-586.o crypt586.o", dso_cflags => "/Zi /Fddso", - dso_extension => "", + dso_extension => ".dll", dso_scheme => "WIN32", ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86.s", ec_obj => "ecp_nistz256.o ecp_nistz256-x86.o", @@ -133,8 +133,8 @@ our %target = ( sha1_obj => "sha1-586.o sha256-586.o sha512-586.o", shared_cflag => "", shared_defines => [ ], - shared_extension => "", - shared_extension_simple => "", + shared_extension => ".dll", + shared_extension_simple => ".dll", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -263,6 +263,7 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", + "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1100,6 +1101,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1266,10 +1271,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3974,6 +3991,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5121,6 +5144,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6306,6 +6335,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7305,6 +7340,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7410,6 +7449,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7499,10 +7542,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7658,6 +7714,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7682,6 +7739,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7698,7 +7756,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7721,448 +7782,10 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], "libcrypto" => [ "crypto/dllmain.o", ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9161,6 +8784,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9909,6 +9536,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10637,6 +10268,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11166,6 +10801,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11352,6 +10988,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11534,6 +11171,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12539,6 +12177,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12739,6 +12386,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12888,6 +12543,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12896,6 +12559,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm index 1da1e643bb..78d5e7375e 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm @@ -10,7 +10,7 @@ global _BF_encrypt align 16 _BF_encrypt: L$_BF_encrypt_begin: - ; + ; push ebp push ebx mov ebx,DWORD [12+esp] @@ -24,7 +24,7 @@ L$_BF_encrypt_begin: mov ebx,DWORD [ebp] xor ecx,ecx xor edi,ebx - ; + ; ; Round 0 mov edx,DWORD [4+ebp] mov ebx,edi @@ -44,7 +44,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 1 mov edx,DWORD [8+ebp] mov ebx,esi @@ -64,7 +64,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 2 mov edx,DWORD [12+ebp] mov ebx,edi @@ -84,7 +84,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 3 mov edx,DWORD [16+ebp] mov ebx,esi @@ -104,7 +104,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 4 mov edx,DWORD [20+ebp] mov ebx,edi @@ -124,7 +124,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 5 mov edx,DWORD [24+ebp] mov ebx,esi @@ -144,7 +144,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 6 mov edx,DWORD [28+ebp] mov ebx,edi @@ -164,7 +164,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 7 mov edx,DWORD [32+ebp] mov ebx,esi @@ -184,7 +184,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 8 mov edx,DWORD [36+ebp] mov ebx,edi @@ -204,7 +204,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 9 mov edx,DWORD [40+ebp] mov ebx,esi @@ -224,7 +224,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 10 mov edx,DWORD [44+ebp] mov ebx,edi @@ -244,7 +244,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 11 mov edx,DWORD [48+ebp] mov ebx,esi @@ -264,7 +264,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 12 mov edx,DWORD [52+ebp] mov ebx,edi @@ -284,7 +284,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 13 mov edx,DWORD [56+ebp] mov ebx,esi @@ -304,7 +304,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 14 mov edx,DWORD [60+ebp] mov ebx,edi @@ -324,7 +324,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 15 mov edx,DWORD [64+ebp] mov ebx,esi @@ -358,7 +358,7 @@ global _BF_decrypt align 16 _BF_decrypt: L$_BF_decrypt_begin: - ; + ; push ebp push ebx mov ebx,DWORD [12+esp] @@ -372,7 +372,7 @@ L$_BF_decrypt_begin: mov ebx,DWORD [68+ebp] xor ecx,ecx xor edi,ebx - ; + ; ; Round 16 mov edx,DWORD [64+ebp] mov ebx,edi @@ -392,7 +392,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 15 mov edx,DWORD [60+ebp] mov ebx,esi @@ -412,7 +412,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 14 mov edx,DWORD [56+ebp] mov ebx,edi @@ -432,7 +432,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 13 mov edx,DWORD [52+ebp] mov ebx,esi @@ -452,7 +452,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 12 mov edx,DWORD [48+ebp] mov ebx,edi @@ -472,7 +472,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 11 mov edx,DWORD [44+ebp] mov ebx,esi @@ -492,7 +492,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 10 mov edx,DWORD [40+ebp] mov ebx,edi @@ -512,7 +512,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 9 mov edx,DWORD [36+ebp] mov ebx,esi @@ -532,7 +532,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 8 mov edx,DWORD [32+ebp] mov ebx,edi @@ -552,7 +552,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 7 mov edx,DWORD [28+ebp] mov ebx,esi @@ -572,7 +572,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 6 mov edx,DWORD [24+ebp] mov ebx,edi @@ -592,7 +592,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 5 mov edx,DWORD [20+ebp] mov ebx,esi @@ -612,7 +612,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 4 mov edx,DWORD [16+ebp] mov ebx,edi @@ -632,7 +632,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 3 mov edx,DWORD [12+ebp] mov ebx,esi @@ -652,7 +652,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 2 mov edx,DWORD [8+ebp] mov ebx,edi @@ -672,7 +672,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 1 mov edx,DWORD [4+ebp] mov ebx,esi @@ -706,7 +706,7 @@ global _BF_cbc_encrypt align 16 _BF_cbc_encrypt: L$_BF_cbc_encrypt_begin: - ; + ; push ebp push ebx push esi diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm index 8534042b05..82002b353b 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm @@ -108,7 +108,7 @@ L$000maw_non_sse2: push ebx push esi push edi - ; + ; xor esi,esi mov edi,DWORD [20+esp] mov ecx,DWORD [28+esp] @@ -191,7 +191,7 @@ L$006maw_loop: adc edx,0 mov DWORD [28+edi],eax mov esi,edx - ; + ; sub ecx,8 lea ebx,[32+ebx] lea edi,[32+edi] @@ -317,7 +317,7 @@ L$009mw_non_sse2: push ebx push esi push edi - ; + ; xor esi,esi mov edi,DWORD [20+esp] mov ebx,DWORD [24+esp] @@ -382,7 +382,7 @@ L$012mw_loop: adc edx,0 mov DWORD [28+edi],eax mov esi,edx - ; + ; add ebx,32 add edi,32 sub ebp,8 @@ -489,7 +489,7 @@ L$015sqr_non_sse2: push ebx push esi push edi - ; + ; mov esi,DWORD [20+esp] mov edi,DWORD [24+esp] mov ebx,DWORD [28+esp] @@ -536,7 +536,7 @@ L$018sw_loop: mul eax mov DWORD [56+esi],eax mov DWORD [60+esi],edx - ; + ; add edi,32 add esi,64 sub ebx,8 @@ -615,7 +615,7 @@ L$_bn_add_words_begin: push ebx push esi push edi - ; + ; mov ebx,DWORD [20+esp] mov esi,DWORD [24+esp] mov edi,DWORD [28+esp] @@ -696,7 +696,7 @@ L$021aw_loop: add ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add esi,32 add edi,32 add ebx,32 @@ -795,7 +795,7 @@ L$_bn_sub_words_begin: push ebx push esi push edi - ; + ; mov ebx,DWORD [20+esp] mov esi,DWORD [24+esp] mov edi,DWORD [28+esp] @@ -876,7 +876,7 @@ L$024aw_loop: sub ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add esi,32 add edi,32 add ebx,32 @@ -975,7 +975,7 @@ L$_bn_sub_part_words_begin: push ebx push esi push edi - ; + ; mov ebx,DWORD [20+esp] mov esi,DWORD [24+esp] mov edi,DWORD [28+esp] @@ -1056,7 +1056,7 @@ L$027aw_loop: sub ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add esi,32 add edi,32 add ebx,32 @@ -1248,7 +1248,7 @@ L$032pw_neg_loop: sub ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add edi,32 add ebx,32 sub ebp,8 @@ -1379,7 +1379,7 @@ L$034pw_pos_loop: sub ecx,eax mov DWORD [28+ebx],ecx jnc NEAR L$042pw_nc7 - ; + ; add esi,32 add ebx,32 sub ebp,8 @@ -1462,7 +1462,7 @@ L$041pw_nc6: mov ecx,DWORD [28+esi] mov DWORD [28+ebx],ecx L$042pw_nc7: - ; + ; add esi,32 add ebx,32 sub ebp,8 diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm index bf237b633a..090630c3a0 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm @@ -448,16 +448,18 @@ L$016sub: lea edx,[1+edx] jge NEAR L$016sub sbb eax,0 - and esi,eax - not eax - mov ebp,edi - and ebp,eax - or esi,ebp + mov edx,-1 + xor edx,eax + jmp NEAR L$017copy align 16 L$017copy: - mov eax,DWORD [ebx*4+esi] - mov DWORD [ebx*4+edi],eax + mov esi,DWORD [32+ebx*4+esp] + mov ebp,DWORD [ebx*4+edi] mov DWORD [32+ebx*4+esp],ecx + and esi,eax + and ebp,edx + or ebp,esi + mov DWORD [ebx*4+edi],ebp dec ebx jge NEAR L$017copy mov esp,DWORD [24+esp] diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h index 29159b7a18..9a504b1683 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Apr 3 00:38:59 2018" +#define DATE "built on: Tue Nov 20 09:39:18 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm index 912b2b9e90..2af8af39d6 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm @@ -15,7 +15,7 @@ L$_fcrypt_body_begin: push ebx push esi push edi - ; + ; ; Load the 2 words xor edi,edi xor esi,esi @@ -24,7 +24,7 @@ L$_fcrypt_body_begin: mov ebp,DWORD [28+esp] push DWORD 25 L$000start: - ; + ; ; Round 0 mov eax,DWORD [36+esp] mov edx,esi @@ -74,7 +74,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 1 mov eax,DWORD [36+esp] mov edx,edi @@ -124,7 +124,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 2 mov eax,DWORD [36+esp] mov edx,esi @@ -174,7 +174,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 3 mov eax,DWORD [36+esp] mov edx,edi @@ -224,7 +224,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 4 mov eax,DWORD [36+esp] mov edx,esi @@ -274,7 +274,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 5 mov eax,DWORD [36+esp] mov edx,edi @@ -324,7 +324,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 6 mov eax,DWORD [36+esp] mov edx,esi @@ -374,7 +374,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 7 mov eax,DWORD [36+esp] mov edx,edi @@ -424,7 +424,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 8 mov eax,DWORD [36+esp] mov edx,esi @@ -474,7 +474,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 9 mov eax,DWORD [36+esp] mov edx,edi @@ -524,7 +524,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 10 mov eax,DWORD [36+esp] mov edx,esi @@ -574,7 +574,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 11 mov eax,DWORD [36+esp] mov edx,edi @@ -624,7 +624,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 12 mov eax,DWORD [36+esp] mov edx,esi @@ -674,7 +674,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 13 mov eax,DWORD [36+esp] mov edx,edi @@ -724,7 +724,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 14 mov eax,DWORD [36+esp] mov edx,esi @@ -774,7 +774,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 15 mov eax,DWORD [36+esp] mov edx,edi @@ -831,7 +831,7 @@ L$000start: mov esi,eax mov DWORD [esp],ebx jnz NEAR L$000start - ; + ; ; FP mov edx,DWORD [28+esp] ror edi,1 @@ -840,35 +840,35 @@ L$000start: and esi,0xaaaaaaaa xor eax,esi xor edi,esi - ; + ; rol eax,23 mov esi,eax xor eax,edi and eax,0x03fc03fc xor esi,eax xor edi,eax - ; + ; rol esi,10 mov eax,esi xor esi,edi and esi,0x33333333 xor eax,esi xor edi,esi - ; + ; rol edi,18 mov esi,edi xor edi,eax and edi,0xfff0000f xor esi,edi xor eax,edi - ; + ; rol esi,12 mov edi,esi xor esi,eax and esi,0xf0f0f0f0 xor edi,esi xor eax,esi - ; + ; ror eax,4 mov DWORD [edx],eax mov DWORD [4+edx],edi diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm index d4a46e1606..3d6ee2a5e4 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm @@ -951,7 +951,7 @@ _DES_encrypt1: L$_DES_encrypt1_begin: push esi push edi - ; + ; ; Load the 2 words mov esi,DWORD [12+esp] xor ecx,ecx @@ -960,7 +960,7 @@ L$_DES_encrypt1_begin: mov eax,DWORD [esi] mov ebx,DWORD [28+esp] mov edi,DWORD [4+esi] - ; + ; ; IP rol eax,4 mov esi,eax @@ -968,35 +968,35 @@ L$_DES_encrypt1_begin: and eax,0xf0f0f0f0 xor esi,eax xor edi,eax - ; + ; rol edi,20 mov eax,edi xor edi,esi and edi,0xfff0000f xor eax,edi xor esi,edi - ; + ; rol eax,14 mov edi,eax xor eax,esi and eax,0x33333333 xor edi,eax xor esi,eax - ; + ; rol esi,22 mov eax,esi xor esi,edi and esi,0x03fc03fc xor eax,esi xor edi,esi - ; + ; rol eax,9 mov esi,eax xor eax,edi and eax,0xaaaaaaaa xor esi,eax xor edi,eax - ; + ; rol edi,1 call L$000pic_point L$000pic_point: @@ -1010,7 +1010,7 @@ L$000pic_point: L$001decrypt: call __x86_DES_decrypt L$002done: - ; + ; ; FP mov edx,DWORD [20+esp] ror esi,1 @@ -1019,35 +1019,35 @@ L$002done: and edi,0xaaaaaaaa xor eax,edi xor esi,edi - ; + ; rol eax,23 mov edi,eax xor eax,esi and eax,0x03fc03fc xor edi,eax xor esi,eax - ; + ; rol edi,10 mov eax,edi xor edi,esi and edi,0x33333333 xor eax,edi xor esi,edi - ; + ; rol esi,18 mov edi,esi xor esi,eax and esi,0xfff0000f xor edi,esi xor eax,esi - ; + ; rol edi,12 mov esi,edi xor edi,eax and edi,0xf0f0f0f0 xor esi,edi xor eax,edi - ; + ; ror eax,4 mov DWORD [edx],eax mov DWORD [4+edx],esi @@ -1062,7 +1062,7 @@ _DES_encrypt2: L$_DES_encrypt2_begin: push esi push edi - ; + ; ; Load the 2 words mov eax,DWORD [12+esp] xor ecx,ecx @@ -1085,7 +1085,7 @@ L$003pic_point: L$004decrypt: call __x86_DES_decrypt L$005done: - ; + ; ; Fixup ror edi,3 mov eax,DWORD [20+esp] @@ -1106,12 +1106,12 @@ L$_DES_encrypt3_begin: push ebp push esi push edi - ; + ; ; Load the data words mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] sub esp,12 - ; + ; ; IP rol edi,4 mov edx,edi @@ -1119,35 +1119,35 @@ L$_DES_encrypt3_begin: and edi,0xf0f0f0f0 xor edx,edi xor esi,edi - ; + ; rol esi,20 mov edi,esi xor esi,edx and esi,0xfff0000f xor edi,esi xor edx,esi - ; + ; rol edi,14 mov esi,edi xor edi,edx and edi,0x33333333 xor esi,edi xor edx,edi - ; + ; rol edx,22 mov edi,edx xor edx,esi and edx,0x03fc03fc xor edi,edx xor esi,edx - ; + ; rol edi,9 mov edx,edi xor edi,esi and edi,0xaaaaaaaa xor edx,edi xor esi,edi - ; + ; ror edx,3 ror esi,2 mov DWORD [4+ebx],esi @@ -1170,7 +1170,7 @@ L$_DES_encrypt3_begin: add esp,12 mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] - ; + ; ; FP rol esi,2 rol edi,3 @@ -1179,35 +1179,35 @@ L$_DES_encrypt3_begin: and edi,0xaaaaaaaa xor eax,edi xor esi,edi - ; + ; rol eax,23 mov edi,eax xor eax,esi and eax,0x03fc03fc xor edi,eax xor esi,eax - ; + ; rol edi,10 mov eax,edi xor edi,esi and edi,0x33333333 xor eax,edi xor esi,edi - ; + ; rol esi,18 mov edi,esi xor esi,eax and esi,0xfff0000f xor edi,esi xor eax,esi - ; + ; rol edi,12 mov esi,edi xor edi,eax and edi,0xf0f0f0f0 xor esi,edi xor eax,edi - ; + ; ror eax,4 mov DWORD [ebx],eax mov DWORD [4+ebx],esi @@ -1225,12 +1225,12 @@ L$_DES_decrypt3_begin: push ebp push esi push edi - ; + ; ; Load the data words mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] sub esp,12 - ; + ; ; IP rol edi,4 mov edx,edi @@ -1238,35 +1238,35 @@ L$_DES_decrypt3_begin: and edi,0xf0f0f0f0 xor edx,edi xor esi,edi - ; + ; rol esi,20 mov edi,esi xor esi,edx and esi,0xfff0000f xor edi,esi xor edx,esi - ; + ; rol edi,14 mov esi,edi xor edi,edx and edi,0x33333333 xor esi,edi xor edx,edi - ; + ; rol edx,22 mov edi,edx xor edx,esi and edx,0x03fc03fc xor edi,edx xor esi,edx - ; + ; rol edi,9 mov edx,edi xor edi,esi and edi,0xaaaaaaaa xor edx,edi xor esi,edi - ; + ; ror edx,3 ror esi,2 mov DWORD [4+ebx],esi @@ -1289,7 +1289,7 @@ L$_DES_decrypt3_begin: add esp,12 mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] - ; + ; ; FP rol esi,2 rol edi,3 @@ -1298,35 +1298,35 @@ L$_DES_decrypt3_begin: and edi,0xaaaaaaaa xor eax,edi xor esi,edi - ; + ; rol eax,23 mov edi,eax xor eax,esi and eax,0x03fc03fc xor edi,eax xor esi,eax - ; + ; rol edi,10 mov eax,edi xor edi,esi and edi,0x33333333 xor eax,edi xor esi,edi - ; + ; rol esi,18 mov edi,esi xor esi,eax and esi,0xfff0000f xor edi,esi xor eax,esi - ; + ; rol edi,12 mov esi,edi xor edi,eax and edi,0xf0f0f0f0 xor esi,edi xor eax,edi - ; + ; ror eax,4 mov DWORD [ebx],eax mov DWORD [4+ebx],esi @@ -1339,7 +1339,7 @@ global _DES_ncbc_encrypt align 16 _DES_ncbc_encrypt: L$_DES_ncbc_encrypt_begin: - ; + ; push ebp push ebx push esi @@ -1517,7 +1517,7 @@ global _DES_ede3_cbc_encrypt align 16 _DES_ede3_cbc_encrypt: L$_DES_ede3_cbc_encrypt_begin: - ; + ; push ebp push ebx push esi diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm index 8203213818..7383523877 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm @@ -3829,7 +3829,7 @@ L$_ecp_nistz256_scatter_w7_begin: mov edi,DWORD [20+esp] mov esi,DWORD [24+esp] mov ebp,DWORD [28+esp] - lea edi,[ebp*1+edi-1] + lea edi,[ebp*1+edi] mov ebp,16 L$007scatter_w7_loop: mov eax,DWORD [esi] diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h index f555fb4bdf..289768d956 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION "" +# define DSO_EXTENSION ".dll" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm index efa6b5f894..90663d022d 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm @@ -26,7 +26,7 @@ L$_md5_block_asm_data_order_begin: mov ecx,DWORD [8+edi] mov edx,DWORD [12+edi] L$000start: - ; + ; ; R0 section mov edi,ecx mov ebp,DWORD [esi] @@ -190,7 +190,7 @@ L$000start: rol ebx,22 mov edi,ecx add ebx,ecx - ; + ; ; R1 section ; R1 16 xor edi,ebx @@ -352,7 +352,7 @@ L$000start: mov edi,ecx rol ebx,20 add ebx,ecx - ; + ; ; R2 section ; R2 32 xor edi,edx @@ -498,7 +498,7 @@ L$000start: mov edi,-1 rol ebx,23 add ebx,ecx - ; + ; ; R3 section ; R3 48 xor edi,edx diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm index 0a05888845..a5ab683672 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm @@ -21,7 +21,7 @@ L$_ripemd160_block_asm_data_order_begin: push ebx sub esp,108 L$000start: - ; + ; mov ebx,DWORD [eax] mov ebp,DWORD [4+eax] mov DWORD [esp],ebx diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h index 630bb30623..19c35390f1 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index 10fa852b2a..f114c22fd3 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -211,6 +211,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -394,6 +395,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -567,6 +569,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index a7afa26f51..1b4354c204 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "/usr/bin/makedepend", + makedepprog => "", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN32", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", dso_cflags => "/Zi /Fddso", - dso_extension => "", + dso_extension => ".dll", dso_scheme => "WIN32", ec_asm_src => "", ec_obj => "", @@ -131,8 +131,8 @@ our %target = ( rmd160_obj => "", shared_cflag => "", shared_defines => [ ], - shared_extension => "", - shared_extension_simple => "", + shared_extension => ".dll", + shared_extension_simple => ".dll", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -262,6 +262,7 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", + "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1099,6 +1100,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1265,10 +1270,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3961,6 +3978,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5096,6 +5119,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6245,6 +6274,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,6 +7267,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7337,6 +7376,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7404,8 +7447,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7426,10 +7469,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7585,6 +7641,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7609,6 +7666,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7625,7 +7683,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7648,448 +7709,10 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], "libcrypto" => [ "crypto/dllmain.o", ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9080,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9447,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10155,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10678,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10863,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11040,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12044,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12253,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12410,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12426,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h index c58c6e6c40..4ff1ec2ebe 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Apr 3 00:39:00 2018" +#define DATE "built on: Tue Nov 20 09:39:22 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h index f555fb4bdf..289768d956 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION "" +# define DSO_EXTENSION ".dll" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h index 1f09ee0d7f..eaf7b68125 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h @@ -108,12 +108,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index 09aef657a4..7e920c437a 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index 95949bf7a4..e06b3546c0 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "/usr/bin/makedepend", + makedepprog => "", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN64A", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", dso_cflags => "/Zi /Fddso", - dso_extension => "", + dso_extension => ".dll", dso_scheme => "WIN32", ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86_64.s", ec_obj => "ecp_nistz256.o ecp_nistz256-x86_64.o", @@ -134,8 +134,8 @@ our %target = ( sha1_obj => "sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o", shared_cflag => "", shared_defines => [ ], - shared_extension => "", - shared_extension_simple => "", + shared_extension => ".dll", + shared_extension_simple => ".dll", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -264,6 +264,7 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", + "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1101,6 +1102,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1267,10 +1272,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -4023,6 +4040,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5170,6 +5193,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6367,6 +6396,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7366,6 +7401,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7471,6 +7510,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7560,10 +7603,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7719,6 +7775,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7743,6 +7800,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7759,7 +7817,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7782,448 +7843,10 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], "libcrypto" => [ "crypto/dllmain.o", ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9254,6 +8877,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -10002,6 +9629,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10738,6 +10369,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11275,6 +10910,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11461,6 +11097,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11645,6 +11282,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12650,6 +12288,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12850,6 +12497,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12999,6 +12654,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -13007,6 +12670,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm index f58343ff2b..26908c313b 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm @@ -214,30 +214,30 @@ $L$inner_enter: xor r14,r14 mov rax,QWORD[rsp] - lea rsi,[rsp] mov r15,r9 - jmp NEAR $L$sub + ALIGN 16 $L$sub: sbb rax,QWORD[r14*8+rcx] mov QWORD[r14*8+rdi],rax - mov rax,QWORD[8+r14*8+rsi] + mov rax,QWORD[8+r14*8+rsp] lea r14,[1+r14] dec r15 jnz NEAR $L$sub sbb rax,0 + mov rbx,-1 + xor rbx,rax xor r14,r14 - and rsi,rax - not rax - mov rcx,rdi - and rcx,rax mov r15,r9 - or rsi,rcx -ALIGN 16 + $L$copy: - mov rax,QWORD[r14*8+rsi] - mov QWORD[r14*8+rsp],r14 - mov QWORD[r14*8+rdi],rax + mov rcx,QWORD[r14*8+rdi] + mov rdx,QWORD[r14*8+rsp] + and rcx,rbx + and rdx,rax + mov QWORD[r14*8+rsp],r9 + or rdx,rcx + mov QWORD[r14*8+rdi],rdx lea r14,[1+r14] sub r15,1 jnz NEAR $L$copy @@ -605,10 +605,10 @@ $L$inner4x: cmp r14,r9 jb NEAR $L$outer4x mov rdi,QWORD[16+r9*8+rsp] + lea r15,[((-4))+r9] mov rax,QWORD[rsp] - pxor xmm0,xmm0 mov rdx,QWORD[8+rsp] - shr r9,2 + shr r15,2 lea rsi,[rsp] xor r14,r14 @@ -616,9 +616,7 @@ $L$inner4x: mov rbx,QWORD[16+rsi] mov rbp,QWORD[24+rsi] sbb rdx,QWORD[8+rcx] - lea r15,[((-1))+r9] - jmp NEAR $L$sub4x -ALIGN 16 + $L$sub4x: mov QWORD[r14*8+rdi],rax mov QWORD[8+r14*8+rdi],rdx @@ -645,34 +643,35 @@ $L$sub4x: sbb rax,0 mov QWORD[24+r14*8+rdi],rbp - xor r14,r14 - and rsi,rax - not rax - mov rcx,rdi - and rcx,rax - lea r15,[((-1))+r9] - or rsi,rcx - - movdqu xmm1,XMMWORD[rsi] - movdqa XMMWORD[rsp],xmm0 - movdqu XMMWORD[rdi],xmm1 + pxor xmm0,xmm0 +DB 102,72,15,110,224 + pcmpeqd xmm5,xmm5 + pshufd xmm4,xmm4,0 + mov r15,r9 + pxor xmm5,xmm4 + shr r15,2 + xor eax,eax + jmp NEAR $L$copy4x ALIGN 16 $L$copy4x: - movdqu xmm2,XMMWORD[16+r14*1+rsi] - movdqu xmm1,XMMWORD[32+r14*1+rsi] - movdqa XMMWORD[16+r14*1+rsp],xmm0 - movdqu XMMWORD[16+r14*1+rdi],xmm2 - movdqa XMMWORD[32+r14*1+rsp],xmm0 - movdqu XMMWORD[32+r14*1+rdi],xmm1 - lea r14,[32+r14] + movdqa xmm1,XMMWORD[rax*1+rsp] + movdqu xmm2,XMMWORD[rax*1+rdi] + pand xmm1,xmm4 + pand xmm2,xmm5 + movdqa xmm3,XMMWORD[16+rax*1+rsp] + movdqa XMMWORD[rax*1+rsp],xmm0 + por xmm1,xmm2 + movdqu xmm2,XMMWORD[16+rax*1+rdi] + movdqu XMMWORD[rax*1+rdi],xmm1 + pand xmm3,xmm4 + pand xmm2,xmm5 + movdqa XMMWORD[16+rax*1+rsp],xmm0 + por xmm3,xmm2 + movdqu XMMWORD[16+rax*1+rdi],xmm3 + lea rax,[32+rax] dec r15 jnz NEAR $L$copy4x - - shl r9,2 - movdqu xmm2,XMMWORD[16+r14*1+rsi] - movdqa XMMWORD[16+r14*1+rsp],xmm0 - movdqu XMMWORD[16+r14*1+rdi],xmm2 mov rsi,QWORD[8+r9*8+rsp] mov rax,1 mov r15,QWORD[((-48))+rsi] diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm index e0fb22b79e..de93630c8f 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm @@ -410,18 +410,19 @@ $L$sub: sbb rax,QWORD[r14*8+rcx] jnz NEAR $L$sub sbb rax,0 + mov rbx,-1 + xor rbx,rax xor r14,r14 - and rsi,rax - not rax - mov rcx,rdi - and rcx,rax mov r15,r9 - or rsi,rcx -ALIGN 16 + $L$copy: - mov rax,QWORD[r14*8+rsi] + mov rcx,QWORD[r14*8+rdi] + mov rdx,QWORD[r14*8+rsp] + and rcx,rbx + and rdx,rax mov QWORD[r14*8+rsp],r14 - mov QWORD[r14*8+rdi],rax + or rdx,rcx + mov QWORD[r14*8+rdi],rdx lea r14,[1+r14] sub r15,1 jnz NEAR $L$copy diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h index bae537d401..c0b70ab335 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Apr 3 00:38:54 2018" +#define DATE "built on: Tue Nov 20 09:39:06 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h index f555fb4bdf..289768d956 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION "" +# define DSO_EXTENSION ".dll" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm index cda3538dba..2aede40d9e 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm @@ -456,3 +456,4 @@ $L$tail_rdseed_bytes: $L$done_rdseed_bytes: DB 0F3h,0C3h ;repret + diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h index 01084232d8..fd1ca5612f 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index 8fccfe154d..1924b0294f 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -215,6 +215,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -572,6 +574,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index b7918f728d..d33be7b8a3 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "/usr/bin/makedepend", + makedepprog => "", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN64A", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", dso_cflags => "/Zi /Fddso", - dso_extension => "", + dso_extension => ".dll", dso_scheme => "WIN32", ec_asm_src => "", ec_obj => "", @@ -132,8 +132,8 @@ our %target = ( rmd160_obj => "", shared_cflag => "", shared_defines => [ ], - shared_extension => "", - shared_extension_simple => "", + shared_extension => ".dll", + shared_extension_simple => ".dll", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -263,6 +263,7 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", + "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1100,6 +1101,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1266,10 +1271,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3962,6 +3979,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5097,6 +5120,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6246,6 +6275,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7233,6 +7268,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7338,6 +7377,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7427,10 +7470,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7586,6 +7642,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7610,6 +7667,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7626,7 +7684,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7649,448 +7710,10 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], "libcrypto" => [ "crypto/dllmain.o", ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9081,6 +8704,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9821,6 +9448,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10525,6 +10156,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11044,6 +10679,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11228,6 +10864,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11404,6 +11041,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12407,6 +12045,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12607,6 +12254,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12756,6 +12411,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12764,6 +12427,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h index 12173ecb40..a7939bd1e6 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Apr 3 00:38:58 2018" +#define DATE "built on: Tue Nov 20 09:39:16 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h index f555fb4bdf..289768d956 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION "" +# define DSO_EXTENSION ".dll" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h index dfe71f8c60..097c8ae7bf 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h @@ -108,12 +108,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi index 54cef95adb..51bf2fe679 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm index 4fe3ed16b6..4eddfafd2c 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -871,11 +871,6 @@ our %unified_info = ( "libcrypto", "libssl", ], - "test/buildtest_opensslconf" => - [ - "libcrypto", - "libssl", - ], "test/buildtest_opensslv" => [ "libcrypto", @@ -1084,6 +1079,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1250,10 +1249,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -2328,11 +2339,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "ocsp", ], - "test/buildtest_opensslconf.c" => - [ - "test/generate_buildtest.pl", - "opensslconf", - ], "test/buildtest_opensslv.c" => [ "test/generate_buildtest.pl", @@ -3975,6 +3981,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5104,6 +5116,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6307,6 +6325,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7112,10 +7136,6 @@ our %unified_info = ( [ "include", ], - "test/buildtest_opensslconf.o" => - [ - "include", - ], "test/buildtest_opensslv.o" => [ "include", @@ -7298,6 +7318,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7403,6 +7427,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7492,10 +7520,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7607,7 +7648,6 @@ our %unified_info = ( "test/buildtest_obj_mac", "test/buildtest_objects", "test/buildtest_ocsp", - "test/buildtest_opensslconf", "test/buildtest_opensslv", "test/buildtest_ossl_typ", "test/buildtest_pem", @@ -7652,6 +7692,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7676,6 +7717,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7692,7 +7734,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7759,702 +7804,258 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslconf" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", + "apps/ts.c", ], "apps/tsget" => [ @@ -9208,6 +8809,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9944,6 +9549,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10684,6 +10293,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11208,6 +10821,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11392,6 +11006,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11577,6 +11192,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12222,14 +11838,6 @@ our %unified_info = ( [ "test/buildtest_ocsp.c", ], - "test/buildtest_opensslconf" => - [ - "test/buildtest_opensslconf.o", - ], - "test/buildtest_opensslconf.o" => - [ - "test/buildtest_opensslconf.c", - ], "test/buildtest_opensslv" => [ "test/buildtest_opensslv.o", @@ -12588,6 +12196,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12788,6 +12405,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12937,6 +12562,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12945,6 +12578,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s index 2b16116024..dad9e59c71 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ LAES_Te: mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ LAES_Td: mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -739,7 +739,7 @@ Lenc_done: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -819,7 +819,7 @@ Lenc_loop: bc 16,0,Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -884,7 +884,7 @@ Lenc_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1029,7 +1029,7 @@ Lenc_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1173,7 +1173,7 @@ Ldec_done: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1253,7 +1253,7 @@ Ldec_loop: bc 16,0,Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1318,7 +1318,7 @@ Ldec_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1548,7 +1548,7 @@ Ldec_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s index bd2926e0b4..af77b04524 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ Lconsts: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -277,7 +277,7 @@ Ldone: Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -325,7 +325,7 @@ Ldeckey: xor 3,3,3 Ldec_key_abort: addi 1,1,32 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -392,7 +392,7 @@ Loop_enc: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -459,7 +459,7 @@ Loop_dec: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -620,7 +620,7 @@ Lcbc_done: stvx 2,10,7 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -910,8 +910,8 @@ Loop_cbc_dec8x: addic. 5,5,128 beq Lcbc_dec8x_done - nop - nop + nop + nop Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -999,15 +999,15 @@ Loop_cbc_dec8x_tail: cmplwi 5,32 blt Lcbc_dec8x_one - nop + nop beq Lcbc_dec8x_two cmplwi 5,64 blt Lcbc_dec8x_three - nop + nop beq Lcbc_dec8x_four cmplwi 5,96 blt Lcbc_dec8x_five - nop + nop beq Lcbc_dec8x_six Lcbc_dec8x_seven: @@ -1194,7 +1194,7 @@ Lcbc_dec8x_done: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1301,7 +1301,7 @@ Loop_ctr32_enc: stvx 2,0,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1604,15 +1604,15 @@ Loop_ctr32_enc8x_middle: Lctr32_enc8x_break: cmpwi 5,-0x60 blt Lctr32_enc8x_one - nop + nop beq Lctr32_enc8x_two cmpwi 5,-0x40 blt Lctr32_enc8x_three - nop + nop beq Lctr32_enc8x_four cmpwi 5,-0x20 blt Lctr32_enc8x_five - nop + nop beq Lctr32_enc8x_six cmpwi 5,0x00 blt Lctr32_enc8x_seven @@ -1821,7 +1821,7 @@ Lctr32_enc8x_done: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1958,7 +1958,7 @@ Loop_xts_enc: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2031,7 +2031,7 @@ Lxts_enc_done: Lxts_enc_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2171,7 +2171,7 @@ Loop_xts_dec: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2236,7 +2236,7 @@ Loop_xts_dec_short: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2287,7 +2287,7 @@ Lxts_dec_done: Lxts_dec_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2618,11 +2618,11 @@ Loop_xts_enc6x: beq Lxts_enc6x_zero cmpwi 5,0x20 blt Lxts_enc6x_one - nop + nop beq Lxts_enc6x_two cmpwi 5,0x40 blt Lxts_enc6x_three - nop + nop beq Lxts_enc6x_four Lxts_enc6x_five: @@ -2719,7 +2719,7 @@ Lxts_enc6x_two: .align 4 Lxts_enc6x_one: vxor 7,5,17 - nop + nop Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2855,7 +2855,7 @@ Lxts_enc6x_ret: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2940,7 +2940,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3268,11 +3268,11 @@ Loop_xts_dec6x: beq Lxts_dec6x_zero cmpwi 5,0x20 blt Lxts_dec6x_one - nop + nop beq Lxts_dec6x_two cmpwi 5,0x40 blt Lxts_dec6x_three - nop + nop beq Lxts_dec6x_four Lxts_dec6x_five: @@ -3373,7 +3373,7 @@ Lxts_dec6x_two: .align 4 Lxts_dec6x_one: vxor 7,5,17 - nop + nop Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3543,7 +3543,7 @@ Lxts_dec6x_ret: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3628,6 +3628,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s index 6f29a012fa..b264c90033 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ Lconsts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ Lenc_entry: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -318,7 +318,7 @@ Lenc_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -360,7 +360,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -455,7 +455,7 @@ Ldec_entry: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -550,7 +550,7 @@ Ldec_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -777,7 +777,7 @@ Lcbc_abort: lwz 31,236(1) mtlr 0 addi 1,1,240 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -831,7 +831,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1077,7 +1077,7 @@ Lschedule_mangle_done: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1105,7 +1105,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1171,7 +1171,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1193,7 +1193,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1245,7 +1245,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 Lschedule_mangle_dec: @@ -1296,7 +1296,7 @@ Lschedule_mangle_dec: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1372,7 +1372,7 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1455,7 +1455,8 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 + diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s index 51fd8f0b49..3f3b3057de 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s @@ -227,7 +227,7 @@ stw 9,24(3) stw 10,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -655,7 +655,7 @@ stw 9, 60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -809,7 +809,7 @@ stw 10,24(3) stw 11,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1348,7 +1348,7 @@ adde 10,10,9 stw 12,56(3) stw 10,60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1399,7 +1399,7 @@ Lppcasm_sub_mainloop: Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1445,7 +1445,7 @@ Lppcasm_add_mainloop: bc 16,0,Lppcasm_add_mainloop Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1474,7 +1474,7 @@ Lppcasm_add_adios: cmplwi 0,5,0 bne Lppcasm_div1 li 3,-1 - blr + blr Lppcasm_div1: xor 0,0,0 li 8,32 @@ -1561,7 +1561,7 @@ Lppcasm_div8: b Lppcasm_divouterloop Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1603,7 +1603,7 @@ Lppcasm_sqr_mainloop: stwu 8,4(3) bc 16,0,Lppcasm_sqr_mainloop Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1709,7 +1709,7 @@ Lppcasm_mw_REM: Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1835,7 +1835,7 @@ Lppcasm_maw_leftover: Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s index a9384f70b0..267308a6ac 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s @@ -9,7 +9,7 @@ li 3,0 bclr 12,0 cmpwi 8,32 - bgelr + bgelr slwi 8,8,2 li 12,-4096 addi 3,8,256 @@ -182,15 +182,16 @@ Lsub: lwzx 12,22,21 li 21,0 mtctr 8 subfe 3,21,3 - and 4,22,3 - andc 6,9,3 - or 4,4,6 .align 4 Lcopy: - lwzx 12,4,21 - stwx 12,9,21 + lwzx 12,22,21 + lwzx 10,9,21 + and 12,12,3 + andc 10,10,3 stwx 21,22,21 + or 10,10,12 + stwx 10,9,21 addi 21,21,4 bc 16,0,Lcopy @@ -209,7 +210,7 @@ Lcopy: lwz 30,-8(12) lwz 31,-4(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s index 281d64ae7d..1506bcc03a 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s @@ -888,11 +888,8 @@ Lsub: lwz 24,12(10) li 12,0 subfe 3,12,3 - addi 10,1,196 + addi 4,1,196 subf 9,8,9 - and 4,10,3 - andc 6,9,3 - or 4,4,6 addi 10,1,192 mtctr 11 @@ -902,6 +899,10 @@ Lcopy: lwz 25,8(4) lwz 26,12(4) lwzu 27,16(4) + lwz 28,4(9) + lwz 29,8(9) + lwz 30,12(9) + lwz 31,16(9) std 12,8(22) std 12,16(22) std 12,24(22) @@ -910,6 +911,18 @@ Lcopy: std 12,48(22) std 12,56(22) stdu 12,64(22) + and 24,24,3 + and 25,25,3 + and 26,26,3 + and 27,27,3 + andc 28,28,3 + andc 29,29,3 + andc 30,30,3 + andc 31,31,3 + or 24,24,28 + or 25,25,29 + or 26,26,30 + or 27,27,31 stw 24,4(9) stw 25,8(9) stw 26,12(9) @@ -945,7 +958,7 @@ Lcopy: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h index f75553781f..1248f50fda 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Tue Apr 3 00:38:08 2018" +#define DATE "built on: Tue Nov 20 09:37:21 2018" diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s index 9130400355..e4e4612d3a 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s @@ -59,7 +59,7 @@ __ChaCha20_ctr32_int: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -345,7 +345,7 @@ Loop: bne Loop_outer - blr + blr .align 4 Ltail: @@ -396,7 +396,7 @@ Loop_tail: stw 1,80(1) stw 1,84(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -554,7 +554,7 @@ Loop_outer_vmx: vspltisw 27,7 mtctr 0 - nop + nop Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1047,7 +1047,7 @@ Laligned_vmx: cmplwi 5,255 bgt Loop_outer_vmx - nop + nop Ldone_vmx: cmplwi 5,0 @@ -1100,7 +1100,7 @@ Ldone_vmx: lwz 31,364(1) mtlr 0 addi 1,1,368 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1113,7 +1113,7 @@ Lconsts: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s index 972f88d9b8..81d7d24b74 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s @@ -122,7 +122,7 @@ .long 0x7E4A1F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -171,7 +171,7 @@ .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -287,7 +287,7 @@ Leven: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -554,7 +554,7 @@ Ldone_4x: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s index 3063cd30a2..1adc3641db 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s @@ -35,7 +35,7 @@ Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 @@ -236,7 +236,7 @@ Loop: lwz 31,92(1) addi 1,1,96 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,18,4,0 @@ -300,7 +300,7 @@ Labort: lwz 30,88(1) lwz 31,92(1) addi 1,1,96 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s index 17d3aeb195..f4cc796fa7 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s @@ -145,7 +145,7 @@ Lno_key: xor 3,3,3 addi 1,1,24 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 @@ -460,7 +460,7 @@ Lentry: lfd 31,208(1) addi 1,1,216 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 @@ -544,7 +544,7 @@ Labort: lwz 30,32(1) lwz 31,36(1) addi 1,1,40 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 @@ -555,7 +555,7 @@ LPICmeup: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s index 85665a6046..2eb7bd60a4 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s @@ -5,7 +5,7 @@ .align 4 .OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -14,7 +14,7 @@ .OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -23,7 +23,7 @@ .align 4 .OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -33,7 +33,7 @@ .OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -44,7 +44,7 @@ xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -76,7 +76,7 @@ xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -89,7 +89,7 @@ Ladd: lwarx 5,0,3 stwcx. 0,0,3 bne- Ladd mr 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -104,7 +104,7 @@ Loop_rdtsc: mftbu 4 cmplw 0,4,5 bne Loop_rdtsc - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -121,7 +121,7 @@ Little: mtctr 4 stb 0,0(3) addi 3,3,1 bc 16,0,$-8 - blr + blr Lot: andi. 5,3,3 beq Laligned stb 0,0(3) @@ -136,7 +136,7 @@ Laligned: bc 16,0,$-8 andi. 4,4,3 bne Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -162,7 +162,7 @@ Lno_data: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -193,7 +193,7 @@ Loop: mftb 6 bc 16,0,Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -245,7 +245,8 @@ Loop2: Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 + diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s index 41cf5f850a..2cbfbd5a3c 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s @@ -100,7 +100,7 @@ Ldone: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1108,7 +1108,7 @@ Lsha1_block_private: mr 11,20 addi 4,4,64 bc 16,0,Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s index 1b8f108174..0be5e923ef 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s @@ -120,7 +120,7 @@ Ldone: lwz 31,188(1) mtlr 0 addi 1,1,192 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1286,7 +1286,7 @@ Lrounds: cmplw 0,31,5 stw 15,28(3) bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1297,7 +1297,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s index 8f73813109..e252f6fe29 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s @@ -772,7 +772,7 @@ L16_xx: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -784,7 +784,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s index 82da5d2e4e..ca3c3629a0 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s @@ -127,7 +127,7 @@ Ldone: lwz 31,252(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -2972,7 +2972,7 @@ Lrounds: stw 4,164(1) cmplw 0,4,5 bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -2983,7 +2983,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s index 08ca5b4573..930f009de7 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s @@ -773,7 +773,7 @@ L16_xx: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -785,7 +785,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h index 8f5c4f48d2..b3ae627c1a 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi index 68196fdabf..20ffeaffa0 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi @@ -217,6 +217,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,6 +402,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -577,6 +579,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm index b8674f9537..f664e12c22 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3934,6 +3950,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5063,6 +5085,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6212,6 +6240,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7199,6 +7233,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7304,6 +7342,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7393,10 +7435,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7552,6 +7607,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7576,6 +7632,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7592,7 +7649,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7659,447 +7719,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9085,6 +8704,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9821,6 +9444,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10525,6 +10152,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11044,6 +10675,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11228,6 +10860,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11404,6 +11037,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12407,6 +12041,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12607,6 +12250,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12756,6 +12407,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12764,6 +12423,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h index 8f97dac70a..40df6f2a2a 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Tue Apr 3 00:38:09 2018" +#define DATE "built on: Tue Nov 20 09:37:23 2018" diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h index ae6ea775d7..de84cb510b 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h @@ -108,12 +108,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi index 70dc22a387..42f01941bc 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm index 1512a38c0e..0435582228 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix64-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1079,6 +1079,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1245,10 +1249,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3965,6 +3981,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5094,6 +5116,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6297,6 +6325,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7284,6 +7318,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7389,6 +7427,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7456,8 +7498,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7478,10 +7520,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7637,6 +7692,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7661,6 +7717,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7677,7 +7734,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7744,709 +7804,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9190,6 +8809,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9926,6 +9549,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10666,6 +10293,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11190,6 +10821,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11374,6 +11006,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11559,6 +11192,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12562,6 +12196,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12762,6 +12405,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12911,6 +12562,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12919,6 +12578,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s index cc96236fe5..32c684cd9c 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ LAES_Te: mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ LAES_Td: mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -739,7 +739,7 @@ Lenc_done: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -819,7 +819,7 @@ Lenc_loop: bc 16,0,Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -884,7 +884,7 @@ Lenc_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1029,7 +1029,7 @@ Lenc_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1173,7 +1173,7 @@ Ldec_done: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1253,7 +1253,7 @@ Ldec_loop: bc 16,0,Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1318,7 +1318,7 @@ Ldec_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1515,7 +1515,7 @@ Ldec_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s index 0893f20dc8..0c906d1798 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ Lconsts: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -277,7 +277,7 @@ Ldone: Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -325,7 +325,7 @@ Ldeckey: xor 3,3,3 Ldec_key_abort: addi 1,1,64 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -392,7 +392,7 @@ Loop_enc: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -459,7 +459,7 @@ Loop_dec: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -620,7 +620,7 @@ Lcbc_done: stvx 2,10,7 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -910,8 +910,8 @@ Loop_cbc_dec8x: addic. 5,5,128 beq Lcbc_dec8x_done - nop - nop + nop + nop Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -999,15 +999,15 @@ Loop_cbc_dec8x_tail: cmplwi 5,32 blt Lcbc_dec8x_one - nop + nop beq Lcbc_dec8x_two cmplwi 5,64 blt Lcbc_dec8x_three - nop + nop beq Lcbc_dec8x_four cmplwi 5,96 blt Lcbc_dec8x_five - nop + nop beq Lcbc_dec8x_six Lcbc_dec8x_seven: @@ -1194,7 +1194,7 @@ Lcbc_dec8x_done: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1301,7 +1301,7 @@ Loop_ctr32_enc: stvx 2,0,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1604,15 +1604,15 @@ Loop_ctr32_enc8x_middle: Lctr32_enc8x_break: cmpwi 5,-0x60 blt Lctr32_enc8x_one - nop + nop beq Lctr32_enc8x_two cmpwi 5,-0x40 blt Lctr32_enc8x_three - nop + nop beq Lctr32_enc8x_four cmpwi 5,-0x20 blt Lctr32_enc8x_five - nop + nop beq Lctr32_enc8x_six cmpwi 5,0x00 blt Lctr32_enc8x_seven @@ -1821,7 +1821,7 @@ Lctr32_enc8x_done: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1958,7 +1958,7 @@ Loop_xts_enc: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2031,7 +2031,7 @@ Lxts_enc_done: Lxts_enc_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2171,7 +2171,7 @@ Loop_xts_dec: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2236,7 +2236,7 @@ Loop_xts_dec_short: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2287,7 +2287,7 @@ Lxts_dec_done: Lxts_dec_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2618,11 +2618,11 @@ Loop_xts_enc6x: beq Lxts_enc6x_zero cmpwi 5,0x20 blt Lxts_enc6x_one - nop + nop beq Lxts_enc6x_two cmpwi 5,0x40 blt Lxts_enc6x_three - nop + nop beq Lxts_enc6x_four Lxts_enc6x_five: @@ -2719,7 +2719,7 @@ Lxts_enc6x_two: .align 4 Lxts_enc6x_one: vxor 7,5,17 - nop + nop Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2855,7 +2855,7 @@ Lxts_enc6x_ret: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2940,7 +2940,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3268,11 +3268,11 @@ Loop_xts_dec6x: beq Lxts_dec6x_zero cmpwi 5,0x20 blt Lxts_dec6x_one - nop + nop beq Lxts_dec6x_two cmpwi 5,0x40 blt Lxts_dec6x_three - nop + nop beq Lxts_dec6x_four Lxts_dec6x_five: @@ -3373,7 +3373,7 @@ Lxts_dec6x_two: .align 4 Lxts_dec6x_one: vxor 7,5,17 - nop + nop Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3543,7 +3543,7 @@ Lxts_dec6x_ret: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3628,6 +3628,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s index f2682de7c1..0e35758de8 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ Lconsts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ Lenc_entry: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -318,7 +318,7 @@ Lenc_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -360,7 +360,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -455,7 +455,7 @@ Ldec_entry: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -550,7 +550,7 @@ Ldec_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -777,7 +777,7 @@ Lcbc_abort: ld 31,264(1) mtlr 0 addi 1,1,272 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -831,7 +831,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1077,7 +1077,7 @@ Lschedule_mangle_done: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1105,7 +1105,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1171,7 +1171,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1193,7 +1193,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1245,7 +1245,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 Lschedule_mangle_dec: @@ -1296,7 +1296,7 @@ Lschedule_mangle_dec: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1372,7 +1372,7 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1455,7 +1455,8 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 + diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s index b8414b98f4..0f88fd28ff 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s @@ -227,7 +227,7 @@ std 9,48(3) std 10,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -655,7 +655,7 @@ std 9, 120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -809,7 +809,7 @@ std 10,48(3) std 11,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1348,7 +1348,7 @@ adde 10,10,9 std 12,112(3) std 10,120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1399,7 +1399,7 @@ Lppcasm_sub_mainloop: Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1445,7 +1445,7 @@ Lppcasm_add_mainloop: bc 16,0,Lppcasm_add_mainloop Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1474,7 +1474,7 @@ Lppcasm_add_adios: cmpldi 0,5,0 bne Lppcasm_div1 li 3,-1 - blr + blr Lppcasm_div1: xor 0,0,0 li 8,64 @@ -1561,7 +1561,7 @@ Lppcasm_div8: b Lppcasm_divouterloop Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1603,7 +1603,7 @@ Lppcasm_sqr_mainloop: stdu 8,8(3) bc 16,0,Lppcasm_sqr_mainloop Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1709,7 +1709,7 @@ Lppcasm_mw_REM: Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1835,7 +1835,7 @@ Lppcasm_maw_leftover: Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s index b767b00a56..4b8b852812 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s @@ -180,15 +180,16 @@ Lsub: ldx 12,22,21 li 21,0 mtctr 8 subfe 3,21,3 - and 4,22,3 - andc 6,9,3 - or 4,4,6 .align 4 Lcopy: - ldx 12,4,21 - stdx 12,9,21 + ldx 12,22,21 + ldx 10,9,21 + and 12,12,3 + andc 10,10,3 stdx 21,22,21 + or 10,10,12 + stdx 10,9,21 addi 21,21,8 bc 16,0,Lcopy @@ -207,7 +208,7 @@ Lcopy: ld 30,-16(12) ld 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s index 2b5e5c9b25..96ef2a9ea7 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s @@ -679,16 +679,14 @@ Lsub: ldx 24,10,12 li 12,0 subfe 3,12,3 - and 4,10,3 - andc 6,9,3 - or 4,4,6 - addi 31,4,8 mtctr 11 .align 4 Lcopy: - ldx 24,4,12 - ldx 25,31,12 + ldx 24,10,12 + ldx 25,28,12 + ldx 26,9,12 + ldx 27,30,12 std 12,8(22) std 12,16(22) std 12,24(22) @@ -697,6 +695,12 @@ Lcopy: std 12,48(22) std 12,56(22) stdu 12,64(22) + and 24,24,3 + and 25,25,3 + andc 26,26,3 + andc 27,27,3 + or 24,24,26 + or 25,25,27 stdx 24,9,12 stdx 25,30,12 stdx 12,10,12 @@ -731,7 +735,7 @@ Lcopy: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h index eb144269c7..76c26c119d 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix64-gcc" -#define DATE "built on: Tue Apr 3 00:38:10 2018" +#define DATE "built on: Tue Nov 20 09:37:25 2018" diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s index 60cf843569..89e9d28bad 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s @@ -59,7 +59,7 @@ __ChaCha20_ctr32_int: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -345,7 +345,7 @@ Loop: bne Loop_outer - blr + blr .align 4 Ltail: @@ -396,7 +396,7 @@ Loop_tail: stw 1,104(1) stw 1,108(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -554,7 +554,7 @@ Loop_outer_vmx: vspltisw 27,7 mtctr 0 - nop + nop Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1047,7 +1047,7 @@ Laligned_vmx: cmpldi 5,255 bgt Loop_outer_vmx - nop + nop Ldone_vmx: cmpldi 5,0 @@ -1100,7 +1100,7 @@ Ldone_vmx: ld 31,456(1) mtlr 0 addi 1,1,464 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1113,7 +1113,7 @@ Lconsts: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s index 252ddc9d4f..db4f73d559 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s @@ -122,7 +122,7 @@ .long 0x7E4A1F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -171,7 +171,7 @@ .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -287,7 +287,7 @@ Leven: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -554,7 +554,7 @@ Ldone_4x: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s index 0c976f6691..e5253a563b 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s @@ -32,7 +32,7 @@ Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 @@ -126,7 +126,7 @@ Loop: ld 31,184(1) addi 1,1,192 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,5,4,0 @@ -166,7 +166,7 @@ Labort: li 12,12 stwbrx 8,11,4 stwbrx 7,12,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s index a6393e8365..912a1f5933 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s @@ -145,7 +145,7 @@ Lno_key: xor 3,3,3 addi 1,1,48 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 @@ -460,7 +460,7 @@ Lentry: lfd 31,232(1) addi 1,1,240 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 @@ -547,7 +547,7 @@ Labort: ld 30,64(1) ld 31,72(1) addi 1,1,80 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 @@ -558,7 +558,7 @@ LPICmeup: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s index d07c409ce4..4eabc38344 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s @@ -5,7 +5,7 @@ .align 4 .OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -14,7 +14,7 @@ .OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -23,7 +23,7 @@ .align 4 .OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -33,7 +33,7 @@ .OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -44,7 +44,7 @@ xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -76,7 +76,7 @@ xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -89,7 +89,7 @@ Ladd: lwarx 5,0,3 stwcx. 0,0,3 bne- Ladd extsw 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -99,7 +99,7 @@ Ladd: lwarx 5,0,3 .align 4 .OPENSSL_rdtsc: mftb 3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -116,7 +116,7 @@ Little: mtctr 4 stb 0,0(3) addi 3,3,1 bc 16,0,$-8 - blr + blr Lot: andi. 5,3,3 beq Laligned stb 0,0(3) @@ -131,7 +131,7 @@ Laligned: bc 16,0,$-8 andi. 4,4,3 bne Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -157,7 +157,7 @@ Lno_data: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -188,7 +188,7 @@ Loop: mftb 6 bc 16,0,Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -240,7 +240,8 @@ Loop2: Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 + diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s index 28dcdd1419..1ffbb93d46 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s @@ -100,7 +100,7 @@ Ldone: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1108,7 +1108,7 @@ Lsha1_block_private: mr 11,20 addi 4,4,64 bc 16,0,Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s index 8f1d4b3129..b77b0151df 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s @@ -120,7 +120,7 @@ Ldone: ld 31,312(1) mtlr 0 addi 1,1,320 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1286,7 +1286,7 @@ Lrounds: cmpld 31,5 stw 15,28(3) bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1297,7 +1297,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s index d765e58116..fa3ea24514 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s @@ -772,7 +772,7 @@ L16_xx: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -784,7 +784,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s index 3a2073c9c8..9106079093 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s @@ -120,7 +120,7 @@ Ldone: ld 31,376(1) mtlr 0 addi 1,1,384 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1318,7 +1318,7 @@ Lrounds: cmpld 31,5 std 15,56(3) bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1329,7 +1329,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s index a08d4748c1..60c23d4372 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s @@ -773,7 +773,7 @@ L16_xx: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -785,7 +785,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h index 5f12b2933d..f4459a98a4 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi index 0985c459cc..1b5ea438a5 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi @@ -217,6 +217,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,6 +402,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -577,6 +579,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm index 5e25c7b88b..3597329e08 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix64-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3934,6 +3950,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5063,6 +5085,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6212,6 +6240,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7199,6 +7233,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7304,6 +7342,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7393,10 +7435,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7552,6 +7607,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7576,6 +7632,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7592,7 +7649,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7659,447 +7719,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9085,6 +8704,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9821,6 +9444,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10525,6 +10152,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11044,6 +10675,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11228,6 +10860,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11404,6 +11037,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12407,6 +12041,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12607,6 +12250,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12756,6 +12407,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12764,6 +12423,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h index 88cd72b844..7120f1058f 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix64-gcc" -#define DATE "built on: Tue Apr 3 00:38:11 2018" +#define DATE "built on: Tue Nov 20 09:37:27 2018" diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h index d2aa623535..123e7f66ed 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h @@ -108,12 +108,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi index 25974f0d08..b7ed1e2aab 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index 0f822647df..bcfad2c161 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin-i386-cc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3946,6 +3962,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5087,6 +5109,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6272,6 +6300,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7271,6 +7305,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7376,6 +7414,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7465,10 +7507,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7624,6 +7679,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7648,6 +7704,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7664,7 +7721,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7731,447 +7791,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9165,6 +8784,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9909,6 +9532,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10637,6 +10264,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11166,6 +10797,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11352,6 +10984,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11534,6 +11167,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12539,6 +12173,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12739,6 +12382,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12888,6 +12539,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12896,6 +12555,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s index a7f782d965..bf02384737 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s @@ -11,7 +11,7 @@ L_BF_encrypt_begin: movl 16(%esp),%ebp pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl (%ebx),%edi movl 4(%ebx),%esi xorl %eax,%eax @@ -19,7 +19,7 @@ L_BF_encrypt_begin: xorl %ecx,%ecx xorl %ebx,%edi - # Round 0 + # Round 0 movl 4(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -39,7 +39,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 1 + # Round 1 movl 8(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -59,7 +59,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 2 + # Round 2 movl 12(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -79,7 +79,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 3 + # Round 3 movl 16(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -99,7 +99,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 4 + # Round 4 movl 20(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -119,7 +119,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 5 + # Round 5 movl 24(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -139,7 +139,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 6 + # Round 6 movl 28(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -159,7 +159,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 7 + # Round 7 movl 32(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -179,7 +179,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 8 + # Round 8 movl 36(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -199,7 +199,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 9 + # Round 9 movl 40(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -219,7 +219,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 10 + # Round 10 movl 44(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -239,7 +239,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 11 + # Round 11 movl 48(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -259,7 +259,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 12 + # Round 12 movl 52(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -279,7 +279,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 13 + # Round 13 movl 56(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -299,7 +299,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 14 + # Round 14 movl 60(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -319,7 +319,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 15 + # Round 15 movl 64(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -336,7 +336,7 @@ L_BF_encrypt_begin: xorl %eax,%ebx movl 3144(%ebp,%edx,4),%edx addl %edx,%ebx - # Load parameter 0 (16) enc=1 + # Load parameter 0 (16) enc=1 movl 20(%esp),%eax xorl %ebx,%edi movl 68(%ebp),%edx @@ -359,7 +359,7 @@ L_BF_decrypt_begin: movl 16(%esp),%ebp pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl (%ebx),%edi movl 4(%ebx),%esi xorl %eax,%eax @@ -367,7 +367,7 @@ L_BF_decrypt_begin: xorl %ecx,%ecx xorl %ebx,%edi - # Round 16 + # Round 16 movl 64(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -387,7 +387,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 15 + # Round 15 movl 60(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -407,7 +407,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 14 + # Round 14 movl 56(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -427,7 +427,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 13 + # Round 13 movl 52(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -447,7 +447,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 12 + # Round 12 movl 48(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -467,7 +467,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 11 + # Round 11 movl 44(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -487,7 +487,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 10 + # Round 10 movl 40(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -507,7 +507,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 9 + # Round 9 movl 36(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -527,7 +527,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 8 + # Round 8 movl 32(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -547,7 +547,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 7 + # Round 7 movl 28(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -567,7 +567,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 6 + # Round 6 movl 24(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -587,7 +587,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 5 + # Round 5 movl 20(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -607,7 +607,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 4 + # Round 4 movl 16(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -627,7 +627,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 3 + # Round 3 movl 12(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -647,7 +647,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 2 + # Round 2 movl 8(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -667,7 +667,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 1 + # Round 1 movl 4(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -684,7 +684,7 @@ L_BF_decrypt_begin: xorl %eax,%ebx movl 3144(%ebp,%edx,4),%edx addl %edx,%ebx - # Load parameter 0 (1) enc=0 + # Load parameter 0 (1) enc=0 movl 20(%esp),%eax xorl %ebx,%edi movl (%ebp),%edx @@ -706,7 +706,7 @@ L_BF_cbc_encrypt_begin: pushl %esi pushl %edi movl 28(%esp),%ebp - # getting iv ptr from parameter 4 + # getting iv ptr from parameter 4 movl 36(%esp),%ebx movl (%ebx),%esi movl 4(%ebx),%edi @@ -717,9 +717,9 @@ L_BF_cbc_encrypt_begin: movl %esp,%ebx movl 36(%esp),%esi movl 40(%esp),%edi - # getting encrypt flag from parameter 5 + # getting encrypt flag from parameter 5 movl 56(%esp),%ecx - # get and push parameter 3 + # get and push parameter 3 movl 48(%esp),%eax pushl %eax pushl %ebx diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s index 11f7e704c0..7e6ccce487 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s @@ -115,7 +115,7 @@ L001maw_non_sse2: jz L006maw_finish .align 4,0x90 L007maw_loop: - # Round 0 + # Round 0 movl (%ebx),%eax mull %ebp addl %esi,%eax @@ -124,7 +124,7 @@ L007maw_loop: adcl $0,%edx movl %eax,(%edi) movl %edx,%esi - # Round 4 + # Round 4 movl 4(%ebx),%eax mull %ebp addl %esi,%eax @@ -133,7 +133,7 @@ L007maw_loop: adcl $0,%edx movl %eax,4(%edi) movl %edx,%esi - # Round 8 + # Round 8 movl 8(%ebx),%eax mull %ebp addl %esi,%eax @@ -142,7 +142,7 @@ L007maw_loop: adcl $0,%edx movl %eax,8(%edi) movl %edx,%esi - # Round 12 + # Round 12 movl 12(%ebx),%eax mull %ebp addl %esi,%eax @@ -151,7 +151,7 @@ L007maw_loop: adcl $0,%edx movl %eax,12(%edi) movl %edx,%esi - # Round 16 + # Round 16 movl 16(%ebx),%eax mull %ebp addl %esi,%eax @@ -160,7 +160,7 @@ L007maw_loop: adcl $0,%edx movl %eax,16(%edi) movl %edx,%esi - # Round 20 + # Round 20 movl 20(%ebx),%eax mull %ebp addl %esi,%eax @@ -169,7 +169,7 @@ L007maw_loop: adcl $0,%edx movl %eax,20(%edi) movl %edx,%esi - # Round 24 + # Round 24 movl 24(%ebx),%eax mull %ebp addl %esi,%eax @@ -178,7 +178,7 @@ L007maw_loop: adcl $0,%edx movl %eax,24(%edi) movl %edx,%esi - # Round 28 + # Round 28 movl 28(%ebx),%eax mull %ebp addl %esi,%eax @@ -198,7 +198,7 @@ L006maw_finish: jnz L008maw_finish2 jmp L009maw_end L008maw_finish2: - # Tail Round 0 + # Tail Round 0 movl (%ebx),%eax mull %ebp addl %esi,%eax @@ -209,7 +209,7 @@ L008maw_finish2: movl %eax,(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 1 + # Tail Round 1 movl 4(%ebx),%eax mull %ebp addl %esi,%eax @@ -220,7 +220,7 @@ L008maw_finish2: movl %eax,4(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 2 + # Tail Round 2 movl 8(%ebx),%eax mull %ebp addl %esi,%eax @@ -231,7 +231,7 @@ L008maw_finish2: movl %eax,8(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 3 + # Tail Round 3 movl 12(%ebx),%eax mull %ebp addl %esi,%eax @@ -242,7 +242,7 @@ L008maw_finish2: movl %eax,12(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 4 + # Tail Round 4 movl 16(%ebx),%eax mull %ebp addl %esi,%eax @@ -253,7 +253,7 @@ L008maw_finish2: movl %eax,16(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 5 + # Tail Round 5 movl 20(%ebx),%eax mull %ebp addl %esi,%eax @@ -264,7 +264,7 @@ L008maw_finish2: movl %eax,20(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 6 + # Tail Round 6 movl 24(%ebx),%eax mull %ebp addl %esi,%eax @@ -325,56 +325,56 @@ L011mw_non_sse2: andl $4294967288,%ebp jz L013mw_finish L014mw_loop: - # Round 0 + # Round 0 movl (%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,(%edi) movl %edx,%esi - # Round 4 + # Round 4 movl 4(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,4(%edi) movl %edx,%esi - # Round 8 + # Round 8 movl 8(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,8(%edi) movl %edx,%esi - # Round 12 + # Round 12 movl 12(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,12(%edi) movl %edx,%esi - # Round 16 + # Round 16 movl 16(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,16(%edi) movl %edx,%esi - # Round 20 + # Round 20 movl 20(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,20(%edi) movl %edx,%esi - # Round 24 + # Round 24 movl 24(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,24(%edi) movl %edx,%esi - # Round 28 + # Round 28 movl 28(%ebx),%eax mull %ecx addl %esi,%eax @@ -393,7 +393,7 @@ L013mw_finish: jnz L015mw_finish2 jmp L016mw_end L015mw_finish2: - # Tail Round 0 + # Tail Round 0 movl (%ebx),%eax mull %ecx addl %esi,%eax @@ -402,7 +402,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 1 + # Tail Round 1 movl 4(%ebx),%eax mull %ecx addl %esi,%eax @@ -411,7 +411,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 2 + # Tail Round 2 movl 8(%ebx),%eax mull %ecx addl %esi,%eax @@ -420,7 +420,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 3 + # Tail Round 3 movl 12(%ebx),%eax mull %ecx addl %esi,%eax @@ -429,7 +429,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 4 + # Tail Round 4 movl 16(%ebx),%eax mull %ecx addl %esi,%eax @@ -438,7 +438,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 5 + # Tail Round 5 movl 20(%ebx),%eax mull %ecx addl %esi,%eax @@ -447,7 +447,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 6 + # Tail Round 6 movl 24(%ebx),%eax mull %ecx addl %esi,%eax @@ -498,42 +498,42 @@ L018sqr_non_sse2: andl $4294967288,%ebx jz L020sw_finish L021sw_loop: - # Round 0 + # Round 0 movl (%edi),%eax mull %eax movl %eax,(%esi) movl %edx,4(%esi) - # Round 4 + # Round 4 movl 4(%edi),%eax mull %eax movl %eax,8(%esi) movl %edx,12(%esi) - # Round 8 + # Round 8 movl 8(%edi),%eax mull %eax movl %eax,16(%esi) movl %edx,20(%esi) - # Round 12 + # Round 12 movl 12(%edi),%eax mull %eax movl %eax,24(%esi) movl %edx,28(%esi) - # Round 16 + # Round 16 movl 16(%edi),%eax mull %eax movl %eax,32(%esi) movl %edx,36(%esi) - # Round 20 + # Round 20 movl 20(%edi),%eax mull %eax movl %eax,40(%esi) movl %edx,44(%esi) - # Round 24 + # Round 24 movl 24(%edi),%eax mull %eax movl %eax,48(%esi) movl %edx,52(%esi) - # Round 28 + # Round 28 movl 28(%edi),%eax mull %eax movl %eax,56(%esi) @@ -547,49 +547,49 @@ L020sw_finish: movl 28(%esp),%ebx andl $7,%ebx jz L022sw_end - # Tail Round 0 + # Tail Round 0 movl (%edi),%eax mull %eax movl %eax,(%esi) decl %ebx movl %edx,4(%esi) jz L022sw_end - # Tail Round 1 + # Tail Round 1 movl 4(%edi),%eax mull %eax movl %eax,8(%esi) decl %ebx movl %edx,12(%esi) jz L022sw_end - # Tail Round 2 + # Tail Round 2 movl 8(%edi),%eax mull %eax movl %eax,16(%esi) decl %ebx movl %edx,20(%esi) jz L022sw_end - # Tail Round 3 + # Tail Round 3 movl 12(%edi),%eax mull %eax movl %eax,24(%esi) decl %ebx movl %edx,28(%esi) jz L022sw_end - # Tail Round 4 + # Tail Round 4 movl 16(%edi),%eax mull %eax movl %eax,32(%esi) decl %ebx movl %edx,36(%esi) jz L022sw_end - # Tail Round 5 + # Tail Round 5 movl 20(%edi),%eax mull %eax movl %eax,40(%esi) decl %ebx movl %edx,44(%esi) jz L022sw_end - # Tail Round 6 + # Tail Round 6 movl 24(%edi),%eax mull %eax movl %eax,48(%esi) @@ -626,7 +626,7 @@ L_bn_add_words_begin: andl $4294967288,%ebp jz L023aw_finish L024aw_loop: - # Round 0 + # Round 0 movl (%esi),%ecx movl (%edi),%edx addl %eax,%ecx @@ -635,7 +635,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # Round 1 + # Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx addl %eax,%ecx @@ -644,7 +644,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # Round 2 + # Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx addl %eax,%ecx @@ -653,7 +653,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # Round 3 + # Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx addl %eax,%ecx @@ -662,7 +662,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # Round 4 + # Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx addl %eax,%ecx @@ -671,7 +671,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # Round 5 + # Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx addl %eax,%ecx @@ -680,7 +680,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # Round 6 + # Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx addl %eax,%ecx @@ -689,7 +689,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # Round 7 + # Round 7 movl 28(%esi),%ecx movl 28(%edi),%edx addl %eax,%ecx @@ -708,7 +708,7 @@ L023aw_finish: movl 32(%esp),%ebp andl $7,%ebp jz L025aw_end - # Tail Round 0 + # Tail Round 0 movl (%esi),%ecx movl (%edi),%edx addl %eax,%ecx @@ -719,7 +719,7 @@ L023aw_finish: decl %ebp movl %ecx,(%ebx) jz L025aw_end - # Tail Round 1 + # Tail Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx addl %eax,%ecx @@ -730,7 +730,7 @@ L023aw_finish: decl %ebp movl %ecx,4(%ebx) jz L025aw_end - # Tail Round 2 + # Tail Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx addl %eax,%ecx @@ -741,7 +741,7 @@ L023aw_finish: decl %ebp movl %ecx,8(%ebx) jz L025aw_end - # Tail Round 3 + # Tail Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx addl %eax,%ecx @@ -752,7 +752,7 @@ L023aw_finish: decl %ebp movl %ecx,12(%ebx) jz L025aw_end - # Tail Round 4 + # Tail Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx addl %eax,%ecx @@ -763,7 +763,7 @@ L023aw_finish: decl %ebp movl %ecx,16(%ebx) jz L025aw_end - # Tail Round 5 + # Tail Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx addl %eax,%ecx @@ -774,7 +774,7 @@ L023aw_finish: decl %ebp movl %ecx,20(%ebx) jz L025aw_end - # Tail Round 6 + # Tail Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx addl %eax,%ecx @@ -806,7 +806,7 @@ L_bn_sub_words_begin: andl $4294967288,%ebp jz L026aw_finish L027aw_loop: - # Round 0 + # Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -815,7 +815,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # Round 1 + # Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -824,7 +824,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # Round 2 + # Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -833,7 +833,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # Round 3 + # Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -842,7 +842,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # Round 4 + # Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -851,7 +851,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # Round 5 + # Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -860,7 +860,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # Round 6 + # Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -869,7 +869,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # Round 7 + # Round 7 movl 28(%esi),%ecx movl 28(%edi),%edx subl %eax,%ecx @@ -888,7 +888,7 @@ L026aw_finish: movl 32(%esp),%ebp andl $7,%ebp jz L028aw_end - # Tail Round 0 + # Tail Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -899,7 +899,7 @@ L026aw_finish: decl %ebp movl %ecx,(%ebx) jz L028aw_end - # Tail Round 1 + # Tail Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -910,7 +910,7 @@ L026aw_finish: decl %ebp movl %ecx,4(%ebx) jz L028aw_end - # Tail Round 2 + # Tail Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -921,7 +921,7 @@ L026aw_finish: decl %ebp movl %ecx,8(%ebx) jz L028aw_end - # Tail Round 3 + # Tail Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -932,7 +932,7 @@ L026aw_finish: decl %ebp movl %ecx,12(%ebx) jz L028aw_end - # Tail Round 4 + # Tail Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -943,7 +943,7 @@ L026aw_finish: decl %ebp movl %ecx,16(%ebx) jz L028aw_end - # Tail Round 5 + # Tail Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -954,7 +954,7 @@ L026aw_finish: decl %ebp movl %ecx,20(%ebx) jz L028aw_end - # Tail Round 6 + # Tail Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -986,7 +986,7 @@ L_bn_sub_part_words_begin: andl $4294967288,%ebp jz L029aw_finish L030aw_loop: - # Round 0 + # Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -995,7 +995,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # Round 1 + # Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -1004,7 +1004,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # Round 2 + # Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -1013,7 +1013,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # Round 3 + # Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -1022,7 +1022,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # Round 4 + # Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -1031,7 +1031,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # Round 5 + # Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -1040,7 +1040,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # Round 6 + # Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -1049,7 +1049,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # Round 7 + # Round 7 movl 28(%esi),%ecx movl 28(%edi),%edx subl %eax,%ecx @@ -1068,7 +1068,7 @@ L029aw_finish: movl 32(%esp),%ebp andl $7,%ebp jz L031aw_end - # Tail Round 0 + # Tail Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1082,7 +1082,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 1 + # Tail Round 1 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1096,7 +1096,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 2 + # Tail Round 2 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1110,7 +1110,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 3 + # Tail Round 3 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1124,7 +1124,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 4 + # Tail Round 4 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1138,7 +1138,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 5 + # Tail Round 5 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1152,7 +1152,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 6 + # Tail Round 6 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1171,14 +1171,14 @@ L031aw_end: cmpl $0,%ebp je L032pw_end jge L033pw_pos - # pw_neg + # pw_neg movl $0,%edx subl %ebp,%edx movl %edx,%ebp andl $4294967288,%ebp jz L034pw_neg_finish L035pw_neg_loop: - # dl<0 Round 0 + # dl<0 Round 0 movl $0,%ecx movl (%edi),%edx subl %eax,%ecx @@ -1187,7 +1187,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # dl<0 Round 1 + # dl<0 Round 1 movl $0,%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -1196,7 +1196,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # dl<0 Round 2 + # dl<0 Round 2 movl $0,%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -1205,7 +1205,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # dl<0 Round 3 + # dl<0 Round 3 movl $0,%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -1214,7 +1214,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # dl<0 Round 4 + # dl<0 Round 4 movl $0,%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -1223,7 +1223,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # dl<0 Round 5 + # dl<0 Round 5 movl $0,%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -1232,7 +1232,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # dl<0 Round 6 + # dl<0 Round 6 movl $0,%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -1241,7 +1241,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # dl<0 Round 7 + # dl<0 Round 7 movl $0,%ecx movl 28(%edi),%edx subl %eax,%ecx @@ -1261,7 +1261,7 @@ L034pw_neg_finish: subl %edx,%ebp andl $7,%ebp jz L032pw_end - # dl<0 Tail Round 0 + # dl<0 Tail Round 0 movl $0,%ecx movl (%edi),%edx subl %eax,%ecx @@ -1272,7 +1272,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,(%ebx) jz L032pw_end - # dl<0 Tail Round 1 + # dl<0 Tail Round 1 movl $0,%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -1283,7 +1283,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,4(%ebx) jz L032pw_end - # dl<0 Tail Round 2 + # dl<0 Tail Round 2 movl $0,%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -1294,7 +1294,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,8(%ebx) jz L032pw_end - # dl<0 Tail Round 3 + # dl<0 Tail Round 3 movl $0,%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -1305,7 +1305,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,12(%ebx) jz L032pw_end - # dl<0 Tail Round 4 + # dl<0 Tail Round 4 movl $0,%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -1316,7 +1316,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,16(%ebx) jz L032pw_end - # dl<0 Tail Round 5 + # dl<0 Tail Round 5 movl $0,%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -1327,7 +1327,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,20(%ebx) jz L032pw_end - # dl<0 Tail Round 6 + # dl<0 Tail Round 6 movl $0,%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -1341,42 +1341,42 @@ L033pw_pos: andl $4294967288,%ebp jz L036pw_pos_finish L037pw_pos_loop: - # dl>0 Round 0 + # dl>0 Round 0 movl (%esi),%ecx subl %eax,%ecx movl %ecx,(%ebx) jnc L038pw_nc0 - # dl>0 Round 1 + # dl>0 Round 1 movl 4(%esi),%ecx subl %eax,%ecx movl %ecx,4(%ebx) jnc L039pw_nc1 - # dl>0 Round 2 + # dl>0 Round 2 movl 8(%esi),%ecx subl %eax,%ecx movl %ecx,8(%ebx) jnc L040pw_nc2 - # dl>0 Round 3 + # dl>0 Round 3 movl 12(%esi),%ecx subl %eax,%ecx movl %ecx,12(%ebx) jnc L041pw_nc3 - # dl>0 Round 4 + # dl>0 Round 4 movl 16(%esi),%ecx subl %eax,%ecx movl %ecx,16(%ebx) jnc L042pw_nc4 - # dl>0 Round 5 + # dl>0 Round 5 movl 20(%esi),%ecx subl %eax,%ecx movl %ecx,20(%ebx) jnc L043pw_nc5 - # dl>0 Round 6 + # dl>0 Round 6 movl 24(%esi),%ecx subl %eax,%ecx movl %ecx,24(%ebx) jnc L044pw_nc6 - # dl>0 Round 7 + # dl>0 Round 7 movl 28(%esi),%ecx subl %eax,%ecx movl %ecx,28(%ebx) @@ -1390,49 +1390,49 @@ L036pw_pos_finish: movl 36(%esp),%ebp andl $7,%ebp jz L032pw_end - # dl>0 Tail Round 0 + # dl>0 Tail Round 0 movl (%esi),%ecx subl %eax,%ecx movl %ecx,(%ebx) jnc L046pw_tail_nc0 decl %ebp jz L032pw_end - # dl>0 Tail Round 1 + # dl>0 Tail Round 1 movl 4(%esi),%ecx subl %eax,%ecx movl %ecx,4(%ebx) jnc L047pw_tail_nc1 decl %ebp jz L032pw_end - # dl>0 Tail Round 2 + # dl>0 Tail Round 2 movl 8(%esi),%ecx subl %eax,%ecx movl %ecx,8(%ebx) jnc L048pw_tail_nc2 decl %ebp jz L032pw_end - # dl>0 Tail Round 3 + # dl>0 Tail Round 3 movl 12(%esi),%ecx subl %eax,%ecx movl %ecx,12(%ebx) jnc L049pw_tail_nc3 decl %ebp jz L032pw_end - # dl>0 Tail Round 4 + # dl>0 Tail Round 4 movl 16(%esi),%ecx subl %eax,%ecx movl %ecx,16(%ebx) jnc L050pw_tail_nc4 decl %ebp jz L032pw_end - # dl>0 Tail Round 5 + # dl>0 Tail Round 5 movl 20(%esi),%ecx subl %eax,%ecx movl %ecx,20(%ebx) jnc L051pw_tail_nc5 decl %ebp jz L032pw_end - # dl>0 Tail Round 6 + # dl>0 Tail Round 6 movl 24(%esi),%ecx subl %eax,%ecx movl %ecx,24(%ebx) diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s index 3e49f0a867..d82fdcbc7d 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s @@ -14,9 +14,9 @@ L_bn_mul_comba8_begin: movl (%esi),%eax xorl %ecx,%ecx movl (%edi),%edx - # ################## Calculate word 0 + # ################## Calculate word 0 xorl %ebp,%ebp - # mul a[0]*b[0] + # mul a[0]*b[0] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -25,17 +25,17 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,(%eax) movl 4(%esi),%eax - # saved r[0] - # ################## Calculate word 1 + # saved r[0] + # ################## Calculate word 1 xorl %ebx,%ebx - # mul a[1]*b[0] + # mul a[1]*b[0] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[0]*b[1] + # mul a[0]*b[1] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -44,24 +44,24 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,4(%eax) movl 8(%esi),%eax - # saved r[1] - # ################## Calculate word 2 + # saved r[1] + # ################## Calculate word 2 xorl %ecx,%ecx - # mul a[2]*b[0] + # mul a[2]*b[0] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 4(%edi),%edx adcl $0,%ecx - # mul a[1]*b[1] + # mul a[1]*b[1] mull %edx addl %eax,%ebp movl (%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[0]*b[2] + # mul a[0]*b[2] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -70,31 +70,31 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,8(%eax) movl 12(%esi),%eax - # saved r[2] - # ################## Calculate word 3 + # saved r[2] + # ################## Calculate word 3 xorl %ebp,%ebp - # mul a[3]*b[0] + # mul a[3]*b[0] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 4(%edi),%edx adcl $0,%ebp - # mul a[2]*b[1] + # mul a[2]*b[1] mull %edx addl %eax,%ebx movl 4(%esi),%eax adcl %edx,%ecx movl 8(%edi),%edx adcl $0,%ebp - # mul a[1]*b[2] + # mul a[1]*b[2] mull %edx addl %eax,%ebx movl (%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[0]*b[3] + # mul a[0]*b[3] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -103,38 +103,38 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,12(%eax) movl 16(%esi),%eax - # saved r[3] - # ################## Calculate word 4 + # saved r[3] + # ################## Calculate word 4 xorl %ebx,%ebx - # mul a[4]*b[0] + # mul a[4]*b[0] mull %edx addl %eax,%ecx movl 12(%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[3]*b[1] + # mul a[3]*b[1] mull %edx addl %eax,%ecx movl 8(%esi),%eax adcl %edx,%ebp movl 8(%edi),%edx adcl $0,%ebx - # mul a[2]*b[2] + # mul a[2]*b[2] mull %edx addl %eax,%ecx movl 4(%esi),%eax adcl %edx,%ebp movl 12(%edi),%edx adcl $0,%ebx - # mul a[1]*b[3] + # mul a[1]*b[3] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 16(%edi),%edx adcl $0,%ebx - # mul a[0]*b[4] + # mul a[0]*b[4] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -143,45 +143,45 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,16(%eax) movl 20(%esi),%eax - # saved r[4] - # ################## Calculate word 5 + # saved r[4] + # ################## Calculate word 5 xorl %ecx,%ecx - # mul a[5]*b[0] + # mul a[5]*b[0] mull %edx addl %eax,%ebp movl 16(%esi),%eax adcl %edx,%ebx movl 4(%edi),%edx adcl $0,%ecx - # mul a[4]*b[1] + # mul a[4]*b[1] mull %edx addl %eax,%ebp movl 12(%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[3]*b[2] + # mul a[3]*b[2] mull %edx addl %eax,%ebp movl 8(%esi),%eax adcl %edx,%ebx movl 12(%edi),%edx adcl $0,%ecx - # mul a[2]*b[3] + # mul a[2]*b[3] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 16(%edi),%edx adcl $0,%ecx - # mul a[1]*b[4] + # mul a[1]*b[4] mull %edx addl %eax,%ebp movl (%esi),%eax adcl %edx,%ebx movl 20(%edi),%edx adcl $0,%ecx - # mul a[0]*b[5] + # mul a[0]*b[5] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -190,52 +190,52 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,20(%eax) movl 24(%esi),%eax - # saved r[5] - # ################## Calculate word 6 + # saved r[5] + # ################## Calculate word 6 xorl %ebp,%ebp - # mul a[6]*b[0] + # mul a[6]*b[0] mull %edx addl %eax,%ebx movl 20(%esi),%eax adcl %edx,%ecx movl 4(%edi),%edx adcl $0,%ebp - # mul a[5]*b[1] + # mul a[5]*b[1] mull %edx addl %eax,%ebx movl 16(%esi),%eax adcl %edx,%ecx movl 8(%edi),%edx adcl $0,%ebp - # mul a[4]*b[2] + # mul a[4]*b[2] mull %edx addl %eax,%ebx movl 12(%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[3]*b[3] + # mul a[3]*b[3] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 16(%edi),%edx adcl $0,%ebp - # mul a[2]*b[4] + # mul a[2]*b[4] mull %edx addl %eax,%ebx movl 4(%esi),%eax adcl %edx,%ecx movl 20(%edi),%edx adcl $0,%ebp - # mul a[1]*b[5] + # mul a[1]*b[5] mull %edx addl %eax,%ebx movl (%esi),%eax adcl %edx,%ecx movl 24(%edi),%edx adcl $0,%ebp - # mul a[0]*b[6] + # mul a[0]*b[6] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -244,59 +244,59 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,24(%eax) movl 28(%esi),%eax - # saved r[6] - # ################## Calculate word 7 + # saved r[6] + # ################## Calculate word 7 xorl %ebx,%ebx - # mul a[7]*b[0] + # mul a[7]*b[0] mull %edx addl %eax,%ecx movl 24(%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[6]*b[1] + # mul a[6]*b[1] mull %edx addl %eax,%ecx movl 20(%esi),%eax adcl %edx,%ebp movl 8(%edi),%edx adcl $0,%ebx - # mul a[5]*b[2] + # mul a[5]*b[2] mull %edx addl %eax,%ecx movl 16(%esi),%eax adcl %edx,%ebp movl 12(%edi),%edx adcl $0,%ebx - # mul a[4]*b[3] + # mul a[4]*b[3] mull %edx addl %eax,%ecx movl 12(%esi),%eax adcl %edx,%ebp movl 16(%edi),%edx adcl $0,%ebx - # mul a[3]*b[4] + # mul a[3]*b[4] mull %edx addl %eax,%ecx movl 8(%esi),%eax adcl %edx,%ebp movl 20(%edi),%edx adcl $0,%ebx - # mul a[2]*b[5] + # mul a[2]*b[5] mull %edx addl %eax,%ecx movl 4(%esi),%eax adcl %edx,%ebp movl 24(%edi),%edx adcl $0,%ebx - # mul a[1]*b[6] + # mul a[1]*b[6] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 28(%edi),%edx adcl $0,%ebx - # mul a[0]*b[7] + # mul a[0]*b[7] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -305,52 +305,52 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,28(%eax) movl 28(%esi),%eax - # saved r[7] - # ################## Calculate word 8 + # saved r[7] + # ################## Calculate word 8 xorl %ecx,%ecx - # mul a[7]*b[1] + # mul a[7]*b[1] mull %edx addl %eax,%ebp movl 24(%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[6]*b[2] + # mul a[6]*b[2] mull %edx addl %eax,%ebp movl 20(%esi),%eax adcl %edx,%ebx movl 12(%edi),%edx adcl $0,%ecx - # mul a[5]*b[3] + # mul a[5]*b[3] mull %edx addl %eax,%ebp movl 16(%esi),%eax adcl %edx,%ebx movl 16(%edi),%edx adcl $0,%ecx - # mul a[4]*b[4] + # mul a[4]*b[4] mull %edx addl %eax,%ebp movl 12(%esi),%eax adcl %edx,%ebx movl 20(%edi),%edx adcl $0,%ecx - # mul a[3]*b[5] + # mul a[3]*b[5] mull %edx addl %eax,%ebp movl 8(%esi),%eax adcl %edx,%ebx movl 24(%edi),%edx adcl $0,%ecx - # mul a[2]*b[6] + # mul a[2]*b[6] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 28(%edi),%edx adcl $0,%ecx - # mul a[1]*b[7] + # mul a[1]*b[7] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -359,45 +359,45 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,32(%eax) movl 28(%esi),%eax - # saved r[8] - # ################## Calculate word 9 + # saved r[8] + # ################## Calculate word 9 xorl %ebp,%ebp - # mul a[7]*b[2] + # mul a[7]*b[2] mull %edx addl %eax,%ebx movl 24(%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[6]*b[3] + # mul a[6]*b[3] mull %edx addl %eax,%ebx movl 20(%esi),%eax adcl %edx,%ecx movl 16(%edi),%edx adcl $0,%ebp - # mul a[5]*b[4] + # mul a[5]*b[4] mull %edx addl %eax,%ebx movl 16(%esi),%eax adcl %edx,%ecx movl 20(%edi),%edx adcl $0,%ebp - # mul a[4]*b[5] + # mul a[4]*b[5] mull %edx addl %eax,%ebx movl 12(%esi),%eax adcl %edx,%ecx movl 24(%edi),%edx adcl $0,%ebp - # mul a[3]*b[6] + # mul a[3]*b[6] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 28(%edi),%edx adcl $0,%ebp - # mul a[2]*b[7] + # mul a[2]*b[7] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -406,38 +406,38 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,36(%eax) movl 28(%esi),%eax - # saved r[9] - # ################## Calculate word 10 + # saved r[9] + # ################## Calculate word 10 xorl %ebx,%ebx - # mul a[7]*b[3] + # mul a[7]*b[3] mull %edx addl %eax,%ecx movl 24(%esi),%eax adcl %edx,%ebp movl 16(%edi),%edx adcl $0,%ebx - # mul a[6]*b[4] + # mul a[6]*b[4] mull %edx addl %eax,%ecx movl 20(%esi),%eax adcl %edx,%ebp movl 20(%edi),%edx adcl $0,%ebx - # mul a[5]*b[5] + # mul a[5]*b[5] mull %edx addl %eax,%ecx movl 16(%esi),%eax adcl %edx,%ebp movl 24(%edi),%edx adcl $0,%ebx - # mul a[4]*b[6] + # mul a[4]*b[6] mull %edx addl %eax,%ecx movl 12(%esi),%eax adcl %edx,%ebp movl 28(%edi),%edx adcl $0,%ebx - # mul a[3]*b[7] + # mul a[3]*b[7] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -446,31 +446,31 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,40(%eax) movl 28(%esi),%eax - # saved r[10] - # ################## Calculate word 11 + # saved r[10] + # ################## Calculate word 11 xorl %ecx,%ecx - # mul a[7]*b[4] + # mul a[7]*b[4] mull %edx addl %eax,%ebp movl 24(%esi),%eax adcl %edx,%ebx movl 20(%edi),%edx adcl $0,%ecx - # mul a[6]*b[5] + # mul a[6]*b[5] mull %edx addl %eax,%ebp movl 20(%esi),%eax adcl %edx,%ebx movl 24(%edi),%edx adcl $0,%ecx - # mul a[5]*b[6] + # mul a[5]*b[6] mull %edx addl %eax,%ebp movl 16(%esi),%eax adcl %edx,%ebx movl 28(%edi),%edx adcl $0,%ecx - # mul a[4]*b[7] + # mul a[4]*b[7] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -479,24 +479,24 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,44(%eax) movl 28(%esi),%eax - # saved r[11] - # ################## Calculate word 12 + # saved r[11] + # ################## Calculate word 12 xorl %ebp,%ebp - # mul a[7]*b[5] + # mul a[7]*b[5] mull %edx addl %eax,%ebx movl 24(%esi),%eax adcl %edx,%ecx movl 24(%edi),%edx adcl $0,%ebp - # mul a[6]*b[6] + # mul a[6]*b[6] mull %edx addl %eax,%ebx movl 20(%esi),%eax adcl %edx,%ecx movl 28(%edi),%edx adcl $0,%ebp - # mul a[5]*b[7] + # mul a[5]*b[7] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -505,17 +505,17 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,48(%eax) movl 28(%esi),%eax - # saved r[12] - # ################## Calculate word 13 + # saved r[12] + # ################## Calculate word 13 xorl %ebx,%ebx - # mul a[7]*b[6] + # mul a[7]*b[6] mull %edx addl %eax,%ecx movl 24(%esi),%eax adcl %edx,%ebp movl 28(%edi),%edx adcl $0,%ebx - # mul a[6]*b[7] + # mul a[6]*b[7] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -524,18 +524,18 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,52(%eax) movl 28(%esi),%eax - # saved r[13] - # ################## Calculate word 14 + # saved r[13] + # ################## Calculate word 14 xorl %ecx,%ecx - # mul a[7]*b[7] + # mul a[7]*b[7] mull %edx addl %eax,%ebp movl 20(%esp),%eax adcl %edx,%ebx adcl $0,%ecx movl %ebp,56(%eax) - # saved r[14] - # save r[15] + # saved r[14] + # save r[15] movl %ebx,60(%eax) popl %ebx popl %ebp @@ -556,9 +556,9 @@ L_bn_mul_comba4_begin: movl (%esi),%eax xorl %ecx,%ecx movl (%edi),%edx - # ################## Calculate word 0 + # ################## Calculate word 0 xorl %ebp,%ebp - # mul a[0]*b[0] + # mul a[0]*b[0] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -567,17 +567,17 @@ L_bn_mul_comba4_begin: adcl $0,%ebp movl %ebx,(%eax) movl 4(%esi),%eax - # saved r[0] - # ################## Calculate word 1 + # saved r[0] + # ################## Calculate word 1 xorl %ebx,%ebx - # mul a[1]*b[0] + # mul a[1]*b[0] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[0]*b[1] + # mul a[0]*b[1] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -586,24 +586,24 @@ L_bn_mul_comba4_begin: adcl $0,%ebx movl %ecx,4(%eax) movl 8(%esi),%eax - # saved r[1] - # ################## Calculate word 2 + # saved r[1] + # ################## Calculate word 2 xorl %ecx,%ecx - # mul a[2]*b[0] + # mul a[2]*b[0] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 4(%edi),%edx adcl $0,%ecx - # mul a[1]*b[1] + # mul a[1]*b[1] mull %edx addl %eax,%ebp movl (%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[0]*b[2] + # mul a[0]*b[2] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -612,31 +612,31 @@ L_bn_mul_comba4_begin: adcl $0,%ecx movl %ebp,8(%eax) movl 12(%esi),%eax - # saved r[2] - # ################## Calculate word 3 + # saved r[2] + # ################## Calculate word 3 xorl %ebp,%ebp - # mul a[3]*b[0] + # mul a[3]*b[0] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 4(%edi),%edx adcl $0,%ebp - # mul a[2]*b[1] + # mul a[2]*b[1] mull %edx addl %eax,%ebx movl 4(%esi),%eax adcl %edx,%ecx movl 8(%edi),%edx adcl $0,%ebp - # mul a[1]*b[2] + # mul a[1]*b[2] mull %edx addl %eax,%ebx movl (%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[0]*b[3] + # mul a[0]*b[3] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -645,24 +645,24 @@ L_bn_mul_comba4_begin: adcl $0,%ebp movl %ebx,12(%eax) movl 12(%esi),%eax - # saved r[3] - # ################## Calculate word 4 + # saved r[3] + # ################## Calculate word 4 xorl %ebx,%ebx - # mul a[3]*b[1] + # mul a[3]*b[1] mull %edx addl %eax,%ecx movl 8(%esi),%eax adcl %edx,%ebp movl 8(%edi),%edx adcl $0,%ebx - # mul a[2]*b[2] + # mul a[2]*b[2] mull %edx addl %eax,%ecx movl 4(%esi),%eax adcl %edx,%ebp movl 12(%edi),%edx adcl $0,%ebx - # mul a[1]*b[3] + # mul a[1]*b[3] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -671,17 +671,17 @@ L_bn_mul_comba4_begin: adcl $0,%ebx movl %ecx,16(%eax) movl 12(%esi),%eax - # saved r[4] - # ################## Calculate word 5 + # saved r[4] + # ################## Calculate word 5 xorl %ecx,%ecx - # mul a[3]*b[2] + # mul a[3]*b[2] mull %edx addl %eax,%ebp movl 8(%esi),%eax adcl %edx,%ebx movl 12(%edi),%edx adcl $0,%ecx - # mul a[2]*b[3] + # mul a[2]*b[3] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -690,18 +690,18 @@ L_bn_mul_comba4_begin: adcl $0,%ecx movl %ebp,20(%eax) movl 12(%esi),%eax - # saved r[5] - # ################## Calculate word 6 + # saved r[5] + # ################## Calculate word 6 xorl %ebp,%ebp - # mul a[3]*b[3] + # mul a[3]*b[3] mull %edx addl %eax,%ebx movl 20(%esp),%eax adcl %edx,%ecx adcl $0,%ebp movl %ebx,24(%eax) - # saved r[6] - # save r[7] + # saved r[6] + # save r[7] movl %ecx,28(%eax) popl %ebx popl %ebp @@ -721,9 +721,9 @@ L_bn_sqr_comba8_begin: xorl %ebx,%ebx xorl %ecx,%ecx movl (%esi),%eax - # ############### Calculate word 0 + # ############### Calculate word 0 xorl %ebp,%ebp - # sqr a[0]*a[0] + # sqr a[0]*a[0] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -731,10 +731,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,(%edi) movl 4(%esi),%eax - # saved r[0] - # ############### Calculate word 1 + # saved r[0] + # ############### Calculate word 1 xorl %ebx,%ebx - # sqr a[1]*a[0] + # sqr a[1]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -745,10 +745,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,4(%edi) movl (%esi),%edx - # saved r[1] - # ############### Calculate word 2 + # saved r[1] + # ############### Calculate word 2 xorl %ecx,%ecx - # sqr a[2]*a[0] + # sqr a[2]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -757,7 +757,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebx movl 4(%esi),%eax adcl $0,%ecx - # sqr a[1]*a[1] + # sqr a[1]*a[1] mull %eax addl %eax,%ebp adcl %edx,%ebx @@ -765,10 +765,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,8(%edi) movl 12(%esi),%eax - # saved r[2] - # ############### Calculate word 3 + # saved r[2] + # ############### Calculate word 3 xorl %ebp,%ebp - # sqr a[3]*a[0] + # sqr a[3]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -778,7 +778,7 @@ L_bn_sqr_comba8_begin: movl 8(%esi),%eax adcl $0,%ebp movl 4(%esi),%edx - # sqr a[2]*a[1] + # sqr a[2]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -789,10 +789,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,12(%edi) movl (%esi),%edx - # saved r[3] - # ############### Calculate word 4 + # saved r[3] + # ############### Calculate word 4 xorl %ebx,%ebx - # sqr a[4]*a[0] + # sqr a[4]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -802,7 +802,7 @@ L_bn_sqr_comba8_begin: movl 12(%esi),%eax adcl $0,%ebx movl 4(%esi),%edx - # sqr a[3]*a[1] + # sqr a[3]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -811,7 +811,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebp movl 8(%esi),%eax adcl $0,%ebx - # sqr a[2]*a[2] + # sqr a[2]*a[2] mull %eax addl %eax,%ecx adcl %edx,%ebp @@ -819,10 +819,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,16(%edi) movl 20(%esi),%eax - # saved r[4] - # ############### Calculate word 5 + # saved r[4] + # ############### Calculate word 5 xorl %ecx,%ecx - # sqr a[5]*a[0] + # sqr a[5]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -832,7 +832,7 @@ L_bn_sqr_comba8_begin: movl 16(%esi),%eax adcl $0,%ecx movl 4(%esi),%edx - # sqr a[4]*a[1] + # sqr a[4]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -842,7 +842,7 @@ L_bn_sqr_comba8_begin: movl 12(%esi),%eax adcl $0,%ecx movl 8(%esi),%edx - # sqr a[3]*a[2] + # sqr a[3]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -853,10 +853,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,20(%edi) movl (%esi),%edx - # saved r[5] - # ############### Calculate word 6 + # saved r[5] + # ############### Calculate word 6 xorl %ebp,%ebp - # sqr a[6]*a[0] + # sqr a[6]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -866,7 +866,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ebp movl 4(%esi),%edx - # sqr a[5]*a[1] + # sqr a[5]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -876,7 +876,7 @@ L_bn_sqr_comba8_begin: movl 16(%esi),%eax adcl $0,%ebp movl 8(%esi),%edx - # sqr a[4]*a[2] + # sqr a[4]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -885,7 +885,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ecx movl 12(%esi),%eax adcl $0,%ebp - # sqr a[3]*a[3] + # sqr a[3]*a[3] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -893,10 +893,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,24(%edi) movl 28(%esi),%eax - # saved r[6] - # ############### Calculate word 7 + # saved r[6] + # ############### Calculate word 7 xorl %ebx,%ebx - # sqr a[7]*a[0] + # sqr a[7]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -906,7 +906,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ebx movl 4(%esi),%edx - # sqr a[6]*a[1] + # sqr a[6]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -916,7 +916,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ebx movl 8(%esi),%edx - # sqr a[5]*a[2] + # sqr a[5]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -926,7 +926,7 @@ L_bn_sqr_comba8_begin: movl 16(%esi),%eax adcl $0,%ebx movl 12(%esi),%edx - # sqr a[4]*a[3] + # sqr a[4]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -937,10 +937,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,28(%edi) movl 4(%esi),%edx - # saved r[7] - # ############### Calculate word 8 + # saved r[7] + # ############### Calculate word 8 xorl %ecx,%ecx - # sqr a[7]*a[1] + # sqr a[7]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -950,7 +950,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ecx movl 8(%esi),%edx - # sqr a[6]*a[2] + # sqr a[6]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -960,7 +960,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ecx movl 12(%esi),%edx - # sqr a[5]*a[3] + # sqr a[5]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -969,7 +969,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebx movl 16(%esi),%eax adcl $0,%ecx - # sqr a[4]*a[4] + # sqr a[4]*a[4] mull %eax addl %eax,%ebp adcl %edx,%ebx @@ -977,10 +977,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,32(%edi) movl 28(%esi),%eax - # saved r[8] - # ############### Calculate word 9 + # saved r[8] + # ############### Calculate word 9 xorl %ebp,%ebp - # sqr a[7]*a[2] + # sqr a[7]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -990,7 +990,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ebp movl 12(%esi),%edx - # sqr a[6]*a[3] + # sqr a[6]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1000,7 +1000,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ebp movl 16(%esi),%edx - # sqr a[5]*a[4] + # sqr a[5]*a[4] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1011,10 +1011,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,36(%edi) movl 12(%esi),%edx - # saved r[9] - # ############### Calculate word 10 + # saved r[9] + # ############### Calculate word 10 xorl %ebx,%ebx - # sqr a[7]*a[3] + # sqr a[7]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1024,7 +1024,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ebx movl 16(%esi),%edx - # sqr a[6]*a[4] + # sqr a[6]*a[4] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1033,7 +1033,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebp movl 20(%esi),%eax adcl $0,%ebx - # sqr a[5]*a[5] + # sqr a[5]*a[5] mull %eax addl %eax,%ecx adcl %edx,%ebp @@ -1041,10 +1041,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,40(%edi) movl 28(%esi),%eax - # saved r[10] - # ############### Calculate word 11 + # saved r[10] + # ############### Calculate word 11 xorl %ecx,%ecx - # sqr a[7]*a[4] + # sqr a[7]*a[4] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1054,7 +1054,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ecx movl 20(%esi),%edx - # sqr a[6]*a[5] + # sqr a[6]*a[5] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1065,10 +1065,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,44(%edi) movl 20(%esi),%edx - # saved r[11] - # ############### Calculate word 12 + # saved r[11] + # ############### Calculate word 12 xorl %ebp,%ebp - # sqr a[7]*a[5] + # sqr a[7]*a[5] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1077,7 +1077,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ecx movl 24(%esi),%eax adcl $0,%ebp - # sqr a[6]*a[6] + # sqr a[6]*a[6] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -1085,10 +1085,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,48(%edi) movl 28(%esi),%eax - # saved r[12] - # ############### Calculate word 13 + # saved r[12] + # ############### Calculate word 13 xorl %ebx,%ebx - # sqr a[7]*a[6] + # sqr a[7]*a[6] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1098,16 +1098,16 @@ L_bn_sqr_comba8_begin: movl 28(%esi),%eax adcl $0,%ebx movl %ecx,52(%edi) - # saved r[13] - # ############### Calculate word 14 + # saved r[13] + # ############### Calculate word 14 xorl %ecx,%ecx - # sqr a[7]*a[7] + # sqr a[7]*a[7] mull %eax addl %eax,%ebp adcl %edx,%ebx adcl $0,%ecx movl %ebp,56(%edi) - # saved r[14] + # saved r[14] movl %ebx,60(%edi) popl %ebx popl %ebp @@ -1127,9 +1127,9 @@ L_bn_sqr_comba4_begin: xorl %ebx,%ebx xorl %ecx,%ecx movl (%esi),%eax - # ############### Calculate word 0 + # ############### Calculate word 0 xorl %ebp,%ebp - # sqr a[0]*a[0] + # sqr a[0]*a[0] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -1137,10 +1137,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebp movl %ebx,(%edi) movl 4(%esi),%eax - # saved r[0] - # ############### Calculate word 1 + # saved r[0] + # ############### Calculate word 1 xorl %ebx,%ebx - # sqr a[1]*a[0] + # sqr a[1]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1151,10 +1151,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebx movl %ecx,4(%edi) movl (%esi),%edx - # saved r[1] - # ############### Calculate word 2 + # saved r[1] + # ############### Calculate word 2 xorl %ecx,%ecx - # sqr a[2]*a[0] + # sqr a[2]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1163,7 +1163,7 @@ L_bn_sqr_comba4_begin: adcl %edx,%ebx movl 4(%esi),%eax adcl $0,%ecx - # sqr a[1]*a[1] + # sqr a[1]*a[1] mull %eax addl %eax,%ebp adcl %edx,%ebx @@ -1171,10 +1171,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ecx movl %ebp,8(%edi) movl 12(%esi),%eax - # saved r[2] - # ############### Calculate word 3 + # saved r[2] + # ############### Calculate word 3 xorl %ebp,%ebp - # sqr a[3]*a[0] + # sqr a[3]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1184,7 +1184,7 @@ L_bn_sqr_comba4_begin: movl 8(%esi),%eax adcl $0,%ebp movl 4(%esi),%edx - # sqr a[2]*a[1] + # sqr a[2]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1195,10 +1195,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebp movl %ebx,12(%edi) movl 4(%esi),%edx - # saved r[3] - # ############### Calculate word 4 + # saved r[3] + # ############### Calculate word 4 xorl %ebx,%ebx - # sqr a[3]*a[1] + # sqr a[3]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1207,7 +1207,7 @@ L_bn_sqr_comba4_begin: adcl %edx,%ebp movl 8(%esi),%eax adcl $0,%ebx - # sqr a[2]*a[2] + # sqr a[2]*a[2] mull %eax addl %eax,%ecx adcl %edx,%ebp @@ -1215,10 +1215,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebx movl %ecx,16(%edi) movl 12(%esi),%eax - # saved r[4] - # ############### Calculate word 5 + # saved r[4] + # ############### Calculate word 5 xorl %ecx,%ecx - # sqr a[3]*a[2] + # sqr a[3]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1228,16 +1228,16 @@ L_bn_sqr_comba4_begin: movl 12(%esi),%eax adcl $0,%ecx movl %ebp,20(%edi) - # saved r[5] - # ############### Calculate word 6 + # saved r[5] + # ############### Calculate word 6 xorl %ebp,%ebp - # sqr a[3]*a[3] + # sqr a[3]*a[3] mull %eax addl %eax,%ebx adcl %edx,%ecx adcl $0,%ebp movl %ebx,24(%edi) - # saved r[6] + # saved r[6] movl %ecx,28(%edi) popl %ebx popl %ebp diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s index 35db106f8c..3183bbb657 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s @@ -444,16 +444,18 @@ L017sub: leal 1(%edx),%edx jge L017sub sbbl $0,%eax - andl %eax,%esi - notl %eax - movl %edi,%ebp - andl %eax,%ebp - orl %ebp,%esi + movl $-1,%edx + xorl %eax,%edx + jmp L018copy .align 4,0x90 L018copy: - movl (%esi,%ebx,4),%eax - movl %eax,(%edi,%ebx,4) + movl 32(%esp,%ebx,4),%esi + movl (%edi,%ebx,4),%ebp movl %ecx,32(%esp,%ebx,4) + andl %eax,%esi + andl %edx,%ebp + orl %esi,%ebp + movl %ebp,(%edi,%ebx,4) decl %ebx jge L018copy movl 24(%esp),%esp diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h index 005ca0b704..9d7d1041fe 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h @@ -37,4 +37,4 @@ static const char cflags[] = { ' ','\0' }; #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Tue Apr 3 00:38:21 2018" +#define DATE "built on: Tue Nov 20 09:37:49 2018" diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s index 1731c53faa..9156a65a1e 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s @@ -9,7 +9,7 @@ L_fcrypt_body_begin: pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words xorl %edi,%edi xorl %esi,%esi call L000PIC_me_up @@ -21,7 +21,7 @@ L000PIC_me_up: pushl $25 L001start: - # Round 0 + # Round 0 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -71,7 +71,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 1 + # Round 1 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -121,7 +121,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 2 + # Round 2 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -171,7 +171,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 3 + # Round 3 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -221,7 +221,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 4 + # Round 4 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -271,7 +271,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 5 + # Round 5 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -321,7 +321,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 6 + # Round 6 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -371,7 +371,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 7 + # Round 7 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -421,7 +421,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 8 + # Round 8 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -471,7 +471,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 9 + # Round 9 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -521,7 +521,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 10 + # Round 10 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -571,7 +571,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 11 + # Round 11 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -621,7 +621,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 12 + # Round 12 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -671,7 +671,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 13 + # Round 13 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -721,7 +721,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 14 + # Round 14 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -771,7 +771,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 15 + # Round 15 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -828,7 +828,7 @@ L001start: movl %ebx,(%esp) jnz L001start - # FP + # FP movl 28(%esp),%edx rorl $1,%edi movl %esi,%eax diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s index 43354871fc..d0c1a2e486 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s @@ -4,7 +4,7 @@ .align 4 __x86_DES_encrypt: pushl %ecx - # Round 0 + # Round 0 movl (%ecx),%eax xorl %ebx,%ebx movl 4(%ecx),%edx @@ -33,7 +33,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 1 + # Round 1 movl 8(%ecx),%eax xorl %ebx,%ebx movl 12(%ecx),%edx @@ -62,7 +62,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 2 + # Round 2 movl 16(%ecx),%eax xorl %ebx,%ebx movl 20(%ecx),%edx @@ -91,7 +91,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 3 + # Round 3 movl 24(%ecx),%eax xorl %ebx,%ebx movl 28(%ecx),%edx @@ -120,7 +120,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 4 + # Round 4 movl 32(%ecx),%eax xorl %ebx,%ebx movl 36(%ecx),%edx @@ -149,7 +149,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 5 + # Round 5 movl 40(%ecx),%eax xorl %ebx,%ebx movl 44(%ecx),%edx @@ -178,7 +178,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 6 + # Round 6 movl 48(%ecx),%eax xorl %ebx,%ebx movl 52(%ecx),%edx @@ -207,7 +207,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 7 + # Round 7 movl 56(%ecx),%eax xorl %ebx,%ebx movl 60(%ecx),%edx @@ -236,7 +236,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 8 + # Round 8 movl 64(%ecx),%eax xorl %ebx,%ebx movl 68(%ecx),%edx @@ -265,7 +265,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 9 + # Round 9 movl 72(%ecx),%eax xorl %ebx,%ebx movl 76(%ecx),%edx @@ -294,7 +294,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 10 + # Round 10 movl 80(%ecx),%eax xorl %ebx,%ebx movl 84(%ecx),%edx @@ -323,7 +323,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 11 + # Round 11 movl 88(%ecx),%eax xorl %ebx,%ebx movl 92(%ecx),%edx @@ -352,7 +352,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 12 + # Round 12 movl 96(%ecx),%eax xorl %ebx,%ebx movl 100(%ecx),%edx @@ -381,7 +381,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 13 + # Round 13 movl 104(%ecx),%eax xorl %ebx,%ebx movl 108(%ecx),%edx @@ -410,7 +410,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 14 + # Round 14 movl 112(%ecx),%eax xorl %ebx,%ebx movl 116(%ecx),%edx @@ -439,7 +439,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 15 + # Round 15 movl 120(%ecx),%eax xorl %ebx,%ebx movl 124(%ecx),%edx @@ -473,7 +473,7 @@ __x86_DES_encrypt: .align 4 __x86_DES_decrypt: pushl %ecx - # Round 15 + # Round 15 movl 120(%ecx),%eax xorl %ebx,%ebx movl 124(%ecx),%edx @@ -502,7 +502,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 14 + # Round 14 movl 112(%ecx),%eax xorl %ebx,%ebx movl 116(%ecx),%edx @@ -531,7 +531,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 13 + # Round 13 movl 104(%ecx),%eax xorl %ebx,%ebx movl 108(%ecx),%edx @@ -560,7 +560,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 12 + # Round 12 movl 96(%ecx),%eax xorl %ebx,%ebx movl 100(%ecx),%edx @@ -589,7 +589,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 11 + # Round 11 movl 88(%ecx),%eax xorl %ebx,%ebx movl 92(%ecx),%edx @@ -618,7 +618,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 10 + # Round 10 movl 80(%ecx),%eax xorl %ebx,%ebx movl 84(%ecx),%edx @@ -647,7 +647,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 9 + # Round 9 movl 72(%ecx),%eax xorl %ebx,%ebx movl 76(%ecx),%edx @@ -676,7 +676,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 8 + # Round 8 movl 64(%ecx),%eax xorl %ebx,%ebx movl 68(%ecx),%edx @@ -705,7 +705,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 7 + # Round 7 movl 56(%ecx),%eax xorl %ebx,%ebx movl 60(%ecx),%edx @@ -734,7 +734,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 6 + # Round 6 movl 48(%ecx),%eax xorl %ebx,%ebx movl 52(%ecx),%edx @@ -763,7 +763,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 5 + # Round 5 movl 40(%ecx),%eax xorl %ebx,%ebx movl 44(%ecx),%edx @@ -792,7 +792,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 4 + # Round 4 movl 32(%ecx),%eax xorl %ebx,%ebx movl 36(%ecx),%edx @@ -821,7 +821,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 3 + # Round 3 movl 24(%ecx),%eax xorl %ebx,%ebx movl 28(%ecx),%edx @@ -850,7 +850,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 2 + # Round 2 movl 16(%ecx),%eax xorl %ebx,%ebx movl 20(%ecx),%edx @@ -879,7 +879,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 1 + # Round 1 movl 8(%ecx),%eax xorl %ebx,%ebx movl 12(%ecx),%edx @@ -908,7 +908,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 0 + # Round 0 movl (%ecx),%eax xorl %ebx,%ebx movl 4(%ecx),%edx @@ -946,7 +946,7 @@ L_DES_encrypt1_begin: pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl 12(%esp),%esi xorl %ecx,%ecx pushl %ebx @@ -955,7 +955,7 @@ L_DES_encrypt1_begin: movl 28(%esp),%ebx movl 4(%esi),%edi - # IP + # IP roll $4,%eax movl %eax,%esi xorl %edi,%eax @@ -1005,7 +1005,7 @@ L001decrypt: call __x86_DES_decrypt L002done: - # FP + # FP movl 20(%esp),%edx rorl $1,%esi movl %edi,%eax @@ -1057,7 +1057,7 @@ L_DES_encrypt2_begin: pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl 12(%esp),%eax xorl %ecx,%ecx pushl %ebx @@ -1080,7 +1080,7 @@ L004decrypt: call __x86_DES_decrypt L005done: - # Fixup + # Fixup rorl $3,%edi movl 20(%esp),%eax rorl $3,%esi @@ -1101,12 +1101,12 @@ L_DES_encrypt3_begin: pushl %esi pushl %edi - # Load the data words + # Load the data words movl (%ebx),%edi movl 4(%ebx),%esi subl $12,%esp - # IP + # IP roll $4,%edi movl %edi,%edx xorl %esi,%edi @@ -1165,7 +1165,7 @@ L_DES_encrypt3_begin: movl (%ebx),%edi movl 4(%ebx),%esi - # FP + # FP roll $2,%esi roll $3,%edi movl %edi,%eax @@ -1220,12 +1220,12 @@ L_DES_decrypt3_begin: pushl %esi pushl %edi - # Load the data words + # Load the data words movl (%ebx),%edi movl 4(%ebx),%esi subl $12,%esp - # IP + # IP roll $4,%edi movl %edi,%edx xorl %esi,%edi @@ -1284,7 +1284,7 @@ L_DES_decrypt3_begin: movl (%ebx),%edi movl 4(%ebx),%esi - # FP + # FP roll $2,%esi roll $3,%edi movl %edi,%eax @@ -1339,7 +1339,7 @@ L_DES_ncbc_encrypt_begin: pushl %esi pushl %edi movl 28(%esp),%ebp - # getting iv ptr from parameter 4 + # getting iv ptr from parameter 4 movl 36(%esp),%ebx movl (%ebx),%esi movl 4(%ebx),%edi @@ -1350,11 +1350,11 @@ L_DES_ncbc_encrypt_begin: movl %esp,%ebx movl 36(%esp),%esi movl 40(%esp),%edi - # getting encrypt flag from parameter 5 + # getting encrypt flag from parameter 5 movl 56(%esp),%ecx - # get and push parameter 5 + # get and push parameter 5 pushl %ecx - # get and push parameter 3 + # get and push parameter 3 movl 52(%esp),%eax pushl %eax pushl %ebx @@ -1517,7 +1517,7 @@ L_DES_ede3_cbc_encrypt_begin: pushl %esi pushl %edi movl 28(%esp),%ebp - # getting iv ptr from parameter 6 + # getting iv ptr from parameter 6 movl 44(%esp),%ebx movl (%ebx),%esi movl 4(%ebx),%edi @@ -1528,15 +1528,15 @@ L_DES_ede3_cbc_encrypt_begin: movl %esp,%ebx movl 36(%esp),%esi movl 40(%esp),%edi - # getting encrypt flag from parameter 7 + # getting encrypt flag from parameter 7 movl 64(%esp),%ecx - # get and push parameter 5 + # get and push parameter 5 movl 56(%esp),%eax pushl %eax - # get and push parameter 4 + # get and push parameter 4 movl 56(%esp),%eax pushl %eax - # get and push parameter 3 + # get and push parameter 3 movl 56(%esp),%eax pushl %eax pushl %ebx diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s index f2163103ef..fe6e89a4db 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s @@ -3822,7 +3822,7 @@ L_ecp_nistz256_scatter_w7_begin: movl 20(%esp),%edi movl 24(%esp),%esi movl 28(%esp),%ebp - leal -1(%edi,%ebp,1),%edi + leal (%edi,%ebp,1),%edi movl $16,%ebp L007scatter_w7_loop: movl (%esi),%eax diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s index 4e70351041..93c6693b5a 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s @@ -21,10 +21,10 @@ L_md5_block_asm_data_order_begin: movl 12(%edi),%edx L000start: - # R0 section + # R0 section movl %ecx,%edi movl (%esi),%ebp - # R0 0 + # R0 0 xorl %edx,%edi andl %ebx,%edi leal 3614090360(%eax,%ebp,1),%eax @@ -34,7 +34,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 1 + # R0 1 xorl %ecx,%edi andl %eax,%edi leal 3905402710(%edx,%ebp,1),%edx @@ -44,7 +44,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 2 + # R0 2 xorl %ebx,%edi andl %edx,%edi leal 606105819(%ecx,%ebp,1),%ecx @@ -54,7 +54,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 3 + # R0 3 xorl %eax,%edi andl %ecx,%edi leal 3250441966(%ebx,%ebp,1),%ebx @@ -64,7 +64,7 @@ L000start: roll $22,%ebx movl %ecx,%edi addl %ecx,%ebx - # R0 4 + # R0 4 xorl %edx,%edi andl %ebx,%edi leal 4118548399(%eax,%ebp,1),%eax @@ -74,7 +74,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 5 + # R0 5 xorl %ecx,%edi andl %eax,%edi leal 1200080426(%edx,%ebp,1),%edx @@ -84,7 +84,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 6 + # R0 6 xorl %ebx,%edi andl %edx,%edi leal 2821735955(%ecx,%ebp,1),%ecx @@ -94,7 +94,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 7 + # R0 7 xorl %eax,%edi andl %ecx,%edi leal 4249261313(%ebx,%ebp,1),%ebx @@ -104,7 +104,7 @@ L000start: roll $22,%ebx movl %ecx,%edi addl %ecx,%ebx - # R0 8 + # R0 8 xorl %edx,%edi andl %ebx,%edi leal 1770035416(%eax,%ebp,1),%eax @@ -114,7 +114,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 9 + # R0 9 xorl %ecx,%edi andl %eax,%edi leal 2336552879(%edx,%ebp,1),%edx @@ -124,7 +124,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 10 + # R0 10 xorl %ebx,%edi andl %edx,%edi leal 4294925233(%ecx,%ebp,1),%ecx @@ -134,7 +134,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 11 + # R0 11 xorl %eax,%edi andl %ecx,%edi leal 2304563134(%ebx,%ebp,1),%ebx @@ -144,7 +144,7 @@ L000start: roll $22,%ebx movl %ecx,%edi addl %ecx,%ebx - # R0 12 + # R0 12 xorl %edx,%edi andl %ebx,%edi leal 1804603682(%eax,%ebp,1),%eax @@ -154,7 +154,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 13 + # R0 13 xorl %ecx,%edi andl %eax,%edi leal 4254626195(%edx,%ebp,1),%edx @@ -164,7 +164,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 14 + # R0 14 xorl %ebx,%edi andl %edx,%edi leal 2792965006(%ecx,%ebp,1),%ecx @@ -174,7 +174,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 15 + # R0 15 xorl %eax,%edi andl %ecx,%edi leal 1236535329(%ebx,%ebp,1),%ebx @@ -185,8 +185,8 @@ L000start: movl %ecx,%edi addl %ecx,%ebx - # R1 section - # R1 16 + # R1 section + # R1 16 xorl %ebx,%edi andl %edx,%edi leal 4129170786(%eax,%ebp,1),%eax @@ -196,7 +196,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 17 + # R1 17 xorl %eax,%edi andl %ecx,%edi leal 3225465664(%edx,%ebp,1),%edx @@ -206,7 +206,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 18 + # R1 18 xorl %edx,%edi andl %ebx,%edi leal 643717713(%ecx,%ebp,1),%ecx @@ -216,7 +216,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 19 + # R1 19 xorl %ecx,%edi andl %eax,%edi leal 3921069994(%ebx,%ebp,1),%ebx @@ -226,7 +226,7 @@ L000start: movl %ecx,%edi roll $20,%ebx addl %ecx,%ebx - # R1 20 + # R1 20 xorl %ebx,%edi andl %edx,%edi leal 3593408605(%eax,%ebp,1),%eax @@ -236,7 +236,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 21 + # R1 21 xorl %eax,%edi andl %ecx,%edi leal 38016083(%edx,%ebp,1),%edx @@ -246,7 +246,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 22 + # R1 22 xorl %edx,%edi andl %ebx,%edi leal 3634488961(%ecx,%ebp,1),%ecx @@ -256,7 +256,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 23 + # R1 23 xorl %ecx,%edi andl %eax,%edi leal 3889429448(%ebx,%ebp,1),%ebx @@ -266,7 +266,7 @@ L000start: movl %ecx,%edi roll $20,%ebx addl %ecx,%ebx - # R1 24 + # R1 24 xorl %ebx,%edi andl %edx,%edi leal 568446438(%eax,%ebp,1),%eax @@ -276,7 +276,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 25 + # R1 25 xorl %eax,%edi andl %ecx,%edi leal 3275163606(%edx,%ebp,1),%edx @@ -286,7 +286,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 26 + # R1 26 xorl %edx,%edi andl %ebx,%edi leal 4107603335(%ecx,%ebp,1),%ecx @@ -296,7 +296,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 27 + # R1 27 xorl %ecx,%edi andl %eax,%edi leal 1163531501(%ebx,%ebp,1),%ebx @@ -306,7 +306,7 @@ L000start: movl %ecx,%edi roll $20,%ebx addl %ecx,%ebx - # R1 28 + # R1 28 xorl %ebx,%edi andl %edx,%edi leal 2850285829(%eax,%ebp,1),%eax @@ -316,7 +316,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 29 + # R1 29 xorl %eax,%edi andl %ecx,%edi leal 4243563512(%edx,%ebp,1),%edx @@ -326,7 +326,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 30 + # R1 30 xorl %edx,%edi andl %ebx,%edi leal 1735328473(%ecx,%ebp,1),%ecx @@ -336,7 +336,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 31 + # R1 31 xorl %ecx,%edi andl %eax,%edi leal 2368359562(%ebx,%ebp,1),%ebx @@ -347,8 +347,8 @@ L000start: roll $20,%ebx addl %ecx,%ebx - # R2 section - # R2 32 + # R2 section + # R2 32 xorl %edx,%edi xorl %ebx,%edi leal 4294588738(%eax,%ebp,1),%eax @@ -356,7 +356,7 @@ L000start: movl 32(%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 33 + # R2 33 addl %ebx,%eax xorl %ecx,%edi leal 2272392833(%edx,%ebp,1),%edx @@ -366,7 +366,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 34 + # R2 34 xorl %ebx,%edi xorl %edx,%edi leal 1839030562(%ecx,%ebp,1),%ecx @@ -374,7 +374,7 @@ L000start: movl 56(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 35 + # R2 35 addl %edx,%ecx xorl %eax,%edi leal 4259657740(%ebx,%ebp,1),%ebx @@ -384,7 +384,7 @@ L000start: movl %ecx,%edi roll $23,%ebx addl %ecx,%ebx - # R2 36 + # R2 36 xorl %edx,%edi xorl %ebx,%edi leal 2763975236(%eax,%ebp,1),%eax @@ -392,7 +392,7 @@ L000start: movl 16(%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 37 + # R2 37 addl %ebx,%eax xorl %ecx,%edi leal 1272893353(%edx,%ebp,1),%edx @@ -402,7 +402,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 38 + # R2 38 xorl %ebx,%edi xorl %edx,%edi leal 4139469664(%ecx,%ebp,1),%ecx @@ -410,7 +410,7 @@ L000start: movl 40(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 39 + # R2 39 addl %edx,%ecx xorl %eax,%edi leal 3200236656(%ebx,%ebp,1),%ebx @@ -420,7 +420,7 @@ L000start: movl %ecx,%edi roll $23,%ebx addl %ecx,%ebx - # R2 40 + # R2 40 xorl %edx,%edi xorl %ebx,%edi leal 681279174(%eax,%ebp,1),%eax @@ -428,7 +428,7 @@ L000start: movl (%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 41 + # R2 41 addl %ebx,%eax xorl %ecx,%edi leal 3936430074(%edx,%ebp,1),%edx @@ -438,7 +438,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 42 + # R2 42 xorl %ebx,%edi xorl %edx,%edi leal 3572445317(%ecx,%ebp,1),%ecx @@ -446,7 +446,7 @@ L000start: movl 24(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 43 + # R2 43 addl %edx,%ecx xorl %eax,%edi leal 76029189(%ebx,%ebp,1),%ebx @@ -456,7 +456,7 @@ L000start: movl %ecx,%edi roll $23,%ebx addl %ecx,%ebx - # R2 44 + # R2 44 xorl %edx,%edi xorl %ebx,%edi leal 3654602809(%eax,%ebp,1),%eax @@ -464,7 +464,7 @@ L000start: movl 48(%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 45 + # R2 45 addl %ebx,%eax xorl %ecx,%edi leal 3873151461(%edx,%ebp,1),%edx @@ -474,7 +474,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 46 + # R2 46 xorl %ebx,%edi xorl %edx,%edi leal 530742520(%ecx,%ebp,1),%ecx @@ -482,7 +482,7 @@ L000start: movl 8(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 47 + # R2 47 addl %edx,%ecx xorl %eax,%edi leal 3299628645(%ebx,%ebp,1),%ebx @@ -493,8 +493,8 @@ L000start: roll $23,%ebx addl %ecx,%ebx - # R3 section - # R3 48 + # R3 section + # R3 48 xorl %edx,%edi orl %ebx,%edi leal 4096336452(%eax,%ebp,1),%eax @@ -505,7 +505,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 49 + # R3 49 orl %eax,%edi leal 1126891415(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -515,7 +515,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 50 + # R3 50 orl %edx,%edi leal 2878612391(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -525,7 +525,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 51 + # R3 51 orl %ecx,%edi leal 4237533241(%ebx,%ebp,1),%ebx xorl %edx,%edi @@ -535,7 +535,7 @@ L000start: roll $21,%ebx xorl %edx,%edi addl %ecx,%ebx - # R3 52 + # R3 52 orl %ebx,%edi leal 1700485571(%eax,%ebp,1),%eax xorl %ecx,%edi @@ -545,7 +545,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 53 + # R3 53 orl %eax,%edi leal 2399980690(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -555,7 +555,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 54 + # R3 54 orl %edx,%edi leal 4293915773(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -565,7 +565,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 55 + # R3 55 orl %ecx,%edi leal 2240044497(%ebx,%ebp,1),%ebx xorl %edx,%edi @@ -575,7 +575,7 @@ L000start: roll $21,%ebx xorl %edx,%edi addl %ecx,%ebx - # R3 56 + # R3 56 orl %ebx,%edi leal 1873313359(%eax,%ebp,1),%eax xorl %ecx,%edi @@ -585,7 +585,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 57 + # R3 57 orl %eax,%edi leal 4264355552(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -595,7 +595,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 58 + # R3 58 orl %edx,%edi leal 2734768916(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -605,7 +605,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 59 + # R3 59 orl %ecx,%edi leal 1309151649(%ebx,%ebp,1),%ebx xorl %edx,%edi @@ -615,7 +615,7 @@ L000start: roll $21,%ebx xorl %edx,%edi addl %ecx,%ebx - # R3 60 + # R3 60 orl %ebx,%edi leal 4149444226(%eax,%ebp,1),%eax xorl %ecx,%edi @@ -625,7 +625,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 61 + # R3 61 orl %eax,%edi leal 3174756917(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -635,7 +635,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 62 + # R3 62 orl %edx,%edi leal 718787259(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -645,7 +645,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 63 + # R3 63 orl %ecx,%edi leal 3951481745(%ebx,%ebp,1),%ebx xorl %edx,%edi diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s index 15dd76c69a..0a19b1429b 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s @@ -51,7 +51,7 @@ L000start: movl %edi,%eax movl 12(%edx),%ebx movl 16(%edx),%ebp - # 0 + # 0 xorl %ebx,%eax movl (%esp),%edx xorl %esi,%eax @@ -61,7 +61,7 @@ L000start: movl %esi,%eax roll $11,%ecx addl %ebp,%ecx - # 1 + # 1 xorl %edi,%eax movl 4(%esp),%edx xorl %ecx,%eax @@ -72,7 +72,7 @@ L000start: xorl %esi,%eax roll $14,%ebp addl %ebx,%ebp - # 2 + # 2 movl 8(%esp),%edx xorl %ebp,%eax addl %edx,%ebx @@ -81,7 +81,7 @@ L000start: movl %ebp,%eax roll $15,%ebx addl %edi,%ebx - # 3 + # 3 xorl %ecx,%eax movl 12(%esp),%edx xorl %ebx,%eax @@ -92,7 +92,7 @@ L000start: xorl %ebp,%eax roll $12,%edi addl %esi,%edi - # 4 + # 4 movl 16(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -101,7 +101,7 @@ L000start: movl %edi,%eax roll $5,%esi addl %ecx,%esi - # 5 + # 5 xorl %ebx,%eax movl 20(%esp),%edx xorl %esi,%eax @@ -112,7 +112,7 @@ L000start: xorl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 6 + # 6 movl 24(%esp),%edx xorl %ecx,%eax addl %edx,%ebp @@ -121,7 +121,7 @@ L000start: movl %ecx,%eax roll $7,%ebp addl %ebx,%ebp - # 7 + # 7 xorl %esi,%eax movl 28(%esp),%edx xorl %ebp,%eax @@ -132,7 +132,7 @@ L000start: xorl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 8 + # 8 movl 32(%esp),%edx xorl %ebx,%eax addl %edx,%edi @@ -141,7 +141,7 @@ L000start: movl %ebx,%eax roll $11,%edi addl %esi,%edi - # 9 + # 9 xorl %ebp,%eax movl 36(%esp),%edx xorl %edi,%eax @@ -152,7 +152,7 @@ L000start: xorl %ebx,%eax roll $13,%esi addl %ecx,%esi - # 10 + # 10 movl 40(%esp),%edx xorl %esi,%eax addl %edx,%ecx @@ -161,7 +161,7 @@ L000start: movl %esi,%eax roll $14,%ecx addl %ebp,%ecx - # 11 + # 11 xorl %edi,%eax movl 44(%esp),%edx xorl %ecx,%eax @@ -172,7 +172,7 @@ L000start: xorl %esi,%eax roll $15,%ebp addl %ebx,%ebp - # 12 + # 12 movl 48(%esp),%edx xorl %ebp,%eax addl %edx,%ebx @@ -181,7 +181,7 @@ L000start: movl %ebp,%eax roll $6,%ebx addl %edi,%ebx - # 13 + # 13 xorl %ecx,%eax movl 52(%esp),%edx xorl %ebx,%eax @@ -192,7 +192,7 @@ L000start: xorl %ebp,%eax roll $7,%edi addl %esi,%edi - # 14 + # 14 movl 56(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -201,7 +201,7 @@ L000start: movl %edi,%eax roll $9,%esi addl %ecx,%esi - # 15 + # 15 xorl %ebx,%eax movl 60(%esp),%edx xorl %esi,%eax @@ -212,7 +212,7 @@ L000start: movl 28(%esp),%edx roll $8,%ecx addl %ebp,%ecx - # 16 + # 16 addl %edx,%ebp movl %esi,%edx subl %ecx,%eax @@ -225,7 +225,7 @@ L000start: movl $-1,%edx roll $7,%ebp addl %ebx,%ebp - # 17 + # 17 addl %eax,%ebx movl %ecx,%eax subl %ebp,%edx @@ -238,7 +238,7 @@ L000start: movl $-1,%eax roll $6,%ebx addl %edi,%ebx - # 18 + # 18 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -251,7 +251,7 @@ L000start: movl $-1,%edx roll $8,%edi addl %esi,%edi - # 19 + # 19 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -264,7 +264,7 @@ L000start: movl $-1,%eax roll $13,%esi addl %ecx,%esi - # 20 + # 20 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -277,7 +277,7 @@ L000start: movl $-1,%edx roll $11,%ecx addl %ebp,%ecx - # 21 + # 21 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -290,7 +290,7 @@ L000start: movl $-1,%eax roll $9,%ebp addl %ebx,%ebp - # 22 + # 22 addl %edx,%ebx movl %ecx,%edx subl %ebp,%eax @@ -303,7 +303,7 @@ L000start: movl $-1,%edx roll $7,%ebx addl %edi,%ebx - # 23 + # 23 addl %eax,%edi movl %ebp,%eax subl %ebx,%edx @@ -316,7 +316,7 @@ L000start: movl $-1,%eax roll $15,%edi addl %esi,%edi - # 24 + # 24 addl %edx,%esi movl %ebx,%edx subl %edi,%eax @@ -329,7 +329,7 @@ L000start: movl $-1,%edx roll $7,%esi addl %ecx,%esi - # 25 + # 25 addl %eax,%ecx movl %edi,%eax subl %esi,%edx @@ -342,7 +342,7 @@ L000start: movl $-1,%eax roll $12,%ecx addl %ebp,%ecx - # 26 + # 26 addl %edx,%ebp movl %esi,%edx subl %ecx,%eax @@ -355,7 +355,7 @@ L000start: movl $-1,%edx roll $15,%ebp addl %ebx,%ebp - # 27 + # 27 addl %eax,%ebx movl %ecx,%eax subl %ebp,%edx @@ -368,7 +368,7 @@ L000start: movl $-1,%eax roll $9,%ebx addl %edi,%ebx - # 28 + # 28 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -381,7 +381,7 @@ L000start: movl $-1,%edx roll $11,%edi addl %esi,%edi - # 29 + # 29 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -394,7 +394,7 @@ L000start: movl $-1,%eax roll $7,%esi addl %ecx,%esi - # 30 + # 30 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -407,7 +407,7 @@ L000start: movl $-1,%edx roll $13,%ecx addl %ebp,%ecx - # 31 + # 31 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -420,7 +420,7 @@ L000start: subl %ecx,%edx roll $12,%ebp addl %ebx,%ebp - # 32 + # 32 movl 12(%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -431,7 +431,7 @@ L000start: subl %ebp,%eax roll $11,%ebx addl %edi,%ebx - # 33 + # 33 movl 40(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -442,7 +442,7 @@ L000start: subl %ebx,%edx roll $13,%edi addl %esi,%edi - # 34 + # 34 movl 56(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -453,7 +453,7 @@ L000start: subl %edi,%eax roll $6,%esi addl %ecx,%esi - # 35 + # 35 movl 16(%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -464,7 +464,7 @@ L000start: subl %esi,%edx roll $7,%ecx addl %ebp,%ecx - # 36 + # 36 movl 36(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -475,7 +475,7 @@ L000start: subl %ecx,%eax roll $14,%ebp addl %ebx,%ebp - # 37 + # 37 movl 60(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -486,7 +486,7 @@ L000start: subl %ebp,%edx roll $9,%ebx addl %edi,%ebx - # 38 + # 38 movl 32(%esp),%eax orl %ebx,%edx addl %eax,%edi @@ -497,7 +497,7 @@ L000start: subl %ebx,%eax roll $13,%edi addl %esi,%edi - # 39 + # 39 movl 4(%esp),%edx orl %edi,%eax addl %edx,%esi @@ -508,7 +508,7 @@ L000start: subl %edi,%edx roll $15,%esi addl %ecx,%esi - # 40 + # 40 movl 8(%esp),%eax orl %esi,%edx addl %eax,%ecx @@ -519,7 +519,7 @@ L000start: subl %esi,%eax roll $14,%ecx addl %ebp,%ecx - # 41 + # 41 movl 28(%esp),%edx orl %ecx,%eax addl %edx,%ebp @@ -530,7 +530,7 @@ L000start: subl %ecx,%edx roll $8,%ebp addl %ebx,%ebp - # 42 + # 42 movl (%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -541,7 +541,7 @@ L000start: subl %ebp,%eax roll $13,%ebx addl %edi,%ebx - # 43 + # 43 movl 24(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -552,7 +552,7 @@ L000start: subl %ebx,%edx roll $6,%edi addl %esi,%edi - # 44 + # 44 movl 52(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -563,7 +563,7 @@ L000start: subl %edi,%eax roll $5,%esi addl %ecx,%esi - # 45 + # 45 movl 44(%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -574,7 +574,7 @@ L000start: subl %esi,%edx roll $12,%ecx addl %ebp,%ecx - # 46 + # 46 movl 20(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -585,7 +585,7 @@ L000start: subl %ecx,%eax roll $7,%ebp addl %ebx,%ebp - # 47 + # 47 movl 48(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -596,7 +596,7 @@ L000start: movl %ecx,%eax roll $5,%ebx addl %edi,%ebx - # 48 + # 48 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -609,7 +609,7 @@ L000start: movl %ebp,%eax roll $11,%edi addl %esi,%edi - # 49 + # 49 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -622,7 +622,7 @@ L000start: movl %ebx,%eax roll $12,%esi addl %ecx,%esi - # 50 + # 50 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -635,7 +635,7 @@ L000start: movl %edi,%eax roll $14,%ecx addl %ebp,%ecx - # 51 + # 51 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -648,7 +648,7 @@ L000start: movl %esi,%eax roll $15,%ebp addl %ebx,%ebp - # 52 + # 52 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -661,7 +661,7 @@ L000start: movl %ecx,%eax roll $14,%ebx addl %edi,%ebx - # 53 + # 53 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -674,7 +674,7 @@ L000start: movl %ebp,%eax roll $15,%edi addl %esi,%edi - # 54 + # 54 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -687,7 +687,7 @@ L000start: movl %ebx,%eax roll $9,%esi addl %ecx,%esi - # 55 + # 55 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -700,7 +700,7 @@ L000start: movl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 56 + # 56 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -713,7 +713,7 @@ L000start: movl %esi,%eax roll $9,%ebp addl %ebx,%ebp - # 57 + # 57 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -726,7 +726,7 @@ L000start: movl %ecx,%eax roll $14,%ebx addl %edi,%ebx - # 58 + # 58 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -739,7 +739,7 @@ L000start: movl %ebp,%eax roll $5,%edi addl %esi,%edi - # 59 + # 59 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -752,7 +752,7 @@ L000start: movl %ebx,%eax roll $6,%esi addl %ecx,%esi - # 60 + # 60 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -765,7 +765,7 @@ L000start: movl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 61 + # 61 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -778,7 +778,7 @@ L000start: movl %esi,%eax roll $6,%ebp addl %ebx,%ebp - # 62 + # 62 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -791,7 +791,7 @@ L000start: movl %ecx,%eax roll $5,%ebx addl %edi,%ebx - # 63 + # 63 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -804,7 +804,7 @@ L000start: subl %ebp,%edx roll $12,%edi addl %esi,%edi - # 64 + # 64 movl 16(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -815,7 +815,7 @@ L000start: subl %ebx,%eax roll $9,%esi addl %ecx,%esi - # 65 + # 65 movl (%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -826,7 +826,7 @@ L000start: subl %edi,%edx roll $15,%ecx addl %ebp,%ecx - # 66 + # 66 movl 20(%esp),%eax orl %esi,%edx addl %eax,%ebp @@ -837,7 +837,7 @@ L000start: subl %esi,%eax roll $5,%ebp addl %ebx,%ebp - # 67 + # 67 movl 36(%esp),%edx orl %ecx,%eax addl %edx,%ebx @@ -848,7 +848,7 @@ L000start: subl %ecx,%edx roll $11,%ebx addl %edi,%ebx - # 68 + # 68 movl 28(%esp),%eax orl %ebp,%edx addl %eax,%edi @@ -859,7 +859,7 @@ L000start: subl %ebp,%eax roll $6,%edi addl %esi,%edi - # 69 + # 69 movl 48(%esp),%edx orl %ebx,%eax addl %edx,%esi @@ -870,7 +870,7 @@ L000start: subl %ebx,%edx roll $8,%esi addl %ecx,%esi - # 70 + # 70 movl 8(%esp),%eax orl %edi,%edx addl %eax,%ecx @@ -881,7 +881,7 @@ L000start: subl %edi,%eax roll $13,%ecx addl %ebp,%ecx - # 71 + # 71 movl 40(%esp),%edx orl %esi,%eax addl %edx,%ebp @@ -892,7 +892,7 @@ L000start: subl %esi,%edx roll $12,%ebp addl %ebx,%ebp - # 72 + # 72 movl 56(%esp),%eax orl %ecx,%edx addl %eax,%ebx @@ -903,7 +903,7 @@ L000start: subl %ecx,%eax roll $5,%ebx addl %edi,%ebx - # 73 + # 73 movl 4(%esp),%edx orl %ebp,%eax addl %edx,%edi @@ -914,7 +914,7 @@ L000start: subl %ebp,%edx roll $12,%edi addl %esi,%edi - # 74 + # 74 movl 12(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -925,7 +925,7 @@ L000start: subl %ebx,%eax roll $13,%esi addl %ecx,%esi - # 75 + # 75 movl 32(%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -936,7 +936,7 @@ L000start: subl %edi,%edx roll $14,%ecx addl %ebp,%ecx - # 76 + # 76 movl 44(%esp),%eax orl %esi,%edx addl %eax,%ebp @@ -947,7 +947,7 @@ L000start: subl %esi,%eax roll $11,%ebp addl %ebx,%ebp - # 77 + # 77 movl 24(%esp),%edx orl %ecx,%eax addl %edx,%ebx @@ -958,7 +958,7 @@ L000start: subl %ecx,%edx roll $8,%ebx addl %edi,%ebx - # 78 + # 78 movl 60(%esp),%eax orl %ebp,%edx addl %eax,%edi @@ -969,7 +969,7 @@ L000start: subl %ebp,%eax roll $5,%edi addl %esi,%edi - # 79 + # 79 movl 52(%esp),%edx orl %ebx,%eax addl %edx,%esi @@ -989,7 +989,7 @@ L000start: movl %ebp,80(%esp) movl 12(%edx),%ebx movl 16(%edx),%ebp - # 80 + # 80 movl $-1,%edx subl %ebx,%edx movl 20(%esp),%eax @@ -1002,7 +1002,7 @@ L000start: subl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 81 + # 81 movl 56(%esp),%edx orl %esi,%eax addl %edx,%ebp @@ -1013,7 +1013,7 @@ L000start: subl %esi,%edx roll $9,%ebp addl %ebx,%ebp - # 82 + # 82 movl 28(%esp),%eax orl %ecx,%edx addl %eax,%ebx @@ -1024,7 +1024,7 @@ L000start: subl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 83 + # 83 movl (%esp),%edx orl %ebp,%eax addl %edx,%edi @@ -1035,7 +1035,7 @@ L000start: subl %ebp,%edx roll $11,%edi addl %esi,%edi - # 84 + # 84 movl 36(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -1046,7 +1046,7 @@ L000start: subl %ebx,%eax roll $13,%esi addl %ecx,%esi - # 85 + # 85 movl 8(%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -1057,7 +1057,7 @@ L000start: subl %edi,%edx roll $15,%ecx addl %ebp,%ecx - # 86 + # 86 movl 44(%esp),%eax orl %esi,%edx addl %eax,%ebp @@ -1068,7 +1068,7 @@ L000start: subl %esi,%eax roll $15,%ebp addl %ebx,%ebp - # 87 + # 87 movl 16(%esp),%edx orl %ecx,%eax addl %edx,%ebx @@ -1079,7 +1079,7 @@ L000start: subl %ecx,%edx roll $5,%ebx addl %edi,%ebx - # 88 + # 88 movl 52(%esp),%eax orl %ebp,%edx addl %eax,%edi @@ -1090,7 +1090,7 @@ L000start: subl %ebp,%eax roll $7,%edi addl %esi,%edi - # 89 + # 89 movl 24(%esp),%edx orl %ebx,%eax addl %edx,%esi @@ -1101,7 +1101,7 @@ L000start: subl %ebx,%edx roll $7,%esi addl %ecx,%esi - # 90 + # 90 movl 60(%esp),%eax orl %edi,%edx addl %eax,%ecx @@ -1112,7 +1112,7 @@ L000start: subl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 91 + # 91 movl 32(%esp),%edx orl %esi,%eax addl %edx,%ebp @@ -1123,7 +1123,7 @@ L000start: subl %esi,%edx roll $11,%ebp addl %ebx,%ebp - # 92 + # 92 movl 4(%esp),%eax orl %ecx,%edx addl %eax,%ebx @@ -1134,7 +1134,7 @@ L000start: subl %ecx,%eax roll $14,%ebx addl %edi,%ebx - # 93 + # 93 movl 40(%esp),%edx orl %ebp,%eax addl %edx,%edi @@ -1145,7 +1145,7 @@ L000start: subl %ebp,%edx roll $14,%edi addl %esi,%edi - # 94 + # 94 movl 12(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -1156,7 +1156,7 @@ L000start: subl %ebx,%eax roll $12,%esi addl %ecx,%esi - # 95 + # 95 movl 48(%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -1167,7 +1167,7 @@ L000start: movl %edi,%eax roll $6,%ecx addl %ebp,%ecx - # 96 + # 96 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1180,7 +1180,7 @@ L000start: movl %esi,%eax roll $9,%ebp addl %ebx,%ebp - # 97 + # 97 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -1193,7 +1193,7 @@ L000start: movl %ecx,%eax roll $13,%ebx addl %edi,%ebx - # 98 + # 98 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -1206,7 +1206,7 @@ L000start: movl %ebp,%eax roll $15,%edi addl %esi,%edi - # 99 + # 99 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -1219,7 +1219,7 @@ L000start: movl %ebx,%eax roll $7,%esi addl %ecx,%esi - # 100 + # 100 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -1232,7 +1232,7 @@ L000start: movl %edi,%eax roll $12,%ecx addl %ebp,%ecx - # 101 + # 101 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1245,7 +1245,7 @@ L000start: movl %esi,%eax roll $8,%ebp addl %ebx,%ebp - # 102 + # 102 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -1258,7 +1258,7 @@ L000start: movl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 103 + # 103 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -1271,7 +1271,7 @@ L000start: movl %ebp,%eax roll $11,%edi addl %esi,%edi - # 104 + # 104 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -1284,7 +1284,7 @@ L000start: movl %ebx,%eax roll $7,%esi addl %ecx,%esi - # 105 + # 105 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -1297,7 +1297,7 @@ L000start: movl %edi,%eax roll $7,%ecx addl %ebp,%ecx - # 106 + # 106 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1310,7 +1310,7 @@ L000start: movl %esi,%eax roll $12,%ebp addl %ebx,%ebp - # 107 + # 107 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -1323,7 +1323,7 @@ L000start: movl %ecx,%eax roll $7,%ebx addl %edi,%ebx - # 108 + # 108 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -1336,7 +1336,7 @@ L000start: movl %ebp,%eax roll $6,%edi addl %esi,%edi - # 109 + # 109 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -1349,7 +1349,7 @@ L000start: movl %ebx,%eax roll $15,%esi addl %ecx,%esi - # 110 + # 110 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -1362,7 +1362,7 @@ L000start: movl %edi,%eax roll $13,%ecx addl %ebp,%ecx - # 111 + # 111 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1375,7 +1375,7 @@ L000start: subl %ecx,%edx roll $11,%ebp addl %ebx,%ebp - # 112 + # 112 movl 60(%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -1386,7 +1386,7 @@ L000start: subl %ebp,%eax roll $9,%ebx addl %edi,%ebx - # 113 + # 113 movl 20(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -1397,7 +1397,7 @@ L000start: subl %ebx,%edx roll $7,%edi addl %esi,%edi - # 114 + # 114 movl 4(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -1408,7 +1408,7 @@ L000start: subl %edi,%eax roll $15,%esi addl %ecx,%esi - # 115 + # 115 movl 12(%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -1419,7 +1419,7 @@ L000start: subl %esi,%edx roll $11,%ecx addl %ebp,%ecx - # 116 + # 116 movl 28(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -1430,7 +1430,7 @@ L000start: subl %ecx,%eax roll $8,%ebp addl %ebx,%ebp - # 117 + # 117 movl 56(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -1441,7 +1441,7 @@ L000start: subl %ebp,%edx roll $6,%ebx addl %edi,%ebx - # 118 + # 118 movl 24(%esp),%eax orl %ebx,%edx addl %eax,%edi @@ -1452,7 +1452,7 @@ L000start: subl %ebx,%eax roll $6,%edi addl %esi,%edi - # 119 + # 119 movl 36(%esp),%edx orl %edi,%eax addl %edx,%esi @@ -1463,7 +1463,7 @@ L000start: subl %edi,%edx roll $14,%esi addl %ecx,%esi - # 120 + # 120 movl 44(%esp),%eax orl %esi,%edx addl %eax,%ecx @@ -1474,7 +1474,7 @@ L000start: subl %esi,%eax roll $12,%ecx addl %ebp,%ecx - # 121 + # 121 movl 32(%esp),%edx orl %ecx,%eax addl %edx,%ebp @@ -1485,7 +1485,7 @@ L000start: subl %ecx,%edx roll $13,%ebp addl %ebx,%ebp - # 122 + # 122 movl 48(%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -1496,7 +1496,7 @@ L000start: subl %ebp,%eax roll $5,%ebx addl %edi,%ebx - # 123 + # 123 movl 8(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -1507,7 +1507,7 @@ L000start: subl %ebx,%edx roll $14,%edi addl %esi,%edi - # 124 + # 124 movl 40(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -1518,7 +1518,7 @@ L000start: subl %edi,%eax roll $13,%esi addl %ecx,%esi - # 125 + # 125 movl (%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -1529,7 +1529,7 @@ L000start: subl %esi,%edx roll $13,%ecx addl %ebp,%ecx - # 126 + # 126 movl 16(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -1540,7 +1540,7 @@ L000start: subl %ecx,%eax roll $7,%ebp addl %ebx,%ebp - # 127 + # 127 movl 52(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -1551,7 +1551,7 @@ L000start: movl $-1,%eax roll $5,%ebx addl %edi,%ebx - # 128 + # 128 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -1564,7 +1564,7 @@ L000start: movl $-1,%edx roll $15,%edi addl %esi,%edi - # 129 + # 129 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -1577,7 +1577,7 @@ L000start: movl $-1,%eax roll $5,%esi addl %ecx,%esi - # 130 + # 130 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -1590,7 +1590,7 @@ L000start: movl $-1,%edx roll $8,%ecx addl %ebp,%ecx - # 131 + # 131 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -1603,7 +1603,7 @@ L000start: movl $-1,%eax roll $11,%ebp addl %ebx,%ebp - # 132 + # 132 addl %edx,%ebx movl %ecx,%edx subl %ebp,%eax @@ -1616,7 +1616,7 @@ L000start: movl $-1,%edx roll $14,%ebx addl %edi,%ebx - # 133 + # 133 addl %eax,%edi movl %ebp,%eax subl %ebx,%edx @@ -1629,7 +1629,7 @@ L000start: movl $-1,%eax roll $14,%edi addl %esi,%edi - # 134 + # 134 addl %edx,%esi movl %ebx,%edx subl %edi,%eax @@ -1642,7 +1642,7 @@ L000start: movl $-1,%edx roll $6,%esi addl %ecx,%esi - # 135 + # 135 addl %eax,%ecx movl %edi,%eax subl %esi,%edx @@ -1655,7 +1655,7 @@ L000start: movl $-1,%eax roll $14,%ecx addl %ebp,%ecx - # 136 + # 136 addl %edx,%ebp movl %esi,%edx subl %ecx,%eax @@ -1668,7 +1668,7 @@ L000start: movl $-1,%edx roll $6,%ebp addl %ebx,%ebp - # 137 + # 137 addl %eax,%ebx movl %ecx,%eax subl %ebp,%edx @@ -1681,7 +1681,7 @@ L000start: movl $-1,%eax roll $9,%ebx addl %edi,%ebx - # 138 + # 138 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -1694,7 +1694,7 @@ L000start: movl $-1,%edx roll $12,%edi addl %esi,%edi - # 139 + # 139 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -1707,7 +1707,7 @@ L000start: movl $-1,%eax roll $9,%esi addl %ecx,%esi - # 140 + # 140 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -1720,7 +1720,7 @@ L000start: movl $-1,%edx roll $12,%ecx addl %ebp,%ecx - # 141 + # 141 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -1733,7 +1733,7 @@ L000start: movl $-1,%eax roll $5,%ebp addl %ebx,%ebp - # 142 + # 142 addl %edx,%ebx movl %ecx,%edx subl %ebp,%eax @@ -1746,7 +1746,7 @@ L000start: movl $-1,%edx roll $15,%ebx addl %edi,%ebx - # 143 + # 143 addl %eax,%edi movl %ebp,%eax subl %ebx,%edx @@ -1759,7 +1759,7 @@ L000start: xorl %ebp,%eax roll $8,%edi addl %esi,%edi - # 144 + # 144 movl 48(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -1768,7 +1768,7 @@ L000start: movl %edi,%eax roll $8,%esi addl %ecx,%esi - # 145 + # 145 xorl %ebx,%eax movl 60(%esp),%edx xorl %esi,%eax @@ -1779,7 +1779,7 @@ L000start: xorl %edi,%eax roll $5,%ecx addl %ebp,%ecx - # 146 + # 146 movl 40(%esp),%edx xorl %ecx,%eax addl %edx,%ebp @@ -1788,7 +1788,7 @@ L000start: movl %ecx,%eax roll $12,%ebp addl %ebx,%ebp - # 147 + # 147 xorl %esi,%eax movl 16(%esp),%edx xorl %ebp,%eax @@ -1799,7 +1799,7 @@ L000start: xorl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 148 + # 148 movl 4(%esp),%edx xorl %ebx,%eax addl %edx,%edi @@ -1808,7 +1808,7 @@ L000start: movl %ebx,%eax roll $12,%edi addl %esi,%edi - # 149 + # 149 xorl %ebp,%eax movl 20(%esp),%edx xorl %edi,%eax @@ -1819,7 +1819,7 @@ L000start: xorl %ebx,%eax roll $5,%esi addl %ecx,%esi - # 150 + # 150 movl 32(%esp),%edx xorl %esi,%eax addl %edx,%ecx @@ -1828,7 +1828,7 @@ L000start: movl %esi,%eax roll $14,%ecx addl %ebp,%ecx - # 151 + # 151 xorl %edi,%eax movl 28(%esp),%edx xorl %ecx,%eax @@ -1839,7 +1839,7 @@ L000start: xorl %esi,%eax roll $6,%ebp addl %ebx,%ebp - # 152 + # 152 movl 24(%esp),%edx xorl %ebp,%eax addl %edx,%ebx @@ -1848,7 +1848,7 @@ L000start: movl %ebp,%eax roll $8,%ebx addl %edi,%ebx - # 153 + # 153 xorl %ecx,%eax movl 8(%esp),%edx xorl %ebx,%eax @@ -1859,7 +1859,7 @@ L000start: xorl %ebp,%eax roll $13,%edi addl %esi,%edi - # 154 + # 154 movl 52(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -1868,7 +1868,7 @@ L000start: movl %edi,%eax roll $6,%esi addl %ecx,%esi - # 155 + # 155 xorl %ebx,%eax movl 56(%esp),%edx xorl %esi,%eax @@ -1879,7 +1879,7 @@ L000start: xorl %edi,%eax roll $5,%ecx addl %ebp,%ecx - # 156 + # 156 movl (%esp),%edx xorl %ecx,%eax addl %edx,%ebp @@ -1888,7 +1888,7 @@ L000start: movl %ecx,%eax roll $15,%ebp addl %ebx,%ebp - # 157 + # 157 xorl %esi,%eax movl 12(%esp),%edx xorl %ebp,%eax @@ -1899,7 +1899,7 @@ L000start: xorl %ecx,%eax roll $13,%ebx addl %edi,%ebx - # 158 + # 158 movl 36(%esp),%edx xorl %ebx,%eax addl %edx,%edi @@ -1908,7 +1908,7 @@ L000start: movl %ebx,%eax roll $11,%edi addl %esi,%edi - # 159 + # 159 xorl %ebp,%eax movl 44(%esp),%edx xorl %edi,%eax diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s index d75e61693d..eea95f6cf2 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s @@ -94,7 +94,7 @@ L002loop: movl 4(%ebp),%ebx movl 8(%ebp),%ecx movl 12(%ebp),%edx - # 00_15 0 + # 00_15 0 movl %ecx,%esi movl %eax,%ebp roll $5,%ebp @@ -106,7 +106,7 @@ L002loop: xorl %edx,%esi leal 1518500249(%ebp,%edi,1),%ebp addl %esi,%ebp - # 00_15 1 + # 00_15 1 movl %ebx,%edi movl %ebp,%esi roll $5,%ebp @@ -118,7 +118,7 @@ L002loop: xorl %ecx,%edi leal 1518500249(%ebp,%edx,1),%ebp addl %edi,%ebp - # 00_15 2 + # 00_15 2 movl %eax,%edx movl %ebp,%edi roll $5,%ebp @@ -130,7 +130,7 @@ L002loop: xorl %ebx,%edx leal 1518500249(%ebp,%ecx,1),%ebp addl %edx,%ebp - # 00_15 3 + # 00_15 3 movl %esi,%ecx movl %ebp,%edx roll $5,%ebp @@ -142,7 +142,7 @@ L002loop: xorl %eax,%ecx leal 1518500249(%ebp,%ebx,1),%ebp addl %ecx,%ebp - # 00_15 4 + # 00_15 4 movl %edi,%ebx movl %ebp,%ecx roll $5,%ebp @@ -154,7 +154,7 @@ L002loop: xorl %esi,%ebx leal 1518500249(%ebp,%eax,1),%ebp addl %ebx,%ebp - # 00_15 5 + # 00_15 5 movl %edx,%eax movl %ebp,%ebx roll $5,%ebp @@ -166,7 +166,7 @@ L002loop: xorl %edi,%eax leal 1518500249(%ebp,%esi,1),%ebp addl %eax,%ebp - # 00_15 6 + # 00_15 6 movl %ecx,%esi movl %ebp,%eax roll $5,%ebp @@ -178,7 +178,7 @@ L002loop: xorl %edx,%esi leal 1518500249(%ebp,%edi,1),%ebp addl %esi,%ebp - # 00_15 7 + # 00_15 7 movl %ebx,%edi movl %ebp,%esi roll $5,%ebp @@ -190,7 +190,7 @@ L002loop: xorl %ecx,%edi leal 1518500249(%ebp,%edx,1),%ebp addl %edi,%ebp - # 00_15 8 + # 00_15 8 movl %eax,%edx movl %ebp,%edi roll $5,%ebp @@ -202,7 +202,7 @@ L002loop: xorl %ebx,%edx leal 1518500249(%ebp,%ecx,1),%ebp addl %edx,%ebp - # 00_15 9 + # 00_15 9 movl %esi,%ecx movl %ebp,%edx roll $5,%ebp @@ -214,7 +214,7 @@ L002loop: xorl %eax,%ecx leal 1518500249(%ebp,%ebx,1),%ebp addl %ecx,%ebp - # 00_15 10 + # 00_15 10 movl %edi,%ebx movl %ebp,%ecx roll $5,%ebp @@ -226,7 +226,7 @@ L002loop: xorl %esi,%ebx leal 1518500249(%ebp,%eax,1),%ebp addl %ebx,%ebp - # 00_15 11 + # 00_15 11 movl %edx,%eax movl %ebp,%ebx roll $5,%ebp @@ -238,7 +238,7 @@ L002loop: xorl %edi,%eax leal 1518500249(%ebp,%esi,1),%ebp addl %eax,%ebp - # 00_15 12 + # 00_15 12 movl %ecx,%esi movl %ebp,%eax roll $5,%ebp @@ -250,7 +250,7 @@ L002loop: xorl %edx,%esi leal 1518500249(%ebp,%edi,1),%ebp addl %esi,%ebp - # 00_15 13 + # 00_15 13 movl %ebx,%edi movl %ebp,%esi roll $5,%ebp @@ -262,7 +262,7 @@ L002loop: xorl %ecx,%edi leal 1518500249(%ebp,%edx,1),%ebp addl %edi,%ebp - # 00_15 14 + # 00_15 14 movl %eax,%edx movl %ebp,%edi roll $5,%ebp @@ -274,7 +274,7 @@ L002loop: xorl %ebx,%edx leal 1518500249(%ebp,%ecx,1),%ebp addl %edx,%ebp - # 00_15 15 + # 00_15 15 movl %esi,%ecx movl %ebp,%edx roll $5,%ebp @@ -287,7 +287,7 @@ L002loop: leal 1518500249(%ebp,%ebx,1),%ebp movl (%esp),%ebx addl %ebp,%ecx - # 16_19 16 + # 16_19 16 movl %edi,%ebp xorl 8(%esp),%ebx xorl %esi,%ebp @@ -304,7 +304,7 @@ L002loop: leal 1518500249(%ebx,%eax,1),%ebx movl 4(%esp),%eax addl %ebp,%ebx - # 16_19 17 + # 16_19 17 movl %edx,%ebp xorl 12(%esp),%eax xorl %edi,%ebp @@ -321,7 +321,7 @@ L002loop: leal 1518500249(%eax,%esi,1),%eax movl 8(%esp),%esi addl %ebp,%eax - # 16_19 18 + # 16_19 18 movl %ecx,%ebp xorl 16(%esp),%esi xorl %edx,%ebp @@ -338,7 +338,7 @@ L002loop: leal 1518500249(%esi,%edi,1),%esi movl 12(%esp),%edi addl %ebp,%esi - # 16_19 19 + # 16_19 19 movl %ebx,%ebp xorl 20(%esp),%edi xorl %ecx,%ebp @@ -355,7 +355,7 @@ L002loop: leal 1518500249(%edi,%edx,1),%edi movl 16(%esp),%edx addl %ebp,%edi - # 20_39 20 + # 20_39 20 movl %esi,%ebp xorl 24(%esp),%edx xorl %eax,%ebp @@ -371,7 +371,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 20(%esp),%ecx addl %ebp,%edx - # 20_39 21 + # 20_39 21 movl %edi,%ebp xorl 28(%esp),%ecx xorl %esi,%ebp @@ -387,7 +387,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 24(%esp),%ebx addl %ebp,%ecx - # 20_39 22 + # 20_39 22 movl %edx,%ebp xorl 32(%esp),%ebx xorl %edi,%ebp @@ -403,7 +403,7 @@ L002loop: leal 1859775393(%ebx,%eax,1),%ebx movl 28(%esp),%eax addl %ebp,%ebx - # 20_39 23 + # 20_39 23 movl %ecx,%ebp xorl 36(%esp),%eax xorl %edx,%ebp @@ -419,7 +419,7 @@ L002loop: leal 1859775393(%eax,%esi,1),%eax movl 32(%esp),%esi addl %ebp,%eax - # 20_39 24 + # 20_39 24 movl %ebx,%ebp xorl 40(%esp),%esi xorl %ecx,%ebp @@ -435,7 +435,7 @@ L002loop: leal 1859775393(%esi,%edi,1),%esi movl 36(%esp),%edi addl %ebp,%esi - # 20_39 25 + # 20_39 25 movl %eax,%ebp xorl 44(%esp),%edi xorl %ebx,%ebp @@ -451,7 +451,7 @@ L002loop: leal 1859775393(%edi,%edx,1),%edi movl 40(%esp),%edx addl %ebp,%edi - # 20_39 26 + # 20_39 26 movl %esi,%ebp xorl 48(%esp),%edx xorl %eax,%ebp @@ -467,7 +467,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 44(%esp),%ecx addl %ebp,%edx - # 20_39 27 + # 20_39 27 movl %edi,%ebp xorl 52(%esp),%ecx xorl %esi,%ebp @@ -483,7 +483,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 48(%esp),%ebx addl %ebp,%ecx - # 20_39 28 + # 20_39 28 movl %edx,%ebp xorl 56(%esp),%ebx xorl %edi,%ebp @@ -499,7 +499,7 @@ L002loop: leal 1859775393(%ebx,%eax,1),%ebx movl 52(%esp),%eax addl %ebp,%ebx - # 20_39 29 + # 20_39 29 movl %ecx,%ebp xorl 60(%esp),%eax xorl %edx,%ebp @@ -515,7 +515,7 @@ L002loop: leal 1859775393(%eax,%esi,1),%eax movl 56(%esp),%esi addl %ebp,%eax - # 20_39 30 + # 20_39 30 movl %ebx,%ebp xorl (%esp),%esi xorl %ecx,%ebp @@ -531,7 +531,7 @@ L002loop: leal 1859775393(%esi,%edi,1),%esi movl 60(%esp),%edi addl %ebp,%esi - # 20_39 31 + # 20_39 31 movl %eax,%ebp xorl 4(%esp),%edi xorl %ebx,%ebp @@ -547,7 +547,7 @@ L002loop: leal 1859775393(%edi,%edx,1),%edi movl (%esp),%edx addl %ebp,%edi - # 20_39 32 + # 20_39 32 movl %esi,%ebp xorl 8(%esp),%edx xorl %eax,%ebp @@ -563,7 +563,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 4(%esp),%ecx addl %ebp,%edx - # 20_39 33 + # 20_39 33 movl %edi,%ebp xorl 12(%esp),%ecx xorl %esi,%ebp @@ -579,7 +579,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 8(%esp),%ebx addl %ebp,%ecx - # 20_39 34 + # 20_39 34 movl %edx,%ebp xorl 16(%esp),%ebx xorl %edi,%ebp @@ -595,7 +595,7 @@ L002loop: leal 1859775393(%ebx,%eax,1),%ebx movl 12(%esp),%eax addl %ebp,%ebx - # 20_39 35 + # 20_39 35 movl %ecx,%ebp xorl 20(%esp),%eax xorl %edx,%ebp @@ -611,7 +611,7 @@ L002loop: leal 1859775393(%eax,%esi,1),%eax movl 16(%esp),%esi addl %ebp,%eax - # 20_39 36 + # 20_39 36 movl %ebx,%ebp xorl 24(%esp),%esi xorl %ecx,%ebp @@ -627,7 +627,7 @@ L002loop: leal 1859775393(%esi,%edi,1),%esi movl 20(%esp),%edi addl %ebp,%esi - # 20_39 37 + # 20_39 37 movl %eax,%ebp xorl 28(%esp),%edi xorl %ebx,%ebp @@ -643,7 +643,7 @@ L002loop: leal 1859775393(%edi,%edx,1),%edi movl 24(%esp),%edx addl %ebp,%edi - # 20_39 38 + # 20_39 38 movl %esi,%ebp xorl 32(%esp),%edx xorl %eax,%ebp @@ -659,7 +659,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 28(%esp),%ecx addl %ebp,%edx - # 20_39 39 + # 20_39 39 movl %edi,%ebp xorl 36(%esp),%ecx xorl %esi,%ebp @@ -675,7 +675,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 32(%esp),%ebx addl %ebp,%ecx - # 40_59 40 + # 40_59 40 movl %edi,%ebp xorl 40(%esp),%ebx xorl %esi,%ebp @@ -694,7 +694,7 @@ L002loop: andl %esi,%ebp movl 36(%esp),%eax addl %ebp,%ebx - # 40_59 41 + # 40_59 41 movl %edx,%ebp xorl 44(%esp),%eax xorl %edi,%ebp @@ -713,7 +713,7 @@ L002loop: andl %edi,%ebp movl 40(%esp),%esi addl %ebp,%eax - # 40_59 42 + # 40_59 42 movl %ecx,%ebp xorl 48(%esp),%esi xorl %edx,%ebp @@ -732,7 +732,7 @@ L002loop: andl %edx,%ebp movl 44(%esp),%edi addl %ebp,%esi - # 40_59 43 + # 40_59 43 movl %ebx,%ebp xorl 52(%esp),%edi xorl %ecx,%ebp @@ -751,7 +751,7 @@ L002loop: andl %ecx,%ebp movl 48(%esp),%edx addl %ebp,%edi - # 40_59 44 + # 40_59 44 movl %eax,%ebp xorl 56(%esp),%edx xorl %ebx,%ebp @@ -770,7 +770,7 @@ L002loop: andl %ebx,%ebp movl 52(%esp),%ecx addl %ebp,%edx - # 40_59 45 + # 40_59 45 movl %esi,%ebp xorl 60(%esp),%ecx xorl %eax,%ebp @@ -789,7 +789,7 @@ L002loop: andl %eax,%ebp movl 56(%esp),%ebx addl %ebp,%ecx - # 40_59 46 + # 40_59 46 movl %edi,%ebp xorl (%esp),%ebx xorl %esi,%ebp @@ -808,7 +808,7 @@ L002loop: andl %esi,%ebp movl 60(%esp),%eax addl %ebp,%ebx - # 40_59 47 + # 40_59 47 movl %edx,%ebp xorl 4(%esp),%eax xorl %edi,%ebp @@ -827,7 +827,7 @@ L002loop: andl %edi,%ebp movl (%esp),%esi addl %ebp,%eax - # 40_59 48 + # 40_59 48 movl %ecx,%ebp xorl 8(%esp),%esi xorl %edx,%ebp @@ -846,7 +846,7 @@ L002loop: andl %edx,%ebp movl 4(%esp),%edi addl %ebp,%esi - # 40_59 49 + # 40_59 49 movl %ebx,%ebp xorl 12(%esp),%edi xorl %ecx,%ebp @@ -865,7 +865,7 @@ L002loop: andl %ecx,%ebp movl 8(%esp),%edx addl %ebp,%edi - # 40_59 50 + # 40_59 50 movl %eax,%ebp xorl 16(%esp),%edx xorl %ebx,%ebp @@ -884,7 +884,7 @@ L002loop: andl %ebx,%ebp movl 12(%esp),%ecx addl %ebp,%edx - # 40_59 51 + # 40_59 51 movl %esi,%ebp xorl 20(%esp),%ecx xorl %eax,%ebp @@ -903,7 +903,7 @@ L002loop: andl %eax,%ebp movl 16(%esp),%ebx addl %ebp,%ecx - # 40_59 52 + # 40_59 52 movl %edi,%ebp xorl 24(%esp),%ebx xorl %esi,%ebp @@ -922,7 +922,7 @@ L002loop: andl %esi,%ebp movl 20(%esp),%eax addl %ebp,%ebx - # 40_59 53 + # 40_59 53 movl %edx,%ebp xorl 28(%esp),%eax xorl %edi,%ebp @@ -941,7 +941,7 @@ L002loop: andl %edi,%ebp movl 24(%esp),%esi addl %ebp,%eax - # 40_59 54 + # 40_59 54 movl %ecx,%ebp xorl 32(%esp),%esi xorl %edx,%ebp @@ -960,7 +960,7 @@ L002loop: andl %edx,%ebp movl 28(%esp),%edi addl %ebp,%esi - # 40_59 55 + # 40_59 55 movl %ebx,%ebp xorl 36(%esp),%edi xorl %ecx,%ebp @@ -979,7 +979,7 @@ L002loop: andl %ecx,%ebp movl 32(%esp),%edx addl %ebp,%edi - # 40_59 56 + # 40_59 56 movl %eax,%ebp xorl 40(%esp),%edx xorl %ebx,%ebp @@ -998,7 +998,7 @@ L002loop: andl %ebx,%ebp movl 36(%esp),%ecx addl %ebp,%edx - # 40_59 57 + # 40_59 57 movl %esi,%ebp xorl 44(%esp),%ecx xorl %eax,%ebp @@ -1017,7 +1017,7 @@ L002loop: andl %eax,%ebp movl 40(%esp),%ebx addl %ebp,%ecx - # 40_59 58 + # 40_59 58 movl %edi,%ebp xorl 48(%esp),%ebx xorl %esi,%ebp @@ -1036,7 +1036,7 @@ L002loop: andl %esi,%ebp movl 44(%esp),%eax addl %ebp,%ebx - # 40_59 59 + # 40_59 59 movl %edx,%ebp xorl 52(%esp),%eax xorl %edi,%ebp @@ -1055,7 +1055,7 @@ L002loop: andl %edi,%ebp movl 48(%esp),%esi addl %ebp,%eax - # 20_39 60 + # 20_39 60 movl %ebx,%ebp xorl 56(%esp),%esi xorl %ecx,%ebp @@ -1071,7 +1071,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 52(%esp),%edi addl %ebp,%esi - # 20_39 61 + # 20_39 61 movl %eax,%ebp xorl 60(%esp),%edi xorl %ebx,%ebp @@ -1087,7 +1087,7 @@ L002loop: leal 3395469782(%edi,%edx,1),%edi movl 56(%esp),%edx addl %ebp,%edi - # 20_39 62 + # 20_39 62 movl %esi,%ebp xorl (%esp),%edx xorl %eax,%ebp @@ -1103,7 +1103,7 @@ L002loop: leal 3395469782(%edx,%ecx,1),%edx movl 60(%esp),%ecx addl %ebp,%edx - # 20_39 63 + # 20_39 63 movl %edi,%ebp xorl 4(%esp),%ecx xorl %esi,%ebp @@ -1119,7 +1119,7 @@ L002loop: leal 3395469782(%ecx,%ebx,1),%ecx movl (%esp),%ebx addl %ebp,%ecx - # 20_39 64 + # 20_39 64 movl %edx,%ebp xorl 8(%esp),%ebx xorl %edi,%ebp @@ -1135,7 +1135,7 @@ L002loop: leal 3395469782(%ebx,%eax,1),%ebx movl 4(%esp),%eax addl %ebp,%ebx - # 20_39 65 + # 20_39 65 movl %ecx,%ebp xorl 12(%esp),%eax xorl %edx,%ebp @@ -1151,7 +1151,7 @@ L002loop: leal 3395469782(%eax,%esi,1),%eax movl 8(%esp),%esi addl %ebp,%eax - # 20_39 66 + # 20_39 66 movl %ebx,%ebp xorl 16(%esp),%esi xorl %ecx,%ebp @@ -1167,7 +1167,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 12(%esp),%edi addl %ebp,%esi - # 20_39 67 + # 20_39 67 movl %eax,%ebp xorl 20(%esp),%edi xorl %ebx,%ebp @@ -1183,7 +1183,7 @@ L002loop: leal 3395469782(%edi,%edx,1),%edi movl 16(%esp),%edx addl %ebp,%edi - # 20_39 68 + # 20_39 68 movl %esi,%ebp xorl 24(%esp),%edx xorl %eax,%ebp @@ -1199,7 +1199,7 @@ L002loop: leal 3395469782(%edx,%ecx,1),%edx movl 20(%esp),%ecx addl %ebp,%edx - # 20_39 69 + # 20_39 69 movl %edi,%ebp xorl 28(%esp),%ecx xorl %esi,%ebp @@ -1215,7 +1215,7 @@ L002loop: leal 3395469782(%ecx,%ebx,1),%ecx movl 24(%esp),%ebx addl %ebp,%ecx - # 20_39 70 + # 20_39 70 movl %edx,%ebp xorl 32(%esp),%ebx xorl %edi,%ebp @@ -1231,7 +1231,7 @@ L002loop: leal 3395469782(%ebx,%eax,1),%ebx movl 28(%esp),%eax addl %ebp,%ebx - # 20_39 71 + # 20_39 71 movl %ecx,%ebp xorl 36(%esp),%eax xorl %edx,%ebp @@ -1247,7 +1247,7 @@ L002loop: leal 3395469782(%eax,%esi,1),%eax movl 32(%esp),%esi addl %ebp,%eax - # 20_39 72 + # 20_39 72 movl %ebx,%ebp xorl 40(%esp),%esi xorl %ecx,%ebp @@ -1263,7 +1263,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 36(%esp),%edi addl %ebp,%esi - # 20_39 73 + # 20_39 73 movl %eax,%ebp xorl 44(%esp),%edi xorl %ebx,%ebp @@ -1279,7 +1279,7 @@ L002loop: leal 3395469782(%edi,%edx,1),%edi movl 40(%esp),%edx addl %ebp,%edi - # 20_39 74 + # 20_39 74 movl %esi,%ebp xorl 48(%esp),%edx xorl %eax,%ebp @@ -1295,7 +1295,7 @@ L002loop: leal 3395469782(%edx,%ecx,1),%edx movl 44(%esp),%ecx addl %ebp,%edx - # 20_39 75 + # 20_39 75 movl %edi,%ebp xorl 52(%esp),%ecx xorl %esi,%ebp @@ -1311,7 +1311,7 @@ L002loop: leal 3395469782(%ecx,%ebx,1),%ecx movl 48(%esp),%ebx addl %ebp,%ecx - # 20_39 76 + # 20_39 76 movl %edx,%ebp xorl 56(%esp),%ebx xorl %edi,%ebp @@ -1327,7 +1327,7 @@ L002loop: leal 3395469782(%ebx,%eax,1),%ebx movl 52(%esp),%eax addl %ebp,%ebx - # 20_39 77 + # 20_39 77 movl %ecx,%ebp xorl 60(%esp),%eax xorl %edx,%ebp @@ -1342,7 +1342,7 @@ L002loop: leal 3395469782(%eax,%esi,1),%eax movl 56(%esp),%esi addl %ebp,%eax - # 20_39 78 + # 20_39 78 movl %ebx,%ebp xorl (%esp),%esi xorl %ecx,%ebp @@ -1357,7 +1357,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 60(%esp),%edi addl %ebp,%esi - # 20_39 79 + # 20_39 79 movl %eax,%ebp xorl 4(%esp),%edi xorl %ebx,%ebp diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h index f53c3d3eb7..cd3e29a4f3 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index 19ae424ab5..423502679d 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -211,6 +211,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -394,6 +395,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -567,6 +569,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm index 768c6baae0..035bc93eea 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin-i386-cc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3933,6 +3949,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5062,6 +5084,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6211,6 +6239,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7198,6 +7232,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7303,6 +7341,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7370,8 +7412,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7392,10 +7434,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7551,6 +7606,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7575,6 +7631,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7591,7 +7648,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7658,709 +7718,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9084,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9443,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10151,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10674,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10859,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11036,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12040,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12249,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12406,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12422,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index 3f09529c5b..44161204be 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Tue Apr 3 00:38:22 2018" +#define DATE "built on: Tue Nov 20 09:37:53 2018" diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h index af8c1f66f8..b2fe2bef12 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h @@ -108,12 +108,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi index c1d26d10f5..1b5a1389a0 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm index 9976ff77d5..095e614945 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin64-x86_64-cc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3994,6 +4010,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5135,6 +5157,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6332,6 +6360,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7331,6 +7365,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7436,6 +7474,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7525,10 +7567,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7684,6 +7739,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7708,6 +7764,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7724,7 +7781,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7791,447 +7851,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9257,6 +8876,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -10001,6 +9624,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10737,6 +10364,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11274,6 +10905,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11460,6 +11092,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11644,6 +11277,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12649,6 +12283,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12849,6 +12492,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12998,6 +12649,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -13006,6 +12665,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s index f28903cd57..9a337fb897 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s index f127e013ea..75ce16175c 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -1432,3 +1432,4 @@ L$dec8x_done: leaq (%rax),%rsp L$dec8x_epilogue: .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s index cdce52cd0a..b14cf7691a 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _aesni_cbc_sha1_enc @@ -2982,3 +2982,4 @@ L$aesenclast14: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s index 40e75bfedb..08025a0bae 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _aesni_cbc_sha256_enc @@ -4352,3 +4352,4 @@ L$aesenclast4: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s index 258ee335ad..2c741239ef 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _aesni_encrypt diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s index 52ae782e9a..da5d1b1122 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -2495,3 +2495,4 @@ L$63: .quad 0x6363636363636363, 0x6363636363636363 .byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 .p2align 6 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s index 2ffd0bc100..bcd4865659 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -824,3 +824,4 @@ L$k_dsbo: .quad 0x12D7560F93441D00, 0xCA4B8159D8C58E9C .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 .p2align 6 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s index f2bc63be34..785a35ac91 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl _rsaz_1024_sqr_avx2 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s index 8a6e44932d..7f4a01109e 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s index c0f0b4bd68..af1ffdd59b 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s index a8b7f998a1..dd43da0d86 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ L$inner_enter: xorq %r14,%r14 movq (%rsp),%rax - leaq (%rsp),%rsi movq %r9,%r15 - jmp L$sub + .p2align 4 L$sub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsi,%r14,8),%rax + movq 8(%rsp,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz L$sub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.p2align 4 + L$copy: - movq (%rsi,%r14,8),%rax - movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx + movq %r9,(%rsp,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz L$copy @@ -574,10 +574,10 @@ L$inner4x: cmpq %r9,%r14 jb L$outer4x movq 16(%rsp,%r9,8),%rdi + leaq -4(%r9),%r15 movq 0(%rsp),%rax - pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r9 + shrq $2,%r15 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,9 +585,7 @@ L$inner4x: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - leaq -1(%r9),%r15 - jmp L$sub4x -.p2align 4 + L$sub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -614,34 +612,35 @@ L$sub4x: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx - leaq -1(%r9),%r15 - orq %rcx,%rsi - - movdqu (%rsi),%xmm1 - movdqa %xmm0,(%rsp) - movdqu %xmm1,(%rdi) + pxor %xmm0,%xmm0 +.byte 102,72,15,110,224 + pcmpeqd %xmm5,%xmm5 + pshufd $0,%xmm4,%xmm4 + movq %r9,%r15 + pxor %xmm4,%xmm5 + shrq $2,%r15 + xorl %eax,%eax + jmp L$copy4x .p2align 4 L$copy4x: - movdqu 16(%rsi,%r14,1),%xmm2 - movdqu 32(%rsi,%r14,1),%xmm1 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) - movdqa %xmm0,32(%rsp,%r14,1) - movdqu %xmm1,32(%rdi,%r14,1) - leaq 32(%r14),%r14 + movdqa (%rsp,%rax,1),%xmm1 + movdqu (%rdi,%rax,1),%xmm2 + pand %xmm4,%xmm1 + pand %xmm5,%xmm2 + movdqa 16(%rsp,%rax,1),%xmm3 + movdqa %xmm0,(%rsp,%rax,1) + por %xmm2,%xmm1 + movdqu 16(%rdi,%rax,1),%xmm2 + movdqu %xmm1,(%rdi,%rax,1) + pand %xmm4,%xmm3 + pand %xmm5,%xmm2 + movdqa %xmm0,16(%rsp,%rax,1) + por %xmm2,%xmm3 + movdqu %xmm3,16(%rdi,%rax,1) + leaq 32(%rax),%rax decq %r15 jnz L$copy4x - - shlq $2,%r9 - movdqu 16(%rsi,%r14,1),%xmm2 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s index 2f62889472..f415b8d80c 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,18 +393,19 @@ L$sub: sbbq (%rcx,%r14,8),%rax jnz L$sub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.p2align 4 + L$copy: - movq (%rsi,%r14,8),%rax + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz L$copy diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index b72d49d68b..ecb27f8a3a 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Tue Apr 3 00:38:16 2018" +#define DATE "built on: Tue Nov 20 09:37:39 2018" diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s index 8025d088fd..35a3ea550a 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s index 58f4283a79..afd47bdf68 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -1990,3 +1990,4 @@ L$done8x: vzeroall movq 640(%rsp),%rsp .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s index 37e6f155b6..77102c6a41 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _ecp_nistz256_precomputed .p2align 12 @@ -2372,7 +2372,7 @@ _ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd -.text +.text @@ -5931,3 +5931,4 @@ L$point_add_affinex: popq %rbx popq %rbp .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s index 76a65a7ed8..f385ea2a3f 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 .globl _md5_block_asm_data_order @@ -662,3 +662,4 @@ L$end: addq $40,%rsp L$epilogue: .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s index af27718a59..f01a002363 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 5 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s index 76f3b7cdfd..502af78349 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s index e4769a669c..c68f5a6fbe 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s index a9c582fdbb..47dce361a6 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 .globl _rc4_md5_enc @@ -1256,3 +1256,4 @@ L$oop: L$epilogue: L$abort: .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s index b842ec60de..86ef486662 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _RC4 @@ -612,3 +612,4 @@ L$opts: .byte 114,99,52,40,49,54,120,44,105,110,116,41,0 .byte 82,67,52,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .p2align 6 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s index ac6ad9bb8c..7026de0e76 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s index 1c52e05e39..3e3633911f 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s index 897dacd5b4..95e0e774af 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s index 3cbe0a170c..05e973612b 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _sha256_block_data_order @@ -5355,3 +5355,4 @@ L$done_avx2: leaq 48(%rsi),%rsp L$epilogue_avx2: .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s index 91821da126..234616bc3b 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _sha512_block_data_order @@ -5362,3 +5362,4 @@ L$done_avx2: leaq 48(%rsi),%rsp L$epilogue_avx2: .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s index ad43b5a1b3..4057ba32ac 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _whirlpool_block diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s index f9987b733a..8f16835f71 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s @@ -7,7 +7,7 @@ .private_extern _OPENSSL_ia32cap_P .comm _OPENSSL_ia32cap_P,16,2 -.text +.text .globl _OPENSSL_atomic_add @@ -455,3 +455,4 @@ L$tail_rdseed_bytes: L$done_rdseed_bytes: .byte 0xf3,0xc3 + diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s index 5121b7a05c..b2c06a9919 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _padlock_capability .p2align 4 @@ -1020,7 +1020,7 @@ L$ctr32_abort: .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .p2align 4 -.data +.data .p2align 3 L$padlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h index f7d6eb8114..dd9f0d18ab 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index 20d6fbba6a..c9d8fe025d 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi @@ -215,6 +215,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -572,6 +574,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index 5c67787780..b2f66ad053 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin64-x86_64-cc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3933,6 +3949,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5062,6 +5084,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6211,6 +6239,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7198,6 +7232,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7303,6 +7341,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7370,8 +7412,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7392,10 +7434,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7551,6 +7606,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7575,6 +7631,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7591,7 +7648,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7658,709 +7718,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9084,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9443,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10151,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10674,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10859,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11036,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12040,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12249,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12406,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12422,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h index c390a3edf1..3d9d8631fe 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Tue Apr 3 00:38:20 2018" +#define DATE "built on: Tue Nov 20 09:37:48 2018" diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h index 8ebbf01547..77321f72a6 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h @@ -108,12 +108,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi index 3ec9ac0dd0..d354fe610e 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index 954f89a92d..d2eec2550e 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-aarch64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3954,6 +3970,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5092,6 +5114,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6250,6 +6278,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7237,6 +7271,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7342,6 +7380,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7409,9 +7451,9 @@ our %unified_info = ( ], "test/testutil.o" => [ + "test", "crypto/include", "include", - "test", ".", ], "test/threadstest.o" => @@ -7431,10 +7473,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7590,6 +7645,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7614,6 +7670,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7630,7 +7687,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7697,709 +7757,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9143,6 +8762,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9887,6 +9510,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10607,6 +10234,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11131,6 +10762,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11317,6 +10949,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11497,6 +11130,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12500,6 +12134,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12700,6 +12343,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12849,6 +12500,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12857,6 +12516,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h index 8eff4c899c..de00160217 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -27,4 +27,4 @@ static const char cflags[] = { '1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Tue Apr 3 00:38:23 2018" +#define DATE "built on: Tue Nov 20 09:37:54 2018" diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S index d5b1539950..85e76b8253 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S @@ -2765,7 +2765,7 @@ __ecp_nistz256_sqr_mont: // *| | | | | | | | 2| // +|a3*a3|a2*a2|a1*a1|a0*a0| // |--+--+--+--+--+--+--+--| - // |A7|A6|A5|A4|A3|A2|A1|A0|, where Ax is , i.e. follow + // |A7|A6|A5|A4|A3|A2|A1|A0|, where Ax is , i.e. follow // // "can't overflow" below mark carrying into high part of // multiplication result, which can't overflow, because it @@ -3752,21 +3752,21 @@ ecp_nistz256_scatter_w7: prfm pstl1strm,[x0,#4096+64*5] prfm pstl1strm,[x0,#4096+64*6] prfm pstl1strm,[x0,#4096+64*7] - strb w3,[x0,#64*0-1] + strb w3,[x0,#64*0] lsr x3,x3,#8 - strb w3,[x0,#64*1-1] + strb w3,[x0,#64*1] lsr x3,x3,#8 - strb w3,[x0,#64*2-1] + strb w3,[x0,#64*2] lsr x3,x3,#8 - strb w3,[x0,#64*3-1] + strb w3,[x0,#64*3] lsr x3,x3,#8 - strb w3,[x0,#64*4-1] + strb w3,[x0,#64*4] lsr x3,x3,#8 - strb w3,[x0,#64*5-1] + strb w3,[x0,#64*5] lsr x3,x3,#8 - strb w3,[x0,#64*6-1] + strb w3,[x0,#64*6] lsr x3,x3,#8 - strb w3,[x0,#64*7-1] + strb w3,[x0,#64*7] add x0,x0,#64*8 b.ne .Loop_scatter_w7 diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S index 20d797bfa7..c3e7c97d09 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S @@ -1,5 +1,6 @@ #include "arm_arch.h" +#if __ARM_MAX_ARCH__>=7 .text .arch armv8-a+crypto .globl gcm_init_v8 @@ -226,3 +227,4 @@ gcm_ghash_v8: .byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 +#endif diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h index 3976dadb19..8bd973e750 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi index e0a7b48970..a35b09bebc 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,6 +405,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm index 6c0451cfb7..cc97299507 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-aarch64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1076,6 +1076,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1242,10 +1246,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3932,6 +3948,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5061,6 +5083,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6210,6 +6238,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7197,6 +7231,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7302,6 +7340,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7391,10 +7433,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7550,6 +7605,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7574,6 +7630,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7590,7 +7647,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7657,447 +7717,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9083,6 +8702,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9819,6 +9442,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10523,6 +10150,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11042,6 +10673,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11226,6 +10858,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11402,6 +11035,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12405,6 +12039,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12605,6 +12248,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12754,6 +12405,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12762,6 +12421,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h index fbcadcd5ff..ef978bd9e7 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Tue Apr 3 00:38:24 2018" +#define DATE "built on: Tue Nov 20 09:37:57 2018" diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h index af3a003d51..08bf3d4394 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi index 9d9b4c82f8..e15c5ddbf4 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index cb318fa4a5..5fcbd4ee5e 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-armv4", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3948,6 +3964,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5086,6 +5108,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6247,6 +6275,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7234,6 +7268,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7339,6 +7377,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7406,8 +7448,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7428,10 +7470,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7587,6 +7642,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7611,6 +7667,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7627,7 +7684,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7694,709 +7754,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9144,6 +8763,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9888,6 +9511,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10612,6 +10239,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11137,6 +10768,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11323,6 +10955,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11504,6 +11137,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12507,6 +12141,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12707,6 +12350,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12856,6 +12507,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12864,6 +12523,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S index deb6016737..eae2d6ad25 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S @@ -104,7 +104,7 @@ CRYPTO_memcmp: ldmia sp!,{r4,r5} .Lno_data: - neg r0,ip + rsb r0,ip,#0 mov r0,r0,lsr#31 #if __ARM_ARCH__>=5 bx lr diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S index bd5efa8156..9f6e7e0c79 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S @@ -165,14 +165,15 @@ bn_mul_mont: mov r4,sp @ "rewind" r4 sub r2,r2,r5 @ "rewind" r2 - and r1,r4,r14 - bic r3,r2,r14 - orr r1,r1,r3 @ ap=borrow?tp:rp - -.Lcopy: ldr r7,[r1],#4 @ copy or in-place refresh +.Lcopy: ldr r7,[r4] @ conditional copy + ldr r5,[r2] str sp,[r4],#4 @ zap tp - str r7,[r2],#4 - cmp r4,r0 +#ifdef __thumb2__ + it cc +#endif + movcc r5,r7 + str r5,[r2],#4 + teq r4,r0 @ preserve carry bne .Lcopy mov sp,r0 diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h index 6a7c2e2220..189f3673f2 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -30,4 +30,4 @@ static const char cflags[] = { '"','"',' ','\0' }; #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Tue Apr 3 00:38:25 2018" +#define DATE "built on: Tue Nov 20 09:37:59 2018" diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S index 625e9506de..ee64a0b30b 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S @@ -3432,13 +3432,13 @@ ecp_nistz256_scatter_w7: .Loop_scatter_w7: ldr r3,[r1],#4 subs r2,r2,#1 - strb r3,[r0,#64*0-1] + strb r3,[r0,#64*0] mov r3,r3,lsr#8 - strb r3,[r0,#64*1-1] + strb r3,[r0,#64*1] mov r3,r3,lsr#8 - strb r3,[r0,#64*2-1] + strb r3,[r0,#64*2] mov r3,r3,lsr#8 - strb r3,[r0,#64*3-1] + strb r3,[r0,#64*3] add r0,r0,#64*4 bne .Loop_scatter_w7 @@ -4114,7 +4114,7 @@ ecp_nistz256_point_add: stmia r0!,{r4,r5} .Ladd_done: add sp,sp,#32*18+16+16 @ +16 means "skip even over saved r0-r3" -#if __ARM_ARCH__>=5 || defined(__thumb__) +#if __ARM_ARCH__>=5 || !defined(__thumb__) ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc} #else ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr} diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S index 2134f9b647..e654d9480f 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S @@ -3,6 +3,8 @@ .text #if defined(__thumb2__) || defined(__clang__) .syntax unified +#define ldrplb ldrbpl +#define ldrneb ldrbne #endif #if defined(__thumb2__) .thumb @@ -10,11 +12,6 @@ .code 32 #endif -#ifdef __clang__ -#define ldrplb ldrbpl -#define ldrneb ldrbne -#endif - .type rem_4bit,%object .align 5 rem_4bit: diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S index f6fb3f1f73..ceceb743ec 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S @@ -1,5 +1,6 @@ #include "arm_arch.h" +#if __ARM_MAX_ARCH__>=7 .text .fpu neon .code 32 @@ -230,3 +231,4 @@ gcm_ghash_v8: .byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 +#endif diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S index 7484c33b84..16b0eb0e9f 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S @@ -132,6 +132,7 @@ poly1305_init: .type poly1305_blocks,%function .align 5 poly1305_blocks: +.Lpoly1305_blocks: stmdb sp!,{r3,r4,r5,r6,r7,r8,r9,r10,r11,lr} ands r2,r2,#-16 @@ -606,7 +607,7 @@ poly1305_blocks_neon: cmp r2,#64 bhs .Lenter_neon tst ip,ip @ is_base2_26? - beq poly1305_blocks + beq .Lpoly1305_blocks .Lenter_neon: stmdb sp!,{r4,r5,r6,r7} diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S index 239e7504f1..3efcde6b6e 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy @@ -1831,7 +1831,7 @@ sha256_block_data_order: eor r12,r12,r6 @ Maj(a,b,c) add r4,r4,r0,ror#2 @ h+=Sigma0(a) @ add r4,r4,r12 @ h+=Maj(a,b,c) -#if __ARM_ARCH__>=7 +#ifdef __thumb2__ ite eq @ Thumb2 thing, sanity check in ARM #endif ldreq r3,[sp,#16*4] @ pull ctx diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S index 14eb87e0ce..1e2fbf6350 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy @@ -265,7 +265,7 @@ sha512_block_data_order: teq r9,#148 ldr r12,[sp,#16+0] @ c.lo -#if __ARM_ARCH__>=7 +#ifdef __thumb2__ it eq @ Thumb2 thing, sanity check in ARM #endif orreq r14,r14,#1 @@ -405,7 +405,7 @@ sha512_block_data_order: teq r9,#23 ldr r12,[sp,#16+0] @ c.lo -#if __ARM_ARCH__>=7 +#ifdef __thumb2__ it eq @ Thumb2 thing, sanity check in ARM #endif orreq r14,r14,#1 @@ -442,7 +442,7 @@ sha512_block_data_order: adc r6,r6,r4 @ h += T tst r14,#1 add r14,r14,#8 -#if __ARM_ARCH__>=7 +#ifdef __thumb2__ ittt eq @ Thumb2 thing, sanity check in ARM #endif ldreq r9,[sp,#184+0] diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h index 2f9817e43b..21dd8cc643 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi index fcb4548956..3115373ca3 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi @@ -218,6 +218,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -578,6 +580,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm index af91de539b..e61c41fe89 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-armv4", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1076,6 +1076,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1242,10 +1246,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3932,6 +3948,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5061,6 +5083,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6210,6 +6238,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7197,6 +7231,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7302,6 +7340,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7369,9 +7411,9 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", "include", + "test", ".", ], "test/threadstest.o" => @@ -7391,10 +7433,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7550,6 +7605,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7574,6 +7630,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7590,7 +7647,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7657,709 +7717,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9083,6 +8702,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9819,6 +9442,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10523,6 +10150,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11042,6 +10673,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11226,6 +10858,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11402,6 +11035,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12405,6 +12039,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12605,6 +12248,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12754,6 +12405,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12762,6 +12421,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h index edce6b669b..9ce6cc98a0 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Tue Apr 3 00:38:26 2018" +#define DATE "built on: Tue Nov 20 09:38:01 2018" diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h index 1f0c62b3c9..5ba3b88d4e 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi index 9a109fd874..c62e0fcd55 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm index e1c530bd87..7e545b5512 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-elf", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3945,6 +3961,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5086,6 +5108,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6271,6 +6299,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7270,6 +7304,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7375,6 +7413,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7442,8 +7484,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7464,10 +7506,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7623,6 +7678,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7647,6 +7703,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7663,7 +7720,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7730,709 +7790,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9164,6 +8783,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9908,6 +9531,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10636,6 +10263,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11165,6 +10796,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11351,6 +10983,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11533,6 +11166,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12538,6 +12172,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12738,6 +12381,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12887,6 +12538,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12895,6 +12554,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s index 945d9e5824..8212ff0825 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s +++ b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s @@ -445,16 +445,18 @@ bn_mul_mont: leal 1(%edx),%edx jge .L017sub sbbl $0,%eax - andl %eax,%esi - notl %eax - movl %edi,%ebp - andl %eax,%ebp - orl %ebp,%esi + movl $-1,%edx + xorl %eax,%edx + jmp .L018copy .align 16 .L018copy: - movl (%esi,%ebx,4),%eax - movl %eax,(%edi,%ebx,4) + movl 32(%esp,%ebx,4),%esi + movl (%edi,%ebx,4),%ebp movl %ecx,32(%esp,%ebx,4) + andl %eax,%esi + andl %edx,%ebp + orl %esi,%ebp + movl %ebp,(%edi,%ebx,4) decl %ebx jge .L018copy movl 24(%esp),%esp diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h index 8baf29639c..fd614bb4f9 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -37,4 +37,4 @@ static const char cflags[] = { '"',' ','\0' }; #define PLATFORM "platform: linux-elf" -#define DATE "built on: Tue Apr 3 00:38:27 2018" +#define DATE "built on: Tue Nov 20 09:38:03 2018" diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s index cbccc5ebf7..9092d66321 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s +++ b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s @@ -3857,7 +3857,7 @@ ecp_nistz256_scatter_w7: movl 20(%esp),%edi movl 24(%esp),%esi movl 28(%esp),%ebp - leal -1(%edi,%ebp,1),%edi + leal (%edi,%ebp,1),%edi movl $16,%ebp .L007scatter_w7_loop: movl (%esi),%eax diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h index e819a68f0b..b9d6509c0b 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index bbc226b89b..cde3a2ab12 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -211,6 +211,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -394,6 +395,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -567,6 +569,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm index 59021fb1d4..f68371d14a 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-elf", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1075,6 +1075,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1241,10 +1245,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3931,6 +3947,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5060,6 +5082,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6209,6 +6237,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7196,6 +7230,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7301,6 +7339,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7390,10 +7432,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7549,6 +7604,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7573,6 +7629,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7589,7 +7646,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7656,447 +7716,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9082,6 +8701,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9818,6 +9441,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10522,6 +10149,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11041,6 +10672,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11225,6 +10857,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11401,6 +11034,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12404,6 +12038,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12604,6 +12247,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12753,6 +12404,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12761,6 +12420,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h index 606ace102e..5d8720c723 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-elf" -#define DATE "built on: Tue Apr 3 00:38:29 2018" +#define DATE "built on: Tue Nov 20 09:38:06 2018" diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h index b20dbd0212..d0fb48f465 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi index b869b1a864..63eb964d68 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm index 5e487cc374..ecb0191666 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3963,6 +3979,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5092,6 +5114,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6295,6 +6323,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7282,6 +7316,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7387,6 +7425,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7454,8 +7496,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7476,10 +7518,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7635,6 +7690,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7659,6 +7715,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7675,7 +7732,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7742,709 +7802,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9188,6 +8807,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9924,6 +9547,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10664,6 +10291,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11188,6 +10819,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11372,6 +11004,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11557,6 +11190,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12560,6 +12194,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12760,6 +12403,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12909,6 +12560,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12917,6 +12576,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s index d59a397c0d..7a2b6fce83 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -740,7 +740,7 @@ AES_encrypt: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -820,7 +820,7 @@ AES_encrypt: bdnz .Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -885,7 +885,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1030,7 +1030,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_encrypt,.-AES_encrypt @@ -1175,7 +1175,7 @@ AES_decrypt: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1255,7 +1255,7 @@ AES_decrypt: bdnz .Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1320,7 +1320,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1550,7 +1550,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_decrypt,.-AES_decrypt diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s index 5eb788907d..16ddeda378 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ rcon: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -278,7 +278,7 @@ aes_p8_set_encrypt_key: .Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -327,7 +327,7 @@ aes_p8_set_decrypt_key: xor 3,3,3 .Ldec_key_abort: addi 1,1,32 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -395,7 +395,7 @@ aes_p8_encrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -463,7 +463,7 @@ aes_p8_decrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -625,7 +625,7 @@ aes_p8_cbc_encrypt: stvx 2,10,7 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -915,8 +915,8 @@ _aesp8_cbc_decrypt8x: addic. 5,5,128 beq .Lcbc_dec8x_done - nop - nop + nop + nop .Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -1004,15 +1004,15 @@ _aesp8_cbc_decrypt8x: cmplwi 5,32 blt .Lcbc_dec8x_one - nop + nop beq .Lcbc_dec8x_two cmplwi 5,64 blt .Lcbc_dec8x_three - nop + nop beq .Lcbc_dec8x_four cmplwi 5,96 blt .Lcbc_dec8x_five - nop + nop beq .Lcbc_dec8x_six .Lcbc_dec8x_seven: @@ -1199,7 +1199,7 @@ _aesp8_cbc_decrypt8x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1307,7 +1307,7 @@ aes_p8_ctr32_encrypt_blocks: stvx 2,0,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1610,15 +1610,15 @@ _aesp8_ctr32_encrypt8x: .Lctr32_enc8x_break: cmpwi 5,-0x60 blt .Lctr32_enc8x_one - nop + nop beq .Lctr32_enc8x_two cmpwi 5,-0x40 blt .Lctr32_enc8x_three - nop + nop beq .Lctr32_enc8x_four cmpwi 5,-0x20 blt .Lctr32_enc8x_five - nop + nop beq .Lctr32_enc8x_six cmpwi 5,0x00 blt .Lctr32_enc8x_seven @@ -1827,7 +1827,7 @@ _aesp8_ctr32_encrypt8x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1965,7 +1965,7 @@ aes_p8_xts_encrypt: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2038,7 +2038,7 @@ aes_p8_xts_encrypt: .Lxts_enc_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2179,7 +2179,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2244,7 +2244,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2295,7 +2295,7 @@ aes_p8_xts_decrypt: .Lxts_dec_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2626,11 +2626,11 @@ _aesp8_xts_encrypt6x: beq .Lxts_enc6x_zero cmpwi 5,0x20 blt .Lxts_enc6x_one - nop + nop beq .Lxts_enc6x_two cmpwi 5,0x40 blt .Lxts_enc6x_three - nop + nop beq .Lxts_enc6x_four .Lxts_enc6x_five: @@ -2727,7 +2727,7 @@ _aesp8_xts_encrypt6x: .align 4 .Lxts_enc6x_one: vxor 7,5,17 - nop + nop .Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2863,7 +2863,7 @@ _aesp8_xts_encrypt6x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2948,7 +2948,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3276,11 +3276,11 @@ _aesp8_xts_decrypt6x: beq .Lxts_dec6x_zero cmpwi 5,0x20 blt .Lxts_dec6x_one - nop + nop beq .Lxts_dec6x_two cmpwi 5,0x40 blt .Lxts_dec6x_three - nop + nop beq .Lxts_dec6x_four .Lxts_dec6x_five: @@ -3381,7 +3381,7 @@ _aesp8_xts_decrypt6x: .align 4 .Lxts_dec6x_one: vxor 7,5,17 - nop + nop .Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3551,7 +3551,7 @@ _aesp8_xts_decrypt6x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3636,6 +3636,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s index babd699bf7..12bc03a588 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ _vpaes_consts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ _vpaes_encrypt_core: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -319,7 +319,7 @@ vpaes_encrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -361,7 +361,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -456,7 +456,7 @@ _vpaes_decrypt_core: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -552,7 +552,7 @@ vpaes_decrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -780,7 +780,7 @@ vpaes_cbc_encrypt: lwz 31,236(1) mtlr 0 addi 1,1,240 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -834,7 +834,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1080,7 +1080,7 @@ _vpaes_schedule_core: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1108,7 +1108,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1174,7 +1174,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1196,7 +1196,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1248,7 +1248,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 .Lschedule_mangle_dec: @@ -1299,7 +1299,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1376,7 +1376,7 @@ vpaes_set_encrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1460,7 +1460,7 @@ vpaes_set_decrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s index 4745306e54..b029cc94b0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s @@ -237,7 +237,7 @@ bn_sqr_comba4: stw 9,24(3) stw 10,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -665,7 +665,7 @@ bn_sqr_comba8: stw 9, 60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -819,7 +819,7 @@ bn_mul_comba4: stw 10,24(3) stw 11,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1358,7 +1358,7 @@ bn_mul_comba8: adde 10,10,9 stw 12,56(3) stw 10,60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1409,7 +1409,7 @@ bn_sub_words: .Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1455,7 +1455,7 @@ bn_add_words: bdnz .Lppcasm_add_mainloop .Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1484,7 +1484,7 @@ bn_div_words: cmplwi 0,5,0 bne .Lppcasm_div1 li 3,-1 - blr + blr .Lppcasm_div1: xor 0,0,0 li 8,32 @@ -1571,7 +1571,7 @@ bn_div_words: b .Lppcasm_divouterloop .Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1613,7 +1613,7 @@ bn_sqr_words: stwu 8,4(3) bdnz .Lppcasm_sqr_mainloop .Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1719,7 +1719,7 @@ bn_mul_words: .Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1845,7 +1845,7 @@ bn_mul_add_words: .Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s index aefd29c9d8..5bba1e47ac 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s @@ -10,7 +10,7 @@ bn_mul_mont_int: li 3,0 .long 0x4d800020 cmpwi 8,32 - bgelr + bgelr slwi 8,8,2 li 12,-4096 addi 3,8,256 @@ -183,15 +183,16 @@ bn_mul_mont_int: li 21,0 mtctr 8 subfe 3,21,3 - and 4,22,3 - andc 6,9,3 - or 4,4,6 .align 4 .Lcopy: - lwzx 12,4,21 - stwx 12,9,21 + lwzx 12,22,21 + lwzx 10,9,21 + and 12,12,3 + andc 10,10,3 stwx 21,22,21 + or 10,10,12 + stwx 10,9,21 addi 21,21,4 bdnz .Lcopy @@ -210,7 +211,7 @@ bn_mul_mont_int: lwz 30,-8(12) lwz 31,-4(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s index 49c6e9c741..774b4c4dea 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s @@ -889,11 +889,8 @@ bn_mul_mont_fpu64: li 12,0 subfe 3,12,3 - addi 10,1,196 + addi 4,1,196 subf 9,8,9 - and 4,10,3 - andc 6,9,3 - or 4,4,6 addi 10,1,192 mtctr 11 @@ -903,6 +900,10 @@ bn_mul_mont_fpu64: lwz 25,8(4) lwz 26,12(4) lwzu 27,16(4) + lwz 28,4(9) + lwz 29,8(9) + lwz 30,12(9) + lwz 31,16(9) std 12,8(22) std 12,16(22) std 12,24(22) @@ -911,6 +912,18 @@ bn_mul_mont_fpu64: std 12,48(22) std 12,56(22) stdu 12,64(22) + and 24,24,3 + and 25,25,3 + and 26,26,3 + and 27,27,3 + andc 28,28,3 + andc 29,29,3 + andc 30,30,3 + andc 31,31,3 + or 24,24,28 + or 25,25,29 + or 26,26,30 + or 27,27,31 stw 24,4(9) stw 25,8(9) stw 26,12(9) @@ -946,7 +959,7 @@ bn_mul_mont_fpu64: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h index 1a32730b38..ed6f9705a9 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Tue Apr 3 00:38:38 2018" +#define DATE "built on: Tue Nov 20 09:38:30 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s index e07f5837a0..02f53619e5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s @@ -60,7 +60,7 @@ __ChaCha20_ctr32_int: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -346,7 +346,7 @@ __ChaCha20_1x: bne .Loop_outer - blr + blr .align 4 .Ltail: @@ -397,7 +397,7 @@ __ChaCha20_1x: stw 1,80(1) stw 1,84(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -556,7 +556,7 @@ ChaCha20_ctr32_vmx: vspltisw 27,7 mtctr 0 - nop + nop .Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1049,7 +1049,7 @@ ChaCha20_ctr32_vmx: cmplwi 5,255 bgt .Loop_outer_vmx - nop + nop .Ldone_vmx: cmplwi 5,0 @@ -1102,7 +1102,7 @@ ChaCha20_ctr32_vmx: lwz 31,364(1) mtlr 0 addi 1,1,368 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1115,7 +1115,7 @@ ChaCha20_ctr32_vmx: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s index 28cbe1956f..a0e364910f 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s @@ -123,7 +123,7 @@ gcm_init_p8: .long 0x7E4A1F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -173,7 +173,7 @@ gcm_gmult_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -290,7 +290,7 @@ gcm_ghash_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -557,7 +557,7 @@ gcm_ghash_p8: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s index a03a08d66c..940d4fa853 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s @@ -36,7 +36,7 @@ poly1305_init_int: .Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .size poly1305_init_int,.-poly1305_init_int @@ -238,7 +238,7 @@ poly1305_blocks: lwz 31,92(1) addi 1,1,96 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,18,4,0 .size poly1305_blocks,.-poly1305_blocks @@ -303,7 +303,7 @@ poly1305_emit: lwz 30,88(1) lwz 31,92(1) addi 1,1,96 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit,.-poly1305_emit diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s index 519158eefd..ee69ce054c 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s @@ -146,7 +146,7 @@ poly1305_init_fpu: .Lno_key: xor 3,3,3 addi 1,1,24 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 .size poly1305_init_fpu,.-poly1305_init_fpu @@ -462,7 +462,7 @@ poly1305_blocks_fpu: lfd 31,208(1) addi 1,1,216 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 .size poly1305_blocks_fpu,.-poly1305_blocks_fpu @@ -547,7 +547,7 @@ poly1305_emit_fpu: lwz 30,32(1) lwz 31,36(1) addi 1,1,40 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit_fpu,.-poly1305_emit_fpu @@ -558,7 +558,7 @@ poly1305_emit_fpu: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s index 59359e7919..19fac1f319 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s @@ -6,7 +6,7 @@ .align 4 OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_fpu_probe,.-OPENSSL_fpu_probe @@ -16,7 +16,7 @@ OPENSSL_fpu_probe: OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_ppc64_probe,.-OPENSSL_ppc64_probe @@ -26,7 +26,7 @@ OPENSSL_ppc64_probe: .align 4 OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_altivec_probe,.-OPENSSL_altivec_probe @@ -37,7 +37,7 @@ OPENSSL_altivec_probe: OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_crypto207_probe,.-OPENSSL_crypto207_probe @@ -49,7 +49,7 @@ OPENSSL_madd300_probe: xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -82,7 +82,7 @@ OPENSSL_wipe_cpu: xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu @@ -96,7 +96,7 @@ OPENSSL_atomic_add: stwcx. 0,0,3 bne- .Ladd mr 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -112,7 +112,7 @@ OPENSSL_rdtsc: mftbu 4 .long 0x7c042840 bne .Loop_rdtsc - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_rdtsc,.-OPENSSL_rdtsc @@ -130,7 +130,7 @@ OPENSSL_cleanse: stb 0,0(3) addi 3,3,1 bdnz $-8 - blr + blr .Lot: andi. 5,3,3 beq .Laligned stb 0,0(3) @@ -145,7 +145,7 @@ OPENSSL_cleanse: bdnz $-8 andi. 4,4,3 bne .Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -172,7 +172,7 @@ CRYPTO_memcmp: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -204,7 +204,7 @@ OPENSSL_instrument_bus: bdnz .Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -257,7 +257,7 @@ OPENSSL_instrument_bus2: .Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s index 5f577714e5..ca8c279a2c 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s @@ -101,7 +101,7 @@ sha1_block_data_order: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1109,7 +1109,7 @@ sha1_block_data_order: mr 11,20 addi 4,4,64 bdnz .Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha1_block_data_order,.-sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s index 1e92cd5884..83c86c17fa 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s @@ -121,7 +121,7 @@ sha256_block_ppc: lwz 31,188(1) mtlr 0 addi 1,1,192 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1287,7 +1287,7 @@ sha256_block_ppc: .long 0x7c1f2840 stw 15,28(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha256_block_ppc,.-sha256_block_ppc @@ -1298,7 +1298,7 @@ sha256_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s index 888cef888e..7c06a0bc05 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s @@ -773,7 +773,7 @@ sha256_block_p8: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -785,7 +785,7 @@ sha256_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s index 582aee7682..2ae1bd579f 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s @@ -128,7 +128,7 @@ sha512_block_ppc: lwz 31,252(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -2973,7 +2973,7 @@ sha512_block_ppc: stw 4,164(1) .long 0x7c042840 bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha512_block_ppc,.-sha512_block_ppc @@ -2984,7 +2984,7 @@ sha512_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s index 00b9f36b42..fc14a5e50f 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s @@ -774,7 +774,7 @@ sha512_block_p8: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -786,7 +786,7 @@ sha512_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h index 2f9817e43b..21dd8cc643 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi index 046400b5d2..1aea69b8a0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi @@ -217,6 +217,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,6 +402,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -577,6 +579,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm index 2a36895668..5d0823ce15 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1076,6 +1076,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1242,10 +1246,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3932,6 +3948,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5061,6 +5083,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6210,6 +6238,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7197,6 +7231,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7302,6 +7340,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7391,10 +7433,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7550,6 +7605,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7574,6 +7630,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7590,7 +7647,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7657,447 +7717,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9083,6 +8702,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9819,6 +9442,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10523,6 +10150,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11042,6 +10673,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11226,6 +10858,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11402,6 +11035,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12405,6 +12039,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12605,6 +12248,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12754,6 +12405,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12762,6 +12421,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h index fcfb67646e..b13be7e738 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Tue Apr 3 00:38:40 2018" +#define DATE "built on: Tue Nov 20 09:38:33 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h index 1f0c62b3c9..5ba3b88d4e 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi index 08a06ab1d9..db9f598242 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm index 09ca2343e7..3a2627b63e 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3964,6 +3980,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5093,6 +5115,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6296,6 +6324,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7283,6 +7317,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7388,6 +7426,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7477,10 +7519,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7636,6 +7691,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7660,6 +7716,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7676,7 +7733,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7743,447 +7803,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9189,6 +8808,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9925,6 +9548,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10665,6 +10292,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11189,6 +10820,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11373,6 +11005,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11558,6 +11191,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12561,6 +12195,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12761,6 +12404,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12910,6 +12561,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12918,6 +12577,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s index b46c8c82a2..95c8377dc1 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -746,7 +746,7 @@ AES_encrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -826,7 +826,7 @@ AES_encrypt: bdnz .Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -891,7 +891,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1036,7 +1036,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_encrypt,.-.AES_encrypt @@ -1188,7 +1188,7 @@ AES_decrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1268,7 +1268,7 @@ AES_decrypt: bdnz .Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1333,7 +1333,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1530,7 +1530,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_decrypt,.-.AES_decrypt diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s index 36fa7e356d..52a195558d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ rcon: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -284,7 +284,7 @@ aes_p8_set_encrypt_key: .Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -340,7 +340,7 @@ aes_p8_set_decrypt_key: xor 3,3,3 .Ldec_key_abort: addi 1,1,64 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -415,7 +415,7 @@ aes_p8_encrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -490,7 +490,7 @@ aes_p8_decrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -659,7 +659,7 @@ aes_p8_cbc_encrypt: stvx 2,10,7 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -949,8 +949,8 @@ _aesp8_cbc_decrypt8x: addic. 5,5,128 beq .Lcbc_dec8x_done - nop - nop + nop + nop .Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -1038,15 +1038,15 @@ _aesp8_cbc_decrypt8x: cmplwi 5,32 blt .Lcbc_dec8x_one - nop + nop beq .Lcbc_dec8x_two cmplwi 5,64 blt .Lcbc_dec8x_three - nop + nop beq .Lcbc_dec8x_four cmplwi 5,96 blt .Lcbc_dec8x_five - nop + nop beq .Lcbc_dec8x_six .Lcbc_dec8x_seven: @@ -1233,7 +1233,7 @@ _aesp8_cbc_decrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1348,7 +1348,7 @@ aes_p8_ctr32_encrypt_blocks: stvx 2,0,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1651,15 +1651,15 @@ _aesp8_ctr32_encrypt8x: .Lctr32_enc8x_break: cmpwi 5,-0x60 blt .Lctr32_enc8x_one - nop + nop beq .Lctr32_enc8x_two cmpwi 5,-0x40 blt .Lctr32_enc8x_three - nop + nop beq .Lctr32_enc8x_four cmpwi 5,-0x20 blt .Lctr32_enc8x_five - nop + nop beq .Lctr32_enc8x_six cmpwi 5,0x00 blt .Lctr32_enc8x_seven @@ -1868,7 +1868,7 @@ _aesp8_ctr32_encrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2013,7 +2013,7 @@ aes_p8_xts_encrypt: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2086,7 +2086,7 @@ aes_p8_xts_encrypt: .Lxts_enc_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2234,7 +2234,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2299,7 +2299,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2350,7 +2350,7 @@ aes_p8_xts_decrypt: .Lxts_dec_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2682,11 +2682,11 @@ _aesp8_xts_encrypt6x: beq .Lxts_enc6x_zero cmpwi 5,0x20 blt .Lxts_enc6x_one - nop + nop beq .Lxts_enc6x_two cmpwi 5,0x40 blt .Lxts_enc6x_three - nop + nop beq .Lxts_enc6x_four .Lxts_enc6x_five: @@ -2783,7 +2783,7 @@ _aesp8_xts_encrypt6x: .align 4 .Lxts_enc6x_one: vxor 7,5,17 - nop + nop .Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2919,7 +2919,7 @@ _aesp8_xts_encrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3004,7 +3004,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3332,11 +3332,11 @@ _aesp8_xts_decrypt6x: beq .Lxts_dec6x_zero cmpwi 5,0x20 blt .Lxts_dec6x_one - nop + nop beq .Lxts_dec6x_two cmpwi 5,0x40 blt .Lxts_dec6x_three - nop + nop beq .Lxts_dec6x_four .Lxts_dec6x_five: @@ -3437,7 +3437,7 @@ _aesp8_xts_decrypt6x: .align 4 .Lxts_dec6x_one: vxor 7,5,17 - nop + nop .Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3607,7 +3607,7 @@ _aesp8_xts_decrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3692,6 +3692,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s index 1168f546f0..c5f074f37f 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ _vpaes_consts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ _vpaes_encrypt_core: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -325,7 +325,7 @@ vpaes_encrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -368,7 +368,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -463,7 +463,7 @@ _vpaes_decrypt_core: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -565,7 +565,7 @@ vpaes_decrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -800,7 +800,7 @@ vpaes_cbc_encrypt: ld 31,264(1) mtlr 0 addi 1,1,272 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -855,7 +855,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1101,7 +1101,7 @@ _vpaes_schedule_core: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1129,7 +1129,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1195,7 +1195,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1217,7 +1217,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1269,7 +1269,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 .Lschedule_mangle_dec: @@ -1320,7 +1320,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1403,7 +1403,7 @@ vpaes_set_encrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1494,7 +1494,7 @@ vpaes_set_decrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s index 0a3a2a76f5..60dd49f863 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s @@ -297,7 +297,7 @@ bn_mul_add_words: std 9,48(3) std 10,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -726,7 +726,7 @@ bn_mul_add_words: std 9, 120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -881,7 +881,7 @@ bn_mul_add_words: std 10,48(3) std 11,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1421,7 +1421,7 @@ bn_mul_add_words: adde 10,10,9 std 12,112(3) std 10,120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1473,7 +1473,7 @@ bn_mul_add_words: .Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1520,7 +1520,7 @@ bn_mul_add_words: bdnz .Lppcasm_add_mainloop .Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1550,7 +1550,7 @@ bn_mul_add_words: cmpldi 0,5,0 bne .Lppcasm_div1 li 3,-1 - blr + blr .Lppcasm_div1: xor 0,0,0 li 8,64 @@ -1637,7 +1637,7 @@ bn_mul_add_words: b .Lppcasm_divouterloop .Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1680,7 +1680,7 @@ bn_mul_add_words: stdu 8,8(3) bdnz .Lppcasm_sqr_mainloop .Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1787,7 +1787,7 @@ bn_mul_add_words: .Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1914,7 +1914,7 @@ bn_mul_add_words: .Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s index ac8653f240..353c449244 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s @@ -187,15 +187,16 @@ bn_mul_mont_int: li 21,0 mtctr 8 subfe 3,21,3 - and 4,22,3 - andc 6,9,3 - or 4,4,6 .align 4 .Lcopy: - ldx 12,4,21 - stdx 12,9,21 + ldx 12,22,21 + ldx 10,9,21 + and 12,12,3 + andc 10,10,3 stdx 21,22,21 + or 10,10,12 + stdx 10,9,21 addi 21,21,8 bdnz .Lcopy @@ -214,7 +215,7 @@ bn_mul_mont_int: ld 30,-16(12) ld 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s index 8450d9a939..c8a045698b 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s @@ -686,16 +686,14 @@ bn_mul_mont_fpu64: li 12,0 subfe 3,12,3 - and 4,10,3 - andc 6,9,3 - or 4,4,6 - addi 31,4,8 mtctr 11 .align 4 .Lcopy: - ldx 24,4,12 - ldx 25,31,12 + ldx 24,10,12 + ldx 25,28,12 + ldx 26,9,12 + ldx 27,30,12 std 12,8(22) std 12,16(22) std 12,24(22) @@ -704,6 +702,12 @@ bn_mul_mont_fpu64: std 12,48(22) std 12,56(22) stdu 12,64(22) + and 24,24,3 + and 25,25,3 + andc 26,26,3 + andc 27,27,3 + or 24,24,26 + or 25,25,27 stdx 24,9,12 stdx 25,30,12 stdx 12,10,12 @@ -738,7 +742,7 @@ bn_mul_mont_fpu64: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h index 12830ce399..16aeae7e46 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Tue Apr 3 00:38:40 2018" +#define DATE "built on: Tue Nov 20 09:38:34 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s index 93efe4d9b5..b69868c41f 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s @@ -66,7 +66,7 @@ __ChaCha20_ctr32_int: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -353,7 +353,7 @@ __ChaCha20_1x: bne .Loop_outer - blr + blr .align 4 .Ltail: @@ -404,7 +404,7 @@ __ChaCha20_1x: stw 1,104(1) stw 1,108(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -569,7 +569,7 @@ ChaCha20_ctr32_vmx: vspltisw 27,7 mtctr 0 - nop + nop .Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1062,7 +1062,7 @@ ChaCha20_ctr32_vmx: cmpldi 5,255 bgt .Loop_outer_vmx - nop + nop .Ldone_vmx: cmpldi 5,0 @@ -1115,7 +1115,7 @@ ChaCha20_ctr32_vmx: ld 31,456(1) mtlr 0 addi 1,1,464 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1129,7 +1129,7 @@ ChaCha20_ctr32_vmx: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s index 5ca8640eda..8294ab9b95 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s @@ -129,7 +129,7 @@ gcm_init_p8: .long 0x7E4A1F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -186,7 +186,7 @@ gcm_gmult_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -310,7 +310,7 @@ gcm_ghash_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -577,7 +577,7 @@ gcm_ghash_p8: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s index 0907f4ae20..4006308ab2 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s @@ -39,7 +39,7 @@ poly1305_init_int: .Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .size poly1305_init_int,.-.poly1305_init_int @@ -141,7 +141,7 @@ poly1305_blocks: ld 31,184(1) addi 1,1,192 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,5,4,0 .size poly1305_blocks,.-.poly1305_blocks @@ -189,7 +189,7 @@ poly1305_emit: li 12,12 stwbrx 8,11,4 stwbrx 7,12,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .size poly1305_emit,.-.poly1305_emit diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s index a26ff5adba..a5a6dfd505 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s @@ -152,7 +152,7 @@ poly1305_init_fpu: .Lno_key: xor 3,3,3 addi 1,1,48 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 .size poly1305_init_fpu,.-.poly1305_init_fpu @@ -475,7 +475,7 @@ poly1305_blocks_fpu: lfd 31,232(1) addi 1,1,240 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 .size poly1305_blocks_fpu,.-.poly1305_blocks_fpu @@ -570,7 +570,7 @@ poly1305_emit_fpu: ld 30,64(1) ld 31,72(1) addi 1,1,80 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit_fpu,.-.poly1305_emit_fpu @@ -582,7 +582,7 @@ poly1305_emit_fpu: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s index adc9731bb6..55fa667f64 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s @@ -12,7 +12,7 @@ OPENSSL_fpu_probe: .align 4 .OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_fpu_probe,.-.OPENSSL_fpu_probe @@ -29,7 +29,7 @@ OPENSSL_ppc64_probe: .OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_ppc64_probe,.-.OPENSSL_ppc64_probe @@ -46,7 +46,7 @@ OPENSSL_altivec_probe: .align 4 .OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_altivec_probe,.-.OPENSSL_altivec_probe @@ -64,7 +64,7 @@ OPENSSL_crypto207_probe: .OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_crypto207_probe,.-.OPENSSL_crypto207_probe @@ -83,7 +83,7 @@ OPENSSL_madd300_probe: xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -122,7 +122,7 @@ OPENSSL_wipe_cpu: xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_wipe_cpu,.-.OPENSSL_wipe_cpu @@ -143,7 +143,7 @@ OPENSSL_atomic_add: stwcx. 0,0,3 bne- .Ladd extsw 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -161,7 +161,7 @@ OPENSSL_rdtsc: .align 4 .OPENSSL_rdtsc: mftb 3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_rdtsc,.-.OPENSSL_rdtsc @@ -186,7 +186,7 @@ OPENSSL_cleanse: stb 0,0(3) addi 3,3,1 bdnz $-8 - blr + blr .Lot: andi. 5,3,3 beq .Laligned stb 0,0(3) @@ -201,7 +201,7 @@ OPENSSL_cleanse: bdnz $-8 andi. 4,4,3 bne .Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -235,7 +235,7 @@ CRYPTO_memcmp: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -274,7 +274,7 @@ OPENSSL_instrument_bus: bdnz .Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -334,7 +334,7 @@ OPENSSL_instrument_bus2: .Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s index aa47944d37..e332225e3b 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s @@ -107,7 +107,7 @@ sha1_block_data_order: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1115,7 +1115,7 @@ sha1_block_data_order: mr 11,20 addi 4,4,64 bdnz .Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha1_block_data_order,.-.sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s index 8bc52879f4..8a55a49ed3 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s @@ -127,7 +127,7 @@ sha256_block_ppc: ld 31,312(1) mtlr 0 addi 1,1,320 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1293,7 +1293,7 @@ sha256_block_ppc: cmpld 31,5 stw 15,28(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha256_block_ppc,.-.sha256_block_ppc @@ -1305,7 +1305,7 @@ sha256_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s index cfa6282d6d..23db0265f5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s @@ -779,7 +779,7 @@ sha256_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -792,7 +792,7 @@ sha256_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s index 9c699a4f32..775b64d0fb 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s @@ -127,7 +127,7 @@ sha512_block_ppc: ld 31,376(1) mtlr 0 addi 1,1,384 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1325,7 +1325,7 @@ sha512_block_ppc: cmpld 31,5 std 15,56(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha512_block_ppc,.-.sha512_block_ppc @@ -1337,7 +1337,7 @@ sha512_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s index 03c09abfe1..6526b53ff0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s @@ -780,7 +780,7 @@ sha512_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -793,7 +793,7 @@ sha512_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h index 3976dadb19..8bd973e750 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi index b99768aed0..d4d832520c 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi @@ -217,6 +217,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,6 +402,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -577,6 +579,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm index 3385fae227..34fcb52aeb 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3933,6 +3949,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5062,6 +5084,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6211,6 +6239,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7198,6 +7232,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7303,6 +7341,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7370,8 +7412,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7392,10 +7434,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7551,6 +7606,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7575,6 +7631,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7591,7 +7648,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7658,709 +7718,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9084,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9443,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10151,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10674,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10859,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11036,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12040,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12249,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12406,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12422,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h index e00115c55c..d09dbd7c84 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Tue Apr 3 00:38:41 2018" +#define DATE "built on: Tue Nov 20 09:38:37 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h index af3a003d51..08bf3d4394 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi index e45227748e..f5c23cbf66 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index f83a155f66..33639132f0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64le", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3963,6 +3979,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5092,6 +5114,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6295,6 +6323,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7282,6 +7316,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7387,6 +7425,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7454,8 +7496,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7476,10 +7518,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7635,6 +7690,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7659,6 +7715,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7675,7 +7732,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7742,709 +7802,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9188,6 +8807,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9924,6 +9547,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10664,6 +10291,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11188,6 +10819,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11372,6 +11004,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11557,6 +11190,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12560,6 +12194,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12760,6 +12403,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12909,6 +12560,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12917,6 +12576,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s index bbc4e95d54..2aa99e753a 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s @@ -9,7 +9,7 @@ mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -19,7 +19,7 @@ mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -766,7 +766,7 @@ AES_encrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -846,7 +846,7 @@ AES_encrypt: bdnz .Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -911,7 +911,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1056,7 +1056,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_encrypt,.-AES_encrypt @@ -1226,7 +1226,7 @@ AES_decrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1306,7 +1306,7 @@ AES_decrypt: bdnz .Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1371,7 +1371,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1568,7 +1568,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_decrypt,.-AES_decrypt diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s index 54f61290bd..581d16e664 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s @@ -15,7 +15,7 @@ rcon: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -280,7 +280,7 @@ aes_p8_set_encrypt_key: .Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -330,7 +330,7 @@ aes_p8_set_decrypt_key: xor 3,3,3 .Ldec_key_abort: addi 1,1,64 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -399,7 +399,7 @@ aes_p8_encrypt: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -468,7 +468,7 @@ aes_p8_decrypt: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -631,7 +631,7 @@ aes_p8_cbc_encrypt: stvx 2,10,7 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -921,8 +921,8 @@ _aesp8_cbc_decrypt8x: addic. 5,5,128 beq .Lcbc_dec8x_done - nop - nop + nop + nop .Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -1010,15 +1010,15 @@ _aesp8_cbc_decrypt8x: cmplwi 5,32 blt .Lcbc_dec8x_one - nop + nop beq .Lcbc_dec8x_two cmplwi 5,64 blt .Lcbc_dec8x_three - nop + nop beq .Lcbc_dec8x_four cmplwi 5,96 blt .Lcbc_dec8x_five - nop + nop beq .Lcbc_dec8x_six .Lcbc_dec8x_seven: @@ -1205,7 +1205,7 @@ _aesp8_cbc_decrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1314,7 +1314,7 @@ aes_p8_ctr32_encrypt_blocks: stvx 2,0,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1617,15 +1617,15 @@ _aesp8_ctr32_encrypt8x: .Lctr32_enc8x_break: cmpwi 5,-0x60 blt .Lctr32_enc8x_one - nop + nop beq .Lctr32_enc8x_two cmpwi 5,-0x40 blt .Lctr32_enc8x_three - nop + nop beq .Lctr32_enc8x_four cmpwi 5,-0x20 blt .Lctr32_enc8x_five - nop + nop beq .Lctr32_enc8x_six cmpwi 5,0x00 blt .Lctr32_enc8x_seven @@ -1834,7 +1834,7 @@ _aesp8_ctr32_encrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2046,7 +2046,7 @@ aes_p8_xts_encrypt: .Lxts_enc_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2304,7 +2304,7 @@ aes_p8_xts_decrypt: .Lxts_dec_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2635,11 +2635,11 @@ _aesp8_xts_encrypt6x: beq .Lxts_enc6x_zero cmpwi 5,0x20 blt .Lxts_enc6x_one - nop + nop beq .Lxts_enc6x_two cmpwi 5,0x40 blt .Lxts_enc6x_three - nop + nop beq .Lxts_enc6x_four .Lxts_enc6x_five: @@ -2736,7 +2736,7 @@ _aesp8_xts_encrypt6x: .align 4 .Lxts_enc6x_one: vxor 7,5,17 - nop + nop .Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2872,7 +2872,7 @@ _aesp8_xts_encrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2957,7 +2957,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3285,11 +3285,11 @@ _aesp8_xts_decrypt6x: beq .Lxts_dec6x_zero cmpwi 5,0x20 blt .Lxts_dec6x_one - nop + nop beq .Lxts_dec6x_two cmpwi 5,0x40 blt .Lxts_dec6x_three - nop + nop beq .Lxts_dec6x_four .Lxts_dec6x_five: @@ -3390,7 +3390,7 @@ _aesp8_xts_decrypt6x: .align 4 .Lxts_dec6x_one: vxor 7,5,17 - nop + nop .Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3560,7 +3560,7 @@ _aesp8_xts_decrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3645,6 +3645,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s index abd3016384..74d9d5f5ce 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s @@ -96,7 +96,7 @@ _vpaes_consts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -136,7 +136,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -224,7 +224,7 @@ _vpaes_encrypt_core: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -321,7 +321,7 @@ vpaes_encrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -363,7 +363,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -458,7 +458,7 @@ _vpaes_decrypt_core: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -555,7 +555,7 @@ vpaes_decrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -784,7 +784,7 @@ vpaes_cbc_encrypt: ld 31,264(1) mtlr 0 addi 1,1,272 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -838,7 +838,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1084,7 +1084,7 @@ _vpaes_schedule_core: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1112,7 +1112,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 9, 6, 16-8 vsldoi 6, 6, 9, 16-8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1178,7 +1178,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1200,7 +1200,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1252,7 +1252,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 .Lschedule_mangle_dec: @@ -1303,7 +1303,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1381,7 +1381,7 @@ vpaes_set_encrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1466,7 +1466,7 @@ vpaes_set_decrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s index 146f9af69d..c846a555af 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s @@ -238,7 +238,7 @@ bn_sqr_comba4: std 9,48(3) std 10,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -667,7 +667,7 @@ bn_sqr_comba8: std 9, 120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -822,7 +822,7 @@ bn_mul_comba4: std 10,48(3) std 11,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1362,7 +1362,7 @@ bn_mul_comba8: adde 10,10,9 std 12,112(3) std 10,120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1414,7 +1414,7 @@ bn_sub_words: .Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1461,7 +1461,7 @@ bn_add_words: bdnz .Lppcasm_add_mainloop .Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1491,7 +1491,7 @@ bn_div_words: cmpldi 0,5,0 bne .Lppcasm_div1 li 3,-1 - blr + blr .Lppcasm_div1: xor 0,0,0 li 8,64 @@ -1578,7 +1578,7 @@ bn_div_words: b .Lppcasm_divouterloop .Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1621,7 +1621,7 @@ bn_sqr_words: stdu 8,8(3) bdnz .Lppcasm_sqr_mainloop .Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1728,7 +1728,7 @@ bn_mul_words: .Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1855,7 +1855,7 @@ bn_mul_add_words: .Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s index 83b5f96f13..763ad1a55b 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s @@ -183,15 +183,16 @@ bn_mul_mont_int: li 21,0 mtctr 8 subfe 3,21,3 - and 4,22,3 - andc 6,9,3 - or 4,4,6 .align 4 .Lcopy: - ldx 12,4,21 - stdx 12,9,21 + ldx 12,22,21 + ldx 10,9,21 + and 12,12,3 + andc 10,10,3 stdx 21,22,21 + or 10,10,12 + stdx 10,9,21 addi 21,21,8 bdnz .Lcopy @@ -210,7 +211,7 @@ bn_mul_mont_int: ld 30,-16(12) ld 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s index 520b855991..5bafae2b27 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s @@ -682,16 +682,14 @@ bn_mul_mont_fpu64: li 12,0 subfe 3,12,3 - and 4,10,3 - andc 6,9,3 - or 4,4,6 - addi 31,4,8 mtctr 11 .align 4 .Lcopy: - ldx 24,4,12 - ldx 25,31,12 + ldx 24,10,12 + ldx 25,28,12 + ldx 26,9,12 + ldx 27,30,12 std 12,8(22) std 12,16(22) std 12,24(22) @@ -700,6 +698,12 @@ bn_mul_mont_fpu64: std 12,48(22) std 12,56(22) stdu 12,64(22) + and 24,24,3 + and 25,25,3 + andc 26,26,3 + andc 27,27,3 + or 24,24,26 + or 25,25,27 stdx 24,9,12 stdx 25,30,12 stdx 12,10,12 @@ -734,7 +738,7 @@ bn_mul_mont_fpu64: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h index db18e0e136..6247ce31fe 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Tue Apr 3 00:38:42 2018" +#define DATE "built on: Tue Nov 20 09:38:38 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s index d5173a6b2b..dafa6a1eb5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s @@ -62,7 +62,7 @@ __ChaCha20_ctr32_int: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -284,7 +284,7 @@ __ChaCha20_1x: bne .Loop_outer - blr + blr .align 4 .Ltail: @@ -335,7 +335,7 @@ __ChaCha20_1x: stw 1,104(1) stw 1,108(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -495,7 +495,7 @@ ChaCha20_ctr32_vmx: vspltisw 27,7 mtctr 0 - nop + nop .Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -924,7 +924,7 @@ ChaCha20_ctr32_vmx: cmpldi 5,255 bgt .Loop_outer_vmx - nop + nop .Ldone_vmx: cmpldi 5,0 @@ -977,7 +977,7 @@ ChaCha20_ctr32_vmx: ld 31,456(1) mtlr 0 addi 1,1,464 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -990,7 +990,7 @@ ChaCha20_ctr32_vmx: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s index ec8ae8c05f..c5ace016e1 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s @@ -125,7 +125,7 @@ gcm_init_p8: .long 0x7E4A1F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -176,7 +176,7 @@ gcm_gmult_p8: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -294,7 +294,7 @@ gcm_ghash_p8: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -561,7 +561,7 @@ gcm_ghash_p8: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s index 247885f631..de5c728fe1 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s @@ -28,7 +28,7 @@ poly1305_init_int: .Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .size poly1305_init_int,.-poly1305_init_int @@ -117,7 +117,7 @@ poly1305_blocks: ld 31,184(1) addi 1,1,192 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,5,4,0 .size poly1305_blocks,.-poly1305_blocks @@ -150,7 +150,7 @@ poly1305_emit: adde 8,8,5 std 7,0(4) std 8,8(4) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .size poly1305_emit,.-poly1305_emit diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s index 0ddf681308..bf94546c85 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s @@ -148,7 +148,7 @@ poly1305_init_fpu: .Lno_key: xor 3,3,3 addi 1,1,48 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 .size poly1305_init_fpu,.-poly1305_init_fpu @@ -465,7 +465,7 @@ poly1305_blocks_fpu: lfd 31,232(1) addi 1,1,240 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 .size poly1305_blocks_fpu,.-poly1305_blocks_fpu @@ -549,7 +549,7 @@ poly1305_emit_fpu: ld 30,64(1) ld 31,72(1) addi 1,1,80 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit_fpu,.-poly1305_emit_fpu @@ -560,7 +560,7 @@ poly1305_emit_fpu: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s index a2b975fbe2..6a859efc09 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s @@ -8,7 +8,7 @@ OPENSSL_fpu_probe: .localentry OPENSSL_fpu_probe,0 fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_fpu_probe,.-OPENSSL_fpu_probe @@ -19,7 +19,7 @@ OPENSSL_ppc64_probe: .localentry OPENSSL_ppc64_probe,0 fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_ppc64_probe,.-OPENSSL_ppc64_probe @@ -30,7 +30,7 @@ OPENSSL_ppc64_probe: OPENSSL_altivec_probe: .localentry OPENSSL_altivec_probe,0 .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_altivec_probe,.-OPENSSL_altivec_probe @@ -42,7 +42,7 @@ OPENSSL_crypto207_probe: .localentry OPENSSL_crypto207_probe,0 .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_crypto207_probe,.-OPENSSL_crypto207_probe @@ -55,7 +55,7 @@ OPENSSL_madd300_probe: xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -89,7 +89,7 @@ OPENSSL_wipe_cpu: xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu @@ -104,7 +104,7 @@ OPENSSL_atomic_add: stwcx. 0,0,3 bne- .Ladd extsw 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -116,7 +116,7 @@ OPENSSL_atomic_add: OPENSSL_rdtsc: .localentry OPENSSL_rdtsc,0 mftb 3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_rdtsc,.-OPENSSL_rdtsc @@ -135,7 +135,7 @@ OPENSSL_cleanse: stb 0,0(3) addi 3,3,1 bdnz $-8 - blr + blr .Lot: andi. 5,3,3 beq .Laligned stb 0,0(3) @@ -150,7 +150,7 @@ OPENSSL_cleanse: bdnz $-8 andi. 4,4,3 bne .Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -178,7 +178,7 @@ CRYPTO_memcmp: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -211,7 +211,7 @@ OPENSSL_instrument_bus: bdnz .Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -265,7 +265,7 @@ OPENSSL_instrument_bus2: .Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s index 3b6f4a492c..ca4da78395 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s @@ -103,7 +103,7 @@ sha1_block_data_order: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1159,7 +1159,7 @@ sha1_block_data_order: mr 11,20 addi 4,4,64 bdnz .Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha1_block_data_order,.-sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s index 0c1539013d..2e0c25a0c7 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s @@ -123,7 +123,7 @@ sha256_block_ppc: ld 31,312(1) mtlr 0 addi 1,1,320 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1337,7 +1337,7 @@ sha256_block_ppc: cmpld 31,5 stw 15,28(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha256_block_ppc,.-sha256_block_ppc @@ -1348,7 +1348,7 @@ sha256_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s index 8536cf5e99..80d4942b94 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s @@ -783,7 +783,7 @@ sha256_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -795,7 +795,7 @@ sha256_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s index 89d26735a5..9c40d44b0b 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s @@ -123,7 +123,7 @@ sha512_block_ppc: ld 31,376(1) mtlr 0 addi 1,1,384 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1417,7 +1417,7 @@ sha512_block_ppc: cmpld 31,5 std 15,56(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha512_block_ppc,.-sha512_block_ppc @@ -1428,7 +1428,7 @@ sha512_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s index 2214209e7d..408e974ea5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s @@ -788,7 +788,7 @@ sha512_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -800,7 +800,7 @@ sha512_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h index 3976dadb19..8bd973e750 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi index c8d2c69df2..41598e5287 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi @@ -217,6 +217,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,6 +402,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -577,6 +579,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm index 00ea347e49..22b293cbd0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64le", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1076,6 +1076,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1242,10 +1246,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3932,6 +3948,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5061,6 +5083,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6210,6 +6238,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7197,6 +7231,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7302,6 +7340,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7369,8 +7411,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7391,10 +7433,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7550,6 +7605,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7574,6 +7630,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7590,7 +7647,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7657,709 +7717,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9083,6 +8702,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9819,6 +9442,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10523,6 +10150,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11042,6 +10673,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11226,6 +10858,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11402,6 +11035,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12405,6 +12039,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12605,6 +12248,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12754,6 +12405,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12762,6 +12421,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h index 1a4d84b065..e24a2b72e1 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Tue Apr 3 00:38:43 2018" +#define DATE "built on: Tue Nov 20 09:38:41 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h index af3a003d51..08bf3d4394 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi index 4f068803a3..34291bbb73 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm index 31589f2288..3c5848328c 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x32", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3994,6 +4010,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5135,6 +5157,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6332,6 +6360,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7331,6 +7365,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7436,6 +7474,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7503,8 +7545,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7525,10 +7567,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7684,6 +7739,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7708,6 +7764,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7724,7 +7781,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7791,709 +7851,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9257,6 +8876,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -10001,6 +9624,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10737,6 +10364,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11274,6 +10905,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11460,6 +11092,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11644,6 +11277,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12649,6 +12283,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12849,6 +12492,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12998,6 +12649,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -13006,6 +12665,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s index aa7a1ea1cf..488ae6d781 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s index d493797832..3dcd55d3f5 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s index c7c53e8771..ca193ddb9e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s index 70eed05b00..427a1c7d12 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s index cd8b00f259..e18f87c4e6 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s index 0fd201167f..c76c5a8afb 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s index bf7c2b0b6f..d193298940 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s index a2cccde636..ee619092c9 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s index b6797a6849..795cebe1d7 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s index f4e5337565..a0b78a0565 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s index d19d4662b4..3a78cd8440 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax - leaq (%rsp),%rsi movq %r9,%r15 - jmp .Lsub + .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsi,%r14,8),%rax + movq 8(%rsp,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax - movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx + movq %r9,(%rsp,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi + leaq -4(%r9),%r15 movq 0(%rsp),%rax - pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r9 + shrq $2,%r15 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,9 +585,7 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - leaq -1(%r9),%r15 - jmp .Lsub4x -.align 16 + .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -614,34 +612,35 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx - leaq -1(%r9),%r15 - orq %rcx,%rsi - - movdqu (%rsi),%xmm1 - movdqa %xmm0,(%rsp) - movdqu %xmm1,(%rdi) + pxor %xmm0,%xmm0 +.byte 102,72,15,110,224 + pcmpeqd %xmm5,%xmm5 + pshufd $0,%xmm4,%xmm4 + movq %r9,%r15 + pxor %xmm4,%xmm5 + shrq $2,%r15 + xorl %eax,%eax + jmp .Lcopy4x .align 16 .Lcopy4x: - movdqu 16(%rsi,%r14,1),%xmm2 - movdqu 32(%rsi,%r14,1),%xmm1 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) - movdqa %xmm0,32(%rsp,%r14,1) - movdqu %xmm1,32(%rdi,%r14,1) - leaq 32(%r14),%r14 + movdqa (%rsp,%rax,1),%xmm1 + movdqu (%rdi,%rax,1),%xmm2 + pand %xmm4,%xmm1 + pand %xmm5,%xmm2 + movdqa 16(%rsp,%rax,1),%xmm3 + movdqa %xmm0,(%rsp,%rax,1) + por %xmm2,%xmm1 + movdqu 16(%rdi,%rax,1),%xmm2 + movdqu %xmm1,(%rdi,%rax,1) + pand %xmm4,%xmm3 + pand %xmm5,%xmm2 + movdqa %xmm0,16(%rsp,%rax,1) + por %xmm2,%xmm3 + movdqu %xmm3,16(%rdi,%rax,1) + leaq 32(%rax),%rax decq %r15 jnz .Lcopy4x - - shlq $2,%r9 - movdqu 16(%rsi,%r14,1),%xmm2 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s index a2fccf088e..0dd53512f9 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,18 +393,19 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h index 373b56f423..9689f1ea0f 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x32" -#define DATE "built on: Tue Apr 3 00:38:29 2018" +#define DATE "built on: Tue Nov 20 09:38:08 2018" diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s index 1117381f31..1dead91b17 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s index 044b8f031e..a9fed05fd7 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s index ce86d5d969..62a7ac611f 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s index 0aa90515d6..0defe666bb 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s index d1a1c895a3..21e49925f1 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s index 10f5987415..0116ef1c94 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s index 0d401b7e47..5a05965c80 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s index 9c7110f4ef..aab3c6db13 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s index bdd0da3bd1..781b48b9eb 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s index d2857f3288..d266d776ec 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s index 195a148bb9..dbeebed9a0 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s index bd72a459ab..f2896b4d6e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s index 23b932e1de..8264a7dbdf 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s index a1021c17a9..6f8488a38a 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s index f83130ea68..a4d55b6afc 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s index 5a109c6fd9..7e1f5e2740 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s index 3e5ab736fd..38c02c188e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h index 510bac93ae..546f077108 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi index 99963ad8f4..f3bfdd9737 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi @@ -215,6 +215,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -572,6 +574,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm index e6503fe62c..3d937ac91d 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x32", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3933,6 +3949,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5062,6 +5084,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6211,6 +6239,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7198,6 +7232,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7303,6 +7341,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7370,8 +7412,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7392,10 +7434,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7551,6 +7606,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7575,6 +7631,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7591,7 +7648,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7658,709 +7718,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9084,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9443,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10151,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10674,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10859,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11036,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12040,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12249,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12406,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12422,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h index c45d8db17e..356e92607e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x32" -#define DATE "built on: Tue Apr 3 00:38:33 2018" +#define DATE "built on: Tue Nov 20 09:38:17 2018" diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h index cbe32f64d8..9540032788 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi index 014e893b95..f7cb5e2b9e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm index 9e9bd8b787..2acb2a7d76 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x86_64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3994,6 +4010,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5135,6 +5157,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6332,6 +6360,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7331,6 +7365,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7436,6 +7474,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7525,10 +7567,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7684,6 +7739,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7708,6 +7764,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7724,7 +7781,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7791,447 +7851,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9257,6 +8876,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -10001,6 +9624,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10737,6 +10364,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11274,6 +10905,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11460,6 +11092,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11644,6 +11277,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12649,6 +12283,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12849,6 +12492,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12998,6 +12649,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -13006,6 +12665,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s index aa7a1ea1cf..488ae6d781 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s index d493797832..3dcd55d3f5 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s index c7c53e8771..ca193ddb9e 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s index 70eed05b00..427a1c7d12 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s index cd8b00f259..e18f87c4e6 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s index 0fd201167f..c76c5a8afb 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s index bf7c2b0b6f..d193298940 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s index a2cccde636..ee619092c9 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s index b6797a6849..795cebe1d7 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s index f4e5337565..a0b78a0565 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s index d19d4662b4..3a78cd8440 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax - leaq (%rsp),%rsi movq %r9,%r15 - jmp .Lsub + .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsi,%r14,8),%rax + movq 8(%rsp,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax - movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx + movq %r9,(%rsp,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi + leaq -4(%r9),%r15 movq 0(%rsp),%rax - pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r9 + shrq $2,%r15 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,9 +585,7 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - leaq -1(%r9),%r15 - jmp .Lsub4x -.align 16 + .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -614,34 +612,35 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx - leaq -1(%r9),%r15 - orq %rcx,%rsi - - movdqu (%rsi),%xmm1 - movdqa %xmm0,(%rsp) - movdqu %xmm1,(%rdi) + pxor %xmm0,%xmm0 +.byte 102,72,15,110,224 + pcmpeqd %xmm5,%xmm5 + pshufd $0,%xmm4,%xmm4 + movq %r9,%r15 + pxor %xmm4,%xmm5 + shrq $2,%r15 + xorl %eax,%eax + jmp .Lcopy4x .align 16 .Lcopy4x: - movdqu 16(%rsi,%r14,1),%xmm2 - movdqu 32(%rsi,%r14,1),%xmm1 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) - movdqa %xmm0,32(%rsp,%r14,1) - movdqu %xmm1,32(%rdi,%r14,1) - leaq 32(%r14),%r14 + movdqa (%rsp,%rax,1),%xmm1 + movdqu (%rdi,%rax,1),%xmm2 + pand %xmm4,%xmm1 + pand %xmm5,%xmm2 + movdqa 16(%rsp,%rax,1),%xmm3 + movdqa %xmm0,(%rsp,%rax,1) + por %xmm2,%xmm1 + movdqu 16(%rdi,%rax,1),%xmm2 + movdqu %xmm1,(%rdi,%rax,1) + pand %xmm4,%xmm3 + pand %xmm5,%xmm2 + movdqa %xmm0,16(%rsp,%rax,1) + por %xmm2,%xmm3 + movdqu %xmm3,16(%rdi,%rax,1) + leaq 32(%rax),%rax decq %r15 jnz .Lcopy4x - - shlq $2,%r9 - movdqu 16(%rsi,%r14,1),%xmm2 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s index a2fccf088e..0dd53512f9 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,18 +393,19 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h index 4e13db139d..70d5c7e424 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Tue Apr 3 00:38:34 2018" +#define DATE "built on: Tue Nov 20 09:38:19 2018" diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s index 1117381f31..1dead91b17 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s index 044b8f031e..a9fed05fd7 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s index ce86d5d969..62a7ac611f 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s index 0aa90515d6..0defe666bb 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s index d1a1c895a3..21e49925f1 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s index 10f5987415..0116ef1c94 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s index 5662696481..8b2e361ea1 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s index 9c7110f4ef..aab3c6db13 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s index bdd0da3bd1..781b48b9eb 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s index d2857f3288..d266d776ec 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s index 195a148bb9..dbeebed9a0 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s index bd72a459ab..f2896b4d6e 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s index 23b932e1de..8264a7dbdf 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s index a1021c17a9..6f8488a38a 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s index f83130ea68..a4d55b6afc 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s index 5a109c6fd9..7e1f5e2740 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s index 3e5ab736fd..38c02c188e 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h index 9df0f86ed6..7dd2101053 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index 69169eaaee..7e9040babc 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -215,6 +215,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -572,6 +574,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm index 2e79f043b3..510e1c88f4 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x86_64", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3933,6 +3949,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5062,6 +5084,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6211,6 +6239,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7198,6 +7232,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7303,6 +7341,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7371,8 +7413,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "test", "include", + "test", ".", ], "test/threadstest.o" => @@ -7392,10 +7434,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7551,6 +7606,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7575,6 +7631,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7591,7 +7648,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7658,709 +7718,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9084,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9443,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10151,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10674,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10859,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11036,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12040,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12249,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12406,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12422,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h index 131636a641..245939e5e7 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Tue Apr 3 00:38:38 2018" +#define DATE "built on: Tue Nov 20 09:38:28 2018" diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h index e20916814d..7b122bd86e 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi index 7232d4e55e..fe9f801862 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 47d017c24a..811d022c71 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux32-s390x", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3934,6 +3950,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5063,6 +5085,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6227,6 +6255,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7214,6 +7248,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7319,6 +7357,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7386,9 +7428,9 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", "include", + "test", ".", ], "test/threadstest.o" => @@ -7408,10 +7450,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7567,6 +7622,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7591,6 +7647,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7607,7 +7664,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7674,709 +7734,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9104,6 +8723,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9840,6 +9463,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10564,6 +10191,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11084,6 +10715,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11268,6 +10900,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11449,6 +11082,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12452,6 +12086,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12652,6 +12295,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12801,6 +12452,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12809,6 +12468,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S index 71138f8176..541636080c 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S @@ -458,7 +458,7 @@ _s390x_AES_encrypt: or %r9,%r1 or %r2,%r6 or %r3,%r7 - + srlg %r5,%r10,5 # i0 srlg %r6,%r10,13 # i1 nr %r5,%r0 @@ -511,7 +511,7 @@ _s390x_AES_encrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_encrypt,.-_s390x_AES_encrypt .type AES_Td,@object .align 256 @@ -1015,7 +1015,7 @@ _s390x_AES_decrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_decrypt,.-_s390x_AES_decrypt # void AES_set_encrypt_key(const unsigned char *in, int bits, # AES_KEY *key) { @@ -1496,7 +1496,7 @@ AES_cbc_encrypt: .Lcbc_enc_done: l %r6,6*4(%r15) st %r8,0(%r6) - st %r9,4(%r6) + st %r9,4(%r6) st %r10,8(%r6) st %r11,12(%r6) @@ -1744,7 +1744,7 @@ _s390x_xts_km: llgc %r3,2*4-1(%r15) nill %r3,0x0f # %r3%=16 br %r14 - + .align 16 .Lxts_km_vanilla: # prepare and allocate stack frame at the top of 4K page @@ -1961,7 +1961,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,80+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2012,7 +2012,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,80+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2190,7 +2190,7 @@ AES_xts_decrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,80+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S index cb7743cfea..0a6c67545a 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S @@ -152,16 +152,16 @@ bn_mul_mont: brct %r14,.Lsub lghi %r8,0 slbgr %r12,%r8 # handle upmost carry - - ngr %r3,%r12 - lghi %r5,-1 - xgr %r5,%r12 - ngr %r5,%r2 - ogr %r3,%r5 # ap=borrow?tp:rp + lghi %r13,-1 + xgr %r13,%r12 la %r7,0(%r0) lgr %r14,%r1 -.Lcopy: lg %r9,0(%r7,%r3) # copy or in-place refresh +.Lcopy: lg %r8,96(%r7,%r15) # conditional copy + lg %r9,0(%r7,%r2) + ngr %r8,%r12 + ngr %r9,%r13 + ogr %r9,%r8 rllg %r9,%r9,32 stg %r7,96(%r7,%r15) # zap tp stg %r9,0(%r7,%r2) diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h index 64e7f072a3..e28d2b1884 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -30,4 +30,4 @@ static const char cflags[] = { 'e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Tue Apr 3 00:38:44 2018" +#define DATE "built on: Tue Nov 20 09:38:42 2018" diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S index 88c26122cc..4a006d9c5d 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S @@ -41,7 +41,7 @@ gcm_ghash_4bit: lg %r0,0+1(%r2) lghi %r12,0 .Louter: - xg %r0,0(%r4) # Xi ^= inp + xg %r0,0(%r4) # Xi ^= inp xg %r1,8(%r4) xgr %r0,%r12 stg %r1,8+1(%r2) diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S index cf1b7819a1..f02c836633 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S @@ -1234,7 +1234,7 @@ sha256_block_data_order: cl %r3,176(%r15) jne .Lloop - lm %r6,%r15,184(%r15) + lm %r6,%r15,184(%r15) br %r14 .size sha256_block_data_order,.-sha256_block_data_order .string "SHA256 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S index 6900891667..3d682e8658 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S @@ -1258,7 +1258,7 @@ sha512_block_data_order: cl %r3,240(%r15) jne .Lloop - lm %r6,%r15,248(%r15) + lm %r6,%r15,248(%r15) br %r14 .size sha512_block_data_order,.-sha512_block_data_order .string "SHA512 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h index 2f9817e43b..21dd8cc643 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi index ffff267d09..1474182807 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi @@ -216,6 +216,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -575,6 +577,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm index 5d1929317b..0fcbf6e406 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux32-s390x", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3927,6 +3943,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5056,6 +5078,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6205,6 +6233,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7192,6 +7226,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7297,6 +7335,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7386,10 +7428,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7545,6 +7600,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7569,6 +7625,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7585,7 +7642,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7652,447 +7712,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9074,6 +8693,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9810,6 +9433,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10514,6 +10141,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11032,6 +10663,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11216,6 +10848,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11392,6 +11025,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12395,6 +12029,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12595,6 +12238,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12744,6 +12395,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12752,6 +12411,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h index d79eb3ca2a..103c712bb3 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Tue Apr 3 00:38:45 2018" +#define DATE "built on: Tue Nov 20 09:38:44 2018" diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h index 1f0c62b3c9..5ba3b88d4e 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi index d3be0776df..d174275b36 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi @@ -218,6 +218,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -402,6 +403,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -578,6 +580,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index ebdafeb184..475bd469c1 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux64-s390x", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3934,6 +3950,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5063,6 +5085,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6227,6 +6255,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7214,6 +7248,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7319,6 +7357,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7408,10 +7450,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7567,6 +7622,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7591,6 +7647,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7607,7 +7664,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7674,447 +7734,6 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => - [ - ], - "fuzz/asn1-test" => - [ - ], - "fuzz/asn1parse-test" => - [ - ], - "fuzz/bignum-test" => - [ - ], - "fuzz/bndiv-test" => - [ - ], - "fuzz/cms-test" => - [ - ], - "fuzz/conf-test" => - [ - ], - "fuzz/crl-test" => - [ - ], - "fuzz/ct-test" => - [ - ], - "fuzz/server-test" => - [ - ], - "fuzz/x509-test" => - [ - ], - "libcrypto" => - [ - ], - "libssl" => - [ - ], - "test/aborttest" => - [ - ], - "test/afalgtest" => - [ - ], - "test/asynciotest" => - [ - ], - "test/asynctest" => - [ - ], - "test/bad_dtls_test" => - [ - ], - "test/bftest" => - [ - ], - "test/bio_enc_test" => - [ - ], - "test/bioprinttest" => - [ - ], - "test/bntest" => - [ - ], - "test/buildtest_aes" => - [ - ], - "test/buildtest_asn1" => - [ - ], - "test/buildtest_asn1t" => - [ - ], - "test/buildtest_async" => - [ - ], - "test/buildtest_bio" => - [ - ], - "test/buildtest_blowfish" => - [ - ], - "test/buildtest_bn" => - [ - ], - "test/buildtest_buffer" => - [ - ], - "test/buildtest_camellia" => - [ - ], - "test/buildtest_cast" => - [ - ], - "test/buildtest_cmac" => - [ - ], - "test/buildtest_cms" => - [ - ], - "test/buildtest_conf" => - [ - ], - "test/buildtest_conf_api" => - [ - ], - "test/buildtest_crypto" => - [ - ], - "test/buildtest_ct" => - [ - ], - "test/buildtest_des" => - [ - ], - "test/buildtest_dh" => - [ - ], - "test/buildtest_dsa" => - [ - ], - "test/buildtest_dtls1" => - [ - ], - "test/buildtest_e_os2" => - [ - ], - "test/buildtest_ebcdic" => - [ - ], - "test/buildtest_ec" => - [ - ], - "test/buildtest_ecdh" => - [ - ], - "test/buildtest_ecdsa" => - [ - ], - "test/buildtest_engine" => - [ - ], - "test/buildtest_err" => - [ - ], - "test/buildtest_evp" => - [ - ], - "test/buildtest_hmac" => - [ - ], - "test/buildtest_idea" => - [ - ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], }, "sources" => { @@ -9104,6 +8723,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9840,6 +9463,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10564,6 +10191,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11084,6 +10715,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11268,6 +10900,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11449,6 +11082,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12452,6 +12086,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12652,6 +12295,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12801,6 +12452,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12809,6 +12468,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S index 1a1e4c224d..a44e72d047 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S @@ -458,7 +458,7 @@ _s390x_AES_encrypt: or %r9,%r1 or %r2,%r6 or %r3,%r7 - + srlg %r5,%r10,5 # i0 srlg %r6,%r10,13 # i1 nr %r5,%r0 @@ -511,7 +511,7 @@ _s390x_AES_encrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_encrypt,.-_s390x_AES_encrypt .type AES_Td,@object .align 256 @@ -1015,7 +1015,7 @@ _s390x_AES_decrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_decrypt,.-_s390x_AES_decrypt # void AES_set_encrypt_key(const unsigned char *in, int bits, # AES_KEY *key) { @@ -1496,7 +1496,7 @@ AES_cbc_encrypt: .Lcbc_enc_done: lg %r6,6*8(%r15) st %r8,0(%r6) - st %r9,4(%r6) + st %r9,4(%r6) st %r10,8(%r6) st %r11,12(%r6) @@ -1744,7 +1744,7 @@ _s390x_xts_km: llgc %r3,2*8-1(%r15) nill %r3,0x0f # %r3%=16 br %r14 - + .align 16 .Lxts_km_vanilla: # prepare and allocate stack frame at the top of 4K page @@ -1960,7 +1960,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,144+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2011,7 +2011,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,144+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2188,7 +2188,7 @@ AES_xts_decrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,144+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s index e0b0822cae..1b90426659 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s @@ -206,7 +206,7 @@ bn_GF2m_mul_2x2: xgr %r4,%r7 xgr %r3,%r6 xgr %r4,%r8 - xgr %r3,%r9 + xgr %r3,%r9 xgr %r4,%r9 xgr %r3,%r4 stg %r4,16(%r2) diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S index c4ee541906..b8dea0a66f 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S @@ -26,12 +26,12 @@ bn_mul_mont: la %r4,0(%r7,%r4) # restore %r4 ahi %r1,-1 # adjust %r1 for inner loop lg %r6,0(%r6) # pull n0 - + lg %r2,0(%r4) - + lg %r9,0(%r3) - + mlgr %r8,%r2 # ap[0]*bp[0] lgr %r12,%r8 @@ -39,7 +39,7 @@ bn_mul_mont: msgr %r0,%r6 lg %r11,0(%r5) # - + mlgr %r10,%r0 # np[0]*m1 algr %r11,%r9 # +="tp[0]" lghi %r13,0 @@ -51,14 +51,14 @@ bn_mul_mont: .align 16 .L1st: lg %r9,0(%r7,%r3) - + mlgr %r8,%r2 # ap[j]*bp[0] algr %r9,%r12 lghi %r12,0 alcgr %r12,%r8 lg %r11,0(%r7,%r5) - + mlgr %r10,%r0 # np[j]*m1 algr %r11,%r13 lghi %r13,0 @@ -79,9 +79,9 @@ bn_mul_mont: .Louter: lg %r2,0(%r4) # bp[i] - + lg %r9,0(%r3) - + mlgr %r8,%r2 # ap[0]*bp[i] alg %r9,160(%r15) # +=tp[0] lghi %r12,0 @@ -91,7 +91,7 @@ bn_mul_mont: msgr %r0,%r6 # tp[0]*n0 lg %r11,0(%r5) # np[0] - + mlgr %r10,%r0 # np[0]*m1 algr %r11,%r9 # +="tp[0]" lghi %r13,0 @@ -103,7 +103,7 @@ bn_mul_mont: .align 16 .Linner: lg %r9,0(%r7,%r3) - + mlgr %r8,%r2 # ap[j]*bp[i] algr %r9,%r12 lghi %r12,0 @@ -112,7 +112,7 @@ bn_mul_mont: alcgr %r12,%r8 lg %r11,0(%r7,%r5) - + mlgr %r10,%r0 # np[j]*m1 algr %r11,%r13 lghi %r13,0 @@ -145,24 +145,24 @@ bn_mul_mont: lr %r14,%r1 .Lsub: lg %r9,0(%r7,%r3) lg %r11,0(%r7,%r5) - + slbgr %r9,%r11 stg %r9,0(%r7,%r2) la %r7,8(%r7) brct %r14,.Lsub lghi %r8,0 slbgr %r12,%r8 # handle upmost carry - - ngr %r3,%r12 - lghi %r5,-1 - xgr %r5,%r12 - ngr %r5,%r2 - ogr %r3,%r5 # ap=borrow?tp:rp + lghi %r13,-1 + xgr %r13,%r12 la %r7,0(%r0) lgr %r14,%r1 -.Lcopy: lg %r9,0(%r7,%r3) # copy or in-place refresh - +.Lcopy: lg %r8,160(%r7,%r15) # conditional copy + lg %r9,0(%r7,%r2) + ngr %r8,%r12 + ngr %r9,%r13 + ogr %r9,%r8 + stg %r7,160(%r7,%r15) # zap tp stg %r9,0(%r7,%r2) la %r7,8(%r7) diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h index 0539055a2c..2f2e17886a 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -30,4 +30,4 @@ static const char cflags[] = { 'e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Tue Apr 3 00:38:46 2018" +#define DATE "built on: Tue Nov 20 09:38:47 2018" diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S index a1c0217590..6dfaa76c35 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S @@ -40,7 +40,7 @@ gcm_ghash_4bit: lg %r0,0+1(%r2) lghi %r12,0 .Louter: - xg %r0,0(%r4) # Xi ^= inp + xg %r0,0(%r4) # Xi ^= inp xg %r1,8(%r4) xgr %r0,%r12 stg %r1,8+1(%r2) diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S index 28cbb63752..e66c672764 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S @@ -1234,7 +1234,7 @@ sha256_block_data_order: clg %r3,256(%r15) jne .Lloop - lmg %r6,%r15,272(%r15) + lmg %r6,%r15,272(%r15) br %r14 .size sha256_block_data_order,.-sha256_block_data_order .string "SHA256 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S index 77c99e416b..5ff5c6bf9f 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S @@ -1258,7 +1258,7 @@ sha512_block_data_order: clg %r3,320(%r15) jne .Lloop - lmg %r6,%r15,336(%r15) + lmg %r6,%r15,336(%r15) br %r14 .size sha512_block_data_order,.-sha512_block_data_order .string "SHA512 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h index 3976dadb19..8bd973e750 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi index 30272e9dbc..fcae58e93e 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi @@ -216,6 +216,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -575,6 +577,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm index 5c9cbdcf00..cf41d1a8ac 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux64-s390x", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3933,6 +3949,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5062,6 +5084,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6211,6 +6239,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7198,6 +7232,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7303,6 +7341,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7371,8 +7413,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "test", "include", + "test", ".", ], "test/threadstest.o" => @@ -7392,10 +7434,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7551,6 +7606,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7575,6 +7631,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7591,7 +7648,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7658,709 +7718,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9084,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9443,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10151,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10674,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10859,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11036,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12040,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12249,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12406,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12422,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h index a52b3fe333..f454793ad3 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Tue Apr 3 00:38:47 2018" +#define DATE "built on: Tue Nov 20 09:38:48 2018" diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h index af3a003d51..08bf3d4394 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi index 37430ef795..bb0d0771c1 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm index bebfecbdce..541ce9980b 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris-x86-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3945,6 +3961,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5086,6 +5108,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6271,6 +6299,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7270,6 +7304,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7375,6 +7413,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7442,9 +7484,9 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", "include", + "test", ".", ], "test/threadstest.o" => @@ -7464,10 +7506,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7623,6 +7678,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7647,6 +7703,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7663,7 +7720,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7730,709 +7790,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9164,6 +8783,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9908,6 +9531,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10636,6 +10263,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11165,6 +10796,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11351,6 +10983,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11533,6 +11166,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12538,6 +12172,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12738,6 +12381,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12887,6 +12538,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12895,6 +12554,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s index 945d9e5824..8212ff0825 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s @@ -445,16 +445,18 @@ bn_mul_mont: leal 1(%edx),%edx jge .L017sub sbbl $0,%eax - andl %eax,%esi - notl %eax - movl %edi,%ebp - andl %eax,%ebp - orl %ebp,%esi + movl $-1,%edx + xorl %eax,%edx + jmp .L018copy .align 16 .L018copy: - movl (%esi,%ebx,4),%eax - movl %eax,(%edi,%ebx,4) + movl 32(%esp,%ebx,4),%esi + movl (%edi,%ebx,4),%ebp movl %ecx,32(%esp,%ebx,4) + andl %eax,%esi + andl %edx,%ebp + orl %esi,%ebp + movl %ebp,(%edi,%ebx,4) decl %ebx jge .L018copy movl 24(%esp),%esp diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h index 864103a8dc..3a93af610a 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h @@ -37,4 +37,4 @@ static const char cflags[] = { '"',' ','\0' }; #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Tue Apr 3 00:38:47 2018" +#define DATE "built on: Tue Nov 20 09:38:50 2018" diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s index cbccc5ebf7..9092d66321 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s @@ -3857,7 +3857,7 @@ ecp_nistz256_scatter_w7: movl 20(%esp),%edi movl 24(%esp),%esi movl 28(%esp),%ebp - leal -1(%edi,%ebp,1),%edi + leal (%edi,%ebp,1),%edi movl $16,%ebp .L007scatter_w7_loop: movl (%esi),%eax diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h index e819a68f0b..b9d6509c0b 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi index af1d87642d..46404972a5 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi @@ -211,6 +211,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -394,6 +395,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -567,6 +569,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm index f6f187ac6d..4df2be4157 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris-x86-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1075,6 +1075,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1241,10 +1245,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3931,6 +3947,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5060,6 +5082,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6209,6 +6237,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7196,6 +7230,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7301,6 +7339,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7369,8 +7411,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "test", "include", + "test", ".", ], "test/threadstest.o" => @@ -7390,10 +7432,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7549,6 +7604,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7573,6 +7629,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7589,7 +7646,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7656,709 +7716,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9082,6 +8701,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9818,6 +9441,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10522,6 +10149,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11041,6 +10672,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11225,6 +10857,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11401,6 +11034,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12404,6 +12038,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12604,6 +12247,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12753,6 +12404,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12761,6 +12420,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h index e3ba51d54c..217d42d422 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Tue Apr 3 00:38:49 2018" +#define DATE "built on: Tue Nov 20 09:38:54 2018" diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h index b20dbd0212..d0fb48f465 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi index 4d880dad4e..d25eac7b3e 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm index 4f080d8013..278eea138c 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris64-x86_64-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1078,6 +1078,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1244,10 +1248,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3994,6 +4010,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5135,6 +5157,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6332,6 +6360,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7331,6 +7365,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7436,6 +7474,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7503,8 +7545,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7525,10 +7567,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7684,6 +7739,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7708,6 +7764,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7724,7 +7781,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7791,709 +7851,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9257,6 +8876,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -10001,6 +9624,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10737,6 +10364,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11274,6 +10905,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11460,6 +11092,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11644,6 +11277,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12649,6 +12283,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12849,6 +12492,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12998,6 +12649,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -13006,6 +12665,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s index aa7a1ea1cf..488ae6d781 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s index d493797832..3dcd55d3f5 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s index c7c53e8771..ca193ddb9e 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s index 70eed05b00..427a1c7d12 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s index cd8b00f259..e18f87c4e6 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s index 0fd201167f..c76c5a8afb 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s index bf7c2b0b6f..d193298940 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s index a2cccde636..ee619092c9 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s index b6797a6849..795cebe1d7 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s index f4e5337565..a0b78a0565 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s index d19d4662b4..3a78cd8440 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax - leaq (%rsp),%rsi movq %r9,%r15 - jmp .Lsub + .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsi,%r14,8),%rax + movq 8(%rsp,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax - movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx + movq %r9,(%rsp,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi + leaq -4(%r9),%r15 movq 0(%rsp),%rax - pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r9 + shrq $2,%r15 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,9 +585,7 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - leaq -1(%r9),%r15 - jmp .Lsub4x -.align 16 + .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -614,34 +612,35 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx - leaq -1(%r9),%r15 - orq %rcx,%rsi - - movdqu (%rsi),%xmm1 - movdqa %xmm0,(%rsp) - movdqu %xmm1,(%rdi) + pxor %xmm0,%xmm0 +.byte 102,72,15,110,224 + pcmpeqd %xmm5,%xmm5 + pshufd $0,%xmm4,%xmm4 + movq %r9,%r15 + pxor %xmm4,%xmm5 + shrq $2,%r15 + xorl %eax,%eax + jmp .Lcopy4x .align 16 .Lcopy4x: - movdqu 16(%rsi,%r14,1),%xmm2 - movdqu 32(%rsi,%r14,1),%xmm1 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) - movdqa %xmm0,32(%rsp,%r14,1) - movdqu %xmm1,32(%rdi,%r14,1) - leaq 32(%r14),%r14 + movdqa (%rsp,%rax,1),%xmm1 + movdqu (%rdi,%rax,1),%xmm2 + pand %xmm4,%xmm1 + pand %xmm5,%xmm2 + movdqa 16(%rsp,%rax,1),%xmm3 + movdqa %xmm0,(%rsp,%rax,1) + por %xmm2,%xmm1 + movdqu 16(%rdi,%rax,1),%xmm2 + movdqu %xmm1,(%rdi,%rax,1) + pand %xmm4,%xmm3 + pand %xmm5,%xmm2 + movdqa %xmm0,16(%rsp,%rax,1) + por %xmm2,%xmm3 + movdqu %xmm3,16(%rdi,%rax,1) + leaq 32(%rax),%rax decq %r15 jnz .Lcopy4x - - shlq $2,%r9 - movdqu 16(%rsi,%r14,1),%xmm2 - movdqa %xmm0,16(%rsp,%r14,1) - movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s index a2fccf088e..0dd53512f9 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,18 +393,19 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax + movq $-1,%rbx + xorq %rax,%rbx xorq %r14,%r14 - andq %rax,%rsi - notq %rax - movq %rdi,%rcx - andq %rax,%rcx movq %r9,%r15 - orq %rcx,%rsi -.align 16 + .Lcopy: - movq (%rsi,%r14,8),%rax + movq (%rdi,%r14,8),%rcx + movq (%rsp,%r14,8),%rdx + andq %rbx,%rcx + andq %rax,%rdx movq %r14,(%rsp,%r14,8) - movq %rax,(%rdi,%r14,8) + orq %rcx,%rdx + movq %rdx,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h index e1b87d9f50..816440ae63 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Tue Apr 3 00:38:50 2018" +#define DATE "built on: Tue Nov 20 09:38:56 2018" diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s index 1117381f31..1dead91b17 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s index 044b8f031e..a9fed05fd7 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s index ce86d5d969..62a7ac611f 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s index 0aa90515d6..0defe666bb 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s index d1a1c895a3..21e49925f1 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s index 10f5987415..0116ef1c94 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s index 5662696481..8b2e361ea1 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s index 9c7110f4ef..aab3c6db13 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s index bdd0da3bd1..781b48b9eb 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s index d2857f3288..d266d776ec 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s index 195a148bb9..dbeebed9a0 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s index bd72a459ab..f2896b4d6e 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s index 23b932e1de..8264a7dbdf 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s index a1021c17a9..6f8488a38a 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s index f83130ea68..a4d55b6afc 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s index 5a109c6fd9..7e1f5e2740 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s index 3e5ab736fd..38c02c188e 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h index 9df0f86ed6..7dd2101053 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h @@ -102,12 +102,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi index 46a2ed34cf..bdef71da40 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi @@ -215,6 +215,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -400,6 +401,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -572,6 +574,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm index f0d822aa7d..2c00fcf1a0 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris64-x86_64-gcc", - version => "1.1.0h", - version_num => "0x1010008fL", + version => "1.1.0j", + version_num => "0x101000afL", ); our %target = ( @@ -1077,6 +1077,10 @@ our %unified_info = ( [ "libcrypto", ], + "test/errtest" => + [ + "libcrypto", + ], "test/evp_extra_test" => [ "libcrypto", @@ -1243,10 +1247,22 @@ our %unified_info = ( [ "libcrypto", ], + "test/versions" => + [ + "libcrypto", + ], "test/wp_test" => [ "libcrypto", ], + "test/x509_dup_cert_test" => + [ + "libcrypto", + ], + "test/x509_time_test" => + [ + "libcrypto", + ], "test/x509aux" => [ "libcrypto", @@ -3933,6 +3949,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/conf/conf_ssl.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/cpt_err.o" => [ ".", @@ -5062,6 +5084,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/getenv.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6211,6 +6239,12 @@ our %unified_info = ( "crypto/include", "include", ], + "crypto/x509/x509_meth.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/x509/x509_obj.o" => [ ".", @@ -7198,6 +7232,10 @@ our %unified_info = ( [ "include", ], + "test/errtest.o" => + [ + "include", + ], "test/evp_extra_test.o" => [ "include", @@ -7303,6 +7341,10 @@ our %unified_info = ( [ "include", ], + "test/rsa_complex.o" => + [ + "include", + ], "test/rsa_test.o" => [ ".", @@ -7371,8 +7413,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "include", "test", + "include", ".", ], "test/threadstest.o" => @@ -7392,10 +7434,23 @@ our %unified_info = ( [ "include", ], + "test/versions.o" => + [ + "include", + ], "test/wp_test.o" => [ "include", ], + "test/x509_dup_cert_test.o" => + [ + "include", + ], + "test/x509_time_test.o" => + [ + ".", + "include", + ], "test/x509aux.o" => [ "include", @@ -7551,6 +7606,7 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", + "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7575,6 +7631,7 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", + "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7591,7 +7648,10 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", + "test/versions", "test/wp_test", + "test/x509_dup_cert_test", + "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7658,709 +7718,268 @@ our %unified_info = ( ], "shared_sources" => { - "apps/openssl" => + }, + "sources" => + { + "apps/CA.pl" => [ + "apps/CA.pl.in", ], - "fuzz/asn1-test" => + "apps/app_rand.o" => [ + "apps/app_rand.c", ], - "fuzz/asn1parse-test" => + "apps/apps.o" => [ + "apps/apps.c", ], - "fuzz/bignum-test" => + "apps/asn1pars.o" => [ + "apps/asn1pars.c", ], - "fuzz/bndiv-test" => + "apps/ca.o" => [ + "apps/ca.c", ], - "fuzz/cms-test" => + "apps/ciphers.o" => [ + "apps/ciphers.c", ], - "fuzz/conf-test" => + "apps/cms.o" => [ + "apps/cms.c", ], - "fuzz/crl-test" => + "apps/crl.o" => [ + "apps/crl.c", ], - "fuzz/ct-test" => + "apps/crl2p7.o" => [ + "apps/crl2p7.c", ], - "fuzz/server-test" => + "apps/dgst.o" => [ + "apps/dgst.c", ], - "fuzz/x509-test" => + "apps/dhparam.o" => [ + "apps/dhparam.c", ], - "libcrypto" => + "apps/dsa.o" => [ + "apps/dsa.c", ], - "libssl" => + "apps/dsaparam.o" => [ + "apps/dsaparam.c", ], - "test/aborttest" => + "apps/ec.o" => [ + "apps/ec.c", ], - "test/afalgtest" => + "apps/ecparam.o" => [ + "apps/ecparam.c", ], - "test/asynciotest" => + "apps/enc.o" => [ + "apps/enc.c", ], - "test/asynctest" => + "apps/engine.o" => [ + "apps/engine.c", ], - "test/bad_dtls_test" => + "apps/errstr.o" => [ + "apps/errstr.c", ], - "test/bftest" => + "apps/gendsa.o" => [ + "apps/gendsa.c", ], - "test/bio_enc_test" => + "apps/genpkey.o" => [ + "apps/genpkey.c", ], - "test/bioprinttest" => + "apps/genrsa.o" => [ + "apps/genrsa.c", ], - "test/bntest" => + "apps/nseq.o" => [ + "apps/nseq.c", ], - "test/buildtest_aes" => + "apps/ocsp.o" => [ + "apps/ocsp.c", ], - "test/buildtest_asn1" => + "apps/openssl" => [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", ], - "test/buildtest_asn1t" => + "apps/openssl.o" => [ + "apps/openssl.c", ], - "test/buildtest_async" => + "apps/opt.o" => [ + "apps/opt.c", ], - "test/buildtest_bio" => + "apps/passwd.o" => [ + "apps/passwd.c", ], - "test/buildtest_blowfish" => + "apps/pkcs12.o" => [ + "apps/pkcs12.c", ], - "test/buildtest_bn" => + "apps/pkcs7.o" => [ + "apps/pkcs7.c", ], - "test/buildtest_buffer" => + "apps/pkcs8.o" => [ + "apps/pkcs8.c", ], - "test/buildtest_camellia" => + "apps/pkey.o" => [ + "apps/pkey.c", ], - "test/buildtest_cast" => + "apps/pkeyparam.o" => [ + "apps/pkeyparam.c", ], - "test/buildtest_cmac" => + "apps/pkeyutl.o" => [ + "apps/pkeyutl.c", ], - "test/buildtest_cms" => + "apps/prime.o" => [ + "apps/prime.c", ], - "test/buildtest_conf" => + "apps/rand.o" => [ + "apps/rand.c", ], - "test/buildtest_conf_api" => + "apps/rehash.o" => [ + "apps/rehash.c", ], - "test/buildtest_crypto" => + "apps/req.o" => [ + "apps/req.c", ], - "test/buildtest_ct" => + "apps/rsa.o" => [ + "apps/rsa.c", ], - "test/buildtest_des" => + "apps/rsautl.o" => [ + "apps/rsautl.c", ], - "test/buildtest_dh" => + "apps/s_cb.o" => [ + "apps/s_cb.c", ], - "test/buildtest_dsa" => + "apps/s_client.o" => [ + "apps/s_client.c", ], - "test/buildtest_dtls1" => + "apps/s_server.o" => [ + "apps/s_server.c", ], - "test/buildtest_e_os2" => + "apps/s_socket.o" => [ + "apps/s_socket.c", ], - "test/buildtest_ebcdic" => + "apps/s_time.o" => [ + "apps/s_time.c", ], - "test/buildtest_ec" => + "apps/sess_id.o" => [ + "apps/sess_id.c", ], - "test/buildtest_ecdh" => + "apps/smime.o" => [ + "apps/smime.c", ], - "test/buildtest_ecdsa" => + "apps/speed.o" => [ + "apps/speed.c", ], - "test/buildtest_engine" => + "apps/spkac.o" => [ + "apps/spkac.c", ], - "test/buildtest_err" => + "apps/srp.o" => [ + "apps/srp.c", ], - "test/buildtest_evp" => + "apps/ts.o" => [ + "apps/ts.c", ], - "test/buildtest_hmac" => + "apps/tsget" => [ + "apps/tsget.in", ], - "test/buildtest_idea" => + "apps/verify.o" => [ + "apps/verify.c", ], - "test/buildtest_kdf" => - [ - ], - "test/buildtest_lhash" => - [ - ], - "test/buildtest_md4" => - [ - ], - "test/buildtest_md5" => - [ - ], - "test/buildtest_mdc2" => - [ - ], - "test/buildtest_modes" => - [ - ], - "test/buildtest_obj_mac" => - [ - ], - "test/buildtest_objects" => - [ - ], - "test/buildtest_ocsp" => - [ - ], - "test/buildtest_opensslv" => - [ - ], - "test/buildtest_ossl_typ" => - [ - ], - "test/buildtest_pem" => - [ - ], - "test/buildtest_pem2" => - [ - ], - "test/buildtest_pkcs12" => - [ - ], - "test/buildtest_pkcs7" => - [ - ], - "test/buildtest_rand" => - [ - ], - "test/buildtest_rc2" => - [ - ], - "test/buildtest_rc4" => - [ - ], - "test/buildtest_ripemd" => - [ - ], - "test/buildtest_rsa" => - [ - ], - "test/buildtest_safestack" => - [ - ], - "test/buildtest_seed" => - [ - ], - "test/buildtest_sha" => - [ - ], - "test/buildtest_srp" => - [ - ], - "test/buildtest_srtp" => - [ - ], - "test/buildtest_ssl" => - [ - ], - "test/buildtest_ssl2" => - [ - ], - "test/buildtest_stack" => - [ - ], - "test/buildtest_symhacks" => - [ - ], - "test/buildtest_tls1" => - [ - ], - "test/buildtest_ts" => - [ - ], - "test/buildtest_txt_db" => - [ - ], - "test/buildtest_ui" => - [ - ], - "test/buildtest_whrlpool" => - [ - ], - "test/buildtest_x509" => - [ - ], - "test/buildtest_x509_vfy" => - [ - ], - "test/buildtest_x509v3" => - [ - ], - "test/casttest" => - [ - ], - "test/cipherlist_test" => - [ - ], - "test/clienthellotest" => - [ - ], - "test/constant_time_test" => - [ - ], - "test/crltest" => - [ - ], - "test/ct_test" => - [ - ], - "test/d2i_test" => - [ - ], - "test/danetest" => - [ - ], - "test/destest" => - [ - ], - "test/dhtest" => - [ - ], - "test/dsatest" => - [ - ], - "test/dtlstest" => - [ - ], - "test/dtlsv1listentest" => - [ - ], - "test/ecdsatest" => - [ - ], - "test/ectest" => - [ - ], - "test/enginetest" => - [ - ], - "test/evp_extra_test" => - [ - ], - "test/evp_test" => - [ - ], - "test/exdatatest" => - [ - ], - "test/exptest" => - [ - ], - "test/fatalerrtest" => - [ - ], - "test/gmdifftest" => - [ - ], - "test/heartbeat_test" => - [ - ], - "test/hmactest" => - [ - ], - "test/ideatest" => - [ - ], - "test/igetest" => - [ - ], - "test/md2test" => - [ - ], - "test/md4test" => - [ - ], - "test/md5test" => - [ - ], - "test/mdc2test" => - [ - ], - "test/memleaktest" => - [ - ], - "test/ocspapitest" => - [ - ], - "test/p5_crpt2_test" => - [ - ], - "test/packettest" => - [ - ], - "test/pbelutest" => - [ - ], - "test/randtest" => - [ - ], - "test/rc2test" => - [ - ], - "test/rc4test" => - [ - ], - "test/rc5test" => - [ - ], - "test/rmdtest" => - [ - ], - "test/rsa_test" => - [ - ], - "test/sanitytest" => - [ - ], - "test/secmemtest" => - [ - ], - "test/sha1test" => - [ - ], - "test/sha256t" => - [ - ], - "test/sha512t" => - [ - ], - "test/srptest" => - [ - ], - "test/ssl_test" => - [ - ], - "test/ssl_test_ctx_test" => - [ - ], - "test/sslapitest" => - [ - ], - "test/sslcorrupttest" => - [ - ], - "test/ssltest_old" => - [ - ], - "test/threadstest" => - [ - ], - "test/v3ext" => - [ - ], - "test/v3nametest" => - [ - ], - "test/verify_extra_test" => - [ - ], - "test/wp_test" => - [ - ], - "test/x509aux" => - [ - ], - }, - "sources" => - { - "apps/CA.pl" => - [ - "apps/CA.pl.in", - ], - "apps/app_rand.o" => - [ - "apps/app_rand.c", - ], - "apps/apps.o" => - [ - "apps/apps.c", - ], - "apps/asn1pars.o" => - [ - "apps/asn1pars.c", - ], - "apps/ca.o" => - [ - "apps/ca.c", - ], - "apps/ciphers.o" => - [ - "apps/ciphers.c", - ], - "apps/cms.o" => - [ - "apps/cms.c", - ], - "apps/crl.o" => - [ - "apps/crl.c", - ], - "apps/crl2p7.o" => - [ - "apps/crl2p7.c", - ], - "apps/dgst.o" => - [ - "apps/dgst.c", - ], - "apps/dhparam.o" => - [ - "apps/dhparam.c", - ], - "apps/dsa.o" => - [ - "apps/dsa.c", - ], - "apps/dsaparam.o" => - [ - "apps/dsaparam.c", - ], - "apps/ec.o" => - [ - "apps/ec.c", - ], - "apps/ecparam.o" => - [ - "apps/ecparam.c", - ], - "apps/enc.o" => - [ - "apps/enc.c", - ], - "apps/engine.o" => - [ - "apps/engine.c", - ], - "apps/errstr.o" => - [ - "apps/errstr.c", - ], - "apps/gendsa.o" => - [ - "apps/gendsa.c", - ], - "apps/genpkey.o" => - [ - "apps/genpkey.c", - ], - "apps/genrsa.o" => - [ - "apps/genrsa.c", - ], - "apps/nseq.o" => - [ - "apps/nseq.c", - ], - "apps/ocsp.o" => - [ - "apps/ocsp.c", - ], - "apps/openssl" => - [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", - ], - "apps/openssl.o" => - [ - "apps/openssl.c", - ], - "apps/opt.o" => - [ - "apps/opt.c", - ], - "apps/passwd.o" => - [ - "apps/passwd.c", - ], - "apps/pkcs12.o" => - [ - "apps/pkcs12.c", - ], - "apps/pkcs7.o" => - [ - "apps/pkcs7.c", - ], - "apps/pkcs8.o" => - [ - "apps/pkcs8.c", - ], - "apps/pkey.o" => - [ - "apps/pkey.c", - ], - "apps/pkeyparam.o" => - [ - "apps/pkeyparam.c", - ], - "apps/pkeyutl.o" => - [ - "apps/pkeyutl.c", - ], - "apps/prime.o" => - [ - "apps/prime.c", - ], - "apps/rand.o" => - [ - "apps/rand.c", - ], - "apps/rehash.o" => - [ - "apps/rehash.c", - ], - "apps/req.o" => - [ - "apps/req.c", - ], - "apps/rsa.o" => - [ - "apps/rsa.c", - ], - "apps/rsautl.o" => - [ - "apps/rsautl.c", - ], - "apps/s_cb.o" => - [ - "apps/s_cb.c", - ], - "apps/s_client.o" => - [ - "apps/s_client.c", - ], - "apps/s_server.o" => - [ - "apps/s_server.c", - ], - "apps/s_socket.o" => - [ - "apps/s_socket.c", - ], - "apps/s_time.o" => - [ - "apps/s_time.c", - ], - "apps/sess_id.o" => - [ - "apps/sess_id.c", - ], - "apps/smime.o" => - [ - "apps/smime.c", - ], - "apps/speed.o" => - [ - "apps/speed.c", - ], - "apps/spkac.o" => - [ - "apps/spkac.c", - ], - "apps/srp.o" => - [ - "apps/srp.c", - ], - "apps/ts.o" => - [ - "apps/ts.c", - ], - "apps/tsget" => - [ - "apps/tsget.in", - ], - "apps/verify.o" => - [ - "apps/verify.c", - ], - "apps/version.o" => + "apps/version.o" => [ "apps/version.c", ], @@ -9084,6 +8703,10 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], + "crypto/conf/conf_ssl.o" => + [ + "crypto/conf/conf_ssl.c", + ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9820,6 +9443,10 @@ our %unified_info = ( [ "crypto/ex_data.c", ], + "crypto/getenv.o" => + [ + "crypto/getenv.c", + ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10524,6 +10151,10 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], + "crypto/x509/x509_meth.o" => + [ + "crypto/x509/x509_meth.c", + ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -11043,6 +10674,7 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", + "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11227,6 +10859,7 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", + "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11403,6 +11036,7 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", + "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12406,6 +12040,15 @@ our %unified_info = ( [ "test/enginetest.c", ], + "test/errtest" => + [ + "test/errtest.o", + "test/testutil.o", + ], + "test/errtest.o" => + [ + "test/errtest.c", + ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12606,6 +12249,14 @@ our %unified_info = ( [ "test/rmdtest.c", ], + "test/rsa_complex" => + [ + "test/rsa_complex.o", + ], + "test/rsa_complex.o" => + [ + "test/rsa_complex.c", + ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12755,6 +12406,14 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], + "test/versions" => + [ + "test/versions.o", + ], + "test/versions.o" => + [ + "test/versions.c", + ], "test/wp_test" => [ "test/wp_test.o", @@ -12763,6 +12422,23 @@ our %unified_info = ( [ "test/wp_test.c", ], + "test/x509_dup_cert_test" => + [ + "test/x509_dup_cert_test.o", + ], + "test/x509_dup_cert_test.o" => + [ + "test/x509_dup_cert_test.c", + ], + "test/x509_time_test" => + [ + "test/testutil.o", + "test/x509_time_test.o", + ], + "test/x509_time_test.o" => + [ + "test/x509_time_test.c", + ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h index 506757d551..9934b58f6c 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Tue Apr 3 00:38:53 2018" +#define DATE "built on: Tue Nov 20 09:39:05 2018" diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h index e20916814d..7b122bd86e 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h @@ -105,12 +105,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi index 55006d7fe9..481282d830 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi @@ -219,6 +219,7 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', + 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,6 +404,7 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', + 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,6 +581,7 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', + 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/openssl.gyp b/worker/deps/openssl/openssl.gyp index 6b0770ebbc..4a6b556866 100644 --- a/worker/deps/openssl/openssl.gyp +++ b/worker/deps/openssl/openssl.gyp @@ -1,7 +1,4 @@ { - 'variables': { - 'openssl_no_asm%': 0, - }, 'targets': [ { 'target_name': 'openssl', diff --git a/worker/deps/openssl/openssl/.travis.yml b/worker/deps/openssl/openssl/.travis.yml index b5fc443181..1c1db2b73d 100644 --- a/worker/deps/openssl/openssl/.travis.yml +++ b/worker/deps/openssl/openssl/.travis.yml @@ -61,7 +61,7 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" + env: UBUNTU_GCC_HACK="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" - os: linux addons: apt: @@ -69,7 +69,7 @@ matrix: - binutils-mingw-w64 - gcc-mingw-w64 compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + env: CONFIG_OPTS="no-pic" - os: linux addons: apt: @@ -85,7 +85,7 @@ matrix: - binutils-mingw-w64 - gcc-mingw-w64 compiler: x86_64-w64-mingw32-gcc - env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + env: CONFIG_OPTS="no-pic" - os: linux addons: apt: @@ -112,6 +112,10 @@ before_script: srcdir=.; top=.; fi + - if [ -n "$UBUNTU_GCC_HACK" ]; then + $CC -dumpspecs | sed "s/--push-state//g; s/--pop-state/--as-needed/g" > gcc-specs.txt; + CC="$CC -specs=gcc-specs.txt"; + fi - if [ "$CC" == i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; @@ -186,7 +190,7 @@ script: fi - if [ -n "$DESTDIR" ]; then mkdir "../$DESTDIR"; - if $make install install_docs DESTDIR="../$DESTDIR"; then + if $make install DESTDIR="../$DESTDIR"; then echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS OK'; else echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS FAILED'; false; diff --git a/worker/deps/openssl/openssl/CHANGES b/worker/deps/openssl/openssl/CHANGES index 9d65bc3a77..cf76704d15 100644 --- a/worker/deps/openssl/openssl/CHANGES +++ b/worker/deps/openssl/openssl/CHANGES @@ -7,6 +7,108 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.0i and 1.1.0j [20 Nov 2018] + + *) Timing vulnerability in DSA signature generation + + The OpenSSL DSA signature algorithm has been shown to be vulnerable to a + timing side channel attack. An attacker could use variations in the signing + algorithm to recover the private key. + + This issue was reported to OpenSSL on 16th October 2018 by Samuel Weiser. + (CVE-2018-0734) + [Paul Dale] + + *) Timing vulnerability in ECDSA signature generation + + The OpenSSL ECDSA signature algorithm has been shown to be vulnerable to a + timing side channel attack. An attacker could use variations in the signing + algorithm to recover the private key. + + This issue was reported to OpenSSL on 25th October 2018 by Samuel Weiser. + (CVE-2018-0735) + [Paul Dale] + + *) Add coordinate blinding for EC_POINT and implement projective + coordinate blinding for generic prime curves as a countermeasure to + chosen point SCA attacks. + [Sohaib ul Hassan, Nicola Tuveri, Billy Bob Brumley] + + Changes between 1.1.0h and 1.1.0i [14 Aug 2018] + + *) Client DoS due to large DH parameter + + During key agreement in a TLS handshake using a DH(E) based ciphersuite a + malicious server can send a very large prime value to the client. This will + cause the client to spend an unreasonably long period of time generating a + key for this prime resulting in a hang until the client has finished. This + could be exploited in a Denial Of Service attack. + + This issue was reported to OpenSSL on 5th June 2018 by Guido Vranken + (CVE-2018-0732) + [Guido Vranken] + + *) Cache timing vulnerability in RSA Key Generation + + The OpenSSL RSA Key generation algorithm has been shown to be vulnerable to + a cache timing side channel attack. An attacker with sufficient access to + mount cache timing attacks during the RSA key generation process could + recover the private key. + + This issue was reported to OpenSSL on 4th April 2018 by Alejandro Cabrera + Aldaya, Billy Brumley, Cesar Pereida Garcia and Luis Manuel Alvarez Tapia. + (CVE-2018-0737) + [Billy Brumley] + + *) Make EVP_PKEY_asn1_new() a bit stricter about its input. A NULL pem_str + parameter is no longer accepted, as it leads to a corrupt table. NULL + pem_str is reserved for alias entries only. + [Richard Levitte] + + *) Revert blinding in ECDSA sign and instead make problematic addition + length-invariant. Switch even to fixed-length Montgomery multiplication. + [Andy Polyakov] + + *) Change generating and checking of primes so that the error rate of not + being prime depends on the intended use based on the size of the input. + For larger primes this will result in more rounds of Miller-Rabin. + The maximal error rate for primes with more than 1080 bits is lowered + to 2^-128. + [Kurt Roeckx, Annie Yousar] + + *) Increase the number of Miller-Rabin rounds for DSA key generating to 64. + [Kurt Roeckx] + + *) Add blinding to ECDSA and DSA signatures to protect against side channel + attacks discovered by Keegan Ryan (NCC Group). + [Matt Caswell] + + *) When unlocking a pass phrase protected PEM file or PKCS#8 container, we + now allow empty (zero character) pass phrases. + [Richard Levitte] + + *) Certificate time validation (X509_cmp_time) enforces stricter + compliance with RFC 5280. Fractional seconds and timezone offsets + are no longer allowed. + [Emilia Käsper] + + *) Fixed a text canonicalisation bug in CMS + + Where a CMS detached signature is used with text content the text goes + through a canonicalisation process first prior to signing or verifying a + signature. This process strips trailing space at the end of lines, converts + line terminators to CRLF and removes additional trailing line terminators + at the end of a file. A bug in the canonicalisation process meant that + some characters, such as form-feed, were incorrectly treated as whitespace + and removed. This is contrary to the specification (RFC5485). This fix + could mean that detached text data signed with an earlier version of + OpenSSL 1.1.0 may fail to verify using the fixed version, or text data + signed with a fixed OpenSSL may fail to verify with an earlier version of + OpenSSL 1.1.0. A workaround is to only verify the canonicalised text data + and use the "-binary" flag (for the "cms" command line application) or set + the SMIME_BINARY/PKCS7_BINARY/CMS_BINARY flags (if using CMS_verify()). + [Matt Caswell] + Changes between 1.1.0g and 1.1.0h [27 Mar 2018] *) Constructed ASN.1 types with a recursive definition could exceed the stack @@ -1144,13 +1246,13 @@ [Steve Henson] *) Experimental encrypt-then-mac support. - + Experimental support for encrypt then mac from draft-gutmann-tls-encrypt-then-mac-02.txt To enable it set the appropriate extension number (0x42 for the test server) using e.g. -DTLSEXT_TYPE_encrypt_then_mac=0x42 - + For non-compliant peers (i.e. just about everything) this should have no effect. @@ -1201,7 +1303,7 @@ *) Use separate DRBG fields for internal and external flags. New function FIPS_drbg_health_check() to perform on demand health checking. Add - generation tests to fips_test_suite with reduced health check interval to + generation tests to fips_test_suite with reduced health check interval to demonstrate periodic health checking. Add "nodh" option to fips_test_suite to skip very slow DH test. [Steve Henson] @@ -1215,7 +1317,7 @@ combination: call this in fips_test_suite. [Steve Henson] - *) Add support for canonical generation of DSA parameter 'g'. See + *) Add support for canonical generation of DSA parameter 'g'. See FIPS 186-3 A.2.3. *) Add support for HMAC DRBG from SP800-90. Update DRBG algorithm test and @@ -1239,7 +1341,7 @@ requested amount of entropy. [Steve Henson] - *) Add PRNG security strength checks to RSA, DSA and ECDSA using + *) Add PRNG security strength checks to RSA, DSA and ECDSA using information in FIPS186-3, SP800-57 and SP800-131A. [Steve Henson] @@ -1331,7 +1433,7 @@ can be set or retrieved with a ctrl. The IV length is by default 12 bytes (96 bits) but can be set to an alternative value. If the IV length exceeds the maximum IV length (currently 16 bytes) it cannot be - set before the key. + set before the key. [Steve Henson] *) New flag in ciphers: EVP_CIPH_FLAG_CUSTOM_CIPHER. This means the @@ -1374,7 +1476,7 @@ Add CMAC pkey methods. [Steve Henson] - *) Experimental renegotiation in s_server -www mode. If the client + *) Experimental renegotiation in s_server -www mode. If the client browses /reneg connection is renegotiated. If /renegcert it is renegotiated requesting a certificate. [Steve Henson] @@ -1394,7 +1496,7 @@ *) New macro __owur for "OpenSSL Warn Unused Result". This makes use of a gcc attribute to warn if the result of a function is ignored. This is enable if DEBUG_UNUSED is set. Add to several functions in evp.h - whose return value is often ignored. + whose return value is often ignored. [Steve Henson] *) New -noct, -requestct, -requirect and -ctlogfile options for s_client. @@ -3628,7 +3730,7 @@ *) New option -sigopt to dgst utility. Update dgst to use EVP_Digest{Sign,Verify}*. These two changes make it possible to use - alternative signing parameters such as X9.31 or PSS in the dgst + alternative signing parameters such as X9.31 or PSS in the dgst utility. [Steve Henson] @@ -12379,7 +12481,7 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k *) Fixed sk_insert which never worked properly. [Steve Henson] - *) Fix ASN1 macros so they can handle indefinite length constructed + *) Fix ASN1 macros so they can handle indefinite length constructed EXPLICIT tags. Some non standard certificates use these: they can now be read in. [Steve Henson] diff --git a/worker/deps/openssl/openssl/CONTRIBUTING b/worker/deps/openssl/openssl/CONTRIBUTING index 1eebaf37ec..a6977b8117 100644 --- a/worker/deps/openssl/openssl/CONTRIBUTING +++ b/worker/deps/openssl/openssl/CONTRIBUTING @@ -1,26 +1,26 @@ -HOW TO CONTRIBUTE PATCHES TO OpenSSL ------------------------------------- +HOW TO CONTRIBUTE TO OpenSSL +---------------------------- (Please visit https://www.openssl.org/community/getting-started.html for other ideas about how to contribute.) -Development is coordinated on the openssl-dev mailing list (see the -above link or https://mta.openssl.org for information on subscribing). -If you are unsure as to whether a feature will be useful for the general -OpenSSL community you might want to discuss it on the openssl-dev mailing -list first. Someone may be already working on the same thing or there -may be a good reason as to why that feature isn't implemented. +Development is done on GitHub, https://github.com/openssl/openssl. -To submit a patch, make a pull request on GitHub. If you think the patch -could use feedback from the community, please start a thread on openssl-dev -to discuss it. +To request new features or report bugs, please open an issue on GitHub -Having addressed the following items before the PR will help make the -acceptance and review process faster: +To submit a patch, please open a pull request on GitHub. If you are thinking +of making a large contribution, open an issue for it before starting work, +to get comments from the community. Someone may be already working on +the same thing or there may be reasons why that feature isn't implemented. - 1. Anything other than trivial contributions will require a contributor - licensing agreement, giving us permission to use your code. See - https://www.openssl.org/policies/cla.html for details. +To make it easier to review and accept your pull request, please follow these +guidelines: + + 1. Anything other than a trivial contribution requires a Contributor + License Agreement (CLA), giving us permission to use your code. See + https://www.openssl.org/policies/cla.html for details. If your + contribution is too small to require a CLA, put "CLA: trivial" on a + line by itself in your commit message body. 2. All source files should start with the following text (with appropriate comment characters at the start of each line and the @@ -34,21 +34,38 @@ acceptance and review process faster: https://www.openssl.org/source/license.html 3. Patches should be as current as possible; expect to have to rebase - often. We do not accept merge commits; You will be asked to remove - them before a patch is considered acceptable. + often. We do not accept merge commits, you will have to remove them + (usually by rebasing) before it will be acceptable. 4. Patches should follow our coding style (see - https://www.openssl.org/policies/codingstyle.html) and compile without - warnings. Where gcc or clang is available you should use the + https://www.openssl.org/policies/codingstyle.html) and compile + without warnings. Where gcc or clang is available you should use the --strict-warnings Configure option. OpenSSL compiles on many varied - platforms: try to ensure you only use portable features. - Clean builds via Travis and AppVeyor are expected, and done whenever - a PR is created or updated. + platforms: try to ensure you only use portable features. Clean builds + via Travis and AppVeyor are required, and they are started automatically + whenever a PR is created or updated. 5. When at all possible, patches should include tests. These can either be added to an existing test, or completely new. Please see test/README for information on the test framework. 6. New features or changed functionality must include - documentation. Please look at the "pod" files in doc/apps, doc/crypto - and doc/ssl for examples of our style. + documentation. Please look at the "pod" files in doc for + examples of our style. + + 7. For user visible changes (API changes, behaviour changes, ...), + consider adding a note in CHANGES. This could be a summarising + description of the change, and could explain the grander details. + Have a look through existing entries for inspiration. + Please note that this is NOT simply a copy of git-log oneliners. + Also note that security fixes get an entry in CHANGES. + This file helps users get more in depth information of what comes + with a specific release without having to sift through the higher + noise ratio in git-log. + + 8. For larger or more important user visible changes, as well as + security fixes, please add a line in NEWS. On exception, it might be + worth adding a multi-line entry (such as the entry that announces all + the types that became opaque with OpenSSL 1.1.0). + This file helps users get a very quick summary of what comes with a + specific release, to see if an upgrade is worth the effort. diff --git a/worker/deps/openssl/openssl/Configurations/00-base-templates.conf b/worker/deps/openssl/openssl/Configurations/00-base-templates.conf index a6b52de498..8503c2f348 100644 --- a/worker/deps/openssl/openssl/Configurations/00-base-templates.conf +++ b/worker/deps/openssl/openssl/Configurations/00-base-templates.conf @@ -68,6 +68,8 @@ } return (); }, + shared_extension => ".so", + build_scheme => [ "unified", "unix" ], build_file => "Makefile", }, @@ -99,6 +101,8 @@ mtinflag => "-manifest ", mtoutflag => "-outputresource:", + shared_extension => ".dll", + build_file => "makefile", build_scheme => [ "unified", "windows" ], }, @@ -107,6 +111,8 @@ inherit_from => [ "BASE_common" ], template => 1, + shared_extension => ".exe", + build_file => "descrip.mms", build_scheme => [ "unified", "VMS" ], }, @@ -247,7 +253,7 @@ sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S", modes_asm_src => "ghash-armv4.S ghashv8-armx.S", chacha_asm_src => "chacha-armv4.S", - poly1305_asm_src=> "poly1305-armv4.S", + poly1305_asm_src=> "poly1305-armv4.S", perlasm_scheme => "void" }, aarch64_asm => { diff --git a/worker/deps/openssl/openssl/Configurations/10-main.conf b/worker/deps/openssl/openssl/Configurations/10-main.conf index b49f04b5d7..6c05c2809f 100644 --- a/worker/deps/openssl/openssl/Configurations/10-main.conf +++ b/worker/deps/openssl/openssl/Configurations/10-main.conf @@ -14,7 +14,7 @@ sub vc_win64a_info { asflags => "/c /Cp /Cx /Zi", asoutflag => "/Fo" }; } else { - $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n"); + $die->("NASM not found - make sure it's installed and available on %PATH%\n"); $vc_win64a_info = { as => "{unknown}", asflags => "", asoutflag => "" }; @@ -39,7 +39,7 @@ sub vc_win32_info { asoutflag => "/Fo", perlasm_scheme => "win32" }; } else { - $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n"); + $die->("NASM not found - make sure it's installed and available on %PATH%\n"); $vc_win32_info = { as => "{unknown}", asflags => "", asoutflag => "", @@ -428,8 +428,17 @@ sub vms_info { # even PA-RISC 2.0-specific code paths, which are chosen at run-time, # thus adequate performance is provided even with PA-RISC 1.1 build. # - "hpux-parisc-gcc" => { + "hpux-common" => { inherit_from => [ "BASE_unix" ], + template => 1, + defines => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED", + "_HPUX_ALT_XOPEN_SOCKET_API"), + thread_scheme => "pthreads", + dso_scheme => "dlfcn", # overridden in 32-bit PA-RISC builds + shared_target => "hpux-shared", + }, + "hpux-parisc-gcc" => { + inherit_from => [ "hpux-common" ], cc => "gcc", cflags => combine(picker(default => "-DB_ENDIAN -DBN_DIV2W", debug => "-O0 -g", @@ -437,9 +446,7 @@ sub vms_info { threads("-pthread")), ex_libs => add("-Wl,+s -ldld", threads("-pthread")), bn_ops => "BN_LLONG", - thread_scheme => "pthreads", dso_scheme => "dl", - shared_target => "hpux-shared", shared_cflag => "-fPIC", shared_ldflag => "-shared", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -449,7 +456,7 @@ sub vms_info { multilib => "/pa1.1", }, "hpux64-parisc2-gcc" => { - inherit_from => [ "BASE_unix", asm("parisc20_64_asm") ], + inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], cc => "gcc", cflags => combine(picker(default => "-DB_ENDIAN", debug => "-O0 -g", @@ -457,9 +464,6 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "-fpic", shared_ldflag => "-shared", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -471,7 +475,7 @@ sub vms_info { # Chris Ruemmler # Kevin Steves "hpux-parisc-cc" => { - inherit_from => [ "BASE_unix" ], + inherit_from => [ "hpux-common" ], cc => "cc", cflags => combine(picker(default => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY", debug => "+O0 +d -g", @@ -479,9 +483,7 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-Wl,+s -ldld",threads("-lpthread")), bn_ops => "RC4_CHAR", - thread_scheme => "pthreads", dso_scheme => "dl", - shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "-b", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -492,7 +494,7 @@ sub vms_info { multilib => "/pa1.1", }, "hpux64-parisc2-cc" => { - inherit_from => [ "BASE_unix", asm("parisc20_64_asm") ], + inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], cc => "cc", cflags => combine(picker(default => "+DD64 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY", debug => "+O0 +d -g", @@ -500,9 +502,6 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl",threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "+DD64 -b", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -511,7 +510,7 @@ sub vms_info { # HP/UX IA-64 targets "hpux-ia64-cc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], cc => "cc", cflags => combine(picker(default => "-Ae +DD32 +Olit=all -z -DB_ENDIAN", debug => "+O0 +d -g", @@ -519,9 +518,6 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl",threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "+DD32 -b", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -530,7 +526,7 @@ sub vms_info { # Frank Geurts has patiently assisted # with debugging of the following config. "hpux64-ia64-cc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], cc => "cc", cflags => combine(picker(default => "-Ae +DD64 +Olit=all -z -DB_ENDIAN", debug => "+O0 +d -g", @@ -538,9 +534,6 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "+DD64 -b", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -548,7 +541,7 @@ sub vms_info { }, # GCC builds... "hpux-ia64-gcc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], cc => "gcc", cflags => combine(picker(default => "-DB_ENDIAN", debug => "-O0 -g", @@ -556,16 +549,13 @@ sub vms_info { threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "-fpic", shared_ldflag => "-shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/hpux32", }, "hpux64-ia64-gcc" => { - inherit_from => [ "BASE_unix", asm("ia64_asm") ], + inherit_from => [ "hpux-common", asm("ia64_asm") ], cc => "gcc", cflags => combine(picker(default => "-mlp64 -DB_ENDIAN", debug => "-O0 -g", @@ -573,9 +563,6 @@ sub vms_info { threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - shared_target => "hpux-shared", shared_cflag => "-fpic", shared_ldflag => "-mlp64 -shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -1223,6 +1210,7 @@ sub vms_info { perlasm_scheme => "aix32", dso_scheme => "dlfcn", shared_target => "aix-shared", + shared_cflag => "-qpic", shared_ldflag => "-q32 -G", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", arflags => "-X 32", @@ -1241,6 +1229,7 @@ sub vms_info { perlasm_scheme => "aix64", dso_scheme => "dlfcn", shared_target => "aix-shared", + shared_cflag => "-qpic", shared_ldflag => "-q64 -G", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", arflags => "-X 64", diff --git a/worker/deps/openssl/openssl/Configurations/90-team.conf b/worker/deps/openssl/openssl/Configurations/90-team.conf deleted file mode 100644 index 0a83c22aaa..0000000000 --- a/worker/deps/openssl/openssl/Configurations/90-team.conf +++ /dev/null @@ -1,112 +0,0 @@ -## -*- mode: perl; -*- -## Build configuration targets for openssl-team members - -%targets = ( - "purify" => { - cc => "purify gcc", - cflags => "-g -Wall", - thread_scheme => "(unknown)", - ex_libs => add(" ","-lsocket -lnsl"), - }, - "debug" => { - cc => "gcc", - cflags => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror", - thread_scheme => "(unknown)", - }, - "debug-erbridge" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => combine("$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g", - threads("-D_REENTRANT")), - ex_libs => add(" ","-ldl"), - bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - multilib => "64", - }, - "debug-linux-pentium" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", - cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall", - threads("-D_REENTRANT")), - ex_libs => add(" ","-ldl"), - bn_ops => "BN_LLONG", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - }, - "debug-linux-ppro" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", - cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall", - threads("-D_REENTRANT")), - ex_libs => add(" ","-ldl"), - bn_ops => "BN_LLONG", - thread_scheme => "pthreads", - dso_scheme => "dlfcn", - }, - "debug-linux-ia32-aes" => { - cc => "gcc", - cflags => combine("-DL_ENDIAN -O3 -fomit-frame-pointer -Wall", - threads("-D_REENTRANT")), - ex_libs => add(" ","-ldl"), - bn_ops => "BN_LLONG", - cpuid_asm_src => "x86cpuid.s", - bn_asm_src => "bn-586.s co-586.s x86-mont.s", - des_asm_src => "des-586.s crypt586.s", - aes_asm_src => "aes_x86core.s aes_cbc.s aesni-x86.s", - bf_asm_src => "bf-586.s", - md5_asm_src => "md5-586.s", - sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s", - cast_asm_src => "cast-586.s", - rc4_asm_src => "rc4-586.s", - rmd160_asm_src => "rmd-586.s", - rc5_asm_src => "rc5-586.s", - wp_asm_src => "wp_block.s wp-mmx.s", - modes_asm_src => "ghash-x86.s", - padlock_asm_src => "e_padlock-x86.s", - thread_scheme => "pthreads", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "dist" => { - cc => "cc", - cflags => "-O", - thread_scheme => "(unknown)", - }, - "debug-test-64-clang" => { - inherit_from => [ "x86_64_asm" ], - cc => "clang", - cflags => combine("$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", - threads("${BSDthreads}")), - bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "darwin64-debug-test-64-clang" => { - inherit_from => [ "x86_64_asm" ], - cc => "clang", - cflags => combine("-arch x86_64 -DL_ENDIAN $gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", - threads("${BSDthreads}")), - sys_id => "MACOSX", - bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "pthreads", - perlasm_scheme => "macosx", - dso_scheme => "dlfcn", - shared_target => "darwin-shared", - shared_cflag => "-fPIC -fno-common", - shared_ldflag => "-arch x86_64 -dynamiclib", - shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - }, -); diff --git a/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure b/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure index 6d148196ff..b28305deca 100644 --- a/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure +++ b/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure @@ -133,3 +133,4 @@ Example 4: | ENDIF | 1 | | | ... whatever ... | | this line is processed | | ENDIF | | | + diff --git a/worker/deps/openssl/openssl/Configurations/README b/worker/deps/openssl/openssl/Configurations/README index e85673c591..6e13645491 100644 --- a/worker/deps/openssl/openssl/Configurations/README +++ b/worker/deps/openssl/openssl/Configurations/README @@ -81,7 +81,7 @@ In each table entry, the following keys are significant: ''. This is very rarely needed. shared_extension => File name extension used for shared - libraries. + libraries. obj_extension => File name extension used for object files. On unix, this defaults to ".o" (NOTE: this is here for future use, it's not @@ -471,11 +471,11 @@ clash with those generated by Configure, it's possible to tell it not to generate them with the use of OVERRIDES, for example: SOURCE[libfoo]=foo.c bar.c - + OVERRIDES=bar.o BEGINRAW[Makefile(unix)] bar.o: bar.c - $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $< + $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $< ENDRAW[Makefile(unix)] See the documentation further up for more information on configuration diff --git a/worker/deps/openssl/openssl/Configurations/README.design b/worker/deps/openssl/openssl/Configurations/README.design index 7179ec027f..bea9790afb 100644 --- a/worker/deps/openssl/openssl/Configurations/README.design +++ b/worker/deps/openssl/openssl/Configurations/README.design @@ -90,7 +90,7 @@ depends on the library 'libssl' to function properly. LIBS=../libcrypto SOURCE[../libcrypto]=aes.c evp.c cversion.c DEPEND[cversion.o]=buildinf.h - + GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" DEPEND[buildinf.h]=../Makefile DEPEND[../util/mkbuildinf.pl]=../util/Foo.pm @@ -105,7 +105,7 @@ show that duplicate information isn't an issue. This build.info file informs us that 'libcrypto' is built from a few source files, 'crypto/aes.c', 'crypto/evp.c' and 'crypto/cversion.c'. It also shows us that building the object file inferred from -'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it +'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it also shows the possibility to declare how some files are generated using some script, in this case a perl script, and how such scripts can be declared to depend on other files, in this case a perl module. @@ -157,7 +157,7 @@ information comes down to this: SOURCE[libssl]=ssl/tls.c INCLUDE[libssl]=include DEPEND[libssl]=libcrypto - + PROGRAMS=apps/openssl SOURCE[apps/openssl]=apps/openssl.c INCLUDE[apps/openssl]=. include @@ -172,7 +172,7 @@ information comes down to this: SOURCE[engines/ossltest]=engines/e_ossltest.c DEPEND[engines/ossltest]=libcrypto INCLUDE[engines/ossltest]=include - + GENERATE[crypto/buildinf.h]=util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" DEPEND[crypto/buildinf.h]=Makefile DEPEND[util/mkbuildinf.pl]=util/Foo.pm diff --git a/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl b/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl index 7e3356f1f1..739928808b 100644 --- a/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl +++ b/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl @@ -368,12 +368,10 @@ descrip.mms : FORCE # Install helper targets ############################################# -install_sw : all install_shared _install_dev_ns - - install_engines _install_runtime_ns - +install_sw : install_dev install_engines install_runtime - install_startup install_ivp -uninstall_sw : uninstall_shared _uninstall_dev_ns - - uninstall_engines _uninstall_runtime_ns - +uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime - uninstall_startup uninstall_ivp install_docs : install_html_docs @@ -396,17 +394,7 @@ install_ssldirs : check_INSTALLTOP COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} - ossl_dataroot:[000000]openssl.cnf -install_shared : check_INSTALLTOP - @ {- output_off() if $disabled{shared}; "" -} ! - @ WRITE SYS$OUTPUT "*** Installing shareable images" - @ ! Install shared (runtime) libraries - - CREATE/DIR ossl_installroot:[LIB.'arch'] - {- join("\n ", - map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" } - @install_shlibs) -} - @ {- output_on() if $disabled{shared}; "" -} ! - -_install_dev_ns : check_INSTALLTOP +install_dev : check_INSTALLTOP install_runtime_libs @ WRITE SYS$OUTPUT "*** Installing development files" @ ! Install header files - CREATE/DIR ossl_installroot:[include.openssl] @@ -417,9 +405,29 @@ _install_dev_ns : check_INSTALLTOP map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } @{$unified_info{install}->{libraries}}) -} -install_dev : install_shared _install_dev_ns +install_engines : check_INSTALLTOP install_runtime_libs build_engines + @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! + @ WRITE SYS$OUTPUT "*** Installing engines" + - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch'] + {- join("\n ", + map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" } + @{$unified_info{install}->{engines}}) -} + @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! -_install_runtime_ns : check_INSTALLTOP +install_runtime : install_programs + +install_runtime_libs : check_INSTALLTOP build_libs + @ {- output_off() if $disabled{shared}; "" -} ! + @ WRITE SYS$OUTPUT "*** Installing shareable images" + @ ! Install shared (runtime) libraries + - CREATE/DIR ossl_installroot:[LIB.'arch'] + {- join("\n ", + map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" } + @install_shlibs) -} + @ {- output_on() if $disabled{shared}; "" -} ! + +install_programs : check_INSTALLTOP install_runtime_libs build_programs + @ {- output_off() if $disabled{apps}; "" -} ! @ ! Install the main program - CREATE/DIR ossl_installroot:[EXE.'arch'] COPY/PROT=W:RE [.APPS]openssl.EXE - @@ -428,17 +436,6 @@ _install_runtime_ns : check_INSTALLTOP COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE] @ ! {- output_on() if $disabled{apps}; "" -} -install_runtime : install_shared _install_runtime_ns - -install_engines : check_INSTALLTOP - @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! - @ WRITE SYS$OUTPUT "*** Installing engines" - - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch'] - {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" } - @{$unified_info{install}->{engines}}) -} - @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! - install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - [.VMS]openssl_utils.com, check_INSTALLTOP - CREATE/DIR ossl_installroot:[SYS$STARTUP] diff --git a/worker/deps/openssl/openssl/Configurations/dist.conf b/worker/deps/openssl/openssl/Configurations/dist.conf new file mode 100644 index 0000000000..4f58dad914 --- /dev/null +++ b/worker/deps/openssl/openssl/Configurations/dist.conf @@ -0,0 +1,12 @@ +## -*- mode: perl; -*- +## Build configuration targets for openssl-team members + +# This is to support 'make dist' +%targets = ( + "dist" => { + inherit_from => [ 'BASE_unix' ], + cc => "cc", + cflags => "-O", + thread_scheme => "(unknown)", + }, +); diff --git a/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl b/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl index 40cf2c3df4..7254478af5 100644 --- a/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl +++ b/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl @@ -323,7 +323,7 @@ depend: # Install helper targets ############################################# -install_sw: all install_dev install_engines install_runtime +install_sw: install_dev install_engines install_runtime uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev @@ -355,7 +355,7 @@ install_ssldirs: chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \ fi -install_dev: +install_dev: install_runtime_libs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @echo "*** Installing development files" @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl @@ -461,7 +461,7 @@ uninstall_dev: -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) -install_engines: +install_engines: install_runtime_libs build_engines @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/ @echo "*** Installing engines" @@ -488,9 +488,10 @@ uninstall_engines: done -$(RMDIR) $(DESTDIR)$(ENGINESDIR) -install_runtime: +install_runtime: install_programs + +install_runtime_libs: build_libs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin @ : {- output_off() if windowsdll(); "" -} @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) @ : {- output_on() if windowsdll(); "" -} @@ -512,6 +513,11 @@ install_runtime: $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ : {- output_on() if windowsdll(); "" -}; \ done + +install_programs: install_runtime_libs build_programs + @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin + @echo "*** Installing runtime programs" @set -e; for x in dummy $(INSTALL_PROGRAMS); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ @@ -531,8 +537,10 @@ install_runtime: $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done -uninstall_runtime: - @echo "*** Uninstalling runtime files" +uninstall_runtime: uninstall_programs uninstall_runtime_libs + +uninstall_programs: + @echo "*** Uninstalling runtime programs" @set -e; for x in dummy $(INSTALL_PROGRAMS); \ do \ if [ "$$x" = "dummy" ]; then continue; fi; \ @@ -547,6 +555,10 @@ uninstall_runtime: echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin + +uninstall_runtime_libs: + @echo "*** Uninstalling runtime libraries" @ : {- output_off() unless windowsdll(); "" -} @set -e; for s in dummy $(INSTALL_SHLIBS); do \ if [ "$$s" = "dummy" ]; then continue; fi; \ @@ -555,7 +567,6 @@ uninstall_runtime: $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done @ : {- output_on() unless windowsdll(); "" -} - -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin install_man_docs: @@ -664,8 +675,10 @@ tar: DISTDIR=$(NAME); \ mkdir -p $$TMPDIR/$$DISTDIR; \ (cd $(SRCDIR); \ + excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf)"; \ + echo "$$excl_re"; \ git ls-tree -r --name-only --full-tree HEAD \ - | grep -v '^fuzz/corpora' \ + | egrep -v "$$excl_re" \ | while read F; do \ mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \ cp $$F $$TMPDIR/$$DISTDIR/$$F; \ @@ -848,7 +861,7 @@ EOF $recipe .= <<"EOF"; $obj$objext: $deps ( trap "rm -f \$@.*" INT 0; \\ - \$(CPP) $incs \$(CFLAGS) $ecflags $srcs | \\ + \$(CC) $incs \$(CFLAGS) $ecflags -E $srcs | \\ \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.s && \\ \$(CC) \$(CFLAGS) $ecflags -c -o \$\@ \$@.s ) EOF diff --git a/worker/deps/openssl/openssl/Configurations/windows-checker.pm b/worker/deps/openssl/openssl/Configurations/windows-checker.pm index de46fbc1df..4b7105df33 100644 --- a/worker/deps/openssl/openssl/Configurations/windows-checker.pm +++ b/worker/deps/openssl/openssl/Configurations/windows-checker.pm @@ -6,7 +6,7 @@ use Config; # we expect for the platform use File::Spec::Functions qw(:DEFAULT rel2abs); -if (rel2abs('.') !~ m|\\|) { +if (!$ENV{CONFIGURE_INSIST} && rel2abs('.') !~ m|\\|) { die <{libraries}}) -} -INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -} -INSTALL_SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; shlib($_) } @{$unified_info{install}->{libraries}}) -} -INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -} -INSTALL_ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{install}->{engines}}) -} -INSTALL_PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} -INSTALL_PROGRAMPDBS={- join(" ", map { $_.".pdb" } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} +INSTALL_LIBS={- join(" ", map { quotify1($_.$libext) } @{$unified_info{install}->{libraries}}) -} +INSTALL_SHLIBS={- join(" ", map { quotify_l(shlib($_)) } @{$unified_info{install}->{libraries}}) -} +INSTALL_SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; quotify_l(shlib($_)) } @{$unified_info{install}->{libraries}}) -} +INSTALL_ENGINES={- join(" ", map { quotify1(dso($_)) } @{$unified_info{install}->{engines}}) -} +INSTALL_ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; quotify1(dso($_)) } @{$unified_info{install}->{engines}}) -} +INSTALL_PROGRAMS={- join(" ", map { quotify1($_.$exeext) } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} +INSTALL_PROGRAMPDBS={- join(" ", map { quotify1($_.".pdb") } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} {- output_off() if $disabled{apps}; "" -} -BIN_SCRIPTS=$(BLDDIR)\tools\c_rehash.pl -MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl +BIN_SCRIPTS="$(BLDDIR)\tools\c_rehash.pl" +MISC_SCRIPTS="$(BLDDIR)\apps\CA.pl" "$(BLDDIR)\apps\tsget.pl" {- output_on() if $disabled{apps}; "" -} APPS_OPENSSL={- use File::Spec::Functions; - catfile("apps","openssl") -} + "\"".catfile("apps","openssl")."\"" -} # Do not edit these manually. Use Configure with --prefix or --openssldir # to change this! Short explanation in the top comment in Configure @@ -182,6 +182,9 @@ MTOUTFLAG={- $target{mtoutflag} || "-outputresource:" -}$(OSSL_EMPTY) AS={- $target{as} -} ASFLAGS={- $target{asflags} -} ASOUTFLAG={- $target{asoutflag} -}$(OSSL_EMPTY) + +ECHO="$(PERL)" "$(SRCDIR)\util\echo.pl" + PERLASM_SCHEME= {- $target{perlasm_scheme} -} PROCESSOR= {- $config{processor} -} @@ -207,7 +210,7 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) test: tests {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep - @rem {- output_off() if $disabled{tests}; "" -} + @{- output_off() if $disabled{tests}; "" -} -mkdir $(BLDDIR)\test\test-runs set SRCTOP=$(SRCDIR) set BLDTOP=$(BLDDIR) @@ -216,17 +219,17 @@ test: tests set OPENSSL_ENGINES=$(MAKEDIR)\engines set OPENSSL_DEBUG_MEMORY=on "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS) - @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} - @echo "Tests are not supported with your chosen Configure options" - @rem {- output_on() if !$disabled{tests}; "" -} + @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} + @$(ECHO) "Tests are not supported with your chosen Configure options" + @{- output_on() if !$disabled{tests}; "" -} list-tests: - @rem {- output_off() if $disabled{tests}; "" -} + @{- output_off() if $disabled{tests}; "" -} @set SRCTOP=$(SRCDIR) @"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list - @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} - @echo "Tests are not supported with your chosen Configure options" - @rem {- output_on() if !$disabled{tests}; "" -} + @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} + @$(ECHO) "Tests are not supported with your chosen Configure options" + @{- output_on() if !$disabled{tests}; "" -} install: install_sw install_ssldirs install_docs @@ -264,7 +267,7 @@ depend: # Install helper targets ############################################# -install_sw: all install_dev install_engines install_runtime +install_sw: install_dev install_engines install_runtime uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev @@ -284,17 +287,18 @@ install_ssldirs: @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \ "$(OPENSSLDIR)\misc" -install_dev: - @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) - @echo *** Installing development files +install_dev: install_runtime_libs + @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) + @$(ECHO) "*** Installing development files" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\include\openssl" - @rem {- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} + @{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\ms\applink.c" \ "$(INSTALLTOP)\include\openssl" - @rem {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} - @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\include\openssl\*.h" \ + @{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} + @"$(PERL)" "$(SRCDIR)\util\copy.pl" "-exclude_re=/__DECC_" \ + "$(SRCDIR)\include\openssl\*.h" \ "$(INSTALLTOP)\include\openssl" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \ + @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(BLDDIR)\include\openssl\*.h" \ "$(INSTALLTOP)\include\openssl" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\$(LIBDIR)" @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_LIBS) \ @@ -305,9 +309,9 @@ install_dev: uninstall_dev: -install_engines: - @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) - @echo *** Installing engines +install_engines: install_runtime_libs build_engines + @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) + @$(ECHO) "*** Installing engines" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(ENGINESDIR)" @if not "$(ENGINES)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINES) "$(ENGINESDIR)" @@ -316,15 +320,22 @@ install_engines: uninstall_engines: -install_runtime: - @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) - @echo *** Installing runtime files +install_runtime: install_programs + +install_runtime_libs: build_libs + @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) + @$(ECHO) "*** Installing runtime libraries" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" @if not "$(SHLIBS)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBS) "$(INSTALLTOP)\bin" @if not "$(SHLIBS)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBPDBS) \ "$(INSTALLTOP)\bin" + +install_programs: install_runtime_libs build_programs + @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) + @$(ECHO) "*** Installing runtime programs" + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \ "$(INSTALLTOP)\bin" @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \ @@ -343,14 +354,14 @@ uninstall_html_docs: # Building targets ################################################### configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} - @echo "Detected changed: $?" - @echo "Reconfiguring..." + @$(ECHO) "Detected changed: $?" + @$(ECHO) "Reconfiguring..." "$(PERL)" "$(SRCDIR)\Configure" reconf - @echo "**************************************************" - @echo "*** ***" - @echo "*** Please run the same make command again ***" - @echo "*** ***" - @echo "**************************************************" + @$(ECHO) "**************************************************" + @$(ECHO) "*** ***" + @$(ECHO) "*** Please run the same make command again ***" + @$(ECHO) "*** ***" + @$(ECHO) "**************************************************" @exit 1 {- @@ -450,22 +461,20 @@ $obj$objext: $deps \$(AS) \$(ASFLAGS) \$(ASOUTFLAG)\$\@ $srcs EOF } - return <<"EOF" if (!$disabled{makedepend}); -$obj$depext: $deps - \$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\ + my $recipe = <<"EOF"; +$obj$objext: $deps + \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs +EOF + $recipe .= <<"EOF" unless $disabled{makedepend}; + \$(CC) $incs \$(CFLAGS) $ecflags /Zs /showIncludes $srcs 2>&1 | \\ "\$(PERL)" -n << > $obj$depext chomp; s/^Note: including file: *//; \$\$collect{\$\$_} = 1; END { print '$obj$objext: ',join(" ", sort keys \%collect),"\\n" } << -$obj$objext: $obj$depext - \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs -EOF - return <<"EOF" if ($disabled{makedepend}); -$obj$objext: $deps - \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs EOF + return $recipe; } # On Unix, we build shlibs from static libs, so we're ignoring the @@ -604,8 +613,6 @@ EOF foreach my $prod (@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) { if (dirname($prod) eq $dir) { push @deps, $prod.$extinfo{$type}; - } else { - push @actions, "\t@rem No support to produce $type ".join(", ", @{$unified_info{dirinfo}->{$dir}->{products}->{$type}}); } } } diff --git a/worker/deps/openssl/openssl/Configure b/worker/deps/openssl/openssl/Configure index c0033643c6..a1ce65239e 100755 --- a/worker/deps/openssl/openssl/Configure +++ b/worker/deps/openssl/openssl/Configure @@ -20,6 +20,9 @@ use OpenSSL::Glob; # see INSTALL for instructions. +my $orig_death_handler = $SIG{__DIE__}; +$SIG{__DIE__} = \&death_handler; + my $usage="Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n"; # Options: @@ -756,21 +759,21 @@ while (@argvcopy) else { $config{options} .= " ".$_; } } + } - if (defined($config{api}) && !exists $apitable->{$config{api}}) { - die "***** Unsupported api compatibility level: $config{api}\n", - } +if (defined($config{api}) && !exists $apitable->{$config{api}}) { + die "***** Unsupported api compatibility level: $config{api}\n", +} - if (keys %deprecated_options) - { - warn "***** Deprecated options: ", - join(", ", keys %deprecated_options), "\n"; - } - if (keys %unsupported_options) - { - die "***** Unsupported options: ", - join(", ", keys %unsupported_options), "\n"; - } +if (keys %deprecated_options) + { + warn "***** Deprecated options: ", + join(", ", keys %deprecated_options), "\n"; + } +if (keys %unsupported_options) + { + die "***** Unsupported options: ", + join(", ", keys %unsupported_options), "\n"; } if ($libs =~ /(^|\s)-Wl,-rpath,/ @@ -908,11 +911,12 @@ if ($d) { $target = $t; } } + +&usage if !$table{$target} || $table{$target}->{template}; + $config{target} = $target; my %target = resolve_config($target); -&usage if (!%target || $target{template}); - my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}}); $config{conf_files} = [ sort keys %conf_files ]; %target = ( %{$table{DEFAULTS}}, %target ); @@ -1215,8 +1219,10 @@ if ($^O ne "VMS") { if (!$disabled{makedepend}) { # We know that GNU C version 3 and up as well as all clang - # versions support dependency generation - if ($predefined{__GNUC__} >= 3) { + # versions support dependency generation, but Xcode did not + # handle $cc -M before clang support (but claims __GNUC__ = 3) + if (($predefined{__GNUC__} // -1) >= 3 + && !($predefined{__APPLE_CC__} && !$predefined{__clang__})) { $config{makedepprog} = $cc; } else { $config{makedepprog} = which('makedepend'); @@ -1900,8 +1906,8 @@ EOF next unless defined($unified_info{includes}->{$dest}->{$k}); my @incs = reverse @{$unified_info{includes}->{$dest}->{$k}}; foreach my $obj (grep /\.o$/, - (keys %{$unified_info{sources}->{$dest}}, - keys %{$unified_info{shared_sources}->{$dest}})) { + (keys %{$unified_info{sources}->{$dest} // {}}, + keys %{$unified_info{shared_sources}->{$dest} // {}})) { foreach my $inc (@incs) { unshift @{$unified_info{includes}->{$obj}->{$k}}, $inc unless grep { $_ eq $inc } @{$unified_info{includes}->{$obj}->{$k}}; @@ -2125,6 +2131,8 @@ my %builders = ( $builders{$builder}->($builder_platform, @builder_opts); +$SIG{__DIE__} = $orig_death_handler; + print <<"EOF"; Configured for $target. @@ -2153,6 +2161,24 @@ exit(0); # Helpers and utility functions # +# Death handler, to print a helpful message in case of failure ####### +# +sub death_handler { + die @_ if $^S; # To prevent the added message in eval blocks + my $build_file = $target{build_file} // "build file"; + my @message = ( <<"_____", @_ ); + +Failure! $build_file wasn't produced. +Please read INSTALL and associated NOTES files. You may also have to look over +your available compiler tool chain or change your configuration. + +_____ + + # Dying is terminal, so it's ok to reset the signal handler here. + $SIG{__DIE__} = $orig_death_handler; + die @message; +} + # Configuration file reading ######################################### # Note: All of the helper functions are for lazy evaluation. They all diff --git a/worker/deps/openssl/openssl/INSTALL b/worker/deps/openssl/openssl/INSTALL index e9b33a5336..5a98d1da83 100644 --- a/worker/deps/openssl/openssl/INSTALL +++ b/worker/deps/openssl/openssl/INSTALL @@ -3,7 +3,8 @@ -------------------- This document describes installation on all supported operating - systems (the Linux/Unix family, OpenVMS and Windows) + systems (the Unix/Linux family (which includes Mac OS/X), OpenVMS, + and Windows). To install OpenSSL, you will need: @@ -76,7 +77,7 @@ If you want to just get on with it, do: - on Unix: + on Unix (again, this includes Mac OS/X): $ ./config $ make @@ -208,7 +209,7 @@ without a path). This flag must be provided if the zlib-dynamic option is not also used. If zlib-dynamic is used then this flag is optional and a default value ("ZLIB1") is - used if not provided. + used if not provided. On VMS: this is the filename of the zlib library (with or without a path). This flag is optional and if not provided then "GNV$LIBZSHR", "GNV$LIBZSHR32" or "GNV$LIBZSHR64" is @@ -663,7 +664,7 @@ $ nmake TESTS='test_rsa test_dsa' test # Windows And of course, you can combine (Unix example shown): - + $ make VERBOSE=1 TESTS='test_rsa test_dsa' test You can find the list of available tests like this: @@ -733,7 +734,7 @@ command symbols. [.SYSTEST] Contains the installation verification procedure. [.HTML] Contains the HTML rendition of the manual pages. - + Additionally, install will add the following directories under OPENSSLDIR (the directory given with --openssldir or its default) diff --git a/worker/deps/openssl/openssl/NEWS b/worker/deps/openssl/openssl/NEWS index 8744fe68ec..983fceb2bb 100644 --- a/worker/deps/openssl/openssl/NEWS +++ b/worker/deps/openssl/openssl/NEWS @@ -5,6 +5,16 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.0j [20 Nov 2018] + + o Timing vulnerability in DSA signature generation (CVE-2018-0734) + o Timing vulnerability in ECDSA signature generation (CVE-2018-0735) + + Major changes between OpenSSL 1.1.0h and OpenSSL 1.1.0i [14 Aug 2018] + + o Client DoS due to large DH parameter (CVE-2018-0732) + o Cache timing vulnerability in RSA Key Generation (CVE-2018-0737) + Major changes between OpenSSL 1.1.0g and OpenSSL 1.1.0h [27 Mar 2018] o Constructed ASN.1 types with a recursive definition could exceed the diff --git a/worker/deps/openssl/openssl/NOTES.DJGPP b/worker/deps/openssl/openssl/NOTES.DJGPP index d43d4e86de..bbe63dc154 100644 --- a/worker/deps/openssl/openssl/NOTES.DJGPP +++ b/worker/deps/openssl/openssl/NOTES.DJGPP @@ -1,5 +1,5 @@ - + INSTALLATION ON THE DOS PLATFORM WITH DJGPP ------------------------------------------- @@ -29,7 +29,7 @@ running "./Configure" with appropriate arguments: ./Configure no-threads --prefix=/dev/env/DJDIR DJGPP - + And finally fire up "make". You may run out of DPMI selectors when running in a DOS box under Windows. If so, just close the BASH shell, go back to Windows, and restart BASH. Then run "make" again. diff --git a/worker/deps/openssl/openssl/NOTES.VMS b/worker/deps/openssl/openssl/NOTES.VMS index 7d74f0dbdd..3e9a57e805 100644 --- a/worker/deps/openssl/openssl/NOTES.VMS +++ b/worker/deps/openssl/openssl/NOTES.VMS @@ -42,7 +42,7 @@ for now is to rename the OpenSSL source directory, as follows (please adjust for the actual source directory name you have): - $ rename openssl-1^.1^.0.DIR openssl-1_1_0.DIR + $ rename openssl-1^.1^.0.DIR openssl-1_1_0.DIR About MMS and DCL diff --git a/worker/deps/openssl/openssl/README b/worker/deps/openssl/openssl/README index 3491280ead..4694701909 100644 --- a/worker/deps/openssl/openssl/README +++ b/worker/deps/openssl/openssl/README @@ -1,7 +1,7 @@ - OpenSSL 1.1.0h 27 Mar 2018 + OpenSSL 1.1.0j 20 Nov 2018 - Copyright (c) 1998-2016 The OpenSSL Project + Copyright (c) 1998-2018 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson All rights reserved. diff --git a/worker/deps/openssl/openssl/README.ECC b/worker/deps/openssl/openssl/README.ECC index 86f5b23070..fa3cad7aa7 100644 --- a/worker/deps/openssl/openssl/README.ECC +++ b/worker/deps/openssl/openssl/README.ECC @@ -5,56 +5,57 @@ Center (NCSC) dated 2010-11-04. That agreement permits implementation and distribution of software containing features covered by any or all of the following patents: -1.) U.S. Pat. No. 5,761,305 entitled "Key Agreement and Transport Protocol +1.) U.S. Pat. No. 5,761,305 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on June 2, 1998; -2.) Can. Pat. Appl. Ser. No. 2176972 entitled "Key Agreement and Transport - Protocol with Implicit Signature and Reduced Bandwidth" filed on May +2.) Can. Pat. Appl. Ser. No. 2176972 entitled "Key Agreement and Transport + Protocol with Implicit Signature and Reduced Bandwidth" filed on May 16, 1996; -3.) U.S. Pat. No. 5,889,865 entitled "Key Agreement and Transport Protocol +3.) U.S. Pat. No. 5,889,865 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on March 30, 1999; -4.) U.S. Pat. No. 5,896,455 entitled "Key Agreement and Transport Protocol +4.) U.S. Pat. No. 5,896,455 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on April 20, 1999; -5.) U.S. Pat. No. 5,933,504 entitled "Strengthened Public Key Protocol" +5.) U.S. Pat. No. 5,933,504 entitled "Strengthened Public Key Protocol" issued on August 3, 1999; -6.) Can. Pat. Appl. Ser. No. 2176866 entitled "Strengthened Public Key +6.) Can. Pat. Appl. Ser. No. 2176866 entitled "Strengthened Public Key Protocol" filed on May 17, 1996; -7.) E.P. Pat. Appl. Ser. No. 96201322.3 entitled "Strengthened Public Key +7.) E.P. Pat. Appl. Ser. No. 96201322.3 entitled "Strengthened Public Key Protocol" filed on May 17, 1996; -8.) U.S. Pat. No. 5,999,626 entitled "Digital Signatures on a Smartcard" +8.) U.S. Pat. No. 5,999,626 entitled "Digital Signatures on a Smartcard" issued on December 7, 1999; -9.) Can. Pat. Appl. Ser. No. 2202566 entitled "Digital Signatures on a +9.) Can. Pat. Appl. Ser. No. 2202566 entitled "Digital Signatures on a Smartcard" filed on April 14, 1997; -10.) E.P. Pat. Appl. No. 97106114.8 entitled "Digital Signatures on a +10.) E.P. Pat. Appl. No. 97106114.8 entitled "Digital Signatures on a Smartcard" filed on April 15, 1997; -11.) U.S Pat. No. 6,122,736 entitled "Key Agreement and Transport Protocol +11.) U.S Pat. No. 6,122,736 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on September 19, 2000; -12.) Can. Pat. Appl. Ser. No. 2174261 entitled "Key Agreement and Transport +12.) Can. Pat. Appl. Ser. No. 2174261 entitled "Key Agreement and Transport Protocol with Implicit Signatures" filed on April 16, 1996; -13.) E.P. Pat. Appl. Ser. No. 96105920.1 entitled "Key Agreement and +13.) E.P. Pat. Appl. Ser. No. 96105920.1 entitled "Key Agreement and Transport Protocol with Implicit Signatures" filed on April 16, 1996; -14.) U.S. Pat. No. 6,141,420 entitled "Elliptic Curve Encryption Systems" +14.) U.S. Pat. No. 6,141,420 entitled "Elliptic Curve Encryption Systems" issued on October 31, 2000; -15.) Can. Pat. Appl. Ser. No. 2155038 entitled "Elliptic Curve Encryption +15.) Can. Pat. Appl. Ser. No. 2155038 entitled "Elliptic Curve Encryption Systems" filed on July 31, 1995; -16.) E.P. Pat. Appl. Ser. No. 95926348.4 entitled "Elliptic Curve Encryption +16.) E.P. Pat. Appl. Ser. No. 95926348.4 entitled "Elliptic Curve Encryption Systems" filed on July 31, 1995; -17.) U.S. Pat. No. 6,336,188 entitled "Authenticated Key Agreement" issued +17.) U.S. Pat. No. 6,336,188 entitled "Authenticated Key Agreement" issued on January 1, 2002; -18.) U.S. Pat. No. 6,487,661 entitled "Key Agreement and Transport Protocol" +18.) U.S. Pat. No. 6,487,661 entitled "Key Agreement and Transport Protocol" issued on November 26, 2002; -19.) Can. Pat. Appl. Ser. No. 2174260 entitled "Key Agreement and Transport +19.) Can. Pat. Appl. Ser. No. 2174260 entitled "Key Agreement and Transport Protocol" filed on April 16, 1996; -20.) E.P. Pat. Appl. Ser. No. 96105921.9 entitled "Key Agreement and +20.) E.P. Pat. Appl. Ser. No. 96105921.9 entitled "Key Agreement and Transport Protocol" filed on April 21, 1996; -21.) U.S. Pat. No. 6,563,928 entitled "Strengthened Public Key Protocol" +21.) U.S. Pat. No. 6,563,928 entitled "Strengthened Public Key Protocol" issued on May 13, 2003; -22.) U.S. Pat. No. 6,618,483 entitled "Elliptic Curve Encryption Systems" +22.) U.S. Pat. No. 6,618,483 entitled "Elliptic Curve Encryption Systems" issued September 9, 2003; -23.) U.S. Pat. Appl. Ser. No. 09/434,247 entitled "Digital Signatures on a +23.) U.S. Pat. Appl. Ser. No. 09/434,247 entitled "Digital Signatures on a Smartcard" filed on November 5, 1999; -24.) U.S. Pat. Appl. Ser. No. 09/558,256 entitled "Key Agreement and +24.) U.S. Pat. Appl. Ser. No. 09/558,256 entitled "Key Agreement and Transport Protocol with Implicit Signatures" filed on April 25, 2000; -25.) U.S. Pat. Appl. Ser. No. 09/942,492 entitled "Digital Signatures on a +25.) U.S. Pat. Appl. Ser. No. 09/942,492 entitled "Digital Signatures on a Smartcard" filed on August 29, 2001 and published on July 18, 2002; and, -26.) U.S. Pat. Appl. Ser. No. 10/185,735 entitled "Strengthened Public Key +26.) U.S. Pat. Appl. Ser. No. 10/185,735 entitled "Strengthened Public Key Protocol" filed on July 1, 2000. + diff --git a/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in b/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in index e888b52879..825a699c4f 100644 --- a/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in +++ b/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in @@ -16,7 +16,7 @@ $ OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") - $ $ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -} $ pz := {- $config{pointer_size} -} -$ +$ $ @'INSTALLTOP_'SYS$STARTUP]openssl_startup'v' $ @'INSTALLTOP_'SYS$STARTUP]openssl_utils'v' $ diff --git a/worker/deps/openssl/openssl/apps/apps.c b/worker/deps/openssl/openssl/apps/apps.c index 8703d0cc31..94efa5ac05 100644 --- a/worker/deps/openssl/openssl/apps/apps.c +++ b/worker/deps/openssl/openssl/apps/apps.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1012,7 +1012,8 @@ int set_name_ex(unsigned long *flags, const char *arg) }; if (set_multi_opts(flags, arg, ex_tbl) == 0) return 0; - if ((*flags & XN_FLAG_SEP_MASK) == 0) + if (*flags != XN_FLAG_COMPAT + && (*flags & XN_FLAG_SEP_MASK) == 0) *flags |= XN_FLAG_SEP_CPLUS_SPC; return 1; } @@ -1706,8 +1707,14 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti) char *work; X509_NAME *n; - if (*cp++ != '/') + if (*cp++ != '/') { + BIO_printf(bio_err, + "name is expected to be in the format " + "/type0=value0/type1=value1/type2=... where characters may " + "be escaped by \\. This name is not in that format: '%s'\n", + --cp); return NULL; + } n = X509_NAME_new(); if (n == NULL) @@ -1763,6 +1770,12 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti) opt_getprog(), typestr); continue; } + if (*valstr == '\0') { + BIO_printf(bio_err, + "%s: No value provided for Subject Attribute %s, skipped\n", + opt_getprog(), typestr); + continue; + } if (!X509_NAME_add_entry_by_NID(n, nid, chtype, valstr, strlen((char *)valstr), -1, ismulti ? -1 : 0)) diff --git a/worker/deps/openssl/openssl/apps/asn1pars.c b/worker/deps/openssl/openssl/apps/asn1pars.c index 1ac261c762..008a6797d0 100644 --- a/worker/deps/openssl/openssl/apps/asn1pars.c +++ b/worker/deps/openssl/openssl/apps/asn1pars.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -41,7 +41,7 @@ OPTIONS asn1parse_options[] = { {"dump", OPT_DUMP, 0, "unknown data in hex form"}, {"dlimit", OPT_DLIMIT, 'p', "dump the first arg bytes of unknown data in hex form"}, - {"strparse", OPT_STRPARSE, 's', + {"strparse", OPT_STRPARSE, 'p', "offset; a series of these can be used to 'dig'"}, {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"}, {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"}, @@ -113,13 +113,13 @@ int asn1parse_main(int argc, char **argv) offset = strtol(opt_arg(), NULL, 0); break; case OPT_LENGTH: - length = atoi(opt_arg()); + length = strtol(opt_arg(), NULL, 0); break; case OPT_DUMP: dump = -1; break; case OPT_DLIMIT: - dump = atoi(opt_arg()); + dump = strtol(opt_arg(), NULL, 0); break; case OPT_STRPARSE: sk_OPENSSL_STRING_push(osk, opt_arg()); @@ -191,7 +191,7 @@ int asn1parse_main(int argc, char **argv) num = 0; for (;;) { - if (!BUF_MEM_grow(buf, (int)num + BUFSIZ)) + if (!BUF_MEM_grow(buf, num + BUFSIZ)) goto end; i = BIO_read(in, &(buf->data[num]), BUFSIZ); if (i <= 0) @@ -211,9 +211,9 @@ int asn1parse_main(int argc, char **argv) for (i = 0; i < sk_OPENSSL_STRING_num(osk); i++) { ASN1_TYPE *atmp; int typ; - j = atoi(sk_OPENSSL_STRING_value(osk, i)); - if (j == 0) { - BIO_printf(bio_err, "'%s' is an invalid number\n", + j = strtol(sk_OPENSSL_STRING_value(osk, i), NULL, 0); + if (j <= 0 || j >= tmplen) { + BIO_printf(bio_err, "'%s' is out of range\n", sk_OPENSSL_STRING_value(osk, i)); continue; } @@ -244,14 +244,14 @@ int asn1parse_main(int argc, char **argv) num = tmplen; } - if (offset >= num) { - BIO_printf(bio_err, "Error: offset too large\n"); + if (offset < 0 || offset >= num) { + BIO_printf(bio_err, "Error: offset out of range\n"); goto end; } num -= offset; - if ((length == 0) || ((long)length > num)) + if (length == 0 || length > (unsigned int)num) length = (unsigned int)num; if (derout) { if (BIO_write(derout, str + offset, length) != (int)length) { diff --git a/worker/deps/openssl/openssl/apps/ca.c b/worker/deps/openssl/openssl/apps/ca.c index d474a2b69a..c69a2b5cdd 100644 --- a/worker/deps/openssl/openssl/apps/ca.c +++ b/worker/deps/openssl/openssl/apps/ca.c @@ -725,10 +725,10 @@ int ca_main(int argc, char **argv) /*****************************************************************/ if (req || gencrl) { - /* FIXME: Is it really always text? */ - Sout = bio_open_default(outfile, 'w', FORMAT_TEXT); - if (Sout == NULL) - goto end; + if (spkac_file != NULL) { + output_der = 1; + batch = 1; + } } if (md == NULL @@ -872,10 +872,6 @@ int ca_main(int argc, char **argv) BIO_printf(bio_err, "Memory allocation failure\n"); goto end; } - if (outfile) { - output_der = 1; - batch = 1; - } } } if (ss_cert_file != NULL) { @@ -929,10 +925,13 @@ int ca_main(int argc, char **argv) if (j > 0) { total_done++; BIO_printf(bio_err, "\n"); - if (!BN_add_word(serial, 1)) + if (!BN_add_word(serial, 1)) { + X509_free(x); goto end; + } if (!sk_X509_push(cert_sk, x)) { BIO_printf(bio_err, "Memory allocation failure\n"); + X509_free(x); goto end; } } @@ -1017,6 +1016,11 @@ int ca_main(int argc, char **argv) if (verbose) BIO_printf(bio_err, "writing %s\n", buf[2]); + Sout = bio_open_default(outfile, 'w', + output_der ? FORMAT_ASN1 : FORMAT_TEXT); + if (Sout == NULL) + goto end; + Cout = BIO_new_file(buf[2], "w"); if (Cout == NULL) { perror(buf[2]); @@ -1025,6 +1029,8 @@ int ca_main(int argc, char **argv) write_new_certificate(Cout, xi, 0, notext); write_new_certificate(Sout, xi, output_der, notext); BIO_free_all(Cout); + BIO_free_all(Sout); + Sout = NULL; } if (sk_X509_num(cert_sk)) { @@ -1173,6 +1179,11 @@ int ca_main(int argc, char **argv) if (!do_X509_CRL_sign(crl, pkey, dgst, sigopts)) goto end; + Sout = bio_open_default(outfile, 'w', + output_der ? FORMAT_ASN1 : FORMAT_TEXT); + if (Sout == NULL) + goto end; + PEM_write_bio_X509_CRL(Sout, crl); if (crlnumberfile != NULL) /* Rename the crlnumber file */ diff --git a/worker/deps/openssl/openssl/apps/cms.c b/worker/deps/openssl/openssl/apps/cms.c index b999c70c95..640f92eb1b 100644 --- a/worker/deps/openssl/openssl/apps/cms.c +++ b/worker/deps/openssl/openssl/apps/cms.c @@ -146,7 +146,7 @@ OPTIONS cms_options[] = { "Do not load certificates from the default certificates directory"}, {"content", OPT_CONTENT, '<', "Supply or override content for detached signature"}, - {"print", OPT_PRINT, '-', + {"print", OPT_PRINT, '-', "For the -cmsout operation print out all fields of the CMS structure"}, {"secretkey", OPT_SECRETKEY, 's'}, {"secretkeyid", OPT_SECRETKEYID, 's'}, diff --git a/worker/deps/openssl/openssl/apps/ct_log_list.cnf b/worker/deps/openssl/openssl/apps/ct_log_list.cnf index a637b477af..243487453c 100644 --- a/worker/deps/openssl/openssl/apps/ct_log_list.cnf +++ b/worker/deps/openssl/openssl/apps/ct_log_list.cnf @@ -31,3 +31,4 @@ key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEluqsHEYMG1XcDfy1lCdGV0JwOmkY4r87xNuroP [venafi] description = Venafi log key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolpIHxdSlTXLo1s6H1OCdpSj/4DyHDc8wLG9wVmLqy1lk9fz4ATVmm+/1iN2Nk8jmctUKK2MFUtlWXZBSpym97M7frGlSaQXUWyA3CqQUEuIJOmlEjKTBEiQAvpfDjCHjlV2Be4qTM6jamkJbiWtgnYPhJL6ONaGTiSPm7Byy57iaz/hbckldSOIoRhYBiMzeNoA0DiRZ9KmfSeXZ1rB8y8X5urSW+iBzf2SaOfzBvDpcoTuAaWx2DPazoOl28fP1hZ+kHUYvxbcMjttjauCFx+JII0dmuZNIwjfeG/GBb9frpSX219k1O4Wi6OEbHEr8at/XQ0y7gTikOxBn/s5wQIDAQAB + diff --git a/worker/deps/openssl/openssl/apps/dh1024.pem b/worker/deps/openssl/openssl/apps/dh1024.pem index 813e8a4a48..f1a5e180aa 100644 --- a/worker/deps/openssl/openssl/apps/dh1024.pem +++ b/worker/deps/openssl/openssl/apps/dh1024.pem @@ -4,7 +4,7 @@ Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL /1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC -----END DH PARAMETERS----- -These are the 1024-bit DH parameters from "Internet Key Exchange +These are the 1024-bit DH parameters from "Internet Key Exchange Protocol Version 2 (IKEv2)": https://tools.ietf.org/html/rfc5996 See https://tools.ietf.org/html/rfc2412 for how they were generated. diff --git a/worker/deps/openssl/openssl/apps/dh2048.pem b/worker/deps/openssl/openssl/apps/dh2048.pem index 288a20997e..e899f2e029 100644 --- a/worker/deps/openssl/openssl/apps/dh2048.pem +++ b/worker/deps/openssl/openssl/apps/dh2048.pem @@ -7,8 +7,8 @@ fDKQXkYuNs474553LBgOhgObJ4Oi7Aeij7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq 5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg== -----END DH PARAMETERS----- -These are the 2048-bit DH parameters from "More Modular Exponential -(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": +These are the 2048-bit DH parameters from "More Modular Exponential +(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": https://tools.ietf.org/html/rfc3526 See https://tools.ietf.org/html/rfc2412 for how they were generated. diff --git a/worker/deps/openssl/openssl/apps/dh4096.pem b/worker/deps/openssl/openssl/apps/dh4096.pem index 08560e1284..adada2b558 100644 --- a/worker/deps/openssl/openssl/apps/dh4096.pem +++ b/worker/deps/openssl/openssl/apps/dh4096.pem @@ -12,8 +12,8 @@ ARpyPBKnh+bXiHGaEL26WyaZwycYavTiPBqUaDS2FQvaJYPpyirUTOjbu8LbBN6O HNAGkSfVsFqpk7TqmI2P3cGG/7fckKbAj030Nck0BjGZ//////////8CAQI= -----END DH PARAMETERS----- -These are the 4096-bit DH parameters from "More Modular Exponential -(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": +These are the 4096-bit DH parameters from "More Modular Exponential +(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": https://tools.ietf.org/html/rfc3526 See https://tools.ietf.org/html/rfc2412 for how they were generated. diff --git a/worker/deps/openssl/openssl/apps/dhparam.c b/worker/deps/openssl/openssl/apps/dhparam.c index 94322e37de..8a28414562 100644 --- a/worker/deps/openssl/openssl/apps/dhparam.c +++ b/worker/deps/openssl/openssl/apps/dhparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -151,6 +151,11 @@ int dhparam_main(int argc, char **argv) goto end; } # endif + + out = bio_open_default(outfile, 'w', outformat); + if (out == NULL) + goto end; + /* DH parameters */ if (num && !g) g = 2; @@ -266,10 +271,6 @@ int dhparam_main(int argc, char **argv) /* dh != NULL */ } - out = bio_open_default(outfile, 'w', outformat); - if (out == NULL) - goto end; - if (text) { DHparams_print(out, dh); } diff --git a/worker/deps/openssl/openssl/apps/dsaparam.c b/worker/deps/openssl/openssl/apps/dsaparam.c index 5c3c8f8089..20891cf3dd 100644 --- a/worker/deps/openssl/openssl/apps/dsaparam.c +++ b/worker/deps/openssl/openssl/apps/dsaparam.c @@ -226,25 +226,28 @@ int dsaparam_main(int argc, char **argv) data = app_malloc(len + 20, "BN space"); - BIO_printf(bio_out, "DSA *get_dsa%d()\n{\n", bits_p); - print_bignum_var(bio_out, p, "dsap", len, data); - print_bignum_var(bio_out, q, "dsaq", len, data); - print_bignum_var(bio_out, g, "dsag", len, data); + BIO_printf(bio_out, "static DSA *get_dsa%d(void)\n{\n", bits_p); + print_bignum_var(bio_out, p, "dsap", bits_p, data); + print_bignum_var(bio_out, q, "dsaq", bits_p, data); + print_bignum_var(bio_out, g, "dsag", bits_p, data); BIO_printf(bio_out, " DSA *dsa = DSA_new();\n" + " BIGNUM *p, *q, *g;\n" "\n"); BIO_printf(bio_out, " if (dsa == NULL)\n" " return NULL;\n"); - BIO_printf(bio_out, " dsa->p = BN_bin2bn(dsap_%d, sizeof(dsap_%d), NULL);\n", - bits_p, bits_p); - BIO_printf(bio_out, " dsa->q = BN_bin2bn(dsaq_%d, sizeof(dsaq_%d), NULL);\n", - bits_p, bits_p); - BIO_printf(bio_out, " dsa->g = BN_bin2bn(dsag_%d, sizeof(dsag_%d), NULL);\n", - bits_p, bits_p); - BIO_printf(bio_out, " if (!dsa->p || !dsa->q || !dsa->g) {\n" - " DSA_free(dsa);\n" + BIO_printf(bio_out, " if (!DSA_set0_pqg(dsa, p = BN_bin2bn(dsap_%d, sizeof(dsap_%d), NULL),\n", + bits_p, bits_p); + BIO_printf(bio_out, " q = BN_bin2bn(dsaq_%d, sizeof(dsaq_%d), NULL),\n", + bits_p, bits_p); + BIO_printf(bio_out, " g = BN_bin2bn(dsag_%d, sizeof(dsag_%d), NULL))) {\n", + bits_p, bits_p); + BIO_printf(bio_out, " DSA_free(dsa);\n" + " BN_free(p);\n" + " BN_free(q);\n" + " BN_free(g);\n" " return NULL;\n" " }\n" - " return(dsa);\n}\n"); + " return dsa;\n}\n"); OPENSSL_free(data); } diff --git a/worker/deps/openssl/openssl/apps/ocsp.c b/worker/deps/openssl/openssl/apps/ocsp.c index 4b533348b4..0c15f5114d 100644 --- a/worker/deps/openssl/openssl/apps/ocsp.c +++ b/worker/deps/openssl/openssl/apps/ocsp.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -639,7 +639,6 @@ int ocsp_main(int argc, char **argv) OCSP_response_status_str(i), i); if (ignore_err) goto redo_accept; - ret = 0; goto end; } diff --git a/worker/deps/openssl/openssl/apps/pkey.c b/worker/deps/openssl/openssl/apps/pkey.c index ad1a3b10eb..5c13d8b87a 100644 --- a/worker/deps/openssl/openssl/apps/pkey.c +++ b/worker/deps/openssl/openssl/apps/pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -141,24 +141,30 @@ int pkey_main(int argc, char **argv) if (!noout) { if (outformat == FORMAT_PEM) { - if (pubout) - PEM_write_bio_PUBKEY(out, pkey); - else { + if (pubout) { + if (!PEM_write_bio_PUBKEY(out, pkey)) + goto end; + } else { assert(private); - if (traditional) - PEM_write_bio_PrivateKey_traditional(out, pkey, cipher, - NULL, 0, NULL, - passout); - else - PEM_write_bio_PrivateKey(out, pkey, cipher, - NULL, 0, NULL, passout); + if (traditional) { + if (!PEM_write_bio_PrivateKey_traditional(out, pkey, cipher, + NULL, 0, NULL, + passout)) + goto end; + } else { + if (!PEM_write_bio_PrivateKey(out, pkey, cipher, + NULL, 0, NULL, passout)) + goto end; + } } } else if (outformat == FORMAT_ASN1) { - if (pubout) - i2d_PUBKEY_bio(out, pkey); - else { + if (pubout) { + if (!i2d_PUBKEY_bio(out, pkey)) + goto end; + } else { assert(private); - i2d_PrivateKey_bio(out, pkey); + if (!i2d_PrivateKey_bio(out, pkey)) + goto end; } } else { BIO_printf(bio_err, "Bad format specified for key\n"); @@ -168,17 +174,21 @@ int pkey_main(int argc, char **argv) } if (text) { - if (pubtext) - EVP_PKEY_print_public(out, pkey, 0, NULL); - else { + if (pubtext) { + if (EVP_PKEY_print_public(out, pkey, 0, NULL) <= 0) + goto end; + } else { assert(private); - EVP_PKEY_print_private(out, pkey, 0, NULL); + if (EVP_PKEY_print_private(out, pkey, 0, NULL) <= 0) + goto end; } } ret = 0; end: + if (ret != 0) + ERR_print_errors(bio_err); EVP_PKEY_free(pkey); release_engine(e); BIO_free_all(out); diff --git a/worker/deps/openssl/openssl/apps/rehash.c b/worker/deps/openssl/openssl/apps/rehash.c index 273ad74969..aa3f8643a5 100644 --- a/worker/deps/openssl/openssl/apps/rehash.c +++ b/worker/deps/openssl/openssl/apps/rehash.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -130,9 +130,10 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename, for (ep = bp->first_entry; ep; ep = ep->next) { if (digest && memcmp(digest, ep->digest, evpmdsize) == 0) { BIO_printf(bio_err, - "%s: skipping duplicate %s in %s\n", opt_getprog(), + "%s: warning: skipping duplicate %s in %s\n", + opt_getprog(), type == TYPE_CERT ? "certificate" : "CRL", filename); - return 1; + return 0; } if (strcmp(filename, ep->filename) == 0) { found = ep; @@ -144,7 +145,7 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename, if (ep == NULL) { if (bp->num_needed >= MAX_COLLISIONS) { BIO_printf(bio_err, - "%s: hash table overflow for %s\n", + "%s: error: hash table overflow for %s\n", opt_getprog(), filename); return 1; } @@ -235,7 +236,7 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h) /* Does it have X.509 data in it? */ if ((b = BIO_new_file(fullpath, "r")) == NULL) { - BIO_printf(bio_err, "%s: skipping %s, cannot open file\n", + BIO_printf(bio_err, "%s: error: skipping %s, cannot open file\n", opt_getprog(), filename); errs++; goto end; @@ -247,7 +248,7 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h) if (sk_X509_INFO_num(inf) != 1) { BIO_printf(bio_err, - "%s: skipping %s," + "%s: warning: skipping %s," "it does not contain exactly one certificate or CRL\n", opt_getprog(), filename); /* This is not an error. */ @@ -502,13 +503,14 @@ int rehash_main(int argc, char **argv) if (*argv) { while (*argv) errs += do_dir(*argv++, h); - } else if ((env = getenv("SSL_CERT_DIR")) != NULL) { + } else if ((env = getenv(X509_get_default_cert_dir_env())) != NULL) { + char lsc[2] = { LIST_SEPARATOR_CHAR, '\0' }; m = OPENSSL_strdup(env); - for (e = strtok(m, ":"); e != NULL; e = strtok(NULL, ":")) + for (e = strtok(m, lsc); e != NULL; e = strtok(NULL, lsc)) errs += do_dir(e, h); OPENSSL_free(m); } else { - errs += do_dir("/etc/ssl/certs", h); + errs += do_dir(X509_get_default_cert_dir(), h); } end: diff --git a/worker/deps/openssl/openssl/apps/req.c b/worker/deps/openssl/openssl/apps/req.c index 2a2156953a..a20e7c1ef1 100644 --- a/worker/deps/openssl/openssl/apps/req.c +++ b/worker/deps/openssl/openssl/apps/req.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -509,8 +509,7 @@ int req_main(int argc, char **argv) if (pkey_type == EVP_PKEY_EC) { BIO_printf(bio_err, "Generating an EC private key\n"); } else { - BIO_printf(bio_err, "Generating a %ld bit %s private key\n", - newkey, keyalgstr); + BIO_printf(bio_err, "Generating a %s private key\n", keyalgstr); } EVP_PKEY_CTX_set_cb(genctx, genpkey_cb); diff --git a/worker/deps/openssl/openssl/apps/s_client.c b/worker/deps/openssl/openssl/apps/s_client.c index fb89f0cd61..3c0c73e851 100644 --- a/worker/deps/openssl/openssl/apps/s_client.c +++ b/worker/deps/openssl/openssl/apps/s_client.c @@ -593,7 +593,8 @@ OPTIONS s_client_options[] = { "Disable name checks when matching DANE-EE(3) TLSA records"}, {"reconnect", OPT_RECONNECT, '-', "Drop and re-make the connection with the same Session-ID"}, - {"showcerts", OPT_SHOWCERTS, '-', "Show all certificates in the chain"}, + {"showcerts", OPT_SHOWCERTS, '-', + "Show all certificates sent by the server"}, {"debug", OPT_DEBUG, '-', "Extra output"}, {"msg", OPT_MSG, '-', "Show protocol messages"}, {"msgfile", OPT_MSGFILE, '>', @@ -2114,8 +2115,7 @@ int s_client_main(int argc, char **argv) FD_ZERO(&readfds); FD_ZERO(&writefds); - if ((SSL_version(con) == DTLS1_VERSION) && - DTLSv1_get_timeout(con, &timeout)) + if (SSL_is_dtls(con) && DTLSv1_get_timeout(con, &timeout)) timeoutp = &timeout; else timeoutp = NULL; @@ -2235,10 +2235,8 @@ int s_client_main(int argc, char **argv) } } - if ((SSL_version(con) == DTLS1_VERSION) - && DTLSv1_handle_timeout(con) > 0) { + if (SSL_is_dtls(con) && DTLSv1_handle_timeout(con) > 0) BIO_printf(bio_err, "TIMEOUT occurred\n"); - } if (!ssl_pending && FD_ISSET(SSL_get_fd(con), &writefds)) { k = SSL_write(con, &(cbuf[cbuf_off]), (unsigned int)cbuf_len); diff --git a/worker/deps/openssl/openssl/apps/s_server.c b/worker/deps/openssl/openssl/apps/s_server.c index 31c90fdd0e..86298334bd 100644 --- a/worker/deps/openssl/openssl/apps/s_server.c +++ b/worker/deps/openssl/openssl/apps/s_server.c @@ -2012,9 +2012,7 @@ static int sv_body(int s, int stype, unsigned char *context) SSL *con = NULL; BIO *sbio; struct timeval timeout; -#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) - struct timeval tv; -#else +#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)) struct timeval *timeoutp; #endif @@ -2149,26 +2147,23 @@ static int sv_body(int s, int stype, unsigned char *context) * second and check for any keypress. In a proper Windows * application we wouldn't do this because it is inefficient. */ - tv.tv_sec = 1; - tv.tv_usec = 0; - i = select(width, (void *)&readfds, NULL, NULL, &tv); + timeout.tv_sec = 1; + timeout.tv_usec = 0; + i = select(width, (void *)&readfds, NULL, NULL, &timeout); if (has_stdin_waiting()) read_from_terminal = 1; if ((i < 0) || (!i && !read_from_terminal)) continue; #else - if ((SSL_version(con) == DTLS1_VERSION) && - DTLSv1_get_timeout(con, &timeout)) + if (SSL_is_dtls(con) && DTLSv1_get_timeout(con, &timeout)) timeoutp = &timeout; else timeoutp = NULL; i = select(width, (void *)&readfds, NULL, NULL, timeoutp); - if ((SSL_version(con) == DTLS1_VERSION) - && DTLSv1_handle_timeout(con) > 0) { + if ((SSL_is_dtls(con)) && DTLSv1_handle_timeout(con) > 0) BIO_printf(bio_err, "TIMEOUT occurred\n"); - } if (i <= 0) continue; @@ -2665,8 +2660,10 @@ static int www_body(int s, int stype, unsigned char *context) if (context && !SSL_set_session_id_context(con, context, - strlen((char *)context))) + strlen((char *)context))) { + SSL_free(con); goto err; + } sbio = BIO_new_socket(s, BIO_NOCLOSE); if (s_nbio_test) { @@ -2678,7 +2675,7 @@ static int www_body(int s, int stype, unsigned char *context) SSL_set_bio(con, sbio, sbio); SSL_set_accept_state(con); - /* SSL_set_fd(con,s); */ + /* No need to free |con| after this. Done by BIO_free(ssl_bio) */ BIO_set_ssl(ssl_bio, con, BIO_CLOSE); BIO_push(io, ssl_bio); #ifdef CHARSET_EBCDIC @@ -3035,6 +3032,7 @@ static int rev_body(int s, int stype, unsigned char *context) if (context && !SSL_set_session_id_context(con, context, strlen((char *)context))) { + SSL_free(con); ERR_print_errors(bio_err); goto err; } @@ -3043,6 +3041,7 @@ static int rev_body(int s, int stype, unsigned char *context) SSL_set_bio(con, sbio, sbio); SSL_set_accept_state(con); + /* No need to free |con| after this. Done by BIO_free(ssl_bio) */ BIO_set_ssl(ssl_bio, con, BIO_CLOSE); BIO_push(io, ssl_bio); #ifdef CHARSET_EBCDIC diff --git a/worker/deps/openssl/openssl/apps/smime.c b/worker/deps/openssl/openssl/apps/smime.c index 8edb1ed994..e18d7de75f 100644 --- a/worker/deps/openssl/openssl/apps/smime.c +++ b/worker/deps/openssl/openssl/apps/smime.c @@ -89,7 +89,7 @@ OPTIONS smime_options[] = { {"no-CApath", OPT_NOCAPATH, '-', "Do not load certificates from the default certificates directory"}, {"resign", OPT_RESIGN, '-', "Resign a signed message"}, - {"nochain", OPT_NOCHAIN, '-', + {"nochain", OPT_NOCHAIN, '-', "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" }, {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"}, {"stream", OPT_STREAM, '-', "Enable CMS streaming" }, diff --git a/worker/deps/openssl/openssl/apps/speed.c b/worker/deps/openssl/openssl/apps/speed.c index f388a9852d..6672fe606a 100644 --- a/worker/deps/openssl/openssl/apps/speed.c +++ b/worker/deps/openssl/openssl/apps/speed.c @@ -129,13 +129,6 @@ #define BUFSIZE (1024*16+1) #define MAX_MISALIGNMENT 63 -#define ALGOR_NUM 30 -#define SIZE_NUM 6 -#define PRIME_NUM 3 -#define RSA_NUM 7 -#define DSA_NUM 3 - -#define EC_NUM 17 #define MAX_ECDH_SIZE 256 #define MISALIGN 64 @@ -144,37 +137,6 @@ static volatile int run = 0; static int mr = 0; static int usertime = 1; -typedef void *(*kdf_fn) ( - const void *in, size_t inlen, void *out, size_t *xoutlen); - -typedef struct loopargs_st { - ASYNC_JOB *inprogress_job; - ASYNC_WAIT_CTX *wait_ctx; - unsigned char *buf; - unsigned char *buf2; - unsigned char *buf_malloc; - unsigned char *buf2_malloc; - unsigned int siglen; -#ifndef OPENSSL_NO_RSA - RSA *rsa_key[RSA_NUM]; -#endif -#ifndef OPENSSL_NO_DSA - DSA *dsa_key[DSA_NUM]; -#endif -#ifndef OPENSSL_NO_EC - EC_KEY *ecdsa[EC_NUM]; - EC_KEY *ecdh_a[EC_NUM]; - EC_KEY *ecdh_b[EC_NUM]; - unsigned char *secret_a; - unsigned char *secret_b; - size_t outlen; - kdf_fn kdf; -#endif - EVP_CIPHER_CTX *ctx; - HMAC_CTX *hctx; - GCM128_CONTEXT *gcm_ctx; -} loopargs_t; - #ifndef OPENSSL_NO_MD2 static int EVP_Digest_MD2_loop(void *args); #endif @@ -227,7 +189,6 @@ static int ECDSA_sign_loop(void *args); static int ECDSA_verify_loop(void *args); static int ECDH_compute_key_loop(void *args); #endif -static int run_benchmark(int async_jobs, int (*loop_function)(void *), loopargs_t *loopargs); static double Time_F(int s); static void print_message(const char *s, long num, int length); @@ -238,32 +199,10 @@ static void print_result(int alg, int run_no, int count, double time_used); static int do_multi(int multi); #endif -static const char *names[ALGOR_NUM] = { - "md2", "mdc2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4", - "des cbc", "des ede3", "idea cbc", "seed cbc", - "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc", - "aes-128 cbc", "aes-192 cbc", "aes-256 cbc", - "camellia-128 cbc", "camellia-192 cbc", "camellia-256 cbc", - "evp", "sha256", "sha512", "whirlpool", - "aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash" -}; - -static double results[ALGOR_NUM][SIZE_NUM]; - -static const int lengths[SIZE_NUM] = { +static const int lengths[] = { 16, 64, 256, 1024, 8 * 1024, 16 * 1024 }; - -#ifndef OPENSSL_NO_RSA -static double rsa_results[RSA_NUM][2]; -#endif -#ifndef OPENSSL_NO_DSA -static double dsa_results[DSA_NUM][2]; -#endif -#ifndef OPENSSL_NO_EC -static double ecdsa_results[EC_NUM][2]; -static double ecdh_results[EC_NUM][1]; -#endif +#define SIZE_NUM OSSL_NELEM(lengths) #if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC) static const char rnd_seed[] = @@ -348,9 +287,14 @@ static double Time_F(int s) static void multiblock_speed(const EVP_CIPHER *evp_cipher); -static int found(const char *name, const OPT_PAIR *pairs, int *result) +#define found(value, pairs, result)\ + opt_found(value, result, pairs, OSSL_NELEM(pairs)) +static int opt_found(const char *name, unsigned int *result, + const OPT_PAIR pairs[], unsigned int nbelem) { - for (; pairs->name; pairs++) + unsigned int idx; + + for (idx = 0; idx < nbelem; ++idx, pairs++) if (strcmp(name, pairs->name) == 0) { *result = pairs->retval; return 1; @@ -387,7 +331,7 @@ OPTIONS speed_options[] = { #ifndef OPENSSL_NO_ENGINE {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"}, #endif - {NULL}, + {NULL} }; #define D_MD2 0 @@ -420,7 +364,19 @@ OPTIONS speed_options[] = { #define D_IGE_192_AES 27 #define D_IGE_256_AES 28 #define D_GHASH 29 -static OPT_PAIR doit_choices[] = { +/* name of algorithms to test */ +static const char *names[] = { + "md2", "mdc2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4", + "des cbc", "des ede3", "idea cbc", "seed cbc", + "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc", + "aes-128 cbc", "aes-192 cbc", "aes-256 cbc", + "camellia-128 cbc", "camellia-192 cbc", "camellia-256 cbc", + "evp", "sha256", "sha512", "whirlpool", + "aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash" +}; +#define ALGOR_NUM OSSL_NELEM(names) +/* list of configured algorithm (remaining) */ +static const OPT_PAIR doit_choices[] = { #ifndef OPENSSL_NO_MD2 {"md2", D_MD2}, #endif @@ -484,21 +440,24 @@ static OPT_PAIR doit_choices[] = { {"cast", D_CBC_CAST}, {"cast5", D_CBC_CAST}, #endif - {"ghash", D_GHASH}, - {NULL} + {"ghash", D_GHASH} }; +static double results[ALGOR_NUM][SIZE_NUM]; + #ifndef OPENSSL_NO_DSA # define R_DSA_512 0 # define R_DSA_1024 1 # define R_DSA_2048 2 -static OPT_PAIR dsa_choices[] = { +static const OPT_PAIR dsa_choices[] = { {"dsa512", R_DSA_512}, {"dsa1024", R_DSA_1024}, - {"dsa2048", R_DSA_2048}, - {NULL}, + {"dsa2048", R_DSA_2048} }; -#endif +# define DSA_NUM OSSL_NELEM(dsa_choices) + +static double dsa_results[DSA_NUM][2]; /* 2 ops: sign then verify */ +#endif /* OPENSSL_NO_DSA */ #define R_RSA_512 0 #define R_RSA_1024 1 @@ -507,16 +466,18 @@ static OPT_PAIR dsa_choices[] = { #define R_RSA_4096 4 #define R_RSA_7680 5 #define R_RSA_15360 6 -static OPT_PAIR rsa_choices[] = { +static const OPT_PAIR rsa_choices[] = { {"rsa512", R_RSA_512}, {"rsa1024", R_RSA_1024}, {"rsa2048", R_RSA_2048}, {"rsa3072", R_RSA_3072}, {"rsa4096", R_RSA_4096}, {"rsa7680", R_RSA_7680}, - {"rsa15360", R_RSA_15360}, - {NULL} + {"rsa15360", R_RSA_15360} }; +# define RSA_NUM OSSL_NELEM(rsa_choices) + +static double rsa_results[RSA_NUM][2]; /* 2 ops: sign then verify */ #define R_EC_P160 0 #define R_EC_P192 1 @@ -536,7 +497,7 @@ static OPT_PAIR rsa_choices[] = { #define R_EC_B571 15 #define R_EC_X25519 16 #ifndef OPENSSL_NO_EC -static OPT_PAIR ecdsa_choices[] = { +static const OPT_PAIR ecdsa_choices[] = { {"ecdsap160", R_EC_P160}, {"ecdsap192", R_EC_P192}, {"ecdsap224", R_EC_P224}, @@ -552,11 +513,13 @@ static OPT_PAIR ecdsa_choices[] = { {"ecdsab233", R_EC_B233}, {"ecdsab283", R_EC_B283}, {"ecdsab409", R_EC_B409}, - {"ecdsab571", R_EC_B571}, - {NULL} + {"ecdsab571", R_EC_B571} }; +# define ECDSA_NUM OSSL_NELEM(ecdsa_choices) + +static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */ -static OPT_PAIR ecdh_choices[] = { +static const OPT_PAIR ecdh_choices[] = { {"ecdhp160", R_EC_P160}, {"ecdhp192", R_EC_P192}, {"ecdhp224", R_EC_P224}, @@ -576,7 +539,10 @@ static OPT_PAIR ecdh_choices[] = { {"ecdhx25519", R_EC_X25519}, {NULL} }; -#endif +# define EC_NUM OSSL_NELEM(ecdh_choices) + +static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */ +#endif /* OPENSSL_NO_EC */ #ifndef SIGALRM # define COND(d) (count < (d)) @@ -586,7 +552,40 @@ static OPT_PAIR ecdh_choices[] = { # define COUNT(d) (count) #endif /* SIGALRM */ -static int testnum; +static unsigned int testnum; +typedef void *(*kdf_fn) (const void *in, size_t inlen, void *out, + size_t *xoutlen); + +typedef struct loopargs_st { + ASYNC_JOB *inprogress_job; + ASYNC_WAIT_CTX *wait_ctx; + unsigned char *buf; + unsigned char *buf2; + unsigned char *buf_malloc; + unsigned char *buf2_malloc; + unsigned int siglen; +#ifndef OPENSSL_NO_RSA + RSA *rsa_key[RSA_NUM]; +#endif +#ifndef OPENSSL_NO_DSA + DSA *dsa_key[DSA_NUM]; +#endif +#ifndef OPENSSL_NO_EC + EC_KEY *ecdsa[ECDSA_NUM]; + EC_KEY *ecdh_a[EC_NUM]; + EC_KEY *ecdh_b[EC_NUM]; + unsigned char *secret_a; + unsigned char *secret_b; + size_t outlen; + kdf_fn kdf; +#endif + EVP_CIPHER_CTX *ctx; + HMAC_CTX *hctx; + GCM128_CONTEXT *gcm_ctx; +} loopargs_t; + +static int run_benchmark(int async_jobs, int (*loop_function) (void *), + loopargs_t * loopargs); /* Nb of iterations to do per algorithm and key-size */ static long c[ALGOR_NUM][SIZE_NUM]; @@ -995,7 +994,7 @@ static int DSA_verify_loop(void *args) #endif #ifndef OPENSSL_NO_EC -static long ecdsa_c[EC_NUM][2]; +static long ecdsa_c[ECDSA_NUM][2]; static int ECDSA_sign_loop(void *args) { loopargs_t *tempargs = *(loopargs_t **)args; @@ -1188,8 +1187,8 @@ static int run_benchmark(int async_jobs, continue; #endif - ret = ASYNC_start_job(&loopargs[i].inprogress_job, - loopargs[i].wait_ctx, &job_op_count, loop_function, + ret = ASYNC_start_job(&loopargs[i].inprogress_job, + loopargs[i].wait_ctx, &job_op_count, loop_function, (void *)(loopargs + i), sizeof(loopargs_t)); switch (ret) { case ASYNC_PAUSE: @@ -1222,26 +1221,23 @@ int speed_main(int argc, char **argv) { ENGINE *e = NULL; loopargs_t *loopargs = NULL; - int async_init = 0; - int loopargs_len = 0; - char *prog; + const char *prog; const char *engine_id = NULL; const EVP_CIPHER *evp_cipher = NULL; double d = 0.0; OPTION_CHOICE o; - int multiblock = 0, pr_header = 0; + int async_init = 0, multiblock = 0, pr_header = 0; int doit[ALGOR_NUM] = { 0 }; - int ret = 1, i, k, misalign = 0; + int ret = 1, misalign = 0; long count = 0; + unsigned int i, k, loop, loopargs_len = 0, async_jobs = 0; #ifndef NO_FORK int multi = 0; #endif - unsigned int async_jobs = 0; #if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) \ || !defined(OPENSSL_NO_EC) long rsa_count = 1; #endif - size_t loop; /* What follows are the buffers and key material. */ #ifndef OPENSSL_NO_RC5 @@ -1325,7 +1321,7 @@ int speed_main(int argc, char **argv) /* * We only test over the following curves as they are representative, To * add tests over more curves, simply add the curve NID and curve name to - * the following arrays and increase the EC_NUM value accordingly. + * the following arrays and increase the |ecdh_choices| list accordingly. */ static const unsigned int test_curves[EC_NUM] = { /* Prime Curves */ @@ -1360,7 +1356,7 @@ int speed_main(int argc, char **argv) 571, 253 /* X25519 */ }; - int ecdsa_doit[EC_NUM] = { 0 }; + int ecdsa_doit[ECDSA_NUM] = { 0 }; int ecdh_doit[EC_NUM] = { 0 }; #endif /* ndef OPENSSL_NO_EC */ @@ -1418,9 +1414,7 @@ int speed_main(int argc, char **argv) goto opterr; } if (async_jobs > 99999) { - BIO_printf(bio_err, - "%s: too many async_jobs\n", - prog); + BIO_printf(bio_err, "%s: too many async_jobs\n", prog); goto opterr; } #endif @@ -1471,10 +1465,8 @@ int speed_main(int argc, char **argv) if (strcmp(*argv, "openssl") == 0) continue; if (strcmp(*argv, "rsa") == 0) { - rsa_doit[R_RSA_512] = rsa_doit[R_RSA_1024] = - rsa_doit[R_RSA_2048] = rsa_doit[R_RSA_3072] = - rsa_doit[R_RSA_4096] = rsa_doit[R_RSA_7680] = - rsa_doit[R_RSA_15360] = 1; + for (loop = 0; loop < OSSL_NELEM(rsa_doit); loop++) + rsa_doit[loop] = 1; continue; } if (found(*argv, rsa_choices, &i)) { @@ -1507,8 +1499,8 @@ int speed_main(int argc, char **argv) #endif #ifndef OPENSSL_NO_EC if (strcmp(*argv, "ecdsa") == 0) { - for (loop = 0; loop < OSSL_NELEM(ecdsa_choices); loop++) - ecdsa_doit[ecdsa_choices[loop].retval] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdsa_doit); loop++) + ecdsa_doit[loop] = 1; continue; } if (found(*argv, ecdsa_choices, &i)) { @@ -1516,8 +1508,8 @@ int speed_main(int argc, char **argv) continue; } if (strcmp(*argv, "ecdh") == 0) { - for (loop = 0; loop < OSSL_NELEM(ecdh_choices); loop++) - ecdh_doit[ecdh_choices[loop].retval] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++) + ecdh_doit[loop] = 1; continue; } if (found(*argv, ecdh_choices, &i)) { @@ -1584,10 +1576,10 @@ int speed_main(int argc, char **argv) dsa_doit[i] = 1; #endif #ifndef OPENSSL_NO_EC - for (loop = 0; loop < OSSL_NELEM(ecdsa_choices); loop++) - ecdsa_doit[ecdsa_choices[loop].retval] = 1; - for (loop = 0; loop < OSSL_NELEM(ecdh_choices); loop++) - ecdh_doit[ecdh_choices[loop].retval] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdsa_doit); loop++) + ecdsa_doit[loop] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++) + ecdh_doit[loop] = 1; #endif } for (i = 0; i < ALGOR_NUM; i++) @@ -1850,6 +1842,8 @@ int speed_main(int argc, char **argv) } } } + /* default iteration count for the last EC Curve */ + ecdh_c[R_EC_X25519][0] = count / 1800; # endif # else @@ -2472,7 +2466,7 @@ int speed_main(int argc, char **argv) if (RAND_status() != 1) { RAND_seed(rnd_seed, sizeof(rnd_seed)); } - for (testnum = 0; testnum < EC_NUM; testnum++) { + for (testnum = 0; testnum < ECDSA_NUM; testnum++) { int st = 1; if (!ecdsa_doit[testnum]) @@ -2547,7 +2541,7 @@ int speed_main(int argc, char **argv) if (rsa_count <= 1) { /* if longer than 10s, don't do any more */ - for (testnum++; testnum < EC_NUM; testnum++) + for (testnum++; testnum < ECDSA_NUM; testnum++) ecdsa_doit[testnum] = 0; } } @@ -2584,7 +2578,7 @@ int speed_main(int argc, char **argv) ecdh_checks = 0; rsa_count = 1; } else { - int secret_size_a, secret_size_b; + int secret_size_a, secret_size_b, j; /* * If field size is not more than 24 octets, then use SHA-1 * hash of result; otherwise, use result (see section 4.8 of @@ -2613,8 +2607,8 @@ int speed_main(int argc, char **argv) else ecdh_checks = 1; - for (k = 0; k < secret_size_a && ecdh_checks == 1; k++) { - if (loopargs[i].secret_a[k] != loopargs[i].secret_b[k]) + for (j = 0; j < secret_size_a && ecdh_checks == 1; j++) { + if (loopargs[i].secret_a[j] != loopargs[i].secret_b[j]) ecdh_checks = 0; } @@ -2644,7 +2638,7 @@ int speed_main(int argc, char **argv) if (rsa_count <= 1) { /* if longer than 10s, don't do any more */ - for (testnum++; testnum < EC_NUM; testnum++) + for (testnum++; testnum < OSSL_NELEM(ecdh_doit); testnum++) ecdh_doit[testnum] = 0; } } @@ -2693,7 +2687,7 @@ int speed_main(int argc, char **argv) if (!doit[k]) continue; if (mr) - printf("+F:%d:%s", k, names[k]); + printf("+F:%u:%s", k, names[k]); else printf("%-13s", names[k]); for (testnum = 0; testnum < SIZE_NUM; testnum++) { @@ -2742,7 +2736,7 @@ int speed_main(int argc, char **argv) #endif #ifndef OPENSSL_NO_EC testnum = 1; - for (k = 0; k < EC_NUM; k++) { + for (k = 0; k < OSSL_NELEM(ecdsa_doit); k++) { if (!ecdsa_doit[k]) continue; if (testnum && !mr) { @@ -2800,8 +2794,9 @@ int speed_main(int argc, char **argv) DSA_free(loopargs[i].dsa_key[k]); #endif #ifndef OPENSSL_NO_EC - for (k = 0; k < EC_NUM; k++) { + for (k = 0; k < ECDSA_NUM; k++) EC_KEY_free(loopargs[i].ecdsa[k]); + for (k = 0; k < EC_NUM; k++) { EC_KEY_free(loopargs[i].ecdh_a[k]); EC_KEY_free(loopargs[i].ecdh_b[k]); } @@ -2950,7 +2945,7 @@ static int do_multi(int multi) printf("Got: %s from %d\n", buf, n); if (strncmp(buf, "+F:", 3) == 0) { int alg; - int j; + unsigned int j; p = buf + 3; alg = atoi(sstrsep(&p, sep)); diff --git a/worker/deps/openssl/openssl/apps/verify.c b/worker/deps/openssl/openssl/apps/verify.c index 0925ee627f..8bcbff6177 100644 --- a/worker/deps/openssl/openssl/apps/verify.c +++ b/worker/deps/openssl/openssl/apps/verify.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -219,6 +219,7 @@ static int check(X509_STORE *ctx, const char *file, X509_STORE_set_flags(ctx, vflags); if (!X509_STORE_CTX_init(csc, ctx, x, uchain)) { + X509_STORE_CTX_free(csc); printf("error %s: X.509 store context initialization failed\n", (file == NULL) ? "stdin" : file); goto end; diff --git a/worker/deps/openssl/openssl/appveyor.yml b/worker/deps/openssl/openssl/appveyor.yml index 8dd6cb6fb0..ba291fdd17 100644 --- a/worker/deps/openssl/openssl/appveyor.yml +++ b/worker/deps/openssl/openssl/appveyor.yml @@ -41,5 +41,5 @@ test_script: - cd _build - nmake test - mkdir ..\_install - - nmake install install_docs DESTDIR=..\_install + - nmake install DESTDIR=..\_install - cd .. diff --git a/worker/deps/openssl/openssl/config b/worker/deps/openssl/openssl/config index 6331d905b4..ef0841d12d 100755 --- a/worker/deps/openssl/openssl/config +++ b/worker/deps/openssl/openssl/config @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -923,11 +923,12 @@ if [ $? = "0" ]; then if [ "$VERBOSE" = "true" ]; then echo $PERL $THERE/Configure $OUT $options - fi + fi if [ "$DRYRUN" = "false" ]; then $PERL $THERE/Configure $OUT $options fi else echo "This system ($OUT) is not supported. See file INSTALL for details." + exit 1 fi ) diff --git a/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl b/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl index 2e704a2124..d6b5f561c4 100755 --- a/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl +++ b/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl @@ -769,7 +769,7 @@ ld1 {v0.16b}, [$inp] // vmovdqu 16(%rdi),%xmm0 # load key part 2 (unaligned) bl _vpaes_schedule_transform // input transform mov $inp, #7 // mov \$7, %esi - + .Loop_schedule_256: sub $inp, $inp, #1 // dec %esi bl _vpaes_schedule_mangle // output low result @@ -778,7 +778,7 @@ // high round bl _vpaes_schedule_round cbz $inp, .Lschedule_mangle_last - bl _vpaes_schedule_mangle + bl _vpaes_schedule_mangle // low round. swap xmm7 and xmm6 dup v0.4s, v0.s[3] // vpshufd \$0xFF, %xmm0, %xmm0 @@ -787,7 +787,7 @@ mov v7.16b, v6.16b // vmovdqa %xmm6, %xmm7 bl _vpaes_schedule_low_round mov v7.16b, v5.16b // vmovdqa %xmm5, %xmm7 - + b .Loop_schedule_256 ## @@ -814,7 +814,7 @@ .Lschedule_mangle_last_dec: ld1 {v20.2d-v21.2d}, [x11] // reload constants - sub $out, $out, #16 // add \$-16, %rdx + sub $out, $out, #16 // add \$-16, %rdx eor v0.16b, v0.16b, v16.16b // vpxor .Lk_s63(%rip), %xmm0, %xmm0 bl _vpaes_schedule_transform // output transform st1 {v0.2d}, [$out] // vmovdqu %xmm0, (%rdx) # save last key diff --git a/worker/deps/openssl/openssl/crypto/arm_arch.h b/worker/deps/openssl/openssl/crypto/arm_arch.h index 3fc9e69b1c..25419e0df1 100644 --- a/worker/deps/openssl/openssl/crypto/arm_arch.h +++ b/worker/deps/openssl/openssl/crypto/arm_arch.h @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -69,7 +69,7 @@ # endif # endif -# if !__ASSEMBLER__ +# ifndef __ASSEMBLER__ extern unsigned int OPENSSL_armcap_P; # endif diff --git a/worker/deps/openssl/openssl/crypto/armcap.c b/worker/deps/openssl/openssl/crypto/armcap.c index 432a06c0c1..28e97c8c4a 100644 --- a/worker/deps/openssl/openssl/crypto/armcap.c +++ b/worker/deps/openssl/openssl/crypto/armcap.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -13,6 +13,7 @@ #include #include #include +#include #include "arm_arch.h" diff --git a/worker/deps/openssl/openssl/crypto/armv4cpuid.pl b/worker/deps/openssl/openssl/crypto/armv4cpuid.pl index f7d31a698a..ab007c19c3 100644 --- a/worker/deps/openssl/openssl/crypto/armv4cpuid.pl +++ b/worker/deps/openssl/openssl/crypto/armv4cpuid.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -125,7 +125,7 @@ ldmia sp!,{r4,r5} .Lno_data: - neg r0,ip + rsb r0,ip,#0 mov r0,r0,lsr#31 #if __ARM_ARCH__>=5 bx lr diff --git a/worker/deps/openssl/openssl/crypto/asn1/a_object.c b/worker/deps/openssl/openssl/crypto/asn1/a_object.c index 1ec7a7e15f..7d332ec2f6 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/a_object.c +++ b/worker/deps/openssl/openssl/crypto/asn1/a_object.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -19,7 +19,7 @@ int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp) { - unsigned char *p; + unsigned char *p, *allocated = NULL; int objsize; if ((a == NULL) || (a->data == NULL)) @@ -29,13 +29,24 @@ int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp) if (pp == NULL || objsize == -1) return objsize; - p = *pp; + if (*pp == NULL) { + if ((p = allocated = OPENSSL_malloc(objsize)) == NULL) { + ASN1err(ASN1_F_I2D_ASN1_OBJECT, ERR_R_MALLOC_FAILURE); + return 0; + } + } else { + p = *pp; + } + ASN1_put_object(&p, 0, a->length, V_ASN1_OBJECT, V_ASN1_UNIVERSAL); memcpy(p, a->data, a->length); - p += a->length; - *pp = p; - return (objsize); + /* + * If a new buffer was allocated, just return it back. + * If not, return the incremented buffer pointer. + */ + *pp = allocated != NULL ? allocated : p + a->length; + return objsize; } int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num) diff --git a/worker/deps/openssl/openssl/crypto/asn1/a_strex.c b/worker/deps/openssl/openssl/crypto/asn1/a_strex.c index b91266b3c5..207190c52b 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/a_strex.c +++ b/worker/deps/openssl/openssl/crypto/asn1/a_strex.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -139,7 +139,7 @@ static int do_buf(unsigned char *buf, int buflen, int type, unsigned short flags, char *quotes, char_io *io_ch, void *arg) { - int i, outlen, len; + int i, outlen, len, charwidth; unsigned short orflags; unsigned char *p, *q; unsigned long c; @@ -147,12 +147,32 @@ static int do_buf(unsigned char *buf, int buflen, p = buf; q = buf + buflen; outlen = 0; + charwidth = type & BUF_TYPE_WIDTH_MASK; + + switch (charwidth) { + case 4: + if (buflen & 3) { + ASN1err(ASN1_F_DO_BUF, ASN1_R_INVALID_UNIVERSALSTRING_LENGTH); + return -1; + } + break; + case 2: + if (buflen & 1) { + ASN1err(ASN1_F_DO_BUF, ASN1_R_INVALID_BMPSTRING_LENGTH); + return -1; + } + break; + default: + break; + } + while (p != q) { if (p == buf && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_FIRST_ESC_2253; else orflags = 0; - switch (type & BUF_TYPE_WIDTH_MASK) { + + switch (charwidth) { case 4: c = ((unsigned long)*p++) << 24; c |= ((unsigned long)*p++) << 16; @@ -173,6 +193,7 @@ static int do_buf(unsigned char *buf, int buflen, i = UTF8_getc(p, buflen, &c); if (i < 0) return -1; /* Invalid UTF8String */ + buflen -= i; p += i; break; default: @@ -592,53 +613,3 @@ int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in) *out = stmp.data; return stmp.length; } - -/* Return 1 if host is a valid hostname and 0 otherwise */ -int asn1_valid_host(const ASN1_STRING *host) -{ - int hostlen = host->length; - const unsigned char *hostptr = host->data; - int type = host->type; - int i; - signed char width = -1; - unsigned short chflags = 0, prevchflags; - - if (type > 0 && type < 31) - width = tag2nbyte[type]; - if (width == -1 || hostlen == 0) - return 0; - /* Treat UTF8String as width 1 as any MSB set is invalid */ - if (width == 0) - width = 1; - for (i = 0 ; i < hostlen; i+= width) { - prevchflags = chflags; - /* Value must be <= 0x7F: check upper bytes are all zeroes */ - if (width == 4) { - if (*hostptr++ != 0 || *hostptr++ != 0 || *hostptr++ != 0) - return 0; - } else if (width == 2) { - if (*hostptr++ != 0) - return 0; - } - if (*hostptr > 0x7f) - return 0; - chflags = char_type[*hostptr++]; - if (!(chflags & (CHARTYPE_HOST_ANY | CHARTYPE_HOST_WILD))) { - /* Nothing else allowed at start or end of string */ - if (i == 0 || i == hostlen - 1) - return 0; - /* Otherwise invalid if not dot or hyphen */ - if (!(chflags & (CHARTYPE_HOST_DOT | CHARTYPE_HOST_HYPHEN))) - return 0; - /* - * If previous is dot or hyphen then illegal unless both - * are hyphens: as .- -. .. are all illegal - */ - if (prevchflags & (CHARTYPE_HOST_DOT | CHARTYPE_HOST_HYPHEN) - && ((prevchflags & CHARTYPE_HOST_DOT) - || (chflags & CHARTYPE_HOST_DOT))) - return 0; - } - } - return 1; -} diff --git a/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c b/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c index b8ba067877..9b0a2ccb20 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c +++ b/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c @@ -255,6 +255,18 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags, goto err; } + /* + * One of the following must be true: + * + * pem_str == NULL AND ASN1_PKEY_ALIAS is set + * pem_str != NULL AND ASN1_PKEY_ALIAS is clear + * + * Anything else is an error and may lead to a corrupt ASN1 method table + */ + if (!((pem_str == NULL && (flags & ASN1_PKEY_ALIAS) != 0) + || (pem_str != NULL && (flags & ASN1_PKEY_ALIAS) == 0))) + goto err; + if (pem_str) { ameth->pem_str = OPENSSL_strdup(pem_str); if (!ameth->pem_str) diff --git a/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c b/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c index 8602c408d9..5d895d3009 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c +++ b/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c @@ -92,8 +92,10 @@ static ERR_STRING_DATA ASN1_str_functs[] = { {ERR_FUNC(ASN1_F_D2I_AUTOPRIVATEKEY), "d2i_AutoPrivateKey"}, {ERR_FUNC(ASN1_F_D2I_PRIVATEKEY), "d2i_PrivateKey"}, {ERR_FUNC(ASN1_F_D2I_PUBLICKEY), "d2i_PublicKey"}, + {ERR_FUNC(ASN1_F_DO_BUF), "do_buf"}, {ERR_FUNC(ASN1_F_DO_TCREATE), "do_tcreate"}, {ERR_FUNC(ASN1_F_I2D_ASN1_BIO_STREAM), "i2d_ASN1_bio_stream"}, + {ERR_FUNC(ASN1_F_I2D_ASN1_OBJECT), "i2d_ASN1_OBJECT"}, {ERR_FUNC(ASN1_F_I2D_DSA_PUBKEY), "i2d_DSA_PUBKEY"}, {ERR_FUNC(ASN1_F_I2D_EC_PUBKEY), "i2d_EC_PUBKEY"}, {ERR_FUNC(ASN1_F_I2D_PRIVATEKEY), "i2d_PrivateKey"}, diff --git a/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c b/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c index 84475e9470..da0085f680 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c +++ b/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c @@ -969,12 +969,14 @@ static int strip_eol(char *linebuf, int *plen, int flags) p = linebuf + len - 1; for (p = linebuf + len - 1; len > 0; len--, p--) { c = *p; - if (c == '\n') + if (c == '\n') { is_eol = 1; - else if (is_eol && flags & SMIME_ASCIICRLF && c < 33) + } else if (is_eol && flags & SMIME_ASCIICRLF && c == 32) { + /* Strip trailing space on a line; 32 == ASCII for ' ' */ continue; - else if (c != '\r') + } else if (c != '\r') { break; + } } *plen = len; return is_eol; diff --git a/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c b/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c index 4cb7837498..10a7360233 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c +++ b/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -91,7 +91,7 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher, if (EVP_CIPHER_iv_length(cipher)) { if (aiv) memcpy(iv, aiv, EVP_CIPHER_iv_length(cipher)); - else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0) + else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) <= 0) goto err; } diff --git a/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c b/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c index caa48696da..3b723a1845 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c +++ b/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -528,6 +528,8 @@ static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, otmp = (ASN1_OBJECT *)*pval; cont = otmp->data; len = otmp->length; + if (cont == NULL || len == 0) + return -1; break; case V_ASN1_NULL: diff --git a/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c b/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c index f79d7d6b44..832603b1db 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c +++ b/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -76,7 +76,7 @@ int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it) } return 1; } - if (CRYPTO_atomic_add(lck, op, &ret, *lock) < 0) + if (!CRYPTO_atomic_add(lck, op, &ret, *lock)) return -1; /* failed */ #ifdef REF_PRINT fprintf(stderr, "%p:%4d:%s\n", it, *lck, it->sname); diff --git a/worker/deps/openssl/openssl/crypto/asn1/x_int64.c b/worker/deps/openssl/openssl/crypto/asn1/x_int64.c index cbfa787362..4433167a44 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/x_int64.c +++ b/worker/deps/openssl/openssl/crypto/asn1/x_int64.c @@ -262,3 +262,4 @@ ASN1_ITEM_start(ZUINT64) ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf, INTxx_FLAG_ZERO_DEFAULT, "ZUINT64" ASN1_ITEM_end(ZUINT64) + diff --git a/worker/deps/openssl/openssl/crypto/async/arch/async_null.c b/worker/deps/openssl/openssl/crypto/async/arch/async_null.c index da23c532b4..3eaf170f2e 100644 --- a/worker/deps/openssl/openssl/crypto/async/arch/async_null.c +++ b/worker/deps/openssl/openssl/crypto/async/arch/async_null.c @@ -20,3 +20,4 @@ void async_local_cleanup(void) { } #endif + diff --git a/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h b/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h index 76937a9e4d..939b4ab183 100644 --- a/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h +++ b/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h @@ -17,7 +17,8 @@ # include -# if _POSIX_VERSION >= 200112L +# if _POSIX_VERSION >= 200112L \ + && (_POSIX_VERSION < 200809L || defined(__GLIBC__)) # include diff --git a/worker/deps/openssl/openssl/crypto/async/async.c b/worker/deps/openssl/openssl/crypto/async/async.c index 9a4e6b2657..0862cca21a 100644 --- a/worker/deps/openssl/openssl/crypto/async/async.c +++ b/worker/deps/openssl/openssl/crypto/async/async.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -30,11 +30,12 @@ static CRYPTO_THREAD_LOCAL ctxkey; static CRYPTO_THREAD_LOCAL poolkey; -static void async_free_pool_internal(async_pool *pool); - static async_ctx *async_ctx_new(void) { - async_ctx *nctx = NULL; + async_ctx *nctx; + + if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) + return NULL; nctx = OPENSSL_malloc(sizeof(async_ctx)); if (nctx == NULL) { @@ -57,9 +58,6 @@ static async_ctx *async_ctx_new(void) async_ctx *async_get_ctx(void) { - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) - return NULL; - return (async_ctx *)CRYPTO_THREAD_get_local(&ctxkey); } @@ -169,16 +167,19 @@ void async_start_func(void) int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, int (*func)(void *), void *args, size_t size) { - async_ctx *ctx = async_get_ctx(); + async_ctx *ctx; + + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) + return ASYNC_ERR; + + ctx = async_get_ctx(); if (ctx == NULL) ctx = async_ctx_new(); - if (ctx == NULL) { + if (ctx == NULL) return ASYNC_ERR; - } - if (*job) { + if (*job) ctx->currjob = *job; - } for (;;) { if (ctx->currjob != NULL) { @@ -219,9 +220,8 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, } /* Start a new job */ - if ((ctx->currjob = async_get_pool_job()) == NULL) { + if ((ctx->currjob = async_get_pool_job()) == NULL) return ASYNC_NO_JOBS; - } if (args != NULL) { ctx->currjob->funcargs = OPENSSL_malloc(size); @@ -323,12 +323,11 @@ int ASYNC_init_thread(size_t max_size, size_t init_size) return 0; } - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) { + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) return 0; - } - if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) { + + if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) return 0; - } pool = OPENSSL_zalloc(sizeof(*pool)); if (pool == NULL) { @@ -369,32 +368,41 @@ int ASYNC_init_thread(size_t max_size, size_t init_size) return 1; err: - async_free_pool_internal(pool); + async_empty_pool(pool); + sk_ASYNC_JOB_free(pool->jobs); + OPENSSL_free(pool); return 0; } -static void async_free_pool_internal(async_pool *pool) +void async_delete_thread_state(void) { - if (pool == NULL) - return; + async_pool *pool = (async_pool *)CRYPTO_THREAD_get_local(&poolkey); - async_empty_pool(pool); - sk_ASYNC_JOB_free(pool->jobs); - OPENSSL_free(pool); - CRYPTO_THREAD_set_local(&poolkey, NULL); + if (pool != NULL) { + async_empty_pool(pool); + sk_ASYNC_JOB_free(pool->jobs); + OPENSSL_free(pool); + CRYPTO_THREAD_set_local(&poolkey, NULL); + } async_local_cleanup(); async_ctx_free(); } void ASYNC_cleanup_thread(void) { - async_free_pool_internal((async_pool *)CRYPTO_THREAD_get_local(&poolkey)); + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) + return; + + async_delete_thread_state(); } ASYNC_JOB *ASYNC_get_current_job(void) { async_ctx *ctx; + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) + return NULL; + ctx = async_get_ctx(); if (ctx == NULL) return NULL; @@ -409,7 +417,12 @@ ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job) void ASYNC_block_pause(void) { - async_ctx *ctx = async_get_ctx(); + async_ctx *ctx; + + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) + return; + + ctx = async_get_ctx(); if (ctx == NULL || ctx->currjob == NULL) { /* * We're not in a job anyway so ignore this @@ -421,7 +434,12 @@ void ASYNC_block_pause(void) void ASYNC_unblock_pause(void) { - async_ctx *ctx = async_get_ctx(); + async_ctx *ctx; + + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) + return; + + ctx = async_get_ctx(); if (ctx == NULL || ctx->currjob == NULL) { /* * We're not in a job anyway so ignore this diff --git a/worker/deps/openssl/openssl/crypto/async/async_locl.h b/worker/deps/openssl/openssl/crypto/async/async_locl.h index 0fe302a4ce..f0ac05a3db 100644 --- a/worker/deps/openssl/openssl/crypto/async/async_locl.h +++ b/worker/deps/openssl/openssl/crypto/async/async_locl.h @@ -74,3 +74,4 @@ void async_start_func(void); async_ctx *async_get_ctx(void); void async_wait_ctx_reset_counts(ASYNC_WAIT_CTX *ctx); + diff --git a/worker/deps/openssl/openssl/crypto/bio/b_addr.c b/worker/deps/openssl/openssl/crypto/bio/b_addr.c index aea843a7b9..6ed1652c8a 100644 --- a/worker/deps/openssl/openssl/crypto/bio/b_addr.c +++ b/worker/deps/openssl/openssl/crypto/bio/b_addr.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -66,18 +66,18 @@ void BIO_ADDR_clear(BIO_ADDR *ap) int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa) { if (sa->sa_family == AF_INET) { - ap->s_in = *(const struct sockaddr_in *)sa; + memcpy(&(ap->s_in), sa, sizeof(struct sockaddr_in)); return 1; } #ifdef AF_INET6 if (sa->sa_family == AF_INET6) { - ap->s_in6 = *(const struct sockaddr_in6 *)sa; + memcpy(&(ap->s_in6), sa, sizeof(struct sockaddr_in6)); return 1; } #endif #ifdef AF_UNIX if (sa->sa_family == AF_UNIX) { - ap->s_un = *(const struct sockaddr_un *)sa; + memcpy(&(ap->s_un), sa, sizeof(struct sockaddr_un)); return 1; } #endif @@ -604,7 +604,8 @@ static int addrinfo_wrap(int family, int socktype, DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init) { - OPENSSL_init_crypto(0, NULL); + if (!OPENSSL_init_crypto(0, NULL)) + return 0; bio_lookup_lock = CRYPTO_THREAD_lock_new(); return bio_lookup_lock != NULL; } diff --git a/worker/deps/openssl/openssl/crypto/bio/b_print.c b/worker/deps/openssl/openssl/crypto/bio/b_print.c index cdfe05f93c..8f50cb8c14 100644 --- a/worker/deps/openssl/openssl/crypto/bio/b_print.c +++ b/worker/deps/openssl/openssl/crypto/bio/b_print.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -10,9 +10,9 @@ #include #include #include -#include "internal/numbers.h" -#include "internal/cryptlib.h" #include +#include "internal/cryptlib.h" +#include "internal/numbers.h" /* * Copyright Patrick Powell 1995 diff --git a/worker/deps/openssl/openssl/crypto/bio/b_sock.c b/worker/deps/openssl/openssl/crypto/bio/b_sock.c index 97dcc7005e..fac1432787 100644 --- a/worker/deps/openssl/openssl/crypto/bio/b_sock.c +++ b/worker/deps/openssl/openssl/crypto/bio/b_sock.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -317,7 +317,7 @@ int BIO_socket_nbio(int s, int mode) l = fcntl(s, F_GETFL, 0); if (l == -1) { - SYSerr(SYS_F_FCNTL, get_last_rtl_error()); + SYSerr(SYS_F_FCNTL, get_last_sys_error()); ret = -1; } else { # if defined(O_NONBLOCK) @@ -335,7 +335,7 @@ int BIO_socket_nbio(int s, int mode) ret = fcntl(s, F_SETFL, l); if (ret < 0) { - SYSerr(SYS_F_FCNTL, get_last_rtl_error()); + SYSerr(SYS_F_FCNTL, get_last_sys_error()); } } # else diff --git a/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h b/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h index 5f4b94f40b..39178cf50a 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h +++ b/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h @@ -185,3 +185,4 @@ void bio_sock_cleanup_int(void); # endif #endif + diff --git a/worker/deps/openssl/openssl/crypto/bio/bio_meth.c b/worker/deps/openssl/openssl/crypto/bio/bio_meth.c index 1e785d348f..63a7cccc82 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bio_meth.c +++ b/worker/deps/openssl/openssl/crypto/bio/bio_meth.c @@ -43,6 +43,7 @@ BIO_METHOD *BIO_meth_new(int type, const char *name) BIOerr(BIO_F_BIO_METH_NEW, ERR_R_MALLOC_FAILURE); return NULL; } + biom->type = type; return biom; } @@ -54,7 +55,7 @@ void BIO_meth_free(BIO_METHOD *biom) } } -int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int) +int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int) { return biom->bwrite; } @@ -66,7 +67,7 @@ int BIO_meth_set_write(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int) +int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int) { return biom->bread; } @@ -78,7 +79,7 @@ int BIO_meth_set_read(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *) +int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *) { return biom->bputs; } @@ -90,7 +91,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int) +int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int) { return biom->bgets; } @@ -102,7 +103,7 @@ int BIO_meth_set_gets(BIO_METHOD *biom, return 1; } -long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *) +long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *) { return biom->ctrl; } @@ -114,7 +115,7 @@ int BIO_meth_set_ctrl(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_create(BIO_METHOD *biom)) (BIO *) +int (*BIO_meth_get_create(const BIO_METHOD *biom)) (BIO *) { return biom->create; } @@ -125,7 +126,7 @@ int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)) return 1; } -int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *) +int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *) { return biom->destroy; } @@ -136,7 +137,7 @@ int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)) return 1; } -long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *) +long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *) { return biom->callback_ctrl; } diff --git a/worker/deps/openssl/openssl/crypto/bio/bss_log.c b/worker/deps/openssl/openssl/crypto/bio/bss_log.c index 5221acc2e3..f090e8214b 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bss_log.c +++ b/worker/deps/openssl/openssl/crypto/bio/bss_log.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -196,7 +196,7 @@ static int slg_write(BIO *b, const char *in, int inl) if ((buf = OPENSSL_malloc(inl + 1)) == NULL) { return (0); } - strncpy(buf, in, inl); + memcpy(buf, in, inl); buf[inl] = '\0'; i = 0; @@ -404,4 +404,9 @@ static void xcloselog(BIO *bp) # endif /* Unix */ +#else /* NO_SYSLOG */ +const BIO_METHOD *BIO_s_log(void) +{ + return NULL; +} #endif /* NO_SYSLOG */ diff --git a/worker/deps/openssl/openssl/crypto/bio/bss_mem.c b/worker/deps/openssl/openssl/crypto/bio/bss_mem.c index ff9a3ebb41..4c0e4d7412 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bss_mem.c +++ b/worker/deps/openssl/openssl/crypto/bio/bss_mem.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -212,6 +212,8 @@ static int mem_write(BIO *b, const char *in, int inl) goto end; } BIO_clear_retry_flags(b); + if (inl == 0) + return 0; blen = bbm->readp->length; mem_buf_sync(b); if (BUF_MEM_grow_clean(bbm->buf, blen + inl) == 0) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl index 1d68d6d072..9632133090 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -297,15 +297,12 @@ mov sp,$tp mov $bp,$rp # restore rp - and sp,$hi0,$ap - bic $bp,$hi0,$bp - bis $bp,$ap,$ap # ap=borrow?tp:rp - .align 4 -.Lcopy: ldq $aj,0($ap) # copy or in-place refresh +.Lcopy: ldq $aj,0($tp) # conditional copy + ldq $nj,0($rp) lda $tp,8($tp) lda $rp,8($rp) - lda $ap,8($ap) + cmoveq $hi0,$nj,$aj stq zero,-8($tp) # zap tp cmpult $tp,$tj,AT stq $aj,-8($rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl index 0dc4fe95e4..ddee8b7fa1 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -262,14 +262,15 @@ mov $tp,sp @ "rewind" $tp sub $rp,$rp,$aj @ "rewind" $rp - and $ap,$tp,$nhi - bic $np,$rp,$nhi - orr $ap,$ap,$np @ ap=borrow?tp:rp - -.Lcopy: ldr $tj,[$ap],#4 @ copy or in-place refresh +.Lcopy: ldr $tj,[$tp] @ conditional copy + ldr $aj,[$rp] str sp,[$tp],#4 @ zap tp - str $tj,[$rp],#4 - cmp $tp,$num +#ifdef __thumb2__ + it cc +#endif + movcc $aj,$tj + str $aj,[$rp],#4 + teq $tp,$num @ preserve carry bne .Lcopy mov sp,$num diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl index 5cc5c599f9..0df1fad115 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -341,19 +341,19 @@ { .mmb; sub rptr=rptr,len // rewind sub tptr=tptr,len clrrrb.pr };; -{ .mmi; and aptr=tptr,topbit - andcm bptr=rptr,topbit +{ .mmi; mov aptr=rptr + mov bptr=tptr mov pr.rot=1<<16 };; -{ .mii; or nptr=aptr,bptr +{ .mii; cmp.eq p0,p6=topbit,r0 mov ar.lc=lc - mov ar.ec=3 };; + mov ar.ec=2 };; .Lcopy_ctop: -{ .mmb; (p16) ld8 n[0]=[nptr],8 - (p18) st8 [tptr]=r0,8 - (p16) nop.b 0 } -{ .mmb; (p16) nop.m 0 - (p18) st8 [rptr]=n[2],8 +{ .mmi; (p16) ld8 a[0]=[aptr],8 + (p16) ld8 t[0]=[bptr],8 + (p6) mov a[1]=t[1] };; // (p17) +{ .mmb; (p17) st8 [rptr]=a[1],8 + (p17) st8 [tptr]=r0,8 br.ctop.sptk .Lcopy_ctop };; .Lcopy_cend: diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl index a907571bec..e141e1a925 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -384,15 +384,13 @@ $PTR_SUB $rp,$num # restore rp not $hi1,$hi0 - and $ap,$hi0,$sp - and $bp,$hi1,$rp - or $ap,$ap,$bp # ap=borrow?tp:rp - -.align 4 -.Lcopy: $LD $aj,($ap) - $PTR_ADD $ap,$BNSZ +.Lcopy: $LD $nj,($tp) # conditional move + $LD $aj,($rp) $ST $zero,($tp) $PTR_ADD $tp,$BNSZ + and $nj,$hi0 + and $aj,$hi1 + or $aj,$nj sltu $at,$tp,$tj $ST $aj,($rp) bnez $at,.Lcopy diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl index 8aa94e8511..cd9926a25f 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2009-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -517,7 +517,6 @@ stws,ma $hi1,4($rp) subb $ti0,%r0,$hi1 - ldo -4($tp),$tp ___ $code.=<<___ if ($BN_SZ==8); ldd,ma 8($tp),$ti0 @@ -532,21 +531,19 @@ extrd,u $ti0,31,32,$ti0 ; carry in flipped word order sub,db $ti0,%r0,$hi1 - ldo -8($tp),$tp ___ $code.=<<___; - and $tp,$hi1,$ap - andcm $rp,$hi1,$bp - or $ap,$bp,$np - + ldo `$LOCALS+32`($fp),$tp sub $rp,$arrsz,$rp ; rewind rp subi 0,$arrsz,$idx - ldo `$LOCALS+32`($fp),$tp L\$copy - ldd $idx($np),$hi0 + ldd 0($tp),$ti0 + ldd 0($rp),$hi0 std,ma %r0,8($tp) - addib,<> 8,$idx,.-8 ; L\$copy - std,ma $hi0,8($rp) + comiclr,= 0,$hi1,%r0 + copy $ti0,$hi0 + addib,<> 8,$idx,L\$copy + std,ma $hi0,8($rp) ___ if ($BN_SZ==4) { # PA-RISC 1.1 code-path @@ -856,17 +853,16 @@ stws,ma $hi1,4($rp) subb $ti0,%r0,$hi1 - ldo -4($tp),$tp - and $tp,$hi1,$ap - andcm $rp,$hi1,$bp - or $ap,$bp,$np + ldo `$LOCALS+32`($fp),$tp sub $rp,$arrsz,$rp ; rewind rp subi 0,$arrsz,$idx - ldo `$LOCALS+32`($fp),$tp L\$copy_pa11 - ldwx $idx($np),$hi0 + ldw 0($tp),$ti0 + ldw 0($rp),$hi0 stws,ma %r0,4($tp) + comiclr,= 0,$hi1,%r0 + copy $ti0,$hi0 addib,<> 4,$idx,L\$copy_pa11 stws,ma $hi0,4($rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl index 5802260ca6..9d14a12156 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -301,15 +301,16 @@ li $j,0 mtctr $num subfe $ovf,$j,$ovf ; handle upmost overflow bit - and $ap,$tp,$ovf - andc $np,$rp,$ovf - or $ap,$ap,$np ; ap=borrow?tp:rp .align 4 -Lcopy: ; copy or in-place refresh - $LDX $tj,$ap,$j - $STX $tj,$rp,$j +Lcopy: ; conditional copy + $LDX $tj,$tp,$j + $LDX $aj,$rp,$j + and $tj,$tj,$ovf + andc $aj,$aj,$ovf $STX $j,$tp,$j ; zap at once + or $aj,$aj,$tj + $STX $aj,$rp,$j addi $j,$j,$BNSZ bdnz Lcopy diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl index 1e19c958a1..5d9f43aa5d 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -1501,16 +1501,14 @@ li $i,0 subfe $ovf,$i,$ovf ; handle upmost overflow bit - and $ap,$tp,$ovf - andc $np,$rp,$ovf - or $ap,$ap,$np ; ap=borrow?tp:rp - addi $t7,$ap,8 mtctr $j .align 4 -Lcopy: ; copy or in-place refresh - ldx $t0,$ap,$i - ldx $t1,$t7,$i +Lcopy: ; conditional copy + ldx $t0,$tp,$i + ldx $t1,$t4,$i + ldx $t2,$rp,$i + ldx $t3,$t6,$i std $i,8($nap_d) ; zap nap_d std $i,16($nap_d) std $i,24($nap_d) @@ -1519,6 +1517,12 @@ std $i,48($nap_d) std $i,56($nap_d) stdu $i,64($nap_d) + and $t0,$t0,$ovf + and $t1,$t1,$ovf + andc $t2,$t2,$ovf + andc $t3,$t3,$ovf + or $t0,$t0,$t2 + or $t1,$t1,$t3 stdx $t0,$rp,$i stdx $t1,$t6,$i stdx $i,$tp,$i ; zap tp at once @@ -1561,20 +1565,21 @@ li $i,0 subfe $ovf,$i,$ovf ; handle upmost overflow bit - addi $tp,$sp,`$FRAME+$TRANSFER+4` + addi $ap,$sp,`$FRAME+$TRANSFER+4` subf $rp,$num,$rp ; rewind rp - and $ap,$tp,$ovf - andc $np,$rp,$ovf - or $ap,$ap,$np ; ap=borrow?tp:rp addi $tp,$sp,`$FRAME+$TRANSFER` mtctr $j .align 4 -Lcopy: ; copy or in-place refresh +Lcopy: ; conditional copy lwz $t0,4($ap) lwz $t1,8($ap) lwz $t2,12($ap) lwzu $t3,16($ap) + lwz $t4,4($rp) + lwz $t5,8($rp) + lwz $t6,12($rp) + lwz $t7,16($rp) std $i,8($nap_d) ; zap nap_d std $i,16($nap_d) std $i,24($nap_d) @@ -1583,6 +1588,18 @@ std $i,48($nap_d) std $i,56($nap_d) stdu $i,64($nap_d) + and $t0,$t0,$ovf + and $t1,$t1,$ovf + and $t2,$t2,$ovf + and $t3,$t3,$ovf + andc $t4,$t4,$ovf + andc $t5,$t5,$ovf + andc $t6,$t6,$ovf + andc $t7,$t7,$ovf + or $t0,$t0,$t4 + or $t1,$t1,$t5 + or $t2,$t2,$t6 + or $t3,$t3,$t7 stw $t0,4($rp) stw $t1,8($rp) stw $t2,12($rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl b/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl index 46d746b7d0..0466e11a25 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2013-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -104,7 +104,7 @@ $addx = ($1>=11); } -if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) { +if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) { my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10 $avx = ($ver>=3.0) + ($ver>=3.01); $addx = ($ver>=3.03); diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl index 2205bc2ca0..66780cdf80 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -252,16 +252,16 @@ brct $count,.Lsub lghi $ahi,0 slbgr $AHI,$ahi # handle upmost carry - - ngr $ap,$AHI - lghi $np,-1 - xgr $np,$AHI - ngr $np,$rp - ogr $ap,$np # ap=borrow?tp:rp + lghi $NHI,-1 + xgr $NHI,$AHI la $j,0(%r0) lgr $count,$num -.Lcopy: lg $alo,0($j,$ap) # copy or in-place refresh +.Lcopy: lg $ahi,$stdframe($j,$sp) # conditional copy + lg $alo,0($j,$rp) + ngr $ahi,$AHI + ngr $alo,$NHI + ogr $alo,$ahi _dswap $alo stg $j,$stdframe($j,$sp) # zap tp stg $alo,0($j,$rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl index 4faf66f10a..4f339b2279 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -888,19 +888,17 @@ () sub $tp, $num, $tp sub $rp, $num, $rp - subc $ovf, %g0, $ovf ! handle upmost overflow bit - and $tp, $ovf, $ap - andn $rp, $ovf, $np - or $np, $ap, $ap ! ap=borrow?tp:rp + subccc $ovf, %g0, $ovf ! handle upmost overflow bit ba .Lcopy sub $num, 8, $cnt .align 16 -.Lcopy: ! copy or in-place refresh - ldx [$ap+0], $t2 - add $ap, 8, $ap +.Lcopy: ! conditional copy + ldx [$tp], $tj + ldx [$rp+0], $t2 stx %g0, [$tp] ! zap add $tp, 8, $tp + movcs %icc, $tj, $t2 stx $t2, [$rp+0] add $rp, 8, $rp brnz $cnt, .Lcopy @@ -1136,19 +1134,17 @@ () sub $tp, $num, $tp sub $rp, $num, $rp - subc $ovf, %g0, $ovf ! handle upmost overflow bit - and $tp, $ovf, $ap - andn $rp, $ovf, $np - or $np, $ap, $ap ! ap=borrow?tp:rp + subccc $ovf, %g0, $ovf ! handle upmost overflow bit ba .Lcopy_g5 sub $num, 8, $cnt .align 16 -.Lcopy_g5: ! copy or in-place refresh - ldx [$ap+0], $t2 - add $ap, 8, $ap +.Lcopy_g5: ! conditional copy + ldx [$tp], $tj + ldx [$rp+0], $t2 stx %g0, [$tp] ! zap add $tp, 8, $tp + movcs %icc, $tj, $t2 stx $t2, [$rp+0] add $rp, 8, $rp brnz $cnt, .Lcopy_g5 diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl index 6807c8b6e0..074f9df14b 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -265,7 +265,6 @@ .Ltail: add $np,$num,$np add $rp,$num,$rp - mov $tp,$ap sub %g0,$num,%o7 ! k=-num ba .Lsub subcc %g0,%g0,%g0 ! clear %icc.c @@ -278,15 +277,14 @@ add %o7,4,%o7 brnz %o7,.Lsub st %o1,[$i] - subc $car2,0,$car2 ! handle upmost overflow bit - and $tp,$car2,$ap - andn $rp,$car2,$np - or $ap,$np,$ap + subccc $car2,0,$car2 ! handle upmost overflow bit sub %g0,$num,%o7 .Lcopy: - ld [$ap+%o7],%o0 ! copy or in-place refresh + ld [$tp+%o7],%o1 ! conditional copy + ld [$rp+%o7],%o0 st %g0,[$tp+%o7] ! zap tp + movcs %icc,%o1,%o0 st %o0,[$rp+%o7] add %o7,4,%o7 brnz %o7,.Lcopy @@ -495,6 +493,9 @@ mulx $npj,$mul1,$acc1 add $tpj,$car1,$car1 ld [$np+$j],$npj ! np[j] + srlx $car1,32,$tmp0 + and $car1,$mask,$car1 + add $tmp0,$sbit,$sbit add $acc0,$car1,$car1 ld [$tp+8],$tpj ! tp[j] add $acc1,$car1,$car1 diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl index 9f81bc822e..9d65a146a2 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -213,18 +213,15 @@ &mov ("eax",&DWP(0,"esi","edx",4)); # upmost overflow bit &sbb ("eax",0); - &and ("esi","eax"); - ¬ ("eax"); - &mov ("ebp","edi"); - &and ("ebp","eax"); - &or ("esi","ebp"); # tp=carry?tp:rp &mov ("ecx","edx"); # num - &xor ("edx","edx"); # i=0 + &mov ("edx",0); # i=0 &set_label("copy",8); - &mov ("eax",&DWP(0,"esi","edx",4)); - &mov (&DWP(64,"esp","edx",4),"ecx"); # zap tp + &mov ("ebx",&DWP(0,"esi","edx",4)); + &mov ("eax",&DWP(0,"edi","edx",4)); + &mov (&DWP(0,"esi","edx",4),"ecx"); # zap tp + &cmovc ("eax","ebx"); &mov (&DWP(0,"edi","edx",4),"eax"); &lea ("edx",&DWP(1,"edx")); # i++ &loop (&label("copy")); diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl index 64dba4480f..ba34b36a81 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -310,23 +310,23 @@ sub $anp, $num, $anp sub $rp, $num, $rp - subc $ovf, %g0, $ovf ! handle upmost overflow bit - and $tp, $ovf, $ap - andn $rp, $ovf, $np - or $np, $ap, $ap ! ap=borrow?tp:rp + subccc $ovf, %g0, $ovf ! handle upmost overflow bit ba .Lcopy sub $num, 8, $cnt .align 16 -.Lcopy: ! copy or in-place refresh - ld [$ap+0], $t2 - ld [$ap+4], $t3 - add $ap, 8, $ap +.Lcopy: ! conditional copy + ld [$tp+0], $t0 + ld [$tp+4], $t1 + ld [$rp+0], $t2 + ld [$rp+4], $t3 stx %g0, [$tp] ! zap add $tp, 8, $tp stx %g0, [$anp] ! zap stx %g0, [$anp+8] add $anp, 16, $anp + movcs %icc, $t0, $t2 + movcs %icc, $t1, $t3 st $t3, [$rp+0] ! flip order st $t2, [$rp+4] add $rp, 8, $rp diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl index a8b402d59b..f1abcc5b4c 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -39,7 +39,7 @@ $output = pop; open STDOUT,">$output"; - + &asm_init($ARGV[0],$0); $sse2=0; @@ -604,16 +604,18 @@ &jge (&label("sub")); &sbb ("eax",0); # handle upmost overflow bit - &and ($tp,"eax"); - ¬ ("eax"); - &mov ($np,$rp); - &and ($np,"eax"); - &or ($tp,$np); # tp=carry?tp:rp - -&set_label("copy",16); # copy or in-place refresh - &mov ("eax",&DWP(0,$tp,$num,4)); - &mov (&DWP(0,$rp,$num,4),"eax"); # rp[i]=tp[i] + &mov ("edx",-1); + &xor ("edx","eax"); + &jmp (&label("copy")); + +&set_label("copy",16); # conditional copy + &mov ($tp,&DWP($frame,"esp",$num,4)); + &mov ($np,&DWP(0,$rp,$num,4)); &mov (&DWP($frame,"esp",$num,4),$j); # zap temporary vector + &and ($tp,"eax"); + &and ($np,"edx"); + &or ($np,$tp); + &mov (&DWP(0,$rp,$num,4),$np); &dec ($num); &jge (&label("copy")); diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c index 0ff3805a61..621be33054 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -64,12 +64,6 @@ * machine. */ -# if defined(_WIN64) || !defined(__LP64__) -# define BN_ULONG unsigned long long -# else -# define BN_ULONG unsigned long -# endif - # undef mul # undef mul_add diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl index df4cca5bfe..8d2fb2cebb 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -302,30 +302,30 @@ xor $i,$i # i=0 and clear CF! mov (%rsp),%rax # tp[0] - lea (%rsp),$ap # borrow ap for tp mov $num,$j # j=num - jmp .Lsub + .align 16 .Lsub: sbb ($np,$i,8),%rax mov %rax,($rp,$i,8) # rp[i]=tp[i]-np[i] - mov 8($ap,$i,8),%rax # tp[i+1] + mov 8(%rsp,$i,8),%rax # tp[i+1] lea 1($i),$i # i++ dec $j # doesnn't affect CF! jnz .Lsub sbb \$0,%rax # handle upmost overflow bit + mov \$-1,%rbx + xor %rax,%rbx # not %rax xor $i,$i - and %rax,$ap - not %rax - mov $rp,$np - and %rax,$np mov $num,$j # j=num - or $np,$ap # ap=borrow?tp:rp -.align 16 -.Lcopy: # copy or in-place refresh - mov ($ap,$i,8),%rax - mov $i,(%rsp,$i,8) # zap temporary vector - mov %rax,($rp,$i,8) # rp[i]=tp[i] + +.Lcopy: # conditional copy + mov ($rp,$i,8),%rcx + mov (%rsp,$i,8),%rdx + and %rbx,%rcx + and %rax,%rdx + mov $num,(%rsp,$i,8) # zap temporary vector + or %rcx,%rdx + mov %rdx,($rp,$i,8) # rp[i]=tp[i] lea 1($i),$i sub \$1,$j jnz .Lcopy @@ -695,10 +695,10 @@ my @ri=("%rax","%rdx",$m0,$m1); $code.=<<___; mov 16(%rsp,$num,8),$rp # restore $rp + lea -4($num),$j mov 0(%rsp),@ri[0] # tp[0] - pxor %xmm0,%xmm0 mov 8(%rsp),@ri[1] # tp[1] - shr \$2,$num # num/=4 + shr \$2,$j # j=num/4-1 lea (%rsp),$ap # borrow ap for tp xor $i,$i # i=0 and clear CF! @@ -706,9 +706,7 @@ mov 16($ap),@ri[2] # tp[2] mov 24($ap),@ri[3] # tp[3] sbb 8($np),@ri[1] - lea -1($num),$j # j=num/4-1 - jmp .Lsub4x -.align 16 + .Lsub4x: mov @ri[0],0($rp,$i,8) # rp[i]=tp[i]-np[i] mov @ri[1],8($rp,$i,8) # rp[i]=tp[i]-np[i] @@ -735,34 +733,35 @@ sbb \$0,@ri[0] # handle upmost overflow bit mov @ri[3],24($rp,$i,8) # rp[i]=tp[i]-np[i] - xor $i,$i # i=0 - and @ri[0],$ap - not @ri[0] - mov $rp,$np - and @ri[0],$np - lea -1($num),$j - or $np,$ap # ap=borrow?tp:rp - - movdqu ($ap),%xmm1 - movdqa %xmm0,(%rsp) - movdqu %xmm1,($rp) + pxor %xmm0,%xmm0 + movq @ri[0],%xmm4 + pcmpeqd %xmm5,%xmm5 + pshufd \$0,%xmm4,%xmm4 + mov $num,$j + pxor %xmm4,%xmm5 + shr \$2,$j # j=num/4 + xor %eax,%eax # i=0 + jmp .Lcopy4x .align 16 -.Lcopy4x: # copy or in-place refresh - movdqu 16($ap,$i),%xmm2 - movdqu 32($ap,$i),%xmm1 - movdqa %xmm0,16(%rsp,$i) - movdqu %xmm2,16($rp,$i) - movdqa %xmm0,32(%rsp,$i) - movdqu %xmm1,32($rp,$i) - lea 32($i),$i +.Lcopy4x: # conditional copy + movdqa (%rsp,%rax),%xmm1 + movdqu ($rp,%rax),%xmm2 + pand %xmm4,%xmm1 + pand %xmm5,%xmm2 + movdqa 16(%rsp,%rax),%xmm3 + movdqa %xmm0,(%rsp,%rax) + por %xmm2,%xmm1 + movdqu 16($rp,%rax),%xmm2 + movdqu %xmm1,($rp,%rax) + pand %xmm4,%xmm3 + pand %xmm5,%xmm2 + movdqa %xmm0,16(%rsp,%rax) + por %xmm2,%xmm3 + movdqu %xmm3,16($rp,%rax) + lea 32(%rax),%rax dec $j jnz .Lcopy4x - - shl \$2,$num - movdqu 16($ap,$i),%xmm2 - movdqa %xmm0,16(%rsp,$i) - movdqu %xmm2,16($rp,$i) ___ } $code.=<<___; diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl index 5779059ea2..97d8eee700 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -414,18 +414,19 @@ jnz .Lsub sbb \$0,%rax # handle upmost overflow bit + mov \$-1,%rbx + xor %rax,%rbx xor $i,$i - and %rax,$ap - not %rax - mov $rp,$np - and %rax,$np mov $num,$j # j=num - or $np,$ap # ap=borrow?tp:rp -.align 16 -.Lcopy: # copy or in-place refresh - mov ($ap,$i,8),%rax + +.Lcopy: # conditional copy + mov ($rp,$i,8),%rcx + mov (%rsp,$i,8),%rdx + and %rbx,%rcx + and %rax,%rdx mov $i,(%rsp,$i,8) # zap temporary vector - mov %rax,($rp,$i,8) # rp[i]=tp[i] + or %rcx,%rdx + mov %rdx,($rp,$i,8) # rp[i]=tp[i] lea 1($i),$i sub \$1,$j jnz .Lcopy diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_blind.c b/worker/deps/openssl/openssl/crypto/bn/bn_blind.c index 24d138309d..9474e21e4c 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_blind.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_blind.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -109,10 +109,15 @@ int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx) if (!BN_BLINDING_create_param(b, NULL, NULL, ctx, NULL, NULL)) goto err; } else if (!(b->flags & BN_BLINDING_NO_UPDATE)) { - if (!BN_mod_mul(b->A, b->A, b->A, b->mod, ctx)) - goto err; - if (!BN_mod_mul(b->Ai, b->Ai, b->Ai, b->mod, ctx)) - goto err; + if (b->m_ctx != NULL) { + if (!bn_mul_mont_fixed_top(b->Ai, b->Ai, b->Ai, b->m_ctx, ctx) + || !bn_mul_mont_fixed_top(b->A, b->A, b->A, b->m_ctx, ctx)) + goto err; + } else { + if (!BN_mod_mul(b->Ai, b->Ai, b->Ai, b->mod, ctx) + || !BN_mod_mul(b->A, b->A, b->A, b->mod, ctx)) + goto err; + } } ret = 1; @@ -144,13 +149,13 @@ int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) else if (!BN_BLINDING_update(b, ctx)) return (0); - if (r != NULL) { - if (!BN_copy(r, b->Ai)) - ret = 0; - } + if (r != NULL && (BN_copy(r, b->Ai) == NULL)) + return 0; - if (!BN_mod_mul(n, n, b->A, b->mod, ctx)) - ret = 0; + if (b->m_ctx != NULL) + ret = BN_mod_mul_montgomery(n, n, b->A, b->m_ctx, ctx); + else + ret = BN_mod_mul(n, n, b->A, b->mod, ctx); return ret; } @@ -167,14 +172,29 @@ int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, bn_check_top(n); - if (r != NULL) - ret = BN_mod_mul(n, n, r, b->mod, ctx); - else { - if (b->Ai == NULL) { - BNerr(BN_F_BN_BLINDING_INVERT_EX, BN_R_NOT_INITIALIZED); - return (0); + if (r == NULL && (r = b->Ai) == NULL) { + BNerr(BN_F_BN_BLINDING_INVERT_EX, BN_R_NOT_INITIALIZED); + return 0; + } + + if (b->m_ctx != NULL) { + /* ensure that BN_mod_mul_montgomery takes pre-defined path */ + if (n->dmax >= r->top) { + size_t i, rtop = r->top, ntop = n->top; + BN_ULONG mask; + + for (i = 0; i < rtop; i++) { + mask = (BN_ULONG)0 - ((i - ntop) >> (8 * sizeof(i) - 1)); + n->d[i] &= mask; + } + mask = (BN_ULONG)0 - ((rtop - ntop) >> (8 * sizeof(ntop) - 1)); + /* always true, if (rtop >= ntop) n->top = r->top; */ + n->top = (int)(rtop & ~mask) | (ntop & mask); + n->flags |= (BN_FLG_FIXED_TOP & ~mask); } - ret = BN_mod_mul(n, n, b->Ai, b->mod, ctx); + ret = BN_mod_mul_montgomery(n, n, r, b->m_ctx, ctx); + } else { + ret = BN_mod_mul(n, n, r, b->mod, ctx); } bn_check_top(n); @@ -253,31 +273,35 @@ BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b, int rv; if (!BN_rand_range(ret->A, ret->mod)) goto err; - if (!int_bn_mod_inverse(ret->Ai, ret->A, ret->mod, ctx, &rv)) { - /* - * this should almost never happen for good RSA keys - */ - if (rv) { - if (retry_counter-- == 0) { - BNerr(BN_F_BN_BLINDING_CREATE_PARAM, - BN_R_TOO_MANY_ITERATIONS); - goto err; - } - } else - goto err; - } else + if (int_bn_mod_inverse(ret->Ai, ret->A, ret->mod, ctx, &rv)) break; + + /* + * this should almost never happen for good RSA keys + */ + if (!rv) + goto err; + + if (retry_counter-- == 0) { + BNerr(BN_F_BN_BLINDING_CREATE_PARAM, BN_R_TOO_MANY_ITERATIONS); + goto err; + } } while (1); if (ret->bn_mod_exp != NULL && ret->m_ctx != NULL) { - if (!ret->bn_mod_exp - (ret->A, ret->A, ret->e, ret->mod, ctx, ret->m_ctx)) + if (!ret->bn_mod_exp(ret->A, ret->A, ret->e, ret->mod, ctx, ret->m_ctx)) goto err; } else { if (!BN_mod_exp(ret->A, ret->A, ret->e, ret->mod, ctx)) goto err; } + if (ret->m_ctx != NULL) { + if (!bn_to_mont_fixed_top(ret->Ai, ret->Ai, ret->m_ctx, ctx) + || !bn_to_mont_fixed_top(ret->A, ret->A, ret->m_ctx, ctx)) + goto err; + } + return ret; err: if (b == NULL) { diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_div.c b/worker/deps/openssl/openssl/crypto/bn/bn_div.c index 5e620b2096..884ff29917 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_div.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_div.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -240,6 +240,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor, wnum.neg = 0; wnum.d = &(snum->d[loop]); wnum.top = div_n; + wnum.flags = BN_FLG_STATIC_DATA; /* * only needed when BN_ucmp messes up the values between top and max */ diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_exp.c b/worker/deps/openssl/openssl/crypto/bn/bn_exp.c index 0d2d1eca6b..a6ad475a0b 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_exp.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_exp.c @@ -188,8 +188,8 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, bits = BN_num_bits(p); if (bits == 0) { - /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + /* x**0 mod 1, or x**0 mod -1 is still zero. */ + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(r); } else { @@ -330,8 +330,8 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, } bits = BN_num_bits(p); if (bits == 0) { - /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + /* x**0 mod 1, or x**0 mod -1 is still zero. */ + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(rr); } else { @@ -371,17 +371,17 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, ret = 1; goto err; } - if (!BN_to_montgomery(val[0], aa, mont, ctx)) + if (!bn_to_mont_fixed_top(val[0], aa, mont, ctx)) goto err; /* 1 */ window = BN_window_bits_for_exponent_size(bits); if (window > 1) { - if (!BN_mod_mul_montgomery(d, val[0], val[0], mont, ctx)) + if (!bn_mul_mont_fixed_top(d, val[0], val[0], mont, ctx)) goto err; /* 2 */ j = 1 << (window - 1); for (i = 1; i < j; i++) { if (((val[i] = BN_CTX_get(ctx)) == NULL) || - !BN_mod_mul_montgomery(val[i], val[i - 1], d, mont, ctx)) + !bn_mul_mont_fixed_top(val[i], val[i - 1], d, mont, ctx)) goto err; } } @@ -403,19 +403,15 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, for (i = 1; i < j; i++) r->d[i] = (~m->d[i]) & BN_MASK2; r->top = j; - /* - * Upper words will be zero if the corresponding words of 'm' were - * 0xfff[...], so decrement r->top accordingly. - */ - bn_correct_top(r); + r->flags |= BN_FLG_FIXED_TOP; } else #endif - if (!BN_to_montgomery(r, BN_value_one(), mont, ctx)) + if (!bn_to_mont_fixed_top(r, BN_value_one(), mont, ctx)) goto err; for (;;) { if (BN_is_bit_set(p, wstart) == 0) { if (!start) { - if (!BN_mod_mul_montgomery(r, r, r, mont, ctx)) + if (!bn_mul_mont_fixed_top(r, r, r, mont, ctx)) goto err; } if (wstart == 0) @@ -446,12 +442,12 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, /* add the 'bytes above' */ if (!start) for (i = 0; i < j; i++) { - if (!BN_mod_mul_montgomery(r, r, r, mont, ctx)) + if (!bn_mul_mont_fixed_top(r, r, r, mont, ctx)) goto err; } /* wvalue will be an odd number < 2^window */ - if (!BN_mod_mul_montgomery(r, r, val[wvalue >> 1], mont, ctx)) + if (!bn_mul_mont_fixed_top(r, r, val[wvalue >> 1], mont, ctx)) goto err; /* move the 'window' down further */ @@ -461,6 +457,11 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, if (wstart < 0) break; } + /* + * Done with zero-padded intermediate BIGNUMs. Final BN_from_montgomery + * removes padding [if any] and makes return value suitable for public + * API consumer. + */ #if defined(SPARC_T4_MONT) if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) { j = mont->N.top; /* borrow j */ @@ -587,7 +588,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, } b->top = top; - bn_correct_top(b); + b->flags |= BN_FLG_FIXED_TOP; return 1; } @@ -639,8 +640,8 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, */ bits = p->top * BN_BITS2; if (bits == 0) { - /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + /* x**0 mod 1, or x**0 mod -1 is still zero. */ + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(rr); } else { @@ -757,16 +758,16 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, tmp.top = top; } else #endif - if (!BN_to_montgomery(&tmp, BN_value_one(), mont, ctx)) + if (!bn_to_mont_fixed_top(&tmp, BN_value_one(), mont, ctx)) goto err; /* prepare a^1 in Montgomery domain */ if (a->neg || BN_ucmp(a, m) >= 0) { if (!BN_mod(&am, a, m, ctx)) goto err; - if (!BN_to_montgomery(&am, &am, mont, ctx)) + if (!bn_to_mont_fixed_top(&am, &am, mont, ctx)) goto err; - } else if (!BN_to_montgomery(&am, a, mont, ctx)) + } else if (!bn_to_mont_fixed_top(&am, a, mont, ctx)) goto err; #if defined(SPARC_T4_MONT) @@ -1033,14 +1034,14 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, * performance advantage of sqr over mul). */ if (window > 1) { - if (!BN_mod_mul_montgomery(&tmp, &am, &am, mont, ctx)) + if (!bn_mul_mont_fixed_top(&tmp, &am, &am, mont, ctx)) goto err; if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 2, window)) goto err; for (i = 3; i < numPowers; i++) { /* Calculate a^i = a^(i-1) * a */ - if (!BN_mod_mul_montgomery(&tmp, &am, &tmp, mont, ctx)) + if (!bn_mul_mont_fixed_top(&tmp, &am, &tmp, mont, ctx)) goto err; if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, i, window)) @@ -1064,7 +1065,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, /* Scan the window, squaring the result as we go */ for (i = 0; i < window; i++, bits--) { - if (!BN_mod_mul_montgomery(&tmp, &tmp, &tmp, mont, ctx)) + if (!bn_mul_mont_fixed_top(&tmp, &tmp, &tmp, mont, ctx)) goto err; wvalue = (wvalue << 1) + BN_is_bit_set(p, bits); } @@ -1077,12 +1078,16 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, goto err; /* Multiply the result into the intermediate result */ - if (!BN_mod_mul_montgomery(&tmp, &tmp, &am, mont, ctx)) + if (!bn_mul_mont_fixed_top(&tmp, &tmp, &am, mont, ctx)) goto err; } } - /* Convert the final result from montgomery to standard format */ + /* + * Done with zero-padded intermediate BIGNUMs. Final BN_from_montgomery + * removes padding [if any] and makes return value suitable for public + * API consumer. + */ #if defined(SPARC_T4_MONT) if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) { am.d[0] = 1; /* borrow am */ @@ -1151,8 +1156,8 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, bits = BN_num_bits(p); if (bits == 0) { - /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + /* x**0 mod 1, or x**0 mod -1 is still zero. */ + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(rr); } else { @@ -1273,9 +1278,9 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, } bits = BN_num_bits(p); - if (bits == 0) { - /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + if (bits == 0) { + /* x**0 mod 1, or x**0 mod -1 is still zero. */ + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(r); } else { diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c b/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c index 067642644e..bed231c8fa 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -140,7 +140,14 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in, BIGNUM *ret = NULL; int sign; - if (pnoinv) + /* This is invalid input so we don't worry about constant time here */ + if (BN_abs_is_word(n, 1) || BN_is_zero(n)) { + if (pnoinv != NULL) + *pnoinv = 1; + return NULL; + } + + if (pnoinv != NULL) *pnoinv = 0; if ((BN_get_flags(a, BN_FLG_CONSTTIME) != 0) diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c b/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c index b1987f55dd..d80f3ec940 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -32,30 +32,32 @@ */ # define MAX_ITERATIONS 50 -static const BN_ULONG SQR_tb[16] = { 0, 1, 4, 5, 16, 17, 20, 21, - 64, 65, 68, 69, 80, 81, 84, 85 -}; +# define SQR_nibble(w) ((((w) & 8) << 3) \ + | (((w) & 4) << 2) \ + | (((w) & 2) << 1) \ + | ((w) & 1)) + /* Platform-specific macros to accelerate squaring. */ # if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG) # define SQR1(w) \ - SQR_tb[(w) >> 60 & 0xF] << 56 | SQR_tb[(w) >> 56 & 0xF] << 48 | \ - SQR_tb[(w) >> 52 & 0xF] << 40 | SQR_tb[(w) >> 48 & 0xF] << 32 | \ - SQR_tb[(w) >> 44 & 0xF] << 24 | SQR_tb[(w) >> 40 & 0xF] << 16 | \ - SQR_tb[(w) >> 36 & 0xF] << 8 | SQR_tb[(w) >> 32 & 0xF] + SQR_nibble((w) >> 60) << 56 | SQR_nibble((w) >> 56) << 48 | \ + SQR_nibble((w) >> 52) << 40 | SQR_nibble((w) >> 48) << 32 | \ + SQR_nibble((w) >> 44) << 24 | SQR_nibble((w) >> 40) << 16 | \ + SQR_nibble((w) >> 36) << 8 | SQR_nibble((w) >> 32) # define SQR0(w) \ - SQR_tb[(w) >> 28 & 0xF] << 56 | SQR_tb[(w) >> 24 & 0xF] << 48 | \ - SQR_tb[(w) >> 20 & 0xF] << 40 | SQR_tb[(w) >> 16 & 0xF] << 32 | \ - SQR_tb[(w) >> 12 & 0xF] << 24 | SQR_tb[(w) >> 8 & 0xF] << 16 | \ - SQR_tb[(w) >> 4 & 0xF] << 8 | SQR_tb[(w) & 0xF] + SQR_nibble((w) >> 28) << 56 | SQR_nibble((w) >> 24) << 48 | \ + SQR_nibble((w) >> 20) << 40 | SQR_nibble((w) >> 16) << 32 | \ + SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | \ + SQR_nibble((w) >> 4) << 8 | SQR_nibble((w) ) # endif # ifdef THIRTY_TWO_BIT # define SQR1(w) \ - SQR_tb[(w) >> 28 & 0xF] << 24 | SQR_tb[(w) >> 24 & 0xF] << 16 | \ - SQR_tb[(w) >> 20 & 0xF] << 8 | SQR_tb[(w) >> 16 & 0xF] + SQR_nibble((w) >> 28) << 24 | SQR_nibble((w) >> 24) << 16 | \ + SQR_nibble((w) >> 20) << 8 | SQR_nibble((w) >> 16) # define SQR0(w) \ - SQR_tb[(w) >> 12 & 0xF] << 24 | SQR_tb[(w) >> 8 & 0xF] << 16 | \ - SQR_tb[(w) >> 4 & 0xF] << 8 | SQR_tb[(w) & 0xF] + SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | \ + SQR_nibble((w) >> 4) << 8 | SQR_nibble((w) ) # endif # if !defined(OPENSSL_BN_ASM_GF2m) diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_intern.c b/worker/deps/openssl/openssl/crypto/bn/bn_intern.c index 2c970647de..7b25927f9b 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_intern.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_intern.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -177,16 +177,20 @@ BN_ULONG *bn_get_words(const BIGNUM *a) return a->d; } -void bn_set_static_words(BIGNUM *a, BN_ULONG *words, int size) +void bn_set_static_words(BIGNUM *a, const BN_ULONG *words, int size) { - a->d = words; + /* + * |const| qualifier omission is compensated by BN_FLG_STATIC_DATA + * flag, which effectively means "read-only data". + */ + a->d = (BN_ULONG *)words; a->dmax = a->top = size; a->neg = 0; a->flags |= BN_FLG_STATIC_DATA; bn_correct_top(a); } -int bn_set_words(BIGNUM *a, BN_ULONG *words, int num_words) +int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words) { if (bn_wexpand(a, num_words) == NULL) { BNerr(BN_F_BN_SET_WORDS, ERR_R_MALLOC_FAILURE); diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h b/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h index 5fb3814554..4d9808f5b8 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h +++ b/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -145,7 +145,16 @@ extern "C" { */ # ifdef BN_DEBUG - +/* + * The new BN_FLG_FIXED_TOP flag marks vectors that were not treated with + * bn_correct_top, in other words such vectors are permitted to have zeros + * in most significant limbs. Such vectors are used internally to achieve + * execution time invariance for critical operations with private keys. + * It's BN_DEBUG-only flag, because user application is not supposed to + * observe it anyway. Moreover, optimizing compiler would actually remove + * all operations manipulating the bit in question in non-BN_DEBUG build. + */ +# define BN_FLG_FIXED_TOP 0x10000 # ifdef BN_DEBUG_RAND /* To avoid "make update" cvs wars due to BN_DEBUG, use some tricks */ # ifndef RAND_bytes @@ -177,8 +186,10 @@ int RAND_bytes(unsigned char *buf, int num); do { \ const BIGNUM *_bnum2 = (a); \ if (_bnum2 != NULL) { \ - OPENSSL_assert(((_bnum2->top == 0) && !_bnum2->neg) || \ - (_bnum2->top && (_bnum2->d[_bnum2->top - 1] != 0))); \ + int _top = _bnum2->top; \ + OPENSSL_assert((_top == 0 && !_bnum2->neg) || \ + (_top && ((_bnum2->flags & BN_FLG_FIXED_TOP) \ + || _bnum2->d[_top - 1] != 0))); \ bn_pollute(_bnum2); \ } \ } while(0) @@ -197,6 +208,7 @@ int RAND_bytes(unsigned char *buf, int num); # else /* !BN_DEBUG */ +# define BN_FLG_FIXED_TOP 0 # define bn_pollute(a) # define bn_check_top(a) # define bn_fix_top(a) bn_correct_top(a) @@ -228,7 +240,8 @@ struct bignum_st { /* Used for montgomery multiplication */ struct bn_mont_ctx_st { int ri; /* number of bits in R */ - BIGNUM RR; /* used to convert to montgomery form */ + BIGNUM RR; /* used to convert to montgomery form, + possibly zero-padded */ BIGNUM N; /* The modulus */ BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1 (Ni is only * stored for bignum algorithm) */ diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_lib.c b/worker/deps/openssl/openssl/crypto/bn/bn_lib.c index 7058494092..3f3c7bbb2f 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_lib.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_lib.c @@ -12,6 +12,7 @@ #include "internal/cryptlib.h" #include "bn_lcl.h" #include +#include "internal/constant_time_locl.h" /* This stuff appears to be completely unused, so is deprecated */ #if OPENSSL_API_COMPAT < 0x00908000L @@ -222,8 +223,6 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) const BN_ULONG *B; int i; - bn_check_top(b); - if (words > (INT_MAX / (4 * BN_BITS2))) { BNerr(BN_F_BN_EXPAND_INTERNAL, BN_R_BIGNUM_TOO_LONG); return NULL; @@ -298,8 +297,6 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) BIGNUM *bn_expand2(BIGNUM *b, int words) { - bn_check_top(b); - if (words > b->dmax) { BN_ULONG *a = bn_expand_internal(b, words); if (!a) @@ -312,7 +309,6 @@ BIGNUM *bn_expand2(BIGNUM *b, int words) b->dmax = words; } - bn_check_top(b); return b; } @@ -379,12 +375,19 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b) memcpy(a->d, b->d, sizeof(b->d[0]) * b->top); #endif - a->top = b->top; a->neg = b->neg; + a->top = b->top; + a->flags |= b->flags & BN_FLG_FIXED_TOP; bn_check_top(a); return (a); } +#define FLAGS_DATA(flags) ((flags) & (BN_FLG_STATIC_DATA \ + | BN_FLG_CONSTTIME \ + | BN_FLG_SECURE \ + | BN_FLG_FIXED_TOP)) +#define FLAGS_STRUCT(flags) ((flags) & (BN_FLG_MALLOCED)) + void BN_swap(BIGNUM *a, BIGNUM *b) { int flags_old_a, flags_old_b; @@ -412,10 +415,8 @@ void BN_swap(BIGNUM *a, BIGNUM *b) b->dmax = tmp_dmax; b->neg = tmp_neg; - a->flags = - (flags_old_a & BN_FLG_MALLOCED) | (flags_old_b & BN_FLG_STATIC_DATA); - b->flags = - (flags_old_b & BN_FLG_MALLOCED) | (flags_old_a & BN_FLG_STATIC_DATA); + a->flags = FLAGS_STRUCT(flags_old_a) | FLAGS_DATA(flags_old_b); + b->flags = FLAGS_STRUCT(flags_old_b) | FLAGS_DATA(flags_old_a); bn_check_top(a); bn_check_top(b); } @@ -425,8 +426,9 @@ void BN_clear(BIGNUM *a) bn_check_top(a); if (a->d != NULL) OPENSSL_cleanse(a->d, sizeof(*a->d) * a->dmax); - a->top = 0; a->neg = 0; + a->top = 0; + a->flags &= ~BN_FLG_FIXED_TOP; } BN_ULONG BN_get_word(const BIGNUM *a) @@ -447,6 +449,7 @@ int BN_set_word(BIGNUM *a, BN_ULONG w) a->neg = 0; a->d[0] = w; a->top = (w ? 1 : 0); + a->flags &= ~BN_FLG_FIXED_TOP; bn_check_top(a); return (1); } @@ -499,24 +502,43 @@ BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret) /* ignore negative */ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) { - int i; + int n; + size_t i, lasti, j, atop, mask; BN_ULONG l; - bn_check_top(a); - i = BN_num_bytes(a); - if (tolen == -1) - tolen = i; - else if (tolen < i) - return -1; - /* Add leading zeroes if necessary */ - if (tolen > i) { - memset(to, 0, tolen - i); - to += tolen - i; + /* + * In case |a| is fixed-top, BN_num_bytes can return bogus length, + * but it's assumed that fixed-top inputs ought to be "nominated" + * even for padded output, so it works out... + */ + n = BN_num_bytes(a); + if (tolen == -1) { + tolen = n; + } else if (tolen < n) { /* uncommon/unlike case */ + BIGNUM temp = *a; + + bn_correct_top(&temp); + n = BN_num_bytes(&temp); + if (tolen < n) + return -1; } - while (i--) { + + /* Swipe through whole available data and don't give away padded zero. */ + atop = a->dmax * BN_BYTES; + if (atop == 0) { + OPENSSL_cleanse(to, tolen); + return tolen; + } + + lasti = atop - 1; + atop = a->top * BN_BYTES; + for (i = 0, j = 0, to += tolen; j < (size_t)tolen; j++) { l = a->d[i / BN_BYTES]; - *(to++) = (unsigned char)(l >> (8 * (i % BN_BYTES))) & 0xff; + mask = 0 - ((j - atop) >> (8 * sizeof(i) - 1)); + *--to = (unsigned char)(l >> (8 * (i % BN_BYTES)) & mask); + i += (i - lasti) >> (8 * sizeof(i) - 1); /* stay on last limb */ } + return tolen; } @@ -683,6 +705,7 @@ int BN_set_bit(BIGNUM *a, int n) for (k = a->top; k < i + 1; k++) a->d[k] = 0; a->top = i + 1; + a->flags &= ~BN_FLG_FIXED_TOP; } a->d[i] |= (((BN_ULONG)1) << j); @@ -824,6 +847,38 @@ void BN_consttime_swap(BN_ULONG condition, BIGNUM *a, BIGNUM *b, int nwords) a->top ^= t; b->top ^= t; + t = (a->neg ^ b->neg) & condition; + a->neg ^= t; + b->neg ^= t; + + /*- + * BN_FLG_STATIC_DATA: indicates that data may not be written to. Intention + * is actually to treat it as it's read-only data, and some (if not most) + * of it does reside in read-only segment. In other words observation of + * BN_FLG_STATIC_DATA in BN_consttime_swap should be treated as fatal + * condition. It would either cause SEGV or effectively cause data + * corruption. + * + * BN_FLG_MALLOCED: refers to BN structure itself, and hence must be + * preserved. + * + * BN_FLG_SECURE: must be preserved, because it determines how x->d was + * allocated and hence how to free it. + * + * BN_FLG_CONSTTIME: sufficient to mask and swap + * + * BN_FLG_FIXED_TOP: indicates that we haven't called bn_correct_top() on + * the data, so the d array may be padded with additional 0 values (i.e. + * top could be greater than the minimal value that it could be). We should + * be swapping it + */ + +#define BN_CONSTTIME_SWAP_FLAGS (BN_FLG_CONSTTIME | BN_FLG_FIXED_TOP) + + t = ((a->flags ^ b->flags) & BN_CONSTTIME_SWAP_FLAGS) & condition; + a->flags ^= t; + b->flags ^= t; + #define BN_CONSTTIME_SWAP(ind) \ do { \ t = (a->d[ind] ^ b->d[ind]) & condition; \ @@ -887,8 +942,9 @@ int BN_security_bits(int L, int N) void BN_zero_ex(BIGNUM *a) { - a->top = 0; a->neg = 0; + a->top = 0; + a->flags &= ~BN_FLG_FIXED_TOP; } int BN_abs_is_word(const BIGNUM *a, const BN_ULONG w) @@ -1012,5 +1068,6 @@ void bn_correct_top(BIGNUM *a) } if (a->top == 0) a->neg = 0; + a->flags &= ~BN_FLG_FIXED_TOP; bn_pollute(a); } diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_mod.c b/worker/deps/openssl/openssl/crypto/bn/bn_mod.c index 13b583f76c..2e98035bd8 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_mod.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_mod.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -35,18 +35,74 @@ int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, /* * BN_mod_add variant that may be used if both a and b are non-negative and - * less than m + * less than m. The original algorithm was + * + * if (!BN_uadd(r, a, b)) + * return 0; + * if (BN_ucmp(r, m) >= 0) + * return BN_usub(r, r, m); + * + * which is replaced with addition, subtracting modulus, and conditional + * move depending on whether or not subtraction borrowed. */ -int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - const BIGNUM *m) +int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + const BIGNUM *m) { - if (!BN_uadd(r, a, b)) + size_t i, ai, bi, mtop = m->top; + BN_ULONG storage[1024 / BN_BITS2]; + BN_ULONG carry, temp, mask, *rp, *tp = storage; + const BN_ULONG *ap, *bp; + + if (bn_wexpand(r, mtop) == NULL) return 0; - if (BN_ucmp(r, m) >= 0) - return BN_usub(r, r, m); + + if (mtop > sizeof(storage) / sizeof(storage[0]) + && (tp = OPENSSL_malloc(mtop * sizeof(BN_ULONG))) == NULL) + return 0; + + ap = a->d != NULL ? a->d : tp; + bp = b->d != NULL ? b->d : tp; + + for (i = 0, ai = 0, bi = 0, carry = 0; i < mtop;) { + mask = (BN_ULONG)0 - ((i - a->top) >> (8 * sizeof(i) - 1)); + temp = ((ap[ai] & mask) + carry) & BN_MASK2; + carry = (temp < carry); + + mask = (BN_ULONG)0 - ((i - b->top) >> (8 * sizeof(i) - 1)); + tp[i] = ((bp[bi] & mask) + temp) & BN_MASK2; + carry += (tp[i] < temp); + + i++; + ai += (i - a->dmax) >> (8 * sizeof(i) - 1); + bi += (i - b->dmax) >> (8 * sizeof(i) - 1); + } + rp = r->d; + carry -= bn_sub_words(rp, tp, m->d, mtop); + for (i = 0; i < mtop; i++) { + rp[i] = (carry & tp[i]) | (~carry & rp[i]); + ((volatile BN_ULONG *)tp)[i] = 0; + } + r->top = mtop; + r->flags |= BN_FLG_FIXED_TOP; + r->neg = 0; + + if (tp != storage) + OPENSSL_free(tp); + return 1; } +int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + const BIGNUM *m) +{ + int ret = bn_mod_add_fixed_top(r, a, b, m); + + if (ret) + bn_correct_top(r); + + return ret; +} + int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx) { @@ -55,6 +111,70 @@ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, return BN_nnmod(r, r, m, ctx); } +/* + * BN_mod_sub variant that may be used if both a and b are non-negative, + * a is less than m, while b is of same bit width as m. It's implemented + * as subtraction followed by two conditional additions. + * + * 0 <= a < m + * 0 <= b < 2^w < 2*m + * + * after subtraction + * + * -2*m < r = a - b < m + * + * Thus it takes up to two conditional additions to make |r| positive. + */ +int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + const BIGNUM *m) +{ + size_t i, ai, bi, mtop = m->top; + BN_ULONG borrow, carry, ta, tb, mask, *rp; + const BN_ULONG *ap, *bp; + + if (bn_wexpand(r, mtop) == NULL) + return 0; + + rp = r->d; + ap = a->d != NULL ? a->d : rp; + bp = b->d != NULL ? b->d : rp; + + for (i = 0, ai = 0, bi = 0, borrow = 0; i < mtop;) { + mask = (BN_ULONG)0 - ((i - a->top) >> (8 * sizeof(i) - 1)); + ta = ap[ai] & mask; + + mask = (BN_ULONG)0 - ((i - b->top) >> (8 * sizeof(i) - 1)); + tb = bp[bi] & mask; + rp[i] = ta - tb - borrow; + if (ta != tb) + borrow = (ta < tb); + + i++; + ai += (i - a->dmax) >> (8 * sizeof(i) - 1); + bi += (i - b->dmax) >> (8 * sizeof(i) - 1); + } + ap = m->d; + for (i = 0, mask = 0 - borrow, carry = 0; i < mtop; i++) { + ta = ((ap[i] & mask) + carry) & BN_MASK2; + carry = (ta < carry); + rp[i] = (rp[i] + ta) & BN_MASK2; + carry += (rp[i] < ta); + } + borrow -= carry; + for (i = 0, mask = 0 - borrow, carry = 0; i < mtop; i++) { + ta = ((ap[i] & mask) + carry) & BN_MASK2; + carry = (ta < carry); + rp[i] = (rp[i] + ta) & BN_MASK2; + carry += (rp[i] < ta); + } + + r->top = mtop; + r->flags |= BN_FLG_FIXED_TOP; + r->neg = 0; + + return 1; +} + /* * BN_mod_sub variant that may be used if both a and b are non-negative and * less than m diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_mont.c b/worker/deps/openssl/openssl/crypto/bn/bn_mont.c index faef581571..41214334b8 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_mont.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_mont.c @@ -20,29 +20,43 @@ #define MONT_WORD /* use the faster word-based algorithm */ #ifdef MONT_WORD -static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont); +static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont); #endif int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_MONT_CTX *mont, BN_CTX *ctx) +{ + int ret = bn_mul_mont_fixed_top(r, a, b, mont, ctx); + + bn_correct_top(r); + bn_check_top(r); + + return ret; +} + +int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + BN_MONT_CTX *mont, BN_CTX *ctx) { BIGNUM *tmp; int ret = 0; -#if defined(OPENSSL_BN_ASM_MONT) && defined(MONT_WORD) int num = mont->N.top; +#if defined(OPENSSL_BN_ASM_MONT) && defined(MONT_WORD) if (num > 1 && a->top == num && b->top == num) { if (bn_wexpand(r, num) == NULL) return (0); if (bn_mul_mont(r->d, a->d, b->d, mont->N.d, mont->n0, num)) { r->neg = a->neg ^ b->neg; r->top = num; - bn_correct_top(r); + r->flags |= BN_FLG_FIXED_TOP; return (1); } } #endif + if ((a->top + b->top) > 2 * num) + return 0; + BN_CTX_start(ctx); tmp = BN_CTX_get(ctx); if (tmp == NULL) @@ -50,21 +64,20 @@ int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, bn_check_top(tmp); if (a == b) { - if (!BN_sqr(tmp, a, ctx)) + if (!bn_sqr_fixed_top(tmp, a, ctx)) goto err; } else { - if (!BN_mul(tmp, a, b, ctx)) + if (!bn_mul_fixed_top(tmp, a, b, ctx)) goto err; } /* reduce from aRR to aR */ #ifdef MONT_WORD - if (!BN_from_montgomery_word(r, tmp, mont)) + if (!bn_from_montgomery_word(r, tmp, mont)) goto err; #else if (!BN_from_montgomery(r, tmp, mont, ctx)) goto err; #endif - bn_check_top(r); ret = 1; err: BN_CTX_end(ctx); @@ -72,11 +85,12 @@ int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, } #ifdef MONT_WORD -static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) +static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) { BIGNUM *n; BN_ULONG *ap, *np, *rp, n0, v, carry; int nl, max, i; + unsigned int rtop; n = &(mont->N); nl = n->top; @@ -93,12 +107,13 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) np = n->d; rp = r->d; - /* clear the top words of T */ - i = max - r->top; - if (i) - memset(&rp[r->top], 0, sizeof(*rp) * i); + for (rtop = r->top, i = 0; i < max; i++) { + v = (BN_ULONG)0 - ((i - rtop) >> (8 * sizeof(rtop) - 1)); + rp[i] &= v; + } r->top = max; + r->flags |= BN_FLG_FIXED_TOP; n0 = mont->n0[0]; /* @@ -117,6 +132,7 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) if (bn_wexpand(ret, nl) == NULL) return (0); ret->top = nl; + ret->flags |= BN_FLG_FIXED_TOP; ret->neg = r->neg; rp = ret->d; @@ -127,20 +143,16 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) */ ap = &(r->d[nl]); + carry -= bn_sub_words(rp, ap, np, nl); /* - * |v| is one if |ap| - |np| underflowed or zero if it did not. Note |v| - * cannot be -1. That would imply the subtraction did not fit in |nl| words, - * and we know at most one subtraction is needed. + * |carry| is -1 if |ap| - |np| underflowed or zero if it did not. Note + * |carry| cannot be 1. That would imply the subtraction did not fit in + * |nl| words, and we know at most one subtraction is needed. */ - v = bn_sub_words(rp, ap, np, nl) - carry; - v = 0 - v; for (i = 0; i < nl; i++) { - rp[i] = (v & ap[i]) | (~v & rp[i]); + rp[i] = (carry & ap[i]) | (~carry & rp[i]); ap[i] = 0; } - bn_correct_top(r); - bn_correct_top(ret); - bn_check_top(ret); return (1); } @@ -148,14 +160,27 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont, BN_CTX *ctx) +{ + int retn; + + retn = bn_from_mont_fixed_top(ret, a, mont, ctx); + bn_correct_top(ret); + bn_check_top(ret); + + return retn; +} + +int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont, + BN_CTX *ctx) { int retn = 0; #ifdef MONT_WORD BIGNUM *t; BN_CTX_start(ctx); - if ((t = BN_CTX_get(ctx)) && BN_copy(t, a)) - retn = BN_from_montgomery_word(ret, t, mont); + if ((t = BN_CTX_get(ctx)) && BN_copy(t, a)) { + retn = bn_from_montgomery_word(ret, t, mont); + } BN_CTX_end(ctx); #else /* !MONT_WORD */ BIGNUM *t1, *t2; @@ -193,6 +218,12 @@ int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont, return (retn); } +int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, + BN_CTX *ctx) +{ + return bn_mul_mont_fixed_top(r, a, &(mont->RR), mont, ctx); +} + BN_MONT_CTX *BN_MONT_CTX_new(void) { BN_MONT_CTX *ret; @@ -229,7 +260,7 @@ void BN_MONT_CTX_free(BN_MONT_CTX *mont) int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) { - int ret = 0; + int i, ret = 0; BIGNUM *Ri, *R; if (BN_is_zero(mod)) @@ -278,7 +309,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) if ((buf[1] = mod->top > 1 ? mod->d[1] : 0)) tmod.top = 2; - if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) + if (BN_is_one(&tmod)) + BN_zero(Ri); + else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) goto err; if (!BN_lshift(Ri, Ri, 2 * BN_BITS2)) goto err; /* R*Ri */ @@ -311,7 +344,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) buf[1] = 0; tmod.top = buf[0] != 0 ? 1 : 0; /* Ri = R^-1 mod N */ - if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) + if (BN_is_one(&tmod)) + BN_zero(Ri); + else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) goto err; if (!BN_lshift(Ri, Ri, BN_BITS2)) goto err; /* R*Ri */ @@ -360,6 +395,11 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) if (!BN_mod(&(mont->RR), &(mont->RR), &(mont->N), ctx)) goto err; + for (i = mont->RR.top, ret = mont->N.top; i < ret; i++) + mont->RR.d[i] = 0; + mont->RR.top = ret; + mont->RR.flags |= BN_FLG_FIXED_TOP; + ret = 1; err: BN_CTX_end(ctx); diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_mul.c b/worker/deps/openssl/openssl/crypto/bn/bn_mul.c index a1abc5b05a..237d7df106 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_mul.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_mul.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -832,6 +832,16 @@ void bn_mul_high(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, BN_ULONG *l, int n2, #endif /* BN_RECURSION */ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) +{ + int ret = bn_mul_fixed_top(r, a, b, ctx); + + bn_correct_top(r); + bn_check_top(r); + + return ret; +} + +int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) { int ret = 0; int top, al, bl; @@ -935,7 +945,7 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) end: #endif rr->neg = a->neg ^ b->neg; - bn_correct_top(rr); + rr->flags |= BN_FLG_FIXED_TOP; if (r != rr && BN_copy(r, rr) == NULL) goto err; diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_prime.h b/worker/deps/openssl/openssl/crypto/bn/bn_prime.h index 5f5cc4f580..41440fa4e1 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_prime.h +++ b/worker/deps/openssl/openssl/crypto/bn/bn_prime.h @@ -15,260 +15,260 @@ typedef unsigned short prime_t; static const prime_t primes[2048] = { - 2, 3, 5, 7, 11, 13, 17, 19, - 23, 29, 31, 37, 41, 43, 47, 53, - 59, 61, 67, 71, 73, 79, 83, 89, - 97, 101, 103, 107, 109, 113, 127, 131, - 137, 139, 149, 151, 157, 163, 167, 173, - 179, 181, 191, 193, 197, 199, 211, 223, - 227, 229, 233, 239, 241, 251, 257, 263, - 269, 271, 277, 281, 283, 293, 307, 311, - 313, 317, 331, 337, 347, 349, 353, 359, - 367, 373, 379, 383, 389, 397, 401, 409, - 419, 421, 431, 433, 439, 443, 449, 457, - 461, 463, 467, 479, 487, 491, 499, 503, - 509, 521, 523, 541, 547, 557, 563, 569, - 571, 577, 587, 593, 599, 601, 607, 613, - 617, 619, 631, 641, 643, 647, 653, 659, - 661, 673, 677, 683, 691, 701, 709, 719, - 727, 733, 739, 743, 751, 757, 761, 769, - 773, 787, 797, 809, 811, 821, 823, 827, - 829, 839, 853, 857, 859, 863, 877, 881, - 883, 887, 907, 911, 919, 929, 937, 941, - 947, 953, 967, 971, 977, 983, 991, 997, - 1009, 1013, 1019, 1021, 1031, 1033, 1039, 1049, - 1051, 1061, 1063, 1069, 1087, 1091, 1093, 1097, - 1103, 1109, 1117, 1123, 1129, 1151, 1153, 1163, - 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, - 1229, 1231, 1237, 1249, 1259, 1277, 1279, 1283, - 1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, - 1327, 1361, 1367, 1373, 1381, 1399, 1409, 1423, - 1427, 1429, 1433, 1439, 1447, 1451, 1453, 1459, - 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511, - 1523, 1531, 1543, 1549, 1553, 1559, 1567, 1571, - 1579, 1583, 1597, 1601, 1607, 1609, 1613, 1619, - 1621, 1627, 1637, 1657, 1663, 1667, 1669, 1693, - 1697, 1699, 1709, 1721, 1723, 1733, 1741, 1747, - 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811, - 1823, 1831, 1847, 1861, 1867, 1871, 1873, 1877, - 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, - 1951, 1973, 1979, 1987, 1993, 1997, 1999, 2003, - 2011, 2017, 2027, 2029, 2039, 2053, 2063, 2069, - 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129, - 2131, 2137, 2141, 2143, 2153, 2161, 2179, 2203, - 2207, 2213, 2221, 2237, 2239, 2243, 2251, 2267, - 2269, 2273, 2281, 2287, 2293, 2297, 2309, 2311, - 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377, - 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, - 2437, 2441, 2447, 2459, 2467, 2473, 2477, 2503, - 2521, 2531, 2539, 2543, 2549, 2551, 2557, 2579, - 2591, 2593, 2609, 2617, 2621, 2633, 2647, 2657, - 2659, 2663, 2671, 2677, 2683, 2687, 2689, 2693, - 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741, - 2749, 2753, 2767, 2777, 2789, 2791, 2797, 2801, - 2803, 2819, 2833, 2837, 2843, 2851, 2857, 2861, - 2879, 2887, 2897, 2903, 2909, 2917, 2927, 2939, - 2953, 2957, 2963, 2969, 2971, 2999, 3001, 3011, - 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079, - 3083, 3089, 3109, 3119, 3121, 3137, 3163, 3167, - 3169, 3181, 3187, 3191, 3203, 3209, 3217, 3221, - 3229, 3251, 3253, 3257, 3259, 3271, 3299, 3301, - 3307, 3313, 3319, 3323, 3329, 3331, 3343, 3347, - 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413, - 3433, 3449, 3457, 3461, 3463, 3467, 3469, 3491, - 3499, 3511, 3517, 3527, 3529, 3533, 3539, 3541, - 3547, 3557, 3559, 3571, 3581, 3583, 3593, 3607, - 3613, 3617, 3623, 3631, 3637, 3643, 3659, 3671, - 3673, 3677, 3691, 3697, 3701, 3709, 3719, 3727, - 3733, 3739, 3761, 3767, 3769, 3779, 3793, 3797, - 3803, 3821, 3823, 3833, 3847, 3851, 3853, 3863, - 3877, 3881, 3889, 3907, 3911, 3917, 3919, 3923, - 3929, 3931, 3943, 3947, 3967, 3989, 4001, 4003, - 4007, 4013, 4019, 4021, 4027, 4049, 4051, 4057, - 4073, 4079, 4091, 4093, 4099, 4111, 4127, 4129, - 4133, 4139, 4153, 4157, 4159, 4177, 4201, 4211, - 4217, 4219, 4229, 4231, 4241, 4243, 4253, 4259, - 4261, 4271, 4273, 4283, 4289, 4297, 4327, 4337, - 4339, 4349, 4357, 4363, 4373, 4391, 4397, 4409, - 4421, 4423, 4441, 4447, 4451, 4457, 4463, 4481, - 4483, 4493, 4507, 4513, 4517, 4519, 4523, 4547, - 4549, 4561, 4567, 4583, 4591, 4597, 4603, 4621, - 4637, 4639, 4643, 4649, 4651, 4657, 4663, 4673, - 4679, 4691, 4703, 4721, 4723, 4729, 4733, 4751, - 4759, 4783, 4787, 4789, 4793, 4799, 4801, 4813, - 4817, 4831, 4861, 4871, 4877, 4889, 4903, 4909, - 4919, 4931, 4933, 4937, 4943, 4951, 4957, 4967, - 4969, 4973, 4987, 4993, 4999, 5003, 5009, 5011, - 5021, 5023, 5039, 5051, 5059, 5077, 5081, 5087, - 5099, 5101, 5107, 5113, 5119, 5147, 5153, 5167, - 5171, 5179, 5189, 5197, 5209, 5227, 5231, 5233, - 5237, 5261, 5273, 5279, 5281, 5297, 5303, 5309, - 5323, 5333, 5347, 5351, 5381, 5387, 5393, 5399, - 5407, 5413, 5417, 5419, 5431, 5437, 5441, 5443, - 5449, 5471, 5477, 5479, 5483, 5501, 5503, 5507, - 5519, 5521, 5527, 5531, 5557, 5563, 5569, 5573, - 5581, 5591, 5623, 5639, 5641, 5647, 5651, 5653, - 5657, 5659, 5669, 5683, 5689, 5693, 5701, 5711, - 5717, 5737, 5741, 5743, 5749, 5779, 5783, 5791, - 5801, 5807, 5813, 5821, 5827, 5839, 5843, 5849, - 5851, 5857, 5861, 5867, 5869, 5879, 5881, 5897, - 5903, 5923, 5927, 5939, 5953, 5981, 5987, 6007, - 6011, 6029, 6037, 6043, 6047, 6053, 6067, 6073, - 6079, 6089, 6091, 6101, 6113, 6121, 6131, 6133, - 6143, 6151, 6163, 6173, 6197, 6199, 6203, 6211, - 6217, 6221, 6229, 6247, 6257, 6263, 6269, 6271, - 6277, 6287, 6299, 6301, 6311, 6317, 6323, 6329, - 6337, 6343, 6353, 6359, 6361, 6367, 6373, 6379, - 6389, 6397, 6421, 6427, 6449, 6451, 6469, 6473, - 6481, 6491, 6521, 6529, 6547, 6551, 6553, 6563, - 6569, 6571, 6577, 6581, 6599, 6607, 6619, 6637, - 6653, 6659, 6661, 6673, 6679, 6689, 6691, 6701, - 6703, 6709, 6719, 6733, 6737, 6761, 6763, 6779, - 6781, 6791, 6793, 6803, 6823, 6827, 6829, 6833, - 6841, 6857, 6863, 6869, 6871, 6883, 6899, 6907, - 6911, 6917, 6947, 6949, 6959, 6961, 6967, 6971, - 6977, 6983, 6991, 6997, 7001, 7013, 7019, 7027, - 7039, 7043, 7057, 7069, 7079, 7103, 7109, 7121, - 7127, 7129, 7151, 7159, 7177, 7187, 7193, 7207, - 7211, 7213, 7219, 7229, 7237, 7243, 7247, 7253, - 7283, 7297, 7307, 7309, 7321, 7331, 7333, 7349, - 7351, 7369, 7393, 7411, 7417, 7433, 7451, 7457, - 7459, 7477, 7481, 7487, 7489, 7499, 7507, 7517, - 7523, 7529, 7537, 7541, 7547, 7549, 7559, 7561, - 7573, 7577, 7583, 7589, 7591, 7603, 7607, 7621, - 7639, 7643, 7649, 7669, 7673, 7681, 7687, 7691, - 7699, 7703, 7717, 7723, 7727, 7741, 7753, 7757, - 7759, 7789, 7793, 7817, 7823, 7829, 7841, 7853, - 7867, 7873, 7877, 7879, 7883, 7901, 7907, 7919, - 7927, 7933, 7937, 7949, 7951, 7963, 7993, 8009, - 8011, 8017, 8039, 8053, 8059, 8069, 8081, 8087, - 8089, 8093, 8101, 8111, 8117, 8123, 8147, 8161, - 8167, 8171, 8179, 8191, 8209, 8219, 8221, 8231, - 8233, 8237, 8243, 8263, 8269, 8273, 8287, 8291, - 8293, 8297, 8311, 8317, 8329, 8353, 8363, 8369, - 8377, 8387, 8389, 8419, 8423, 8429, 8431, 8443, - 8447, 8461, 8467, 8501, 8513, 8521, 8527, 8537, - 8539, 8543, 8563, 8573, 8581, 8597, 8599, 8609, - 8623, 8627, 8629, 8641, 8647, 8663, 8669, 8677, - 8681, 8689, 8693, 8699, 8707, 8713, 8719, 8731, - 8737, 8741, 8747, 8753, 8761, 8779, 8783, 8803, - 8807, 8819, 8821, 8831, 8837, 8839, 8849, 8861, - 8863, 8867, 8887, 8893, 8923, 8929, 8933, 8941, - 8951, 8963, 8969, 8971, 8999, 9001, 9007, 9011, - 9013, 9029, 9041, 9043, 9049, 9059, 9067, 9091, - 9103, 9109, 9127, 9133, 9137, 9151, 9157, 9161, - 9173, 9181, 9187, 9199, 9203, 9209, 9221, 9227, - 9239, 9241, 9257, 9277, 9281, 9283, 9293, 9311, - 9319, 9323, 9337, 9341, 9343, 9349, 9371, 9377, - 9391, 9397, 9403, 9413, 9419, 9421, 9431, 9433, - 9437, 9439, 9461, 9463, 9467, 9473, 9479, 9491, - 9497, 9511, 9521, 9533, 9539, 9547, 9551, 9587, - 9601, 9613, 9619, 9623, 9629, 9631, 9643, 9649, - 9661, 9677, 9679, 9689, 9697, 9719, 9721, 9733, - 9739, 9743, 9749, 9767, 9769, 9781, 9787, 9791, - 9803, 9811, 9817, 9829, 9833, 9839, 9851, 9857, - 9859, 9871, 9883, 9887, 9901, 9907, 9923, 9929, - 9931, 9941, 9949, 9967, 9973, 10007, 10009, 10037, - 10039, 10061, 10067, 10069, 10079, 10091, 10093, 10099, - 10103, 10111, 10133, 10139, 10141, 10151, 10159, 10163, - 10169, 10177, 10181, 10193, 10211, 10223, 10243, 10247, - 10253, 10259, 10267, 10271, 10273, 10289, 10301, 10303, - 10313, 10321, 10331, 10333, 10337, 10343, 10357, 10369, - 10391, 10399, 10427, 10429, 10433, 10453, 10457, 10459, - 10463, 10477, 10487, 10499, 10501, 10513, 10529, 10531, - 10559, 10567, 10589, 10597, 10601, 10607, 10613, 10627, - 10631, 10639, 10651, 10657, 10663, 10667, 10687, 10691, - 10709, 10711, 10723, 10729, 10733, 10739, 10753, 10771, - 10781, 10789, 10799, 10831, 10837, 10847, 10853, 10859, - 10861, 10867, 10883, 10889, 10891, 10903, 10909, 10937, - 10939, 10949, 10957, 10973, 10979, 10987, 10993, 11003, - 11027, 11047, 11057, 11059, 11069, 11071, 11083, 11087, - 11093, 11113, 11117, 11119, 11131, 11149, 11159, 11161, - 11171, 11173, 11177, 11197, 11213, 11239, 11243, 11251, - 11257, 11261, 11273, 11279, 11287, 11299, 11311, 11317, - 11321, 11329, 11351, 11353, 11369, 11383, 11393, 11399, - 11411, 11423, 11437, 11443, 11447, 11467, 11471, 11483, - 11489, 11491, 11497, 11503, 11519, 11527, 11549, 11551, - 11579, 11587, 11593, 11597, 11617, 11621, 11633, 11657, - 11677, 11681, 11689, 11699, 11701, 11717, 11719, 11731, - 11743, 11777, 11779, 11783, 11789, 11801, 11807, 11813, - 11821, 11827, 11831, 11833, 11839, 11863, 11867, 11887, - 11897, 11903, 11909, 11923, 11927, 11933, 11939, 11941, - 11953, 11959, 11969, 11971, 11981, 11987, 12007, 12011, - 12037, 12041, 12043, 12049, 12071, 12073, 12097, 12101, - 12107, 12109, 12113, 12119, 12143, 12149, 12157, 12161, - 12163, 12197, 12203, 12211, 12227, 12239, 12241, 12251, - 12253, 12263, 12269, 12277, 12281, 12289, 12301, 12323, - 12329, 12343, 12347, 12373, 12377, 12379, 12391, 12401, - 12409, 12413, 12421, 12433, 12437, 12451, 12457, 12473, - 12479, 12487, 12491, 12497, 12503, 12511, 12517, 12527, - 12539, 12541, 12547, 12553, 12569, 12577, 12583, 12589, - 12601, 12611, 12613, 12619, 12637, 12641, 12647, 12653, - 12659, 12671, 12689, 12697, 12703, 12713, 12721, 12739, - 12743, 12757, 12763, 12781, 12791, 12799, 12809, 12821, - 12823, 12829, 12841, 12853, 12889, 12893, 12899, 12907, - 12911, 12917, 12919, 12923, 12941, 12953, 12959, 12967, - 12973, 12979, 12983, 13001, 13003, 13007, 13009, 13033, - 13037, 13043, 13049, 13063, 13093, 13099, 13103, 13109, - 13121, 13127, 13147, 13151, 13159, 13163, 13171, 13177, - 13183, 13187, 13217, 13219, 13229, 13241, 13249, 13259, - 13267, 13291, 13297, 13309, 13313, 13327, 13331, 13337, - 13339, 13367, 13381, 13397, 13399, 13411, 13417, 13421, - 13441, 13451, 13457, 13463, 13469, 13477, 13487, 13499, - 13513, 13523, 13537, 13553, 13567, 13577, 13591, 13597, - 13613, 13619, 13627, 13633, 13649, 13669, 13679, 13681, - 13687, 13691, 13693, 13697, 13709, 13711, 13721, 13723, - 13729, 13751, 13757, 13759, 13763, 13781, 13789, 13799, - 13807, 13829, 13831, 13841, 13859, 13873, 13877, 13879, - 13883, 13901, 13903, 13907, 13913, 13921, 13931, 13933, - 13963, 13967, 13997, 13999, 14009, 14011, 14029, 14033, - 14051, 14057, 14071, 14081, 14083, 14087, 14107, 14143, - 14149, 14153, 14159, 14173, 14177, 14197, 14207, 14221, - 14243, 14249, 14251, 14281, 14293, 14303, 14321, 14323, - 14327, 14341, 14347, 14369, 14387, 14389, 14401, 14407, - 14411, 14419, 14423, 14431, 14437, 14447, 14449, 14461, - 14479, 14489, 14503, 14519, 14533, 14537, 14543, 14549, - 14551, 14557, 14561, 14563, 14591, 14593, 14621, 14627, - 14629, 14633, 14639, 14653, 14657, 14669, 14683, 14699, - 14713, 14717, 14723, 14731, 14737, 14741, 14747, 14753, - 14759, 14767, 14771, 14779, 14783, 14797, 14813, 14821, - 14827, 14831, 14843, 14851, 14867, 14869, 14879, 14887, - 14891, 14897, 14923, 14929, 14939, 14947, 14951, 14957, - 14969, 14983, 15013, 15017, 15031, 15053, 15061, 15073, - 15077, 15083, 15091, 15101, 15107, 15121, 15131, 15137, - 15139, 15149, 15161, 15173, 15187, 15193, 15199, 15217, - 15227, 15233, 15241, 15259, 15263, 15269, 15271, 15277, - 15287, 15289, 15299, 15307, 15313, 15319, 15329, 15331, - 15349, 15359, 15361, 15373, 15377, 15383, 15391, 15401, - 15413, 15427, 15439, 15443, 15451, 15461, 15467, 15473, - 15493, 15497, 15511, 15527, 15541, 15551, 15559, 15569, - 15581, 15583, 15601, 15607, 15619, 15629, 15641, 15643, - 15647, 15649, 15661, 15667, 15671, 15679, 15683, 15727, - 15731, 15733, 15737, 15739, 15749, 15761, 15767, 15773, - 15787, 15791, 15797, 15803, 15809, 15817, 15823, 15859, - 15877, 15881, 15887, 15889, 15901, 15907, 15913, 15919, - 15923, 15937, 15959, 15971, 15973, 15991, 16001, 16007, - 16033, 16057, 16061, 16063, 16067, 16069, 16073, 16087, - 16091, 16097, 16103, 16111, 16127, 16139, 16141, 16183, - 16187, 16189, 16193, 16217, 16223, 16229, 16231, 16249, - 16253, 16267, 16273, 16301, 16319, 16333, 16339, 16349, - 16361, 16363, 16369, 16381, 16411, 16417, 16421, 16427, - 16433, 16447, 16451, 16453, 16477, 16481, 16487, 16493, - 16519, 16529, 16547, 16553, 16561, 16567, 16573, 16603, - 16607, 16619, 16631, 16633, 16649, 16651, 16657, 16661, - 16673, 16691, 16693, 16699, 16703, 16729, 16741, 16747, - 16759, 16763, 16787, 16811, 16823, 16829, 16831, 16843, - 16871, 16879, 16883, 16889, 16901, 16903, 16921, 16927, - 16931, 16937, 16943, 16963, 16979, 16981, 16987, 16993, - 17011, 17021, 17027, 17029, 17033, 17041, 17047, 17053, - 17077, 17093, 17099, 17107, 17117, 17123, 17137, 17159, - 17167, 17183, 17189, 17191, 17203, 17207, 17209, 17231, - 17239, 17257, 17291, 17293, 17299, 17317, 17321, 17327, - 17333, 17341, 17351, 17359, 17377, 17383, 17387, 17389, - 17393, 17401, 17417, 17419, 17431, 17443, 17449, 17467, - 17471, 17477, 17483, 17489, 17491, 17497, 17509, 17519, - 17539, 17551, 17569, 17573, 17579, 17581, 17597, 17599, - 17609, 17623, 17627, 17657, 17659, 17669, 17681, 17683, - 17707, 17713, 17729, 17737, 17747, 17749, 17761, 17783, - 17789, 17791, 17807, 17827, 17837, 17839, 17851, 17863, + 2, 3, 5, 7, 11, 13, 17, 19, + 23, 29, 31, 37, 41, 43, 47, 53, + 59, 61, 67, 71, 73, 79, 83, 89, + 97, 101, 103, 107, 109, 113, 127, 131, + 137, 139, 149, 151, 157, 163, 167, 173, + 179, 181, 191, 193, 197, 199, 211, 223, + 227, 229, 233, 239, 241, 251, 257, 263, + 269, 271, 277, 281, 283, 293, 307, 311, + 313, 317, 331, 337, 347, 349, 353, 359, + 367, 373, 379, 383, 389, 397, 401, 409, + 419, 421, 431, 433, 439, 443, 449, 457, + 461, 463, 467, 479, 487, 491, 499, 503, + 509, 521, 523, 541, 547, 557, 563, 569, + 571, 577, 587, 593, 599, 601, 607, 613, + 617, 619, 631, 641, 643, 647, 653, 659, + 661, 673, 677, 683, 691, 701, 709, 719, + 727, 733, 739, 743, 751, 757, 761, 769, + 773, 787, 797, 809, 811, 821, 823, 827, + 829, 839, 853, 857, 859, 863, 877, 881, + 883, 887, 907, 911, 919, 929, 937, 941, + 947, 953, 967, 971, 977, 983, 991, 997, + 1009, 1013, 1019, 1021, 1031, 1033, 1039, 1049, + 1051, 1061, 1063, 1069, 1087, 1091, 1093, 1097, + 1103, 1109, 1117, 1123, 1129, 1151, 1153, 1163, + 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, + 1229, 1231, 1237, 1249, 1259, 1277, 1279, 1283, + 1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, + 1327, 1361, 1367, 1373, 1381, 1399, 1409, 1423, + 1427, 1429, 1433, 1439, 1447, 1451, 1453, 1459, + 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511, + 1523, 1531, 1543, 1549, 1553, 1559, 1567, 1571, + 1579, 1583, 1597, 1601, 1607, 1609, 1613, 1619, + 1621, 1627, 1637, 1657, 1663, 1667, 1669, 1693, + 1697, 1699, 1709, 1721, 1723, 1733, 1741, 1747, + 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811, + 1823, 1831, 1847, 1861, 1867, 1871, 1873, 1877, + 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, + 1951, 1973, 1979, 1987, 1993, 1997, 1999, 2003, + 2011, 2017, 2027, 2029, 2039, 2053, 2063, 2069, + 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129, + 2131, 2137, 2141, 2143, 2153, 2161, 2179, 2203, + 2207, 2213, 2221, 2237, 2239, 2243, 2251, 2267, + 2269, 2273, 2281, 2287, 2293, 2297, 2309, 2311, + 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377, + 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, + 2437, 2441, 2447, 2459, 2467, 2473, 2477, 2503, + 2521, 2531, 2539, 2543, 2549, 2551, 2557, 2579, + 2591, 2593, 2609, 2617, 2621, 2633, 2647, 2657, + 2659, 2663, 2671, 2677, 2683, 2687, 2689, 2693, + 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741, + 2749, 2753, 2767, 2777, 2789, 2791, 2797, 2801, + 2803, 2819, 2833, 2837, 2843, 2851, 2857, 2861, + 2879, 2887, 2897, 2903, 2909, 2917, 2927, 2939, + 2953, 2957, 2963, 2969, 2971, 2999, 3001, 3011, + 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079, + 3083, 3089, 3109, 3119, 3121, 3137, 3163, 3167, + 3169, 3181, 3187, 3191, 3203, 3209, 3217, 3221, + 3229, 3251, 3253, 3257, 3259, 3271, 3299, 3301, + 3307, 3313, 3319, 3323, 3329, 3331, 3343, 3347, + 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413, + 3433, 3449, 3457, 3461, 3463, 3467, 3469, 3491, + 3499, 3511, 3517, 3527, 3529, 3533, 3539, 3541, + 3547, 3557, 3559, 3571, 3581, 3583, 3593, 3607, + 3613, 3617, 3623, 3631, 3637, 3643, 3659, 3671, + 3673, 3677, 3691, 3697, 3701, 3709, 3719, 3727, + 3733, 3739, 3761, 3767, 3769, 3779, 3793, 3797, + 3803, 3821, 3823, 3833, 3847, 3851, 3853, 3863, + 3877, 3881, 3889, 3907, 3911, 3917, 3919, 3923, + 3929, 3931, 3943, 3947, 3967, 3989, 4001, 4003, + 4007, 4013, 4019, 4021, 4027, 4049, 4051, 4057, + 4073, 4079, 4091, 4093, 4099, 4111, 4127, 4129, + 4133, 4139, 4153, 4157, 4159, 4177, 4201, 4211, + 4217, 4219, 4229, 4231, 4241, 4243, 4253, 4259, + 4261, 4271, 4273, 4283, 4289, 4297, 4327, 4337, + 4339, 4349, 4357, 4363, 4373, 4391, 4397, 4409, + 4421, 4423, 4441, 4447, 4451, 4457, 4463, 4481, + 4483, 4493, 4507, 4513, 4517, 4519, 4523, 4547, + 4549, 4561, 4567, 4583, 4591, 4597, 4603, 4621, + 4637, 4639, 4643, 4649, 4651, 4657, 4663, 4673, + 4679, 4691, 4703, 4721, 4723, 4729, 4733, 4751, + 4759, 4783, 4787, 4789, 4793, 4799, 4801, 4813, + 4817, 4831, 4861, 4871, 4877, 4889, 4903, 4909, + 4919, 4931, 4933, 4937, 4943, 4951, 4957, 4967, + 4969, 4973, 4987, 4993, 4999, 5003, 5009, 5011, + 5021, 5023, 5039, 5051, 5059, 5077, 5081, 5087, + 5099, 5101, 5107, 5113, 5119, 5147, 5153, 5167, + 5171, 5179, 5189, 5197, 5209, 5227, 5231, 5233, + 5237, 5261, 5273, 5279, 5281, 5297, 5303, 5309, + 5323, 5333, 5347, 5351, 5381, 5387, 5393, 5399, + 5407, 5413, 5417, 5419, 5431, 5437, 5441, 5443, + 5449, 5471, 5477, 5479, 5483, 5501, 5503, 5507, + 5519, 5521, 5527, 5531, 5557, 5563, 5569, 5573, + 5581, 5591, 5623, 5639, 5641, 5647, 5651, 5653, + 5657, 5659, 5669, 5683, 5689, 5693, 5701, 5711, + 5717, 5737, 5741, 5743, 5749, 5779, 5783, 5791, + 5801, 5807, 5813, 5821, 5827, 5839, 5843, 5849, + 5851, 5857, 5861, 5867, 5869, 5879, 5881, 5897, + 5903, 5923, 5927, 5939, 5953, 5981, 5987, 6007, + 6011, 6029, 6037, 6043, 6047, 6053, 6067, 6073, + 6079, 6089, 6091, 6101, 6113, 6121, 6131, 6133, + 6143, 6151, 6163, 6173, 6197, 6199, 6203, 6211, + 6217, 6221, 6229, 6247, 6257, 6263, 6269, 6271, + 6277, 6287, 6299, 6301, 6311, 6317, 6323, 6329, + 6337, 6343, 6353, 6359, 6361, 6367, 6373, 6379, + 6389, 6397, 6421, 6427, 6449, 6451, 6469, 6473, + 6481, 6491, 6521, 6529, 6547, 6551, 6553, 6563, + 6569, 6571, 6577, 6581, 6599, 6607, 6619, 6637, + 6653, 6659, 6661, 6673, 6679, 6689, 6691, 6701, + 6703, 6709, 6719, 6733, 6737, 6761, 6763, 6779, + 6781, 6791, 6793, 6803, 6823, 6827, 6829, 6833, + 6841, 6857, 6863, 6869, 6871, 6883, 6899, 6907, + 6911, 6917, 6947, 6949, 6959, 6961, 6967, 6971, + 6977, 6983, 6991, 6997, 7001, 7013, 7019, 7027, + 7039, 7043, 7057, 7069, 7079, 7103, 7109, 7121, + 7127, 7129, 7151, 7159, 7177, 7187, 7193, 7207, + 7211, 7213, 7219, 7229, 7237, 7243, 7247, 7253, + 7283, 7297, 7307, 7309, 7321, 7331, 7333, 7349, + 7351, 7369, 7393, 7411, 7417, 7433, 7451, 7457, + 7459, 7477, 7481, 7487, 7489, 7499, 7507, 7517, + 7523, 7529, 7537, 7541, 7547, 7549, 7559, 7561, + 7573, 7577, 7583, 7589, 7591, 7603, 7607, 7621, + 7639, 7643, 7649, 7669, 7673, 7681, 7687, 7691, + 7699, 7703, 7717, 7723, 7727, 7741, 7753, 7757, + 7759, 7789, 7793, 7817, 7823, 7829, 7841, 7853, + 7867, 7873, 7877, 7879, 7883, 7901, 7907, 7919, + 7927, 7933, 7937, 7949, 7951, 7963, 7993, 8009, + 8011, 8017, 8039, 8053, 8059, 8069, 8081, 8087, + 8089, 8093, 8101, 8111, 8117, 8123, 8147, 8161, + 8167, 8171, 8179, 8191, 8209, 8219, 8221, 8231, + 8233, 8237, 8243, 8263, 8269, 8273, 8287, 8291, + 8293, 8297, 8311, 8317, 8329, 8353, 8363, 8369, + 8377, 8387, 8389, 8419, 8423, 8429, 8431, 8443, + 8447, 8461, 8467, 8501, 8513, 8521, 8527, 8537, + 8539, 8543, 8563, 8573, 8581, 8597, 8599, 8609, + 8623, 8627, 8629, 8641, 8647, 8663, 8669, 8677, + 8681, 8689, 8693, 8699, 8707, 8713, 8719, 8731, + 8737, 8741, 8747, 8753, 8761, 8779, 8783, 8803, + 8807, 8819, 8821, 8831, 8837, 8839, 8849, 8861, + 8863, 8867, 8887, 8893, 8923, 8929, 8933, 8941, + 8951, 8963, 8969, 8971, 8999, 9001, 9007, 9011, + 9013, 9029, 9041, 9043, 9049, 9059, 9067, 9091, + 9103, 9109, 9127, 9133, 9137, 9151, 9157, 9161, + 9173, 9181, 9187, 9199, 9203, 9209, 9221, 9227, + 9239, 9241, 9257, 9277, 9281, 9283, 9293, 9311, + 9319, 9323, 9337, 9341, 9343, 9349, 9371, 9377, + 9391, 9397, 9403, 9413, 9419, 9421, 9431, 9433, + 9437, 9439, 9461, 9463, 9467, 9473, 9479, 9491, + 9497, 9511, 9521, 9533, 9539, 9547, 9551, 9587, + 9601, 9613, 9619, 9623, 9629, 9631, 9643, 9649, + 9661, 9677, 9679, 9689, 9697, 9719, 9721, 9733, + 9739, 9743, 9749, 9767, 9769, 9781, 9787, 9791, + 9803, 9811, 9817, 9829, 9833, 9839, 9851, 9857, + 9859, 9871, 9883, 9887, 9901, 9907, 9923, 9929, + 9931, 9941, 9949, 9967, 9973, 10007, 10009, 10037, + 10039, 10061, 10067, 10069, 10079, 10091, 10093, 10099, + 10103, 10111, 10133, 10139, 10141, 10151, 10159, 10163, + 10169, 10177, 10181, 10193, 10211, 10223, 10243, 10247, + 10253, 10259, 10267, 10271, 10273, 10289, 10301, 10303, + 10313, 10321, 10331, 10333, 10337, 10343, 10357, 10369, + 10391, 10399, 10427, 10429, 10433, 10453, 10457, 10459, + 10463, 10477, 10487, 10499, 10501, 10513, 10529, 10531, + 10559, 10567, 10589, 10597, 10601, 10607, 10613, 10627, + 10631, 10639, 10651, 10657, 10663, 10667, 10687, 10691, + 10709, 10711, 10723, 10729, 10733, 10739, 10753, 10771, + 10781, 10789, 10799, 10831, 10837, 10847, 10853, 10859, + 10861, 10867, 10883, 10889, 10891, 10903, 10909, 10937, + 10939, 10949, 10957, 10973, 10979, 10987, 10993, 11003, + 11027, 11047, 11057, 11059, 11069, 11071, 11083, 11087, + 11093, 11113, 11117, 11119, 11131, 11149, 11159, 11161, + 11171, 11173, 11177, 11197, 11213, 11239, 11243, 11251, + 11257, 11261, 11273, 11279, 11287, 11299, 11311, 11317, + 11321, 11329, 11351, 11353, 11369, 11383, 11393, 11399, + 11411, 11423, 11437, 11443, 11447, 11467, 11471, 11483, + 11489, 11491, 11497, 11503, 11519, 11527, 11549, 11551, + 11579, 11587, 11593, 11597, 11617, 11621, 11633, 11657, + 11677, 11681, 11689, 11699, 11701, 11717, 11719, 11731, + 11743, 11777, 11779, 11783, 11789, 11801, 11807, 11813, + 11821, 11827, 11831, 11833, 11839, 11863, 11867, 11887, + 11897, 11903, 11909, 11923, 11927, 11933, 11939, 11941, + 11953, 11959, 11969, 11971, 11981, 11987, 12007, 12011, + 12037, 12041, 12043, 12049, 12071, 12073, 12097, 12101, + 12107, 12109, 12113, 12119, 12143, 12149, 12157, 12161, + 12163, 12197, 12203, 12211, 12227, 12239, 12241, 12251, + 12253, 12263, 12269, 12277, 12281, 12289, 12301, 12323, + 12329, 12343, 12347, 12373, 12377, 12379, 12391, 12401, + 12409, 12413, 12421, 12433, 12437, 12451, 12457, 12473, + 12479, 12487, 12491, 12497, 12503, 12511, 12517, 12527, + 12539, 12541, 12547, 12553, 12569, 12577, 12583, 12589, + 12601, 12611, 12613, 12619, 12637, 12641, 12647, 12653, + 12659, 12671, 12689, 12697, 12703, 12713, 12721, 12739, + 12743, 12757, 12763, 12781, 12791, 12799, 12809, 12821, + 12823, 12829, 12841, 12853, 12889, 12893, 12899, 12907, + 12911, 12917, 12919, 12923, 12941, 12953, 12959, 12967, + 12973, 12979, 12983, 13001, 13003, 13007, 13009, 13033, + 13037, 13043, 13049, 13063, 13093, 13099, 13103, 13109, + 13121, 13127, 13147, 13151, 13159, 13163, 13171, 13177, + 13183, 13187, 13217, 13219, 13229, 13241, 13249, 13259, + 13267, 13291, 13297, 13309, 13313, 13327, 13331, 13337, + 13339, 13367, 13381, 13397, 13399, 13411, 13417, 13421, + 13441, 13451, 13457, 13463, 13469, 13477, 13487, 13499, + 13513, 13523, 13537, 13553, 13567, 13577, 13591, 13597, + 13613, 13619, 13627, 13633, 13649, 13669, 13679, 13681, + 13687, 13691, 13693, 13697, 13709, 13711, 13721, 13723, + 13729, 13751, 13757, 13759, 13763, 13781, 13789, 13799, + 13807, 13829, 13831, 13841, 13859, 13873, 13877, 13879, + 13883, 13901, 13903, 13907, 13913, 13921, 13931, 13933, + 13963, 13967, 13997, 13999, 14009, 14011, 14029, 14033, + 14051, 14057, 14071, 14081, 14083, 14087, 14107, 14143, + 14149, 14153, 14159, 14173, 14177, 14197, 14207, 14221, + 14243, 14249, 14251, 14281, 14293, 14303, 14321, 14323, + 14327, 14341, 14347, 14369, 14387, 14389, 14401, 14407, + 14411, 14419, 14423, 14431, 14437, 14447, 14449, 14461, + 14479, 14489, 14503, 14519, 14533, 14537, 14543, 14549, + 14551, 14557, 14561, 14563, 14591, 14593, 14621, 14627, + 14629, 14633, 14639, 14653, 14657, 14669, 14683, 14699, + 14713, 14717, 14723, 14731, 14737, 14741, 14747, 14753, + 14759, 14767, 14771, 14779, 14783, 14797, 14813, 14821, + 14827, 14831, 14843, 14851, 14867, 14869, 14879, 14887, + 14891, 14897, 14923, 14929, 14939, 14947, 14951, 14957, + 14969, 14983, 15013, 15017, 15031, 15053, 15061, 15073, + 15077, 15083, 15091, 15101, 15107, 15121, 15131, 15137, + 15139, 15149, 15161, 15173, 15187, 15193, 15199, 15217, + 15227, 15233, 15241, 15259, 15263, 15269, 15271, 15277, + 15287, 15289, 15299, 15307, 15313, 15319, 15329, 15331, + 15349, 15359, 15361, 15373, 15377, 15383, 15391, 15401, + 15413, 15427, 15439, 15443, 15451, 15461, 15467, 15473, + 15493, 15497, 15511, 15527, 15541, 15551, 15559, 15569, + 15581, 15583, 15601, 15607, 15619, 15629, 15641, 15643, + 15647, 15649, 15661, 15667, 15671, 15679, 15683, 15727, + 15731, 15733, 15737, 15739, 15749, 15761, 15767, 15773, + 15787, 15791, 15797, 15803, 15809, 15817, 15823, 15859, + 15877, 15881, 15887, 15889, 15901, 15907, 15913, 15919, + 15923, 15937, 15959, 15971, 15973, 15991, 16001, 16007, + 16033, 16057, 16061, 16063, 16067, 16069, 16073, 16087, + 16091, 16097, 16103, 16111, 16127, 16139, 16141, 16183, + 16187, 16189, 16193, 16217, 16223, 16229, 16231, 16249, + 16253, 16267, 16273, 16301, 16319, 16333, 16339, 16349, + 16361, 16363, 16369, 16381, 16411, 16417, 16421, 16427, + 16433, 16447, 16451, 16453, 16477, 16481, 16487, 16493, + 16519, 16529, 16547, 16553, 16561, 16567, 16573, 16603, + 16607, 16619, 16631, 16633, 16649, 16651, 16657, 16661, + 16673, 16691, 16693, 16699, 16703, 16729, 16741, 16747, + 16759, 16763, 16787, 16811, 16823, 16829, 16831, 16843, + 16871, 16879, 16883, 16889, 16901, 16903, 16921, 16927, + 16931, 16937, 16943, 16963, 16979, 16981, 16987, 16993, + 17011, 17021, 17027, 17029, 17033, 17041, 17047, 17053, + 17077, 17093, 17099, 17107, 17117, 17123, 17137, 17159, + 17167, 17183, 17189, 17191, 17203, 17207, 17209, 17231, + 17239, 17257, 17291, 17293, 17299, 17317, 17321, 17327, + 17333, 17341, 17351, 17359, 17377, 17383, 17387, 17389, + 17393, 17401, 17417, 17419, 17431, 17443, 17449, 17467, + 17471, 17477, 17483, 17489, 17491, 17497, 17509, 17519, + 17539, 17551, 17569, 17573, 17579, 17581, 17597, 17599, + 17609, 17623, 17627, 17657, 17659, 17669, 17681, 17683, + 17707, 17713, 17729, 17737, 17747, 17749, 17761, 17783, + 17789, 17791, 17807, 17827, 17837, 17839, 17851, 17863, }; diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c b/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c index 44e7332acf..db72bf28a6 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -15,6 +15,16 @@ * I've just gone over this and it is now %20 faster on x86 - eay - 27 Jun 96 */ int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) +{ + int ret = bn_sqr_fixed_top(r, a, ctx); + + bn_correct_top(r); + bn_check_top(r); + + return ret; +} + +int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) { int max, al; int ret = 0; @@ -82,14 +92,8 @@ int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) } rr->neg = 0; - /* - * If the most-significant half of the top word of 'a' is zero, then the - * square of 'a' will max-1 words. - */ - if (a->d[al - 1] == (a->d[al - 1] & BN_MASK2l)) - rr->top = max - 1; - else - rr->top = max; + rr->top = max; + rr->flags |= BN_FLG_FIXED_TOP; if (r != rr && BN_copy(r, rr) == NULL) goto err; diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c b/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c index 8bfbcac6a4..d01f12cadc 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -184,8 +184,10 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx) for (i = 0; i < 1000; i++) { if (!BN_rand(Xq, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY)) goto err; + /* Check that |Xp - Xq| > 2^(nbits - 100) */ - BN_sub(t, Xp, Xq); + if (!BN_sub(t, Xp, Xq)) + goto err; if (BN_num_bits(t) > (nbits - 100)) break; } diff --git a/worker/deps/openssl/openssl/crypto/build.info b/worker/deps/openssl/openssl/crypto/build.info index 916d24f66e..8e15379700 100644 --- a/worker/deps/openssl/openssl/crypto/build.info +++ b/worker/deps/openssl/openssl/crypto/build.info @@ -1,9 +1,8 @@ -{- use File::Spec::Functions qw/catdir catfile/; -} LIBS=../libcrypto SOURCE[../libcrypto]=\ cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fopen.c \ - threads_pthread.c threads_win.c threads_none.c \ + threads_pthread.c threads_win.c threads_none.c getenv.c \ o_init.c o_fips.c mem_sec.c init.c {- $target{cpuid_asm_src} -} \ {- $target{uplink_aux_src} -} EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ diff --git a/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl b/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl index 9024b67e32..6beb9c5f25 100644 --- a/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl +++ b/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl @@ -7,7 +7,7 @@ # https://www.openssl.org/source/license.html -# This flag makes the inner loop one cycle longer, but generates +# This flag makes the inner loop one cycle longer, but generates # code that runs %30 faster on the pentium pro/II, 44% faster # of PIII, while only %7 slower on the pentium. # By default, this flag is on. diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl index c90306e45c..b5e21e4938 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl @@ -15,7 +15,7 @@ # ==================================================================== # # December 2014 -# +# # ChaCha20 for ARMv4. # # Performance in cycles per byte out of large buffer. @@ -720,7 +720,7 @@ sub NEONROUND { vadd.i32 $d2,$d1,$t0 @ counter+2 str @t[3], [sp,#4*(16+15)] mov @t[3],#10 - add @x[12],@x[12],#3 @ counter+3 + add @x[12],@x[12],#3 @ counter+3 b .Loop_neon .align 4 diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl index db3776a2fc..f7e1074714 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl @@ -15,7 +15,7 @@ # ==================================================================== # # June 2015 -# +# # ChaCha20 for ARMv8. # # Performance in cycles per byte out of large buffer. @@ -201,7 +201,7 @@ sub ROUND { mov $ctr,#10 subs $len,$len,#64 .Loop: - sub $ctr,$ctr,#1 + sub $ctr,$ctr,#1 ___ foreach (&ROUND(0, 4, 8,12)) { eval; } foreach (&ROUND(0, 5,10,15)) { eval; } diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl index f972ee471a..181decdad9 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl @@ -15,7 +15,7 @@ # ==================================================================== # # October 2015 -# +# # ChaCha20 for PowerPC/AltiVec. # # Performance in cycles per byte out of large buffer. @@ -525,7 +525,7 @@ sub VMXROUND { lwz @d[3],12($ctr) vadduwm @K[5],@K[4],@K[5] - vspltisw $twenty,-12 # synthesize constants + vspltisw $twenty,-12 # synthesize constants vspltisw $twelve,12 vspltisw $twenty5,-7 #vspltisw $seven,7 # synthesized in the loop diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl index 61b328612b..932dec67e4 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -61,7 +61,7 @@ $1>=10); # first version supporting AVX $ymm=1 if ($xmm && !$ymm && - `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && + `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0); # first version supporting AVX $a="eax"; diff --git a/worker/deps/openssl/openssl/crypto/cms/cms_env.c b/worker/deps/openssl/openssl/crypto/cms/cms_env.c index 8d45943530..fe5076ec02 100644 --- a/worker/deps/openssl/openssl/crypto/cms/cms_env.c +++ b/worker/deps/openssl/openssl/crypto/cms/cms_env.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -282,6 +282,7 @@ int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey) CMSerr(CMS_F_CMS_RECIPIENTINFO_SET0_PKEY, CMS_R_NOT_KEY_TRANSPORT); return 0; } + EVP_PKEY_free(ri->d.ktri->pkey); ri->d.ktri->pkey = pkey; return 1; } diff --git a/worker/deps/openssl/openssl/crypto/cms/cms_smime.c b/worker/deps/openssl/openssl/crypto/cms/cms_smime.c index 7e7b6e5d4f..5dcf803f4b 100644 --- a/worker/deps/openssl/openssl/crypto/cms/cms_smime.c +++ b/worker/deps/openssl/openssl/crypto/cms/cms_smime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -631,6 +631,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert) * all. */ else if (!cert || !CMS_RecipientInfo_ktri_cert_cmp(ri, cert)) { + EVP_PKEY_up_ref(pk); CMS_RecipientInfo_set0_pkey(ri, pk); r = CMS_RecipientInfo_decrypt(cms, ri); CMS_RecipientInfo_set0_pkey(ri, NULL); diff --git a/worker/deps/openssl/openssl/crypto/conf/build.info b/worker/deps/openssl/openssl/crypto/conf/build.info index 4438eb4262..ff367994ea 100644 --- a/worker/deps/openssl/openssl/crypto/conf/build.info +++ b/worker/deps/openssl/openssl/crypto/conf/build.info @@ -1,4 +1,4 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]= \ conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \ - conf_mall.c conf_sap.c + conf_mall.c conf_sap.c conf_ssl.c diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_api.c b/worker/deps/openssl/openssl/crypto/conf/conf_api.c index 5535416ab3..36c91b1663 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_api.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_api.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -9,11 +9,12 @@ /* Part of the code in here was originally in conf.c, which is now removed */ +#include "e_os.h" +#include "internal/cryptlib.h" #include #include #include #include -#include "e_os.h" static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf); static void value_free_stack_doall(CONF_VALUE *a); @@ -82,7 +83,7 @@ char *_CONF_get_string(const CONF *conf, const char *section, if (v != NULL) return (v->value); if (strcmp(section, "ENV") == 0) { - p = getenv(name); + p = ossl_safe_getenv(name); if (p != NULL) return (p); } @@ -95,7 +96,7 @@ char *_CONF_get_string(const CONF *conf, const char *section, else return (NULL); } else - return (getenv(name)); + return ossl_safe_getenv(name); } static unsigned long conf_value_hash(const CONF_VALUE *v) @@ -205,10 +206,14 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section) vv = lh_CONF_VALUE_insert(conf->data, v); OPENSSL_assert(vv == NULL); + if (lh_CONF_VALUE_error(conf->data) > 0) + goto err; return v; err: sk_CONF_VALUE_free(sk); + if (v != NULL) + OPENSSL_free(v->section); OPENSSL_free(v); return NULL; } diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_err.c b/worker/deps/openssl/openssl/crypto/conf/conf_err.c index 0863bc4d36..19f480d5b3 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_err.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -37,6 +37,7 @@ static ERR_STRING_DATA CONF_str_functs[] = { {ERR_FUNC(CONF_F_NCONF_LOAD_BIO), "NCONF_load_bio"}, {ERR_FUNC(CONF_F_NCONF_LOAD_FP), "NCONF_load_fp"}, {ERR_FUNC(CONF_F_NCONF_NEW), "NCONF_new"}, + {ERR_FUNC(CONF_F_SSL_MODULE_INIT), "ssl_module_init"}, {ERR_FUNC(CONF_F_STR_COPY), "str_copy"}, {0, NULL} }; @@ -57,6 +58,12 @@ static ERR_STRING_DATA CONF_str_reasons[] = { {ERR_REASON(CONF_R_NO_SECTION), "no section"}, {ERR_REASON(CONF_R_NO_SUCH_FILE), "no such file"}, {ERR_REASON(CONF_R_NO_VALUE), "no value"}, + {ERR_REASON(CONF_R_SSL_COMMAND_SECTION_EMPTY), + "ssl command section empty"}, + {ERR_REASON(CONF_R_SSL_COMMAND_SECTION_NOT_FOUND), + "ssl command section not found"}, + {ERR_REASON(CONF_R_SSL_SECTION_EMPTY), "ssl section empty"}, + {ERR_REASON(CONF_R_SSL_SECTION_NOT_FOUND), "ssl section not found"}, {ERR_REASON(CONF_R_UNABLE_TO_CREATE_NEW_SECTION), "unable to create new section"}, {ERR_REASON(CONF_R_UNKNOWN_MODULE_NAME), "unknown module name"}, diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_lcl.h b/worker/deps/openssl/openssl/crypto/conf/conf_lcl.h new file mode 100644 index 0000000000..6e1f7fe00d --- /dev/null +++ b/worker/deps/openssl/openssl/crypto/conf/conf_lcl.h @@ -0,0 +1,11 @@ +/* + * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +void conf_add_ssl_module(void); + diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_mall.c b/worker/deps/openssl/openssl/crypto/conf/conf_mall.c index 4e7a434e0e..7e86948e89 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_mall.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_mall.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -14,6 +14,7 @@ #include #include #include +#include "conf_lcl.h" /* Load all OpenSSL builtin modules */ @@ -26,4 +27,5 @@ void OPENSSL_load_builtin_modules(void) ENGINE_add_conf_module(); #endif EVP_add_alg_module(); + conf_add_ssl_module(); } diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_mod.c b/worker/deps/openssl/openssl/crypto/conf/conf_mod.c index 543a8ea4ed..722fe46061 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_mod.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_mod.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -478,8 +478,7 @@ char *CONF_get1_default_config_file(void) char *file; int len; - file = getenv("OPENSSL_CONF"); - if (file) + if ((file = ossl_safe_getenv("OPENSSL_CONF")) != NULL) return OPENSSL_strdup(file); len = strlen(X509_get_default_cert_area()); diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_ssl.c b/worker/deps/openssl/openssl/crypto/conf/conf_ssl.c new file mode 100644 index 0000000000..015c46c6da --- /dev/null +++ b/worker/deps/openssl/openssl/crypto/conf/conf_ssl.c @@ -0,0 +1,178 @@ +/* + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include +#include +#include "internal/sslconf.h" +#include "conf_lcl.h" + +/* + * SSL library configuration module placeholder. We load it here but defer + * all decisions about its contents to libssl. + */ + +struct ssl_conf_name_st { + /* Name of this set of commands */ + char *name; + /* List of commands */ + SSL_CONF_CMD *cmds; + /* Number of commands */ + size_t cmd_count; +}; + +struct ssl_conf_cmd_st { + /* Command */ + char *cmd; + /* Argument */ + char *arg; +}; + +static struct ssl_conf_name_st *ssl_names; +static size_t ssl_names_count; + +static void ssl_module_free(CONF_IMODULE *md) +{ + size_t i, j; + if (ssl_names == NULL) + return; + for (i = 0; i < ssl_names_count; i++) { + struct ssl_conf_name_st *tname = ssl_names + i; + + OPENSSL_free(tname->name); + for (j = 0; j < tname->cmd_count; j++) { + OPENSSL_free(tname->cmds[j].cmd); + OPENSSL_free(tname->cmds[j].arg); + } + OPENSSL_free(tname->cmds); + } + OPENSSL_free(ssl_names); + ssl_names = NULL; + ssl_names_count = 0; +} + +static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf) +{ + size_t i, j, cnt; + int rv = 0; + const char *ssl_conf_section; + STACK_OF(CONF_VALUE) *cmd_lists; + + ssl_conf_section = CONF_imodule_get_value(md); + cmd_lists = NCONF_get_section(cnf, ssl_conf_section); + if (sk_CONF_VALUE_num(cmd_lists) <= 0) { + if (cmd_lists == NULL) + CONFerr(CONF_F_SSL_MODULE_INIT, CONF_R_SSL_SECTION_NOT_FOUND); + else + CONFerr(CONF_F_SSL_MODULE_INIT, CONF_R_SSL_SECTION_EMPTY); + ERR_add_error_data(2, "section=", ssl_conf_section); + goto err; + } + cnt = sk_CONF_VALUE_num(cmd_lists); + ssl_names = OPENSSL_zalloc(sizeof(*ssl_names) * cnt); + ssl_names_count = cnt; + for (i = 0; i < ssl_names_count; i++) { + struct ssl_conf_name_st *ssl_name = ssl_names + i; + CONF_VALUE *sect = sk_CONF_VALUE_value(cmd_lists, (int)i); + STACK_OF(CONF_VALUE) *cmds = NCONF_get_section(cnf, sect->value); + + if (sk_CONF_VALUE_num(cmds) <= 0) { + if (cmds == NULL) + CONFerr(CONF_F_SSL_MODULE_INIT, + CONF_R_SSL_COMMAND_SECTION_NOT_FOUND); + else + CONFerr(CONF_F_SSL_MODULE_INIT, + CONF_R_SSL_COMMAND_SECTION_EMPTY); + ERR_add_error_data(4, "name=", sect->name, ", value=", sect->value); + goto err; + } + ssl_name->name = OPENSSL_strdup(sect->name); + if (ssl_name->name == NULL) + goto err; + cnt = sk_CONF_VALUE_num(cmds); + ssl_name->cmds = OPENSSL_zalloc(cnt * sizeof(struct ssl_conf_cmd_st)); + if (ssl_name->cmds == NULL) + goto err; + ssl_name->cmd_count = cnt; + for (j = 0; j < cnt; j++) { + const char *name; + CONF_VALUE *cmd_conf = sk_CONF_VALUE_value(cmds, (int)j); + struct ssl_conf_cmd_st *cmd = ssl_name->cmds + j; + + /* Skip any initial dot in name */ + name = strchr(cmd_conf->name, '.'); + if (name != NULL) + name++; + else + name = cmd_conf->name; + cmd->cmd = OPENSSL_strdup(name); + cmd->arg = OPENSSL_strdup(cmd_conf->value); + if (cmd->cmd == NULL || cmd->arg == NULL) + goto err; + } + + } + rv = 1; + err: + if (rv == 0) + ssl_module_free(md); + return rv; +} + +/* + * Returns the set of commands with index |idx| previously searched for via + * conf_ssl_name_find. Also stores the name of the set of commands in |*name| + * and the number of commands in the set in |*cnt|. + */ +const SSL_CONF_CMD *conf_ssl_get(size_t idx, const char **name, size_t *cnt) +{ + *name = ssl_names[idx].name; + *cnt = ssl_names[idx].cmd_count; + return ssl_names[idx].cmds; +} + +/* + * Search for the named set of commands given in |name|. On success return the + * index for the command set in |*idx|. + * Returns 1 on success or 0 on failure. + */ +int conf_ssl_name_find(const char *name, size_t *idx) +{ + size_t i; + const struct ssl_conf_name_st *nm; + + if (name == NULL) + return 0; + for (i = 0, nm = ssl_names; i < ssl_names_count; i++, nm++) { + if (strcmp(nm->name, name) == 0) { + *idx = i; + return 1; + } + } + return 0; +} + +/* + * Given a command set |cmd|, return details on the command at index |idx| which + * must be less than the number of commands in the set (as returned by + * conf_ssl_get). The name of the command will be returned in |*cmdstr| and the + * argument is returned in |*arg|. + */ +void conf_ssl_get_cmd(const SSL_CONF_CMD *cmd, size_t idx, char **cmdstr, + char **arg) +{ + *cmdstr = cmd[idx].cmd; + *arg = cmd[idx].arg; +} + +void conf_add_ssl_module(void) +{ + CONF_module_add("ssl_conf", ssl_module_init, ssl_module_free); +} diff --git a/worker/deps/openssl/openssl/crypto/cryptlib.c b/worker/deps/openssl/openssl/crypto/cryptlib.c index d93bcd357b..9e59e03ef6 100644 --- a/worker/deps/openssl/openssl/crypto/cryptlib.c +++ b/worker/deps/openssl/openssl/crypto/cryptlib.c @@ -23,29 +23,97 @@ extern unsigned int OPENSSL_ia32cap_P[4]; # if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) -#include + +/* + * Purpose of these minimalistic and character-type-agnostic subroutines + * is to break dependency on MSVCRT (on Windows) and locale. This makes + * OPENSSL_cpuid_setup safe to use as "constructor". "Character-type- + * agnostic" means that they work with either wide or 8-bit characters, + * exploiting the fact that first 127 characters can be simply casted + * between the sets, while the rest would be simply rejected by ossl_is* + * subroutines. + */ +# ifdef _WIN32 +typedef WCHAR variant_char; + +static variant_char *ossl_getenv(const char *name) +{ + /* + * Since we pull only one environment variable, it's simpler to + * to just ignore |name| and use equivalent wide-char L-literal. + * As well as to ignore excessively long values... + */ + static WCHAR value[48]; + DWORD len = GetEnvironmentVariableW(L"OPENSSL_ia32cap", value, 48); + + return (len > 0 && len < 48) ? value : NULL; +} +# else +typedef char variant_char; +# define ossl_getenv getenv +# endif + +static int todigit(variant_char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + else if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + else if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + + /* return largest base value to make caller terminate the loop */ + return 16; +} + +static uint64_t ossl_strtouint64(const variant_char *str) +{ + uint64_t ret = 0; + unsigned int digit, base = 10; + + if (*str == '0') { + base = 8, str++; + if (*str == 'x' || *str == 'X') + base = 16, str++; + } + + while((digit = todigit(*str++)) < base) + ret = ret * base + digit; + + return ret; +} + +static variant_char *ossl_strchr(const variant_char *str, char srch) +{ variant_char c; + + while((c = *str)) { + if (c == srch) + return (variant_char *)str; + str++; + } + + return NULL; +} + # define OPENSSL_CPUID_SETUP typedef uint64_t IA32CAP; + void OPENSSL_cpuid_setup(void) { static int trigger = 0; IA32CAP OPENSSL_ia32_cpuid(unsigned int *); IA32CAP vec; - char *env; + const variant_char *env; if (trigger) return; trigger = 1; - if ((env = getenv("OPENSSL_ia32cap"))) { + if ((env = ossl_getenv("OPENSSL_ia32cap")) != NULL) { int off = (env[0] == '~') ? 1 : 0; -# if defined(_WIN32) - if (!sscanf(env + off, "%I64i", &vec)) - vec = strtoul(env + off, NULL, 0); -# else - if (!sscanf(env + off, "%lli", (long long *)&vec)) - vec = strtoul(env + off, NULL, 0); -# endif + + vec = ossl_strtouint64(env + off); + if (off) { IA32CAP mask = vec; vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~mask; @@ -64,15 +132,17 @@ void OPENSSL_cpuid_setup(void) vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); } - if ((env = strchr(env, ':'))) { - unsigned int vecx; + if ((env = ossl_strchr(env, ':')) != NULL) { + IA32CAP vecx; + env++; off = (env[0] == '~') ? 1 : 0; - vecx = strtoul(env + off, NULL, 0); - if (off) - OPENSSL_ia32cap_P[2] &= ~vecx; - else - OPENSSL_ia32cap_P[2] = vecx; + vecx = ossl_strtouint64(env + off); + if (off) { + OPENSSL_ia32cap_P[2] &= ~(unsigned int)vecx; + } else { + OPENSSL_ia32cap_P[2] = (unsigned int)vecx; + } } else { OPENSSL_ia32cap_P[2] = 0; } @@ -128,10 +198,14 @@ int OPENSSL_isservice(void) if (_OPENSSL_isservice.p == NULL) { HANDLE mod = GetModuleHandle(NULL); + FARPROC f = NULL; + if (mod != NULL) - _OPENSSL_isservice.f = GetProcAddress(mod, "_OPENSSL_isservice"); - if (_OPENSSL_isservice.p == NULL) + f = GetProcAddress(mod, "_OPENSSL_isservice"); + if (f == NULL) _OPENSSL_isservice.p = (void *)-1; + else + _OPENSSL_isservice.f = f; } if (_OPENSSL_isservice.p != (void *)-1) diff --git a/worker/deps/openssl/openssl/crypto/ct/ct_log.c b/worker/deps/openssl/openssl/crypto/ct/ct_log.c index d442322e26..973bf4ddbd 100644 --- a/worker/deps/openssl/openssl/crypto/ct/ct_log.c +++ b/worker/deps/openssl/openssl/crypto/ct/ct_log.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -137,7 +137,7 @@ static int ctlog_new_from_conf(CTLOG **ct_log, const CONF *conf, const char *sec int CTLOG_STORE_load_default_file(CTLOG_STORE *store) { - const char *fpath = getenv(CTLOG_FILE_EVP); + const char *fpath = ossl_safe_getenv(CTLOG_FILE_EVP); if (fpath == NULL) fpath = CTLOG_FILE; diff --git a/worker/deps/openssl/openssl/crypto/dh/dh_key.c b/worker/deps/openssl/openssl/crypto/dh/dh_key.c index 58003d7087..b53a063244 100644 --- a/worker/deps/openssl/openssl/crypto/dh/dh_key.c +++ b/worker/deps/openssl/openssl/crypto/dh/dh_key.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/crypto/dh/dh_lib.c b/worker/deps/openssl/openssl/crypto/dh/dh_lib.c index 716f4a4b0a..2e727df897 100644 --- a/worker/deps/openssl/openssl/crypto/dh/dh_lib.c +++ b/worker/deps/openssl/openssl/crypto/dh/dh_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -82,12 +82,14 @@ DH *DH_new_method(ENGINE *engine) if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { DHerr(DH_F_DH_NEW_METHOD, ERR_R_INIT_FAIL); -err: - DH_free(ret); - ret = NULL; + goto err; } return ret; + + err: + DH_free(ret); + return NULL; } void DH_free(DH *r) @@ -103,7 +105,7 @@ void DH_free(DH *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth->finish) + if (r->meth != NULL && r->meth->finish != NULL) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE ENGINE_finish(r->engine); diff --git a/worker/deps/openssl/openssl/crypto/dh/dh_meth.c b/worker/deps/openssl/openssl/crypto/dh/dh_meth.c index ce6114c133..59c4d7e967 100644 --- a/worker/deps/openssl/openssl/crypto/dh/dh_meth.c +++ b/worker/deps/openssl/openssl/crypto/dh/dh_meth.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -75,7 +75,7 @@ int DH_meth_set1_name(DH_METHOD *dhm, const char *name) return 1; } -int DH_meth_get_flags(DH_METHOD *dhm) +int DH_meth_get_flags(const DH_METHOD *dhm) { return dhm->flags; } diff --git a/worker/deps/openssl/openssl/crypto/dllmain.c b/worker/deps/openssl/openssl/crypto/dllmain.c index 2d96787025..91904aad98 100644 --- a/worker/deps/openssl/openssl/crypto/dllmain.c +++ b/worker/deps/openssl/openssl/crypto/dllmain.c @@ -57,3 +57,4 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return (TRUE); } #endif + diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c index b8f0af4662..132008803e 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -40,6 +40,7 @@ static ERR_STRING_DATA DSA_str_functs[] = { {ERR_FUNC(DSA_F_DSA_SIG_NEW), "DSA_SIG_new"}, {ERR_FUNC(DSA_F_OLD_DSA_PRIV_DECODE), "old_dsa_priv_decode"}, {ERR_FUNC(DSA_F_PKEY_DSA_CTRL), "pkey_dsa_ctrl"}, + {ERR_FUNC(DSA_F_PKEY_DSA_CTRL_STR), "pkey_dsa_ctrl_str"}, {ERR_FUNC(DSA_F_PKEY_DSA_KEYGEN), "pkey_dsa_keygen"}, {0, NULL} }; diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c index e58ad8d70d..46f4f01ee0 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -64,9 +64,16 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, /* invalid q size */ return 0; - if (evpmd == NULL) - /* use SHA1 as default */ - evpmd = EVP_sha1(); + if (evpmd == NULL) { + if (qsize == SHA_DIGEST_LENGTH) + evpmd = EVP_sha1(); + else if (qsize == SHA224_DIGEST_LENGTH) + evpmd = EVP_sha224(); + else + evpmd = EVP_sha256(); + } else { + qsize = EVP_MD_size(evpmd); + } if (bits < 512) bits = 512; diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c index 9598846e3b..08956b9e3d 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -91,12 +91,14 @@ DSA *DSA_new_method(ENGINE *engine) if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_INIT_FAIL); -err: - DSA_free(ret); - ret = NULL; + goto err; } return ret; + + err: + DSA_free(ret); + return NULL; } void DSA_free(DSA *r) @@ -112,7 +114,7 @@ void DSA_free(DSA *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth->finish) + if (r->meth != NULL && r->meth->finish != NULL) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE ENGINE_finish(r->engine); diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c index f0188f2007..04203780c4 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -83,7 +83,7 @@ int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name) return 1; } -int DSA_meth_get_flags(DSA_METHOD *dsam) +int DSA_meth_get_flags(const DSA_METHOD *dsam) { return dsam->flags; } diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c index 7f48cf2e33..868283ac63 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,6 +11,7 @@ #include #include "internal/cryptlib.h" +#include "internal/bn_int.h" #include #include #include "dsa_locl.h" @@ -25,6 +26,8 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa); static int dsa_init(DSA *dsa); static int dsa_finish(DSA *dsa); +static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q, + BN_CTX *ctx); static DSA_METHOD openssl_dsa_meth = { "OpenSSL DSA method", @@ -61,19 +64,13 @@ const DSA_METHOD *DSA_OpenSSL(void) static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) { BIGNUM *kinv = NULL; - BIGNUM *m; - BIGNUM *xr; + BIGNUM *m, *blind, *blindm, *tmp; BN_CTX *ctx = NULL; int reason = ERR_R_BN_LIB; DSA_SIG *ret = NULL; int rv = 0; - m = BN_new(); - xr = BN_new(); - if (m == NULL || xr == NULL) - goto err; - - if (!dsa->p || !dsa->q || !dsa->g) { + if (dsa->p == NULL || dsa->q == NULL || dsa->g == NULL) { reason = DSA_R_MISSING_PARAMETERS; goto err; } @@ -89,6 +86,13 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) ctx = BN_CTX_new(); if (ctx == NULL) goto err; + m = BN_CTX_get(ctx); + blind = BN_CTX_get(ctx); + blindm = BN_CTX_get(ctx); + tmp = BN_CTX_get(ctx); + if (tmp == NULL) + goto err; + redo: if (!dsa_sign_setup(dsa, ctx, &kinv, &ret->r, dgst, dlen)) goto err; @@ -103,17 +107,50 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) if (BN_bin2bn(dgst, dlen, m) == NULL) goto err; - /* Compute s = inv(k) (m + xr) mod q */ - if (!BN_mod_mul(xr, dsa->priv_key, ret->r, dsa->q, ctx)) - goto err; /* s = xr */ - if (!BN_add(ret->s, xr, m)) - goto err; /* s = m + xr */ - if (BN_cmp(ret->s, dsa->q) > 0) - if (!BN_sub(ret->s, ret->s, dsa->q)) + /* + * The normal signature calculation is: + * + * s := k^-1 * (m + r * priv_key) mod q + * + * We will blind this to protect against side channel attacks + * + * s := blind^-1 * k^-1 * (blind * m + blind * r * priv_key) mod q + */ + + /* Generate a blinding value */ + do { + if (!BN_rand(blind, BN_num_bits(dsa->q) - 1, BN_RAND_TOP_ANY, + BN_RAND_BOTTOM_ANY)) goto err; + } while (BN_is_zero(blind)); + BN_set_flags(blind, BN_FLG_CONSTTIME); + BN_set_flags(blindm, BN_FLG_CONSTTIME); + BN_set_flags(tmp, BN_FLG_CONSTTIME); + + /* tmp := blind * priv_key * r mod q */ + if (!BN_mod_mul(tmp, blind, dsa->priv_key, dsa->q, ctx)) + goto err; + if (!BN_mod_mul(tmp, tmp, ret->r, dsa->q, ctx)) + goto err; + + /* blindm := blind * m mod q */ + if (!BN_mod_mul(blindm, blind, m, dsa->q, ctx)) + goto err; + + /* s : = (blind * priv_key * r) + (blind * m) mod q */ + if (!BN_mod_add_quick(ret->s, tmp, blindm, dsa->q)) + goto err; + + /* s := s * k^-1 mod q */ if (!BN_mod_mul(ret->s, ret->s, kinv, dsa->q, ctx)) goto err; + /* s:= s * blind^-1 mod q */ + if (BN_mod_inverse(blind, blind, dsa->q, ctx) == NULL) + goto err; + if (!BN_mod_mul(ret->s, ret->s, blind, dsa->q, ctx)) + goto err; + /* * Redo if r or s is zero as required by FIPS 186-3: this is very * unlikely. @@ -130,8 +167,6 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) ret = NULL; } BN_CTX_free(ctx); - BN_clear_free(m); - BN_clear_free(xr); BN_clear_free(kinv); return ret; } @@ -148,9 +183,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, { BN_CTX *ctx = NULL; BIGNUM *k, *kinv = NULL, *r = *rp; - BIGNUM *l, *m; + BIGNUM *l; int ret = 0; - int q_bits; + int q_bits, q_words; if (!dsa->p || !dsa->q || !dsa->g) { DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); @@ -159,8 +194,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, k = BN_new(); l = BN_new(); - m = BN_new(); - if (k == NULL || l == NULL || m == NULL) + if (k == NULL || l == NULL) goto err; if (ctx_in == NULL) { @@ -171,9 +205,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, /* Preallocate space */ q_bits = BN_num_bits(dsa->q); - if (!BN_set_bit(k, q_bits) - || !BN_set_bit(l, q_bits) - || !BN_set_bit(m, q_bits)) + q_words = bn_get_top(dsa->q); + if (!bn_wexpand(k, q_words + 2) + || !bn_wexpand(l, q_words + 2)) goto err; /* Get random k */ @@ -191,6 +225,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, } while (BN_is_zero(k)); BN_set_flags(k, BN_FLG_CONSTTIME); + BN_set_flags(l, BN_FLG_CONSTTIME); if (dsa->flags & DSA_FLAG_CACHE_MONT_P) { if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p, @@ -208,14 +243,17 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, * small timing information leakage. We then choose the sum that is * one bit longer than the modulus. * - * TODO: revisit the BN_copy aiming for a memory access agnostic - * conditional copy. + * There are some concerns about the efficacy of doing this. More + * specificly refer to the discussion starting with: + * https://github.com/openssl/openssl/pull/7486#discussion_r228323705 + * The fix is to rework BN so these gymnastics aren't required. */ if (!BN_add(l, k, dsa->q) - || !BN_add(m, l, dsa->q) - || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m)) + || !BN_add(k, l, dsa->q)) goto err; + BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2); + if ((dsa)->meth->bn_mod_exp != NULL) { if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx, dsa->method_mont_p)) @@ -228,8 +266,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, if (!BN_mod(r, r, dsa->q, ctx)) goto err; - /* Compute part of 's = inv(k) (m + xr) mod q' */ - if ((kinv = BN_mod_inverse(NULL, k, dsa->q, ctx)) == NULL) + /* Compute part of 's = inv(k) (m + xr) mod q' */ + if ((kinv = dsa_mod_inverse_fermat(k, dsa->q, ctx)) == NULL) goto err; BN_clear_free(*kinvp); @@ -243,7 +281,6 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BN_CTX_free(ctx); BN_clear_free(k); BN_clear_free(l); - BN_clear_free(m); return ret; } @@ -363,3 +400,31 @@ static int dsa_finish(DSA *dsa) BN_MONT_CTX_free(dsa->method_mont_p); return (1); } + +/* + * Compute the inverse of k modulo q. + * Since q is prime, Fermat's Little Theorem applies, which reduces this to + * mod-exp operation. Both the exponent and modulus are public information + * so a mod-exp that doesn't leak the base is sufficient. A newly allocated + * BIGNUM is returned which the caller must free. + */ +static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q, + BN_CTX *ctx) +{ + BIGNUM *res = NULL; + BIGNUM *r, *e; + + if ((r = BN_new()) == NULL) + return NULL; + + BN_CTX_start(ctx); + if ((e = BN_CTX_get(ctx)) != NULL + && BN_set_word(r, 2) + && BN_sub(e, q, r) + && BN_mod_exp_mont(r, k, e, q, ctx, NULL)) + res = r; + else + BN_free(r); + BN_CTX_end(ctx); + return res; +} diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c index 95f088a5ec..d606316954 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -76,13 +76,8 @@ static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, DSA_PKEY_CTX *dctx = ctx->data; DSA *dsa = ctx->pkey->pkey.dsa; - if (dctx->md) { - if (tbslen != (size_t)EVP_MD_size(dctx->md)) - return 0; - } else { - if (tbslen != SHA_DIGEST_LENGTH) - return 0; - } + if (dctx->md != NULL && tbslen != (size_t)EVP_MD_size(dctx->md)) + return 0; ret = DSA_sign(0, tbs, tbslen, sig, &sltmp, dsa); @@ -100,13 +95,8 @@ static int pkey_dsa_verify(EVP_PKEY_CTX *ctx, DSA_PKEY_CTX *dctx = ctx->data; DSA *dsa = ctx->pkey->pkey.dsa; - if (dctx->md) { - if (tbslen != (size_t)EVP_MD_size(dctx->md)) - return 0; - } else { - if (tbslen != SHA_DIGEST_LENGTH) - return 0; - } + if (dctx->md != NULL && tbslen != (size_t)EVP_MD_size(dctx->md)) + return 0; ret = DSA_verify(0, tbs, tbslen, sig, siglen, dsa); @@ -187,9 +177,15 @@ static int pkey_dsa_ctrl_str(EVP_PKEY_CTX *ctx, NULL); } if (strcmp(type, "dsa_paramgen_md") == 0) { + const EVP_MD *md = EVP_get_digestbyname(value); + + if (md == NULL) { + DSAerr(DSA_F_PKEY_DSA_CTRL_STR, DSA_R_INVALID_DIGEST_TYPE); + return 0; + } return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, EVP_PKEY_CTRL_DSA_PARAMGEN_MD, 0, - (void *)EVP_get_digestbyname(value)); + (void *)md); } return -2; } diff --git a/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c b/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c index a4b0cdd95b..e01425bc75 100644 --- a/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c +++ b/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -26,7 +26,7 @@ # endif # include # define HAVE_DLINFO 1 -# if defined(_AIX) || defined(__CYGWIN__) || \ +# if defined(__CYGWIN__) || \ defined(__SCO_VERSION__) || defined(_SCO_ELF) || \ (defined(__osf__) && !defined(RTLD_NEXT)) || \ (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \ @@ -308,6 +308,76 @@ static int dladdr(void *address, Dl_info *dl) } # endif /* __sgi */ +# ifdef _AIX +/*- + * See IBM's AIX Version 7.2, Technical Reference: + * Base Operating System and Extensions, Volume 1 and 2 + * https://www.ibm.com/support/knowledgecenter/ssw_aix_72/com.ibm.aix.base/technicalreferences.htm + */ +# include +# include +/* ~ 64 * (sizeof(struct ld_info) + _XOPEN_PATH_MAX + _XOPEN_NAME_MAX) */ +# define DLFCN_LDINFO_SIZE 86976 +typedef struct Dl_info { + const char *dli_fname; +} Dl_info; +/* + * This dladdr()-implementation will also find the ptrgl (Pointer Glue) virtual + * address of a function, which is just located in the DATA segment instead of + * the TEXT segment. + */ +static int dladdr(void *ptr, Dl_info *dl) +{ + uintptr_t addr = (uintptr_t)ptr; + unsigned int found = 0; + struct ld_info *ldinfos, *next_ldi, *this_ldi; + + if ((ldinfos = (struct ld_info *)OPENSSL_malloc(DLFCN_LDINFO_SIZE)) == NULL) { + errno = ENOMEM; + dl->dli_fname = NULL; + return 0; + } + + if ((loadquery(L_GETINFO, (void *)ldinfos, DLFCN_LDINFO_SIZE)) < 0) { + /*- + * Error handling is done through errno and dlerror() reading errno: + * ENOMEM (ldinfos buffer is too small), + * EINVAL (invalid flags), + * EFAULT (invalid ldinfos ptr) + */ + OPENSSL_free((void *)ldinfos); + dl->dli_fname = NULL; + return 0; + } + next_ldi = ldinfos; + + do { + this_ldi = next_ldi; + if (((addr >= (uintptr_t)this_ldi->ldinfo_textorg) + && (addr < ((uintptr_t)this_ldi->ldinfo_textorg + + this_ldi->ldinfo_textsize))) + || ((addr >= (uintptr_t)this_ldi->ldinfo_dataorg) + && (addr < ((uintptr_t)this_ldi->ldinfo_dataorg + + this_ldi->ldinfo_datasize)))) { + found = 1; + /* + * Ignoring the possibility of a member name and just returning + * the path name. See docs: sys/ldr.h, loadquery() and + * dlopen()/RTLD_MEMBER. + */ + if ((dl->dli_fname = + OPENSSL_strdup(this_ldi->ldinfo_filename)) == NULL) + errno = ENOMEM; + } else { + next_ldi = + (struct ld_info *)((uintptr_t)this_ldi + this_ldi->ldinfo_next); + } + } while (this_ldi->ldinfo_next && !found); + OPENSSL_free((void *)ldinfos); + return (found && dl->dli_fname != NULL); +} +# endif /* _AIX */ + static int dlfcn_pathbyaddr(void *addr, char *path, int sz) { # ifdef HAVE_DLINFO @@ -326,12 +396,19 @@ static int dlfcn_pathbyaddr(void *addr, char *path, int sz) if (dladdr(addr, &dli)) { len = (int)strlen(dli.dli_fname); - if (sz <= 0) + if (sz <= 0) { +# ifdef _AIX + OPENSSL_free((void *)dli.dli_fname); +# endif return len + 1; + } if (len >= sz) len = sz - 1; memcpy(path, dli.dli_fname, len); path[len++] = 0; +# ifdef _AIX + OPENSSL_free((void *)dli.dli_fname); +# endif return len; } diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl index 2314b75244..4eb4c68977 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -894,13 +894,13 @@ .Loop_scatter_w7: ldr $mask,[$inp],#4 subs $index,$index,#1 - strb $mask,[$out,#64*0-1] + strb $mask,[$out,#64*0] mov $mask,$mask,lsr#8 - strb $mask,[$out,#64*1-1] + strb $mask,[$out,#64*1] mov $mask,$mask,lsr#8 - strb $mask,[$out,#64*2-1] + strb $mask,[$out,#64*2] mov $mask,$mask,lsr#8 - strb $mask,[$out,#64*3-1] + strb $mask,[$out,#64*3] add $out,$out,#64*4 bne .Loop_scatter_w7 @@ -1633,7 +1633,7 @@ $code.=<<___; .Ladd_done: add sp,sp,#32*18+16+16 @ +16 means "skip even over saved r0-r3" -#if __ARM_ARCH__>=5 || defined(__thumb__) +#if __ARM_ARCH__>=5 || !defined(__thumb__) ldmia sp!,{r4-r12,pc} #else ldmia sp!,{r4-r12,lr} diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl index d93c4fe957..2a39675bfd 100644 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -660,7 +660,7 @@ adc $ap,xzr,xzr // zap $ap tst $acc0,#1 // is a even? - csel $acc0,$acc0,$t0,eq // ret = even ? a : a+modulus + csel $acc0,$acc0,$t0,eq // ret = even ? a : a+modulus csel $acc1,$acc1,$t1,eq csel $acc2,$acc2,$t2,eq csel $acc3,$acc3,$t3,eq @@ -1477,21 +1477,21 @@ prfm pstl1strm,[$out,#4096+64*5] prfm pstl1strm,[$out,#4096+64*6] prfm pstl1strm,[$out,#4096+64*7] - strb w3,[$out,#64*0-1] + strb w3,[$out,#64*0] lsr x3,x3,#8 - strb w3,[$out,#64*1-1] + strb w3,[$out,#64*1] lsr x3,x3,#8 - strb w3,[$out,#64*2-1] + strb w3,[$out,#64*2] lsr x3,x3,#8 - strb w3,[$out,#64*3-1] + strb w3,[$out,#64*3] lsr x3,x3,#8 - strb w3,[$out,#64*4-1] + strb w3,[$out,#64*4] lsr x3,x3,#8 - strb w3,[$out,#64*5-1] + strb w3,[$out,#64*5] lsr x3,x3,#8 - strb w3,[$out,#64*6-1] + strb w3,[$out,#64*6] lsr x3,x3,#8 - strb w3,[$out,#64*7-1] + strb w3,[$out,#64*7] add $out,$out,#64*8 b.ne .Loop_scatter_w7 diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl index 3bdd2cf13f..edd7d01281 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -67,7 +67,7 @@ $addx = ($1>=12); } -if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) { +if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) { my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10 $avx = ($ver>=3.0) + ($ver>=3.01); $addx = ($ver>=3.03); diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl index ee11069459..0c1af95b13 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -1531,13 +1531,13 @@ ld [$inp],%l0 add $inp,4,$inp subcc $index,1,$index - stb %l0,[$out+64*0-1] + stb %l0,[$out+64*0] srl %l0,8,%l1 - stb %l1,[$out+64*1-1] + stb %l1,[$out+64*1] srl %l0,16,%l2 - stb %l2,[$out+64*2-1] + stb %l2,[$out+64*2] srl %l0,24,%l3 - stb %l3,[$out+64*3-1] + stb %l3,[$out+64*3] bne .Loop_scatter_w7 add $out,64*4,$out @@ -1874,7 +1874,7 @@ ldx [$bp+8*($i+1)],$bi ! bp[$i+1] ___ $code.=<<___; - addcc $acc1,$t0,$acc1 ! accumulate high parts of multiplication + addcc $acc1,$t0,$acc1 ! accumulate high parts of multiplication sllx $acc0,32,$t0 addxccc $acc2,$t1,$acc2 srlx $acc0,32,$t1 diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl index f637c844c4..b3bec23228 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -443,7 +443,7 @@ &mov (&DWP(20,"esp"),"eax"); &mov (&DWP(24,"esp"),"eax"); &mov (&DWP(28,"esp"),"eax"); - + &call ("_ecp_nistz256_sub"); &stack_pop(8); @@ -1179,7 +1179,7 @@ &mov ("esi",&wparam(1)); &mov ("ebp",&wparam(2)); - &lea ("edi",&DWP(-1,"edi","ebp")); + &lea ("edi",&DWP(0,"edi","ebp")); &mov ("ebp",64/4); &set_label("scatter_w7_loop"); &mov ("eax",&DWP(0,"esi")); diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl index 183137e5f0..714e852a18 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl @@ -3051,8 +3051,8 @@ () ######################################################################## # Convert ecp_nistz256_table.c to layout expected by ecp_nistz_gather_w7 # -open TABLE,"Z, src->Z)) return 0; dest->Z_is_one = src->Z_is_one; + dest->curve_name = src->curve_name; return 1; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c b/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c index b66adf2bbc..f8f1e2c842 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -92,19 +92,19 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) static EC_KEY *eckey_type2param(int ptype, const void *pval) { EC_KEY *eckey = NULL; + EC_GROUP *group = NULL; + if (ptype == V_ASN1_SEQUENCE) { const ASN1_STRING *pstr = pval; - const unsigned char *pm = NULL; - int pmlen; - pm = pstr->data; - pmlen = pstr->length; + const unsigned char *pm = pstr->data; + int pmlen = pstr->length; + if ((eckey = d2i_ECParameters(NULL, &pm, pmlen)) == NULL) { ECerr(EC_F_ECKEY_TYPE2PARAM, EC_R_DECODE_ERROR); goto ecerr; } } else if (ptype == V_ASN1_OBJECT) { const ASN1_OBJECT *poid = pval; - EC_GROUP *group; /* * type == V_ASN1_OBJECT => the parameters are given by an asn1 OID @@ -129,6 +129,7 @@ static EC_KEY *eckey_type2param(int ptype, const void *pval) ecerr: EC_KEY_free(eckey); + EC_GROUP_free(group); return NULL; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_curve.c b/worker/deps/openssl/openssl/crypto/ec/ec_curve.c index f8a3846fd5..b022528be2 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_curve.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_curve.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -3036,6 +3036,8 @@ static EC_GROUP *ec_group_new_from_data(const ec_list_element curve) } #endif + EC_GROUP_set_curve_name(group, curve.nid); + if ((P = EC_POINT_new(group)) == NULL) { ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB); goto err; @@ -3101,8 +3103,6 @@ EC_GROUP *EC_GROUP_new_by_curve_name(int nid) return NULL; } - EC_GROUP_set_curve_name(ret, nid); - return ret; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_err.c b/worker/deps/openssl/openssl/crypto/ec/ec_err.c index e4c2c1c1a4..717c92e984 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_err.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -97,6 +97,8 @@ static ERR_STRING_DATA EC_str_functs[] = { {ERR_FUNC(EC_F_EC_GFP_NIST_FIELD_SQR), "ec_GFp_nist_field_sqr"}, {ERR_FUNC(EC_F_EC_GFP_NIST_GROUP_SET_CURVE), "ec_GFp_nist_group_set_curve"}, + {ERR_FUNC(EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES), + "ec_GFp_simple_blind_coordinates"}, {ERR_FUNC(EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT), "ec_GFp_simple_group_check_discriminant"}, {ERR_FUNC(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE), diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_key.c b/worker/deps/openssl/openssl/crypto/ec/ec_key.c index f1f0afb466..462156f204 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_key.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_key.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -55,7 +55,7 @@ void EC_KEY_free(EC_KEY *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth->finish != NULL) + if (r->meth != NULL && r->meth->finish != NULL) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c b/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c index 5e5d1ae1cf..64a5d20872 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -119,7 +119,7 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine) } return ret; -err: + err: EC_KEY_free(ret); return NULL; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h b/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h index ded35a72a0..ca1776efdb 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h +++ b/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -169,6 +169,7 @@ struct ec_method_st { /* custom ECDH operation */ int (*ecdh_compute_key)(unsigned char **pout, size_t *poutlen, const EC_POINT *pub_key, const EC_KEY *ecdh); + int (*blind_coordinates)(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx); }; /* @@ -269,6 +270,8 @@ struct ec_key_st { struct ec_point_st { const EC_METHOD *meth; + /* NID for the curve if known */ + int curve_name; /* * All members except 'meth' are handled by the method functions, even if * they appear generic @@ -281,6 +284,20 @@ struct ec_point_st { * special case */ }; + +static ossl_inline int ec_point_is_compat(const EC_POINT *point, + const EC_GROUP *group) +{ + if (group->meth != point->meth + || (group->curve_name != 0 + && point->curve_name != 0 + && group->curve_name != point->curve_name)) + return 0; + + return 1; +} + + NISTP224_PRE_COMP *EC_nistp224_pre_comp_dup(NISTP224_PRE_COMP *); NISTP256_PRE_COMP *EC_nistp256_pre_comp_dup(NISTP256_PRE_COMP *); NISTP521_PRE_COMP *EC_nistp521_pre_comp_dup(NISTP521_PRE_COMP *); @@ -359,6 +376,8 @@ int ec_GFp_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *); int ec_GFp_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); +int ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p, + BN_CTX *ctx); /* method functions in ecp_mont.c */ int ec_GFp_mont_group_init(EC_GROUP *); @@ -611,3 +630,5 @@ int X25519(uint8_t out_shared_key[32], const uint8_t private_key[32], const uint8_t peer_public_value[32]); void X25519_public_from_private(uint8_t out_public_value[32], const uint8_t private_key[32]); + +int ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx); diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_lib.c b/worker/deps/openssl/openssl/crypto/ec/ec_lib.c index 7cb4bfee28..a7be03b627 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_lib.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -140,6 +140,8 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src) if (dest == src) return 1; + dest->curve_name = src->curve_name; + /* Copy precomputed */ dest->pre_comp_type = src->pre_comp_type; switch (src->pre_comp_type) { @@ -202,7 +204,6 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src) return 0; } - dest->curve_name = src->curve_name; dest->asn1_flag = src->asn1_flag; dest->asn1_form = src->asn1_form; @@ -563,6 +564,7 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group) } ret->meth = group->meth; + ret->curve_name = group->curve_name; if (!ret->meth->point_init(ret)) { OPENSSL_free(ret); @@ -600,7 +602,10 @@ int EC_POINT_copy(EC_POINT *dest, const EC_POINT *src) ECerr(EC_F_EC_POINT_COPY, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (dest->meth != src->meth) { + if (dest->meth != src->meth + || (dest->curve_name != src->curve_name + && dest->curve_name != 0 + && src->curve_name != 0)) { ECerr(EC_F_EC_POINT_COPY, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -657,7 +662,7 @@ int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -676,7 +681,7 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -694,7 +699,7 @@ int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -720,7 +725,7 @@ int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -746,11 +751,16 @@ int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; } + if (EC_POINT_is_at_infinity(group, point)) { + ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP, + EC_R_POINT_AT_INFINITY); + return 0; + } return group->meth->point_get_affine_coordinates(group, point, x, y, ctx); } @@ -764,11 +774,16 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS); return 0; } + if (EC_POINT_is_at_infinity(group, point)) { + ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M, + EC_R_POINT_AT_INFINITY); + return 0; + } return group->meth->point_get_affine_coordinates(group, point, x, y, ctx); } #endif @@ -780,8 +795,8 @@ int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, ECerr(EC_F_EC_POINT_ADD, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if ((group->meth != r->meth) || (r->meth != a->meth) - || (a->meth != b->meth)) { + if (!ec_point_is_compat(r, group) || !ec_point_is_compat(a, group) + || !ec_point_is_compat(b, group)) { ECerr(EC_F_EC_POINT_ADD, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -795,7 +810,7 @@ int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, ECerr(EC_F_EC_POINT_DBL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if ((group->meth != r->meth) || (r->meth != a->meth)) { + if (!ec_point_is_compat(r, group) || !ec_point_is_compat(a, group)) { ECerr(EC_F_EC_POINT_DBL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -808,7 +823,7 @@ int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx) ECerr(EC_F_EC_POINT_INVERT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != a->meth) { + if (!ec_point_is_compat(a, group)) { ECerr(EC_F_EC_POINT_INVERT, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -822,7 +837,7 @@ int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *point) ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_IS_AT_INFINITY, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -843,7 +858,7 @@ int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point, ECerr(EC_F_EC_POINT_IS_ON_CURVE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_IS_ON_CURVE, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -857,7 +872,7 @@ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, ECerr(EC_F_EC_POINT_CMP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; } - if ((group->meth != a->meth) || (a->meth != b->meth)) { + if (!ec_point_is_compat(a, group) || !ec_point_is_compat(b, group)) { ECerr(EC_F_EC_POINT_CMP, EC_R_INCOMPATIBLE_OBJECTS); return -1; } @@ -870,7 +885,7 @@ int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx) ECerr(EC_F_EC_POINT_MAKE_AFFINE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_MAKE_AFFINE, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -887,7 +902,7 @@ int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, return 0; } for (i = 0; i < num; i++) { - if (group->meth != points[i]->meth) { + if (!ec_point_is_compat(points[i], group)) { ECerr(EC_F_EC_POINTS_MAKE_AFFINE, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -1002,3 +1017,21 @@ int ec_group_simple_order_bits(const EC_GROUP *group) return 0; return BN_num_bits(group->order); } + +/*- + * Coordinate blinding for EC_POINT. + * + * The underlying EC_METHOD can optionally implement this function: + * underlying implementations should return 0 on errors, or 1 on + * success. + * + * This wrapper returns 1 in case the underlying EC_METHOD does not + * support coordinate blinding. + */ +int ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx) +{ + if (group->meth->blind_coordinates == NULL) + return 1; /* ignore if not implemented */ + + return group->meth->blind_coordinates(group, p, ctx); +} diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_mult.c b/worker/deps/openssl/openssl/crypto/ec/ec_mult.c index b39777fbf2..8350082eb4 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_mult.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_mult.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -105,6 +105,235 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *pre) OPENSSL_free(pre); } +#define EC_POINT_BN_set_flags(P, flags) do { \ + BN_set_flags((P)->X, (flags)); \ + BN_set_flags((P)->Y, (flags)); \ + BN_set_flags((P)->Z, (flags)); \ +} while(0) + +/*- + * This functions computes (in constant time) a point multiplication over the + * EC group. + * + * At a high level, it is Montgomery ladder with conditional swaps. + * + * It performs either a fixed scalar point multiplication + * (scalar * generator) + * when point is NULL, or a generic scalar point multiplication + * (scalar * point) + * when point is not NULL. + * + * scalar should be in the range [0,n) otherwise all constant time bets are off. + * + * NB: This says nothing about EC_POINT_add and EC_POINT_dbl, + * which of course are not constant time themselves. + * + * The product is stored in r. + * + * Returns 1 on success, 0 otherwise. + */ +static int ec_mul_consttime(const EC_GROUP *group, EC_POINT *r, + const BIGNUM *scalar, const EC_POINT *point, + BN_CTX *ctx) +{ + int i, cardinality_bits, group_top, kbit, pbit, Z_is_one; + EC_POINT *s = NULL; + BIGNUM *k = NULL; + BIGNUM *lambda = NULL; + BIGNUM *cardinality = NULL; + BN_CTX *new_ctx = NULL; + int ret = 0; + + if (ctx == NULL && (ctx = new_ctx = BN_CTX_secure_new()) == NULL) + return 0; + + BN_CTX_start(ctx); + + s = EC_POINT_new(group); + if (s == NULL) + goto err; + + if (point == NULL) { + if (!EC_POINT_copy(s, group->generator)) + goto err; + } else { + if (!EC_POINT_copy(s, point)) + goto err; + } + + EC_POINT_BN_set_flags(s, BN_FLG_CONSTTIME); + + cardinality = BN_CTX_get(ctx); + lambda = BN_CTX_get(ctx); + k = BN_CTX_get(ctx); + if (k == NULL || !BN_mul(cardinality, group->order, group->cofactor, ctx)) + goto err; + + /* + * Group cardinalities are often on a word boundary. + * So when we pad the scalar, some timing diff might + * pop if it needs to be expanded due to carries. + * So expand ahead of time. + */ + cardinality_bits = BN_num_bits(cardinality); + group_top = bn_get_top(cardinality); + if ((bn_wexpand(k, group_top + 2) == NULL) + || (bn_wexpand(lambda, group_top + 2) == NULL)) + goto err; + + if (!BN_copy(k, scalar)) + goto err; + + BN_set_flags(k, BN_FLG_CONSTTIME); + + if ((BN_num_bits(k) > cardinality_bits) || (BN_is_negative(k))) { + /*- + * this is an unusual input, and we don't guarantee + * constant-timeness + */ + if (!BN_nnmod(k, k, cardinality, ctx)) + goto err; + } + + if (!BN_add(lambda, k, cardinality)) + goto err; + BN_set_flags(lambda, BN_FLG_CONSTTIME); + if (!BN_add(k, lambda, cardinality)) + goto err; + /* + * lambda := scalar + cardinality + * k := scalar + 2*cardinality + */ + kbit = BN_is_bit_set(lambda, cardinality_bits); + BN_consttime_swap(kbit, k, lambda, group_top + 2); + + group_top = bn_get_top(group->field); + if ((bn_wexpand(s->X, group_top) == NULL) + || (bn_wexpand(s->Y, group_top) == NULL) + || (bn_wexpand(s->Z, group_top) == NULL) + || (bn_wexpand(r->X, group_top) == NULL) + || (bn_wexpand(r->Y, group_top) == NULL) + || (bn_wexpand(r->Z, group_top) == NULL)) + goto err; + + /*- + * Apply coordinate blinding for EC_POINT. + * + * The underlying EC_METHOD can optionally implement this function: + * ec_point_blind_coordinates() returns 0 in case of errors or 1 on + * success or if coordinate blinding is not implemented for this + * group. + */ + if (!ec_point_blind_coordinates(group, s, ctx)) + goto err; + + /* top bit is a 1, in a fixed pos */ + if (!EC_POINT_copy(r, s)) + goto err; + + EC_POINT_BN_set_flags(r, BN_FLG_CONSTTIME); + + if (!EC_POINT_dbl(group, s, s, ctx)) + goto err; + + pbit = 0; + +#define EC_POINT_CSWAP(c, a, b, w, t) do { \ + BN_consttime_swap(c, (a)->X, (b)->X, w); \ + BN_consttime_swap(c, (a)->Y, (b)->Y, w); \ + BN_consttime_swap(c, (a)->Z, (b)->Z, w); \ + t = ((a)->Z_is_one ^ (b)->Z_is_one) & (c); \ + (a)->Z_is_one ^= (t); \ + (b)->Z_is_one ^= (t); \ +} while(0) + + /*- + * The ladder step, with branches, is + * + * k[i] == 0: S = add(R, S), R = dbl(R) + * k[i] == 1: R = add(S, R), S = dbl(S) + * + * Swapping R, S conditionally on k[i] leaves you with state + * + * k[i] == 0: T, U = R, S + * k[i] == 1: T, U = S, R + * + * Then perform the ECC ops. + * + * U = add(T, U) + * T = dbl(T) + * + * Which leaves you with state + * + * k[i] == 0: U = add(R, S), T = dbl(R) + * k[i] == 1: U = add(S, R), T = dbl(S) + * + * Swapping T, U conditionally on k[i] leaves you with state + * + * k[i] == 0: R, S = T, U + * k[i] == 1: R, S = U, T + * + * Which leaves you with state + * + * k[i] == 0: S = add(R, S), R = dbl(R) + * k[i] == 1: R = add(S, R), S = dbl(S) + * + * So we get the same logic, but instead of a branch it's a + * conditional swap, followed by ECC ops, then another conditional swap. + * + * Optimization: The end of iteration i and start of i-1 looks like + * + * ... + * CSWAP(k[i], R, S) + * ECC + * CSWAP(k[i], R, S) + * (next iteration) + * CSWAP(k[i-1], R, S) + * ECC + * CSWAP(k[i-1], R, S) + * ... + * + * So instead of two contiguous swaps, you can merge the condition + * bits and do a single swap. + * + * k[i] k[i-1] Outcome + * 0 0 No Swap + * 0 1 Swap + * 1 0 Swap + * 1 1 No Swap + * + * This is XOR. pbit tracks the previous bit of k. + */ + + for (i = cardinality_bits - 1; i >= 0; i--) { + kbit = BN_is_bit_set(k, i) ^ pbit; + EC_POINT_CSWAP(kbit, r, s, group_top, Z_is_one); + if (!EC_POINT_add(group, s, r, s, ctx)) + goto err; + if (!EC_POINT_dbl(group, r, r, ctx)) + goto err; + /* + * pbit logic merges this cswap with that of the + * next iteration + */ + pbit ^= kbit; + } + /* one final cswap to move the right value into r */ + EC_POINT_CSWAP(pbit, r, s, group_top, Z_is_one); +#undef EC_POINT_CSWAP + + ret = 1; + + err: + EC_POINT_free(s); + BN_CTX_end(ctx); + BN_CTX_free(new_ctx); + + return ret; +} + +#undef EC_POINT_BN_set_flags + /* * TODO: table should be optimised for the wNAF-based implementation, * sometimes smaller windows will give better performance (thus the @@ -155,7 +384,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, * precomputation is not available */ int ret = 0; - if (group->meth != r->meth) { + if (!ec_point_is_compat(r, group)) { ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -164,8 +393,36 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, return EC_POINT_set_to_infinity(group, r); } + if (!BN_is_zero(group->order) && !BN_is_zero(group->cofactor)) { + /*- + * Handle the common cases where the scalar is secret, enforcing a constant + * time scalar multiplication algorithm. + */ + if ((scalar != NULL) && (num == 0)) { + /*- + * In this case we want to compute scalar * GeneratorPoint: this + * codepath is reached most prominently by (ephemeral) key generation + * of EC cryptosystems (i.e. ECDSA keygen and sign setup, ECDH + * keygen/first half), where the scalar is always secret. This is why + * we ignore if BN_FLG_CONSTTIME is actually set and we always call the + * constant time version. + */ + return ec_mul_consttime(group, r, scalar, NULL, ctx); + } + if ((scalar == NULL) && (num == 1)) { + /*- + * In this case we want to compute scalar * GenericPoint: this codepath + * is reached most prominently by the second half of ECDH, where the + * secret scalar is multiplied by the peer's public point. To protect + * the secret scalar, we ignore if BN_FLG_CONSTTIME is actually set and + * we always call the constant time version. + */ + return ec_mul_consttime(group, r, scalars[0], points[0], ctx); + } + } + for (i = 0; i < num; i++) { - if (group->meth != points[i]->meth) { + if (!ec_point_is_compat(points[i], group)) { ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_oct.c b/worker/deps/openssl/openssl/crypto/ec/ec_oct.c index effc42a344..e185df6edf 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_oct.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_oct.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -30,7 +30,7 @@ int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -66,7 +66,7 @@ int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -93,7 +93,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, ECerr(EC_F_EC_POINT_POINT2OCT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -123,7 +123,7 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point, ECerr(EC_F_EC_POINT_OCT2POINT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (group->meth != point->meth) { + if (!ec_point_is_compat(point, group)) { ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_INCOMPATIBLE_OBJECTS); return 0; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c b/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c index 449be0e92a..9e4a68d9ca 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -10,9 +10,8 @@ #include #include #include -#include #include -#include +#include "internal/bn_int.h" #include "ec_lcl.h" int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen, @@ -53,13 +52,12 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, return 0; } - if (ctx_in == NULL) { + if ((ctx = ctx_in) == NULL) { if ((ctx = BN_CTX_new()) == NULL) { ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_MALLOC_FAILURE); return 0; } - } else - ctx = ctx_in; + } k = BN_new(); /* this value is later returned in *kinvp */ r = BN_new(); /* this value is later returned in *rp */ @@ -73,10 +71,6 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, goto err; } order = EC_GROUP_get0_order(group); - if (order == NULL) { - ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); - goto err; - } /* Preallocate space */ order_bits = BN_num_bits(order); @@ -87,23 +81,23 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, do { /* get random k */ - do + do { if (dgst != NULL) { - if (!BN_generate_dsa_nonce - (k, order, EC_KEY_get0_private_key(eckey), dgst, dlen, - ctx)) { + if (!BN_generate_dsa_nonce(k, order, + EC_KEY_get0_private_key(eckey), + dgst, dlen, ctx)) { ECerr(EC_F_ECDSA_SIGN_SETUP, - EC_R_RANDOM_NUMBER_GENERATION_FAILED); + EC_R_RANDOM_NUMBER_GENERATION_FAILED); goto err; } } else { if (!BN_rand_range(k, order)) { ECerr(EC_F_ECDSA_SIGN_SETUP, - EC_R_RANDOM_NUMBER_GENERATION_FAILED); + EC_R_RANDOM_NUMBER_GENERATION_FAILED); goto err; } } - while (BN_is_zero(k)); + } while (BN_is_zero(k)); /* * We do not want timing information to leak the length of k, so we @@ -129,18 +123,16 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, } if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) { - if (!EC_POINT_get_affine_coordinates_GFp - (group, tmp_point, X, NULL, ctx)) { + if (!EC_POINT_get_affine_coordinates_GFp(group, tmp_point, X, + NULL, ctx)) { ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); goto err; } } #ifndef OPENSSL_NO_EC2M else { /* NID_X9_62_characteristic_two_field */ - - if (!EC_POINT_get_affine_coordinates_GF2m(group, - tmp_point, X, NULL, - ctx)) { + if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp_point, X, + NULL, ctx)) { ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); goto err; } @@ -150,8 +142,7 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB); goto err; } - } - while (BN_is_zero(r)); + } while (BN_is_zero(r)); /* compute the inverse of k */ if (EC_GROUP_get_mont_data(group) != NULL) { @@ -210,8 +201,7 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, EC_KEY *eckey) { int ok = 0, i; - BIGNUM *kinv = NULL, *s, *m = NULL, *tmp = NULL, *blind = NULL; - BIGNUM *blindm = NULL; + BIGNUM *kinv = NULL, *s, *m = NULL; const BIGNUM *order, *ckinv; BN_CTX *ctx = NULL; const EC_GROUP *group; @@ -244,27 +234,13 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, } s = ret->s; - ctx = BN_CTX_secure_new(); - if (ctx == NULL) { - ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_MALLOC_FAILURE); - goto err; - } - - BN_CTX_start(ctx); - tmp = BN_CTX_get(ctx); - m = BN_CTX_get(ctx); - blind = BN_CTX_get(ctx); - blindm = BN_CTX_get(ctx); - if (blindm == NULL) { + if ((ctx = BN_CTX_new()) == NULL + || (m = BN_new()) == NULL) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_MALLOC_FAILURE); goto err; } order = EC_GROUP_get0_order(group); - if (order == NULL) { - ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_EC_LIB); - goto err; - } i = BN_num_bits(order); /* * Need to truncate digest if it is too long: first truncate whole bytes. @@ -275,7 +251,7 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } - /* If still too long truncate remaining bits with a shift */ + /* If still too long, truncate remaining bits with a shift */ if ((8 * dgst_len > i) && !BN_rshift(m, m, 8 - (i & 0x7))) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; @@ -296,59 +272,27 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, } /* - * The normal signature calculation is: - * - * s := k^-1 * (m + r * priv_key) mod order - * - * We will blind this to protect against side channel attacks - * - * s := k^-1 * blind^-1 * (blind * m + blind * r * priv_key) mod order + * With only one multiplicant being in Montgomery domain + * multiplication yields real result without post-conversion. + * Also note that all operations but last are performed with + * zero-padded vectors. Last operation, BN_mod_mul_montgomery + * below, returns user-visible value with removed zero padding. */ - - /* Generate a blinding value */ - do { - if (!BN_rand(blind, BN_num_bits(order) - 1, BN_RAND_TOP_ANY, - BN_RAND_BOTTOM_ANY)) - goto err; - } while (BN_is_zero(blind)); - BN_set_flags(blind, BN_FLG_CONSTTIME); - BN_set_flags(blindm, BN_FLG_CONSTTIME); - BN_set_flags(tmp, BN_FLG_CONSTTIME); - - /* tmp := blind * priv_key * r mod order */ - if (!BN_mod_mul(tmp, blind, priv_key, order, ctx)) { - ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); - goto err; - } - if (!BN_mod_mul(tmp, tmp, ret->r, order, ctx)) { - ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); - goto err; - } - - /* blindm := blind * m mod order */ - if (!BN_mod_mul(blindm, blind, m, order, ctx)) { - ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); - goto err; - } - - /* s : = (blind * priv_key * r) + (blind * m) mod order */ - if (!BN_mod_add_quick(s, tmp, blindm, order)) { - ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); - goto err; - } - - /* s:= s * blind^-1 mod order */ - if (BN_mod_inverse(blind, blind, order, ctx) == NULL) { + if (!bn_to_mont_fixed_top(s, ret->r, group->mont_data, ctx) + || !bn_mul_mont_fixed_top(s, s, priv_key, group->mont_data, ctx)) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } - if (!BN_mod_mul(s, s, blind, order, ctx)) { + if (!bn_mod_add_fixed_top(s, s, m, order)) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } - - /* s := s * k^-1 mod order */ - if (!BN_mod_mul(s, s, ckinv, order, ctx)) { + /* + * |s| can still be larger than modulus, because |m| can be. In + * such case we count on Montgomery reduction to tie it up. + */ + if (!bn_to_mont_fixed_top(s, s, group->mont_data, ctx) + || !BN_mod_mul_montgomery(s, s, ckinv, group->mont_data, ctx)) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } @@ -362,11 +306,11 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, EC_R_NEED_NEW_SETUP_VALUES); goto err; } - } else + } else { /* s != 0 => we have a valid signature */ break; - } - while (1); + } + } while (1); ok = 1; err: @@ -374,8 +318,8 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, ECDSA_SIG_free(ret); ret = NULL; } - BN_CTX_end(ctx); BN_CTX_free(ctx); + BN_clear_free(m); BN_clear_free(kinv); return ret; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c b/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c index 994cc1d0ff..d837d4d465 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -66,7 +66,8 @@ const EC_METHOD *EC_GFp_mont_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key + ecdh_simple_compute_key, + ec_GFp_simple_blind_coordinates }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c index 615563bc38..143f21f3f9 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -68,7 +68,8 @@ const EC_METHOD *EC_GFp_nist_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key + ecdh_simple_compute_key, + ec_GFp_simple_blind_coordinates }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c index 0cd994fc23..52056ff591 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -290,7 +290,8 @@ const EC_METHOD *EC_GFp_nistp224_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key + ecdh_simple_compute_key, + 0 /* blind_coordinates */ }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c index 133f089fd2..0a82abca1b 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1642,7 +1642,8 @@ const EC_METHOD *EC_GFp_nistp521_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key + ecdh_simple_compute_key, + 0 /* blind_coordinates */ }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c index 246189833e..7eafce649b 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1110,28 +1110,12 @@ __owur static int ecp_nistz256_set_from_affine(EC_POINT *out, const EC_GROUP *gr const P256_POINT_AFFINE *in, BN_CTX *ctx) { - BIGNUM *x, *y; - BN_ULONG d_x[P256_LIMBS], d_y[P256_LIMBS]; int ret = 0; - x = BN_new(); - if (x == NULL) - return 0; - y = BN_new(); - if (y == NULL) { - BN_free(x); - return 0; - } - memcpy(d_x, in->X, sizeof(d_x)); - bn_set_static_words(x, d_x, P256_LIMBS); - - memcpy(d_y, in->Y, sizeof(d_y)); - bn_set_static_words(y, d_y, P256_LIMBS); - - ret = EC_POINT_set_affine_coordinates_GFp(group, out, x, y, ctx); - - BN_free(x); - BN_free(y); + if ((ret = bn_set_words(out->X, in->X, P256_LIMBS)) + && (ret = bn_set_words(out->Y, in->Y, P256_LIMBS)) + && (ret = bn_set_words(out->Z, ONE, P256_LIMBS))) + out->Z_is_one = 1; return ret; } @@ -1168,7 +1152,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group, return 0; } - if (group->meth != r->meth) { + if (!ec_point_is_compat(r, group)) { ECerr(EC_F_ECP_NISTZ256_POINTS_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -1177,7 +1161,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group, return EC_POINT_set_to_infinity(group, r); for (j = 0; j < num; j++) { - if (group->meth != points[j]->meth) { + if (!ec_point_is_compat(points[j], group)) { ECerr(EC_F_ECP_NISTZ256_POINTS_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -1210,9 +1194,9 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group, if (pre_comp_generator == NULL) goto err; + ecp_nistz256_gather_w7(&p.a, pre_comp->precomp[0], 1); if (!ecp_nistz256_set_from_affine(pre_comp_generator, - group, pre_comp->precomp[0], - ctx)) { + group, &p.a, ctx)) { EC_POINT_free(pre_comp_generator); goto err; } @@ -1552,7 +1536,8 @@ const EC_METHOD *EC_GFp_nistz256_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key + ecdh_simple_compute_key, + 0 /* blind_coordinates */ }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c b/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c index abd3795046..adfb194576 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -67,7 +67,8 @@ const EC_METHOD *EC_GFp_simple_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key + ecdh_simple_compute_key, + ec_GFp_simple_blind_coordinates }; return &ret; @@ -352,6 +353,7 @@ int ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src) if (!BN_copy(dest->Z, src->Z)) return 0; dest->Z_is_one = src->Z_is_one; + dest->curve_name = src->curve_name; return 1; } @@ -1367,3 +1369,56 @@ int ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, { return BN_mod_sqr(r, a, group->field, ctx); } + +/*- + * Apply randomization of EC point projective coordinates: + * + * (X, Y ,Z ) = (lambda^2*X, lambda^3*Y, lambda*Z) + * lambda = [1,group->field) + * + */ +int ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p, + BN_CTX *ctx) +{ + int ret = 0; + BIGNUM *lambda = NULL; + BIGNUM *temp = NULL; + + BN_CTX_start(ctx); + lambda = BN_CTX_get(ctx); + temp = BN_CTX_get(ctx); + if (temp == NULL) { + ECerr(EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES, ERR_R_MALLOC_FAILURE); + goto err; + } + + /* make sure lambda is not zero */ + do { + if (!BN_rand_range(lambda, group->field)) { + ECerr(EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES, ERR_R_BN_LIB); + goto err; + } + } while (BN_is_zero(lambda)); + + /* if field_encode defined convert between representations */ + if (group->meth->field_encode != NULL + && !group->meth->field_encode(group, lambda, lambda, ctx)) + goto err; + if (!group->meth->field_mul(group, p->Z, p->Z, lambda, ctx)) + goto err; + if (!group->meth->field_sqr(group, temp, lambda, ctx)) + goto err; + if (!group->meth->field_mul(group, p->X, p->X, temp, ctx)) + goto err; + if (!group->meth->field_mul(group, temp, temp, lambda, ctx)) + goto err; + if (!group->meth->field_mul(group, p->Y, p->Y, temp, ctx)) + goto err; + p->Z_is_one = 0; + + ret = 1; + + err: + BN_CTX_end(ctx); + return ret; +} diff --git a/worker/deps/openssl/openssl/crypto/engine/eng_lib.c b/worker/deps/openssl/openssl/crypto/engine/eng_lib.c index cbefc7eb6c..ef8e995503 100644 --- a/worker/deps/openssl/openssl/crypto/engine/eng_lib.c +++ b/worker/deps/openssl/openssl/crypto/engine/eng_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -18,7 +18,8 @@ CRYPTO_ONCE engine_lock_init = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE(do_engine_lock_init) { - OPENSSL_init_crypto(0, NULL); + if (!OPENSSL_init_crypto(0, NULL)) + return 0; global_engine_lock = CRYPTO_THREAD_lock_new(); return global_engine_lock != NULL; } @@ -143,8 +144,10 @@ void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb) if (!int_cleanup_check(1)) return; item = int_cleanup_item(cb); - if (item) - sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item); + if (item != NULL) { + if (sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item) <= 0) + OPENSSL_free(item); + } } /* The API function that performs all cleanup */ diff --git a/worker/deps/openssl/openssl/crypto/engine/eng_list.c b/worker/deps/openssl/openssl/crypto/engine/eng_list.c index 934389f74e..f8d74c1d33 100644 --- a/worker/deps/openssl/openssl/crypto/engine/eng_list.c +++ b/worker/deps/openssl/openssl/crypto/engine/eng_list.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -322,7 +322,7 @@ ENGINE *ENGINE_by_id(const char *id) * Prevent infinite recursion if we're looking for the dynamic engine. */ if (strcmp(id, "dynamic")) { - if ((load_dir = getenv("OPENSSL_ENGINES")) == 0) + if ((load_dir = ossl_safe_getenv("OPENSSL_ENGINES")) == NULL) load_dir = ENGINESDIR; iterator = ENGINE_by_id("dynamic"); if (!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || diff --git a/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c b/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c index 0e53c4d1fd..9208f7eafc 100644 --- a/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c +++ b/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c @@ -649,3 +649,4 @@ int openssl_destroy(ENGINE *e) #endif return 1; } + diff --git a/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c b/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c index 480267daab..5c7b161703 100644 --- a/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c +++ b/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -170,7 +170,8 @@ static void look_str_cb(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg) ENGINE *e = sk_ENGINE_value(sk, i); EVP_PKEY_ASN1_METHOD *ameth; e->pkey_asn1_meths(e, &ameth, NULL, nid); - if (((int)strlen(ameth->pem_str) == lk->len) + if (ameth != NULL + && ((int)strlen(ameth->pem_str) == lk->len) && strncasecmp(ameth->pem_str, lk->str, lk->len) == 0) { lk->e = e; lk->ameth = ameth; diff --git a/worker/deps/openssl/openssl/crypto/err/err.c b/worker/deps/openssl/openssl/crypto/err/err.c index c4399285fe..08c27a3e83 100644 --- a/worker/deps/openssl/openssl/crypto/err/err.c +++ b/worker/deps/openssl/openssl/crypto/err/err.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -254,7 +254,8 @@ static void ERR_STATE_free(ERR_STATE *s) DEFINE_RUN_ONCE_STATIC(do_err_strings_init) { - OPENSSL_init_crypto(0, NULL); + if (!OPENSSL_init_crypto(0, NULL)) + return 0; err_string_lock = CRYPTO_THREAD_lock_new(); return err_string_lock != NULL; } @@ -653,29 +654,31 @@ DEFINE_RUN_ONCE_STATIC(err_do_init) ERR_STATE *ERR_get_state(void) { - ERR_STATE *state = NULL; + ERR_STATE *state; - if (!RUN_ONCE(&err_init, err_do_init)) + if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL)) return NULL; - /* - * If base OPENSSL_init_crypto() hasn't been called yet, be sure to call - * it now to avoid state to be doubly allocated and thereby leak memory. - * Needed on any platform that doesn't define OPENSSL_USE_NODELETE. - */ - if (!OPENSSL_init_crypto(0, NULL)) + if (!RUN_ONCE(&err_init, err_do_init)) return NULL; state = CRYPTO_THREAD_get_local(&err_thread_local); + if (state == (ERR_STATE*)-1) + return NULL; if (state == NULL) { - state = OPENSSL_zalloc(sizeof(*state)); - if (state == NULL) + if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1)) return NULL; + if ((state = OPENSSL_zalloc(sizeof(*state))) == NULL) { + CRYPTO_THREAD_set_local(&err_thread_local, NULL); + return NULL; + } + if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE) - || !CRYPTO_THREAD_set_local(&err_thread_local, state)) { + || !CRYPTO_THREAD_set_local(&err_thread_local, state)) { ERR_STATE_free(state); + CRYPTO_THREAD_set_local(&err_thread_local, NULL); return NULL; } @@ -686,13 +689,41 @@ ERR_STATE *ERR_get_state(void) return state; } +/* + * err_shelve_state returns the current thread local error state + * and freezes the error module until err_unshelve_state is called. + */ +int err_shelve_state(void **state) +{ + if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL)) + return 0; + + if (!RUN_ONCE(&err_init, err_do_init)) + return 0; + + *state = CRYPTO_THREAD_get_local(&err_thread_local); + if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1)) + return 0; + + return 1; +} + +/* + * err_unshelve_state restores the error state that was returned + * by err_shelve_state previously. + */ +void err_unshelve_state(void* state) +{ + if (state != (void*)-1) + CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)state); +} + int ERR_get_next_error_library(void) { int ret; - if (!RUN_ONCE(&err_string_init, do_err_strings_init)) { + if (!RUN_ONCE(&err_string_init, do_err_strings_init)) return 0; - } CRYPTO_THREAD_write_lock(err_string_lock); ret = int_err_library_number++; diff --git a/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c b/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c index 5769e0a554..e2295c4dc5 100644 --- a/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c +++ b/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c @@ -148,3 +148,4 @@ int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, { return cipher->ctrl; } + diff --git a/worker/deps/openssl/openssl/crypto/evp/evp_err.c b/worker/deps/openssl/openssl/crypto/evp/evp_err.c index c4b163f0ba..3543d44cb4 100644 --- a/worker/deps/openssl/openssl/crypto/evp/evp_err.c +++ b/worker/deps/openssl/openssl/crypto/evp/evp_err.c @@ -70,6 +70,8 @@ static ERR_STRING_DATA EVP_str_functs[] = { {ERR_FUNC(EVP_F_EVP_PKEY_GET0_RSA), "EVP_PKEY_get0_RSA"}, {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN), "EVP_PKEY_keygen"}, {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN_INIT), "EVP_PKEY_keygen_init"}, + {ERR_FUNC(EVP_F_EVP_PKEY_METH_ADD0), "EVP_PKEY_meth_add0"}, + {ERR_FUNC(EVP_F_EVP_PKEY_METH_NEW), "EVP_PKEY_meth_new"}, {ERR_FUNC(EVP_F_EVP_PKEY_NEW), "EVP_PKEY_new"}, {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN), "EVP_PKEY_paramgen"}, {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN_INIT), "EVP_PKEY_paramgen_init"}, @@ -143,6 +145,7 @@ static ERR_STRING_DATA EVP_str_reasons[] = { {ERR_REASON(EVP_R_OPERATON_NOT_INITIALIZED), "operaton not initialized"}, {ERR_REASON(EVP_R_PARTIALLY_OVERLAPPING), "partially overlapping buffers"}, + {ERR_REASON(EVP_R_PBKDF2_ERROR), "pbkdf2 error"}, {ERR_REASON(EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED), "pkey application asn1 method already registered"}, {ERR_REASON(EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED), diff --git a/worker/deps/openssl/openssl/crypto/evp/p_seal.c b/worker/deps/openssl/openssl/crypto/evp/p_seal.c index faa246483b..6f026e7c4f 100644 --- a/worker/deps/openssl/openssl/crypto/evp/p_seal.c +++ b/worker/deps/openssl/openssl/crypto/evp/p_seal.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -21,6 +21,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, { unsigned char key[EVP_MAX_KEY_LENGTH]; int i; + int rv = 0; if (type) { EVP_CIPHER_CTX_reset(ctx); @@ -31,21 +32,27 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, return 1; if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0) return 0; + if (EVP_CIPHER_CTX_iv_length(ctx) - && RAND_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx)) <= 0) - return 0; + && RAND_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx)) <= 0) + goto err; if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv)) - return 0; + goto err; for (i = 0; i < npubk; i++) { ekl[i] = EVP_PKEY_encrypt_old(ek[i], key, EVP_CIPHER_CTX_key_length(ctx), pubk[i]); - if (ekl[i] <= 0) - return (-1); + if (ekl[i] <= 0) { + rv = -1; + goto err; + } } - return (npubk); + rv = npubk; +err: + OPENSSL_cleanse(key, sizeof(key)); + return rv; } /*- MACRO diff --git a/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c b/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c index 5e650a9db3..f623db3483 100644 --- a/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c +++ b/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -151,8 +151,10 @@ EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags) EVP_PKEY_METHOD *pmeth; pmeth = OPENSSL_zalloc(sizeof(*pmeth)); - if (pmeth == NULL) + if (pmeth == NULL) { + EVPerr(EVP_F_EVP_PKEY_METH_NEW, ERR_R_MALLOC_FAILURE); return NULL; + } pmeth->pkey_id = id; pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC; @@ -238,8 +240,10 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx) } #endif rctx = OPENSSL_malloc(sizeof(*rctx)); - if (rctx == NULL) + if (rctx == NULL) { + EVPerr(EVP_F_EVP_PKEY_CTX_DUP, ERR_R_MALLOC_FAILURE); return NULL; + } rctx->pmeth = pctx->pmeth; #ifndef OPENSSL_NO_ENGINE @@ -273,11 +277,15 @@ int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth) { if (app_pkey_methods == NULL) { app_pkey_methods = sk_EVP_PKEY_METHOD_new(pmeth_cmp); - if (app_pkey_methods == NULL) + if (app_pkey_methods == NULL) { + EVPerr(EVP_F_EVP_PKEY_METH_ADD0, ERR_R_MALLOC_FAILURE); return 0; + } } - if (!sk_EVP_PKEY_METHOD_push(app_pkey_methods, pmeth)) + if (!sk_EVP_PKEY_METHOD_push(app_pkey_methods, pmeth)) { + EVPerr(EVP_F_EVP_PKEY_METH_ADD0, ERR_R_MALLOC_FAILURE); return 0; + } sk_EVP_PKEY_METHOD_sort(app_pkey_methods); return 1; } @@ -557,26 +565,26 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, pmeth->ctrl_str = ctrl_str; } -void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth, int (**pinit) (EVP_PKEY_CTX *ctx)) { *pinit = pmeth->init; } -void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth, int (**pcopy) (EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)) { *pcopy = pmeth->copy; } -void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth, void (**pcleanup) (EVP_PKEY_CTX *ctx)) { *pcleanup = pmeth->cleanup; } -void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth, int (**pparamgen_init) (EVP_PKEY_CTX *ctx), int (**pparamgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)) @@ -587,7 +595,7 @@ void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth, *pparamgen = pmeth->paramgen; } -void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth, int (**pkeygen_init) (EVP_PKEY_CTX *ctx), int (**pkeygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)) @@ -598,7 +606,7 @@ void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth, *pkeygen = pmeth->keygen; } -void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth, int (**psign_init) (EVP_PKEY_CTX *ctx), int (**psign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, @@ -611,7 +619,7 @@ void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, *psign = pmeth->sign; } -void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth, int (**pverify_init) (EVP_PKEY_CTX *ctx), int (**pverify) (EVP_PKEY_CTX *ctx, const unsigned char *sig, @@ -625,7 +633,7 @@ void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth, *pverify = pmeth->verify; } -void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth, int (**pverify_recover_init) (EVP_PKEY_CTX *ctx), int (**pverify_recover) (EVP_PKEY_CTX @@ -643,7 +651,7 @@ void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth, *pverify_recover = pmeth->verify_recover; } -void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth, int (**psignctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**psignctx) (EVP_PKEY_CTX *ctx, @@ -657,7 +665,7 @@ void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth, *psignctx = pmeth->signctx; } -void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth, int (**pverifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**pverifyctx) (EVP_PKEY_CTX *ctx, @@ -671,7 +679,7 @@ void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth, *pverifyctx = pmeth->verifyctx; } -void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth, int (**pencrypt_init) (EVP_PKEY_CTX *ctx), int (**pencryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -685,7 +693,7 @@ void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth, *pencryptfn = pmeth->encrypt; } -void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth, int (**pdecrypt_init) (EVP_PKEY_CTX *ctx), int (**pdecrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -699,7 +707,7 @@ void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, *pdecrypt = pmeth->decrypt; } -void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth, int (**pderive_init) (EVP_PKEY_CTX *ctx), int (**pderive) (EVP_PKEY_CTX *ctx, unsigned char *key, @@ -711,7 +719,7 @@ void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth, *pderive = pmeth->derive; } -void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth, int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2), int (**pctrl_str) (EVP_PKEY_CTX *ctx, diff --git a/worker/deps/openssl/openssl/crypto/evp/scrypt.c b/worker/deps/openssl/openssl/crypto/evp/scrypt.c index 101bb1edbd..3543df5403 100644 --- a/worker/deps/openssl/openssl/crypto/evp/scrypt.c +++ b/worker/deps/openssl/openssl/crypto/evp/scrypt.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -171,8 +171,10 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, if (r == 0 || p == 0 || N < 2 || (N & (N - 1))) return 0; /* Check p * r < SCRYPT_PR_MAX avoiding overflow */ - if (p > SCRYPT_PR_MAX / r) + if (p > SCRYPT_PR_MAX / r) { + EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); return 0; + } /* * Need to check N: if 2^(128 * r / 8) overflows limit this is @@ -180,8 +182,10 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, */ if (16 * r <= LOG2_UINT64_MAX) { - if (N >= (((uint64_t)1) << (16 * r))) + if (N >= (((uint64_t)1) << (16 * r))) { + EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); return 0; + } } /* Memory checks: check total allocated buffer size fits in uint64_t */ @@ -199,13 +203,17 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, * This is combined size V, X and T (section 4) */ i = UINT64_MAX / (32 * sizeof(uint32_t)); - if (N + 2 > i / r) + if (N + 2 > i / r) { + EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); return 0; + } Vlen = 32 * r * (N + 2) * sizeof(uint32_t); /* check total allocated size fits in uint64_t */ - if (Blen > UINT64_MAX - Vlen) + if (Blen > UINT64_MAX - Vlen) { + EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); return 0; + } /* check total allocated size fits in size_t */ if (Blen > SIZE_MAX - Vlen) return 0; @@ -225,8 +233,10 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, return 1; B = OPENSSL_malloc(allocsize); - if (B == NULL) + if (B == NULL) { + EVPerr(EVP_F_EVP_PBE_SCRYPT, ERR_R_MALLOC_FAILURE); return 0; + } X = (uint32_t *)(B + Blen); T = X + 32 * r; V = T + 32 * r; @@ -242,6 +252,9 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, goto err; rv = 1; err: + if (rv == 0) + EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_PBKDF2_ERROR); + OPENSSL_clear_free(B, allocsize); return rv; } diff --git a/worker/deps/openssl/openssl/crypto/ex_data.c b/worker/deps/openssl/openssl/crypto/ex_data.c index 22c4d3d9b9..6e3072f2a9 100644 --- a/worker/deps/openssl/openssl/crypto/ex_data.c +++ b/worker/deps/openssl/openssl/crypto/ex_data.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -38,7 +38,8 @@ static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE_STATIC(do_ex_data_init) { - OPENSSL_init_crypto(0, NULL); + if (!OPENSSL_init_crypto(0, NULL)) + return 0; ex_data_lock = CRYPTO_THREAD_lock_new(); return ex_data_lock != NULL; } diff --git a/worker/deps/openssl/openssl/crypto/getenv.c b/worker/deps/openssl/openssl/crypto/getenv.c new file mode 100644 index 0000000000..7e98b645b0 --- /dev/null +++ b/worker/deps/openssl/openssl/crypto/getenv.c @@ -0,0 +1,31 @@ +/* + * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif + +#include +#include "internal/cryptlib.h" + +char *ossl_safe_getenv(const char *name) +{ +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +# if __GLIBC_PREREQ(2, 17) +# define SECURE_GETENV + return secure_getenv(name); +# endif +#endif + +#ifndef SECURE_GETENV + if (OPENSSL_issetugid()) + return NULL; + return getenv(name); +#endif +} diff --git a/worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H b/worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H new file mode 100644 index 0000000000..5f63860808 --- /dev/null +++ b/worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H @@ -0,0 +1,16 @@ +/* + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * This file is only used by HP C on VMS, and is included automatically + * after each header file from this directory + */ + +/* restore state. Must correspond to the save in __decc_include_prologue.h */ +#pragma names restore diff --git a/worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H b/worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H new file mode 100644 index 0000000000..78b2a87d88 --- /dev/null +++ b/worker/deps/openssl/openssl/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H @@ -0,0 +1,20 @@ +/* + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * This file is only used by HP C on VMS, and is included automatically + * after each header file from this directory + */ + +/* save state */ +#pragma names save +/* have the compiler shorten symbols larger than 31 chars to 23 chars + * followed by a 8 hex char CRC + */ +#pragma names as_is,shortened diff --git a/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h b/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h index f70e3b47ba..ba9c062702 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -90,5 +90,3 @@ struct asn1_pctx_st { unsigned long oid_flags; unsigned long str_flags; } /* ASN1_PCTX */ ; - -int asn1_valid_host(const ASN1_STRING *host); diff --git a/worker/deps/openssl/openssl/crypto/include/internal/async.h b/worker/deps/openssl/openssl/crypto/include/internal/async.h index 16a12a6371..dc8e937b0c 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/async.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/async.h @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,3 +11,5 @@ int async_init(void); void async_deinit(void); +void async_delete_thread_state(void); + diff --git a/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h b/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h index 9c984ba781..2be7fdd0d3 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -53,7 +53,7 @@ BN_ULONG *bn_get_words(const BIGNUM *a); * Set the internal data words in a to point to words which contains size * elements. The BN_FLG_STATIC_DATA flag is set */ -void bn_set_static_words(BIGNUM *a, BN_ULONG *words, int size); +void bn_set_static_words(BIGNUM *a, const BN_ULONG *words, int size); /* * Copy words into the BIGNUM |a|, reallocating space as necessary. @@ -64,7 +64,7 @@ void bn_set_static_words(BIGNUM *a, BN_ULONG *words, int size); * |num_words| is int because bn_expand2 takes an int. This is an internal * function so we simply trust callers not to pass negative values. */ -int bn_set_words(BIGNUM *a, BN_ULONG *words, int num_words); +int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words); size_t bn_sizeof_BIGNUM(void); @@ -74,6 +74,25 @@ size_t bn_sizeof_BIGNUM(void); */ BIGNUM *bn_array_el(BIGNUM *base, int el); +/* + * Some BIGNUM functions assume most significant limb to be non-zero, which + * is customarily arranged by bn_correct_top. Output from below functions + * is not processed with bn_correct_top, and for this reason it may not be + * returned out of public API. It may only be passed internally into other + * functions known to support non-minimal or zero-padded BIGNUMs. + */ +int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + BN_MONT_CTX *mont, BN_CTX *ctx); +int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, + BN_CTX *ctx); +int bn_from_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, + BN_CTX *ctx); +int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + const BIGNUM *m); +int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, + const BIGNUM *m); +int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx); +int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx); #ifdef __cplusplus } diff --git a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h index f3ec9b67b8..d42a134bdf 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -67,6 +67,8 @@ void OPENSSL_showfatal(const char *fmta, ...); extern int OPENSSL_NONPIC_relocated; void crypto_cleanup_all_ex_data_int(void); +char *ossl_safe_getenv(const char *name); + int openssl_strerror_r(int errnum, char *buf, size_t buflen); # if !defined(OPENSSL_NO_STDIO) FILE *openssl_fopen(const char *filename, const char *mode); @@ -74,6 +76,8 @@ FILE *openssl_fopen(const char *filename, const char *mode); void *openssl_fopen(const char *filename, const char *mode); # endif +unsigned long OPENSSL_rdtsc(void); + #ifdef __cplusplus } #endif diff --git a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h index ab86e1e53d..ceeb63ddd0 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -24,7 +24,9 @@ int ossl_init_thread_start(uint64_t opts); * use". */ # define OPENSSL_INIT_ZLIB 0x00010000L +# define OPENSSL_INIT_BASE_ONLY 0x00040000L /* OPENSSL_INIT_THREAD flags */ # define OPENSSL_INIT_THREAD_ASYNC 0x01 # define OPENSSL_INIT_THREAD_ERR_STATE 0x02 + diff --git a/worker/deps/openssl/openssl/crypto/include/internal/err_int.h b/worker/deps/openssl/openssl/crypto/include/internal/err_int.h index 7fec3ed767..44ac944627 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/err_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/err_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -13,5 +13,7 @@ int err_load_crypto_strings_int(void); void err_cleanup(void); void err_delete_thread_state(void); +int err_shelve_state(void **); +void err_unshelve_state(void *); #endif diff --git a/worker/deps/openssl/openssl/crypto/include/internal/lhash.h b/worker/deps/openssl/openssl/crypto/include/internal/lhash.h new file mode 100644 index 0000000000..200ba8685d --- /dev/null +++ b/worker/deps/openssl/openssl/crypto/include/internal/lhash.h @@ -0,0 +1,15 @@ +/* + * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef INTERNAL_LHASH_H +# define INTERNAL_LHASH_H + +unsigned long openssl_lh_strcasehash(const char *); + +#endif diff --git a/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h b/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h index 2845026dd8..eb43997704 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -166,6 +166,7 @@ struct x509_st { unsigned char sha1_hash[SHA_DIGEST_LENGTH]; X509_CERT_AUX *aux; CRYPTO_RWLOCK *lock; + volatile int ex_cached; } /* X509 */ ; /* diff --git a/worker/deps/openssl/openssl/crypto/init.c b/worker/deps/openssl/openssl/crypto/init.c index 2d16c41bc6..2ad946c5bf 100644 --- a/worker/deps/openssl/openssl/crypto/init.c +++ b/worker/deps/openssl/openssl/crypto/init.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -27,11 +27,28 @@ static int stopped = 0; -static void ossl_init_thread_stop(struct thread_local_inits_st *locals); +/* + * Since per-thread-specific-data destructors are not universally + * available, i.e. not on Windows, only below CRYPTO_THREAD_LOCAL key + * is assumed to have destructor associated. And then an effort is made + * to call this single destructor on non-pthread platform[s]. + * + * Initial value is "impossible". It is used as guard value to shortcut + * destructor for threads terminating before libcrypto is initialized or + * after it's de-initialized. Access to the key doesn't have to be + * serialized for the said threads, because they didn't use libcrypto + * and it doesn't matter if they pick "impossible" or derefernce real + * key value and pull NULL past initialization in the first thread that + * intends to use libcrypto. + */ +static union { + long sane; + CRYPTO_THREAD_LOCAL value; +} destructor_key = { -1 }; -static CRYPTO_THREAD_LOCAL threadstopkey; +static void ossl_init_thread_stop(struct thread_local_inits_st *locals); -static void ossl_init_thread_stop_wrap(void *local) +static void ossl_init_thread_destructor(void *local) { ossl_init_thread_stop((struct thread_local_inits_st *)local); } @@ -39,17 +56,17 @@ static void ossl_init_thread_stop_wrap(void *local) static struct thread_local_inits_st *ossl_init_get_thread_local(int alloc) { struct thread_local_inits_st *local = - CRYPTO_THREAD_get_local(&threadstopkey); + CRYPTO_THREAD_get_local(&destructor_key.value); - if (local == NULL && alloc) { - local = OPENSSL_zalloc(sizeof(*local)); - if (local != NULL && !CRYPTO_THREAD_set_local(&threadstopkey, local)) { + if (alloc) { + if (local == NULL + && (local = OPENSSL_zalloc(sizeof(*local))) != NULL + && !CRYPTO_THREAD_set_local(&destructor_key.value, local)) { OPENSSL_free(local); return NULL; } - } - if (!alloc) { - CRYPTO_THREAD_set_local(&threadstopkey, NULL); + } else { + CRYPTO_THREAD_set_local(&destructor_key.value, NULL); } return local; @@ -68,29 +85,42 @@ static CRYPTO_ONCE base = CRYPTO_ONCE_STATIC_INIT; static int base_inited = 0; DEFINE_RUN_ONCE_STATIC(ossl_init_base) { + CRYPTO_THREAD_LOCAL key; + #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n"); #endif - /* - * We use a dummy thread local key here. We use the destructor to detect - * when the thread is going to stop (where that feature is available) - */ - CRYPTO_THREAD_init_local(&threadstopkey, ossl_init_thread_stop_wrap); + if (!CRYPTO_THREAD_init_local(&key, ossl_init_thread_destructor)) + return 0; + if ((init_lock = CRYPTO_THREAD_lock_new()) == NULL) + goto err; #ifndef OPENSSL_SYS_UEFI - atexit(OPENSSL_cleanup); + if (atexit(OPENSSL_cleanup) != 0) + goto err; #endif - if ((init_lock = CRYPTO_THREAD_lock_new()) == NULL) - return 0; OPENSSL_cpuid_setup(); - /* - * BIG FAT WARNING! - * Everything needed to be initialized in this function before threads - * come along MUST happen before base_inited is set to 1, or we will - * see race conditions. - */ + destructor_key.value = key; base_inited = 1; + return 1; + +err: +#ifdef OPENSSL_INIT_DEBUG + fprintf(stderr, "OPENSSL_INIT: ossl_init_base not ok!\n"); +#endif + CRYPTO_THREAD_lock_free(init_lock); + init_lock = NULL; + + CRYPTO_THREAD_cleanup_local(&key); + return 0; +} +static CRYPTO_ONCE load_crypto_nodelete = CRYPTO_ONCE_STATIC_INIT; +DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete) +{ +#ifdef OPENSSL_INIT_DEBUG + fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_nodelete()\n"); +#endif #if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) # ifdef DSO_WIN32 { @@ -102,6 +132,10 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_base) | GET_MODULE_HANDLE_EX_FLAG_PIN, (void *)&base_inited, &handle); +# ifdef OPENSSL_INIT_DEBUG + fprintf(stderr, "OPENSSL_INIT: obtained DSO reference? %s\n", + (ret == TRUE ? "No!" : "Yes.")); +# endif return (ret == TRUE) ? 1 : 0; } # else @@ -110,12 +144,24 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_base) * to remain loaded until the atexit() handler is run at process exit. */ { - DSO *dso = NULL; + DSO *dso; + void *err; + + if (!err_shelve_state(&err)) + return 0; - ERR_set_mark(); dso = DSO_dsobyaddr(&base_inited, DSO_FLAG_NO_UNLOAD_ON_FREE); +# ifdef OPENSSL_INIT_DEBUG + fprintf(stderr, "OPENSSL_INIT: obtained DSO reference? %s\n", + (dso == NULL ? "No!" : "Yes.")); + /* + * In case of No!, it is uncertain our exit()-handlers can still be + * called. After dlclose() the whole library might have been unloaded + * already. + */ +# endif DSO_free(dso); - ERR_pop_to_mark(); + err_unshelve_state(err); } # endif #endif @@ -145,7 +191,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_strings) # endif ret = err_load_crypto_strings_int(); load_crypto_strings_inited = 1; -#endif +#endif return ret; } @@ -335,9 +381,9 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals) if (locals->async) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_thread_stop: " - "ASYNC_cleanup_thread()\n"); + "async_delete_thread_state()\n"); #endif - ASYNC_cleanup_thread(); + async_delete_thread_state(); } if (locals->err_state) { @@ -353,8 +399,8 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals) void OPENSSL_thread_stop(void) { - ossl_init_thread_stop( - (struct thread_local_inits_st *)ossl_init_get_thread_local(0)); + if (destructor_key.sane != -1) + ossl_init_thread_stop(ossl_init_get_thread_local(0)); } int ossl_init_thread_start(uint64_t opts) @@ -391,6 +437,7 @@ int ossl_init_thread_start(uint64_t opts) void OPENSSL_cleanup(void) { OPENSSL_INIT_STOP *currhandler, *lasthandler; + CRYPTO_THREAD_LOCAL key; /* If we've not been inited then no need to deinit */ if (!base_inited) @@ -449,7 +496,9 @@ void OPENSSL_cleanup(void) err_free_strings_int(); } - CRYPTO_THREAD_cleanup_local(&threadstopkey); + key = destructor_key.value; + destructor_key.sane = -1; + CRYPTO_THREAD_cleanup_local(&key); #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " @@ -505,22 +554,18 @@ void OPENSSL_cleanup(void) */ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) { - static int stoperrset = 0; - if (stopped) { - if (!stoperrset) { - /* - * We only ever set this once to avoid getting into an infinite - * loop where the error system keeps trying to init and fails so - * sets an error etc - */ - stoperrset = 1; + if (!(opts & OPENSSL_INIT_BASE_ONLY)) CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL); - } return 0; } - if (!base_inited && !RUN_ONCE(&base, ossl_init_base)) + if (!RUN_ONCE(&base, ossl_init_base)) + return 0; + + if (!(opts & OPENSSL_INIT_BASE_ONLY) + && !RUN_ONCE(&load_crypto_nodelete, + ossl_init_load_crypto_nodelete)) return 0; if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS) @@ -657,6 +702,12 @@ int OPENSSL_atexit(void (*handler)(void)) ERR_set_mark(); dso = DSO_dsobyaddr(handlersym.sym, DSO_FLAG_NO_UNLOAD_ON_FREE); +# ifdef OPENSSL_INIT_DEBUG + fprintf(stderr, + "OPENSSL_INIT: OPENSSL_atexit: obtained DSO reference? %s\n", + (dso == NULL ? "No!" : "Yes.")); + /* See same code above in ossl_init_base() for an explanation. */ +# endif DSO_free(dso); ERR_pop_to_mark(); } diff --git a/worker/deps/openssl/openssl/crypto/kdf/hkdf.c b/worker/deps/openssl/openssl/crypto/kdf/hkdf.c index 00b95b5a88..0fb55e9c65 100644 --- a/worker/deps/openssl/openssl/crypto/kdf/hkdf.c +++ b/worker/deps/openssl/openssl/crypto/kdf/hkdf.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -234,6 +234,7 @@ static unsigned char *HKDF_Expand(const EVP_MD *evp_md, unsigned char *okm, size_t okm_len) { HMAC_CTX *hmac; + unsigned char *ret = NULL; unsigned int i; @@ -283,11 +284,10 @@ static unsigned char *HKDF_Expand(const EVP_MD *evp_md, done_len += copy_len; } - - HMAC_CTX_free(hmac); - return okm; + ret = okm; err: + OPENSSL_cleanse(prev, sizeof(prev)); HMAC_CTX_free(hmac); - return NULL; + return ret; } diff --git a/worker/deps/openssl/openssl/crypto/lhash/lhash.c b/worker/deps/openssl/openssl/crypto/lhash/lhash.c index 7777935182..ea83bf900f 100644 --- a/worker/deps/openssl/openssl/crypto/lhash/lhash.c +++ b/worker/deps/openssl/openssl/crypto/lhash/lhash.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -12,6 +12,8 @@ #include #include #include +#include +#include "internal/lhash.h" #include "lhash_lcl.h" /* @@ -49,7 +51,7 @@ OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c) return NULL; if ((ret->b = OPENSSL_zalloc(sizeof(*ret->b) * MIN_NODES)) == NULL) goto err; - if ((ret->retrieve_stats_lock = CRYPTO_THREAD_lock_new()) == NULL) + if ((ret->retrieve_stats_lock = CRYPTO_THREAD_lock_new()) == NULL) goto err; ret->comp = ((c == NULL) ? (OPENSSL_LH_COMPFUNC)strcmp : c); ret->hash = ((h == NULL) ? (OPENSSL_LH_HASHFUNC)OPENSSL_LH_strhash : h); @@ -351,6 +353,27 @@ unsigned long OPENSSL_LH_strhash(const char *c) return ((ret >> 16) ^ ret); } +unsigned long openssl_lh_strcasehash(const char *c) +{ + unsigned long ret = 0; + long n; + unsigned long v; + int r; + + if (c == NULL || *c == '\0') + return ret; + + for (n = 0x100; *c != '\0'; n += 0x100) { + v = n | tolower(*c); + r = (int)((v >> 2) ^ v) & 0x0f; + ret = (ret << r) | (ret >> (32 - r)); + ret &= 0xFFFFFFFFL; + ret ^= v * v; + c++; + } + return (ret >> 16) ^ ret; +} + unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh) { return lh ? lh->num_items : 0; diff --git a/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h b/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h index 64d3134fc1..01d463fb36 100644 --- a/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h +++ b/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h @@ -21,7 +21,7 @@ struct lhash_st { /* * some stats are updated on lookup, which callers aren't expecting to have * to take an exclusive lock around. This lock protects them on platforms - * without atomics, and their types are int rather than unsigned long below + * without atomics, and their types are int rather than unsigned long below * so they can be adjusted with CRYPTO_atomic_add. */ CRYPTO_RWLOCK *retrieve_stats_lock; diff --git a/worker/deps/openssl/openssl/crypto/mem_sec.c b/worker/deps/openssl/openssl/crypto/mem_sec.c index 25cdb47d56..1ccf68cc93 100644 --- a/worker/deps/openssl/openssl/crypto/mem_sec.c +++ b/worker/deps/openssl/openssl/crypto/mem_sec.c @@ -134,11 +134,12 @@ void *CRYPTO_secure_malloc(size_t num, const char *file, int line) void *CRYPTO_secure_zalloc(size_t num, const char *file, int line) { - void *ret = CRYPTO_secure_malloc(num, file, line); - - if (ret != NULL) - memset(ret, 0, num); - return ret; +#ifdef IMPLEMENTED + if (secure_mem_initialized) + /* CRYPTO_secure_malloc() zeroes allocations when it is implemented */ + return CRYPTO_secure_malloc(num, file, line); +#endif + return CRYPTO_zalloc(num, file, line); } void CRYPTO_secure_free(void *ptr, const char *file, int line) @@ -574,6 +575,9 @@ static char *sh_malloc(size_t size) OPENSSL_assert(WITHIN_ARENA(chunk)); + /* zero the free list header as a precaution against information leakage */ + memset(chunk, 0, sizeof(SH_LIST)); + return chunk; } @@ -606,6 +610,8 @@ static void sh_free(char *ptr) list--; + /* Zero the higher addressed block's free list pointers */ + memset(ptr > buddy ? ptr : buddy, 0, sizeof(SH_LIST)); if (ptr > buddy) ptr = buddy; diff --git a/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl b/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl index 7d880c94a7..1cf14a6c9f 100644 --- a/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -145,6 +145,8 @@ () .text #if defined(__thumb2__) || defined(__clang__) .syntax unified +#define ldrplb ldrbpl +#define ldrneb ldrbne #endif #if defined(__thumb2__) .thumb @@ -152,11 +154,6 @@ () .code 32 #endif -#ifdef __clang__ -#define ldrplb ldrbpl -#define ldrneb ldrbne -#endif - .type rem_4bit,%object .align 5 rem_4bit: diff --git a/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl b/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl index dcd5f595d2..e13c709019 100644 --- a/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl +++ b/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -64,6 +64,7 @@ $code=<<___; #include "arm_arch.h" +#if __ARM_MAX_ARCH__>=7 .text ___ $code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/); @@ -351,6 +352,7 @@ $code.=<<___; .asciz "GHASH for ARMv8, CRYPTOGAMS by " .align 2 +#endif ___ if ($flavour =~ /64/) { ######## 64-bit code diff --git a/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h b/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h index 7a1603bf90..4fc32e190f 100644 --- a/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h +++ b/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -174,12 +174,13 @@ struct ocb128_context { OCB_BLOCK l_dollar; OCB_BLOCK *l; /* Must be reset for each session */ - u64 blocks_hashed; - u64 blocks_processed; - OCB_BLOCK tag; - OCB_BLOCK offset_aad; - OCB_BLOCK sum; - OCB_BLOCK offset; - OCB_BLOCK checksum; + struct { + u64 blocks_hashed; + u64 blocks_processed; + OCB_BLOCK offset_aad; + OCB_BLOCK sum; + OCB_BLOCK offset; + OCB_BLOCK checksum; + } sess; }; #endif /* OPENSSL_NO_OCB */ diff --git a/worker/deps/openssl/openssl/crypto/modes/ocb128.c b/worker/deps/openssl/openssl/crypto/modes/ocb128.c index db794d0854..fc92b246bd 100644 --- a/worker/deps/openssl/openssl/crypto/modes/ocb128.c +++ b/worker/deps/openssl/openssl/crypto/modes/ocb128.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -236,6 +236,9 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv, return -1; } + /* Reset nonce-dependent variables */ + memset(&ctx->sess, 0, sizeof(ctx->sess)); + /* Nonce = num2str(TAGLEN mod 128,7) || zeros(120-bitlen(N)) || 1 || N */ nonce[0] = ((taglen * 8) % 128) << 1; memset(nonce + 1, 0, 15); @@ -256,10 +259,10 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv, /* Offset_0 = Stretch[1+bottom..128+bottom] */ shift = bottom % 8; - ocb_block_lshift(stretch + (bottom / 8), shift, ctx->offset.c); + ocb_block_lshift(stretch + (bottom / 8), shift, ctx->sess.offset.c); mask = 0xff; mask <<= 8 - shift; - ctx->offset.c[15] |= + ctx->sess.offset.c[15] |= (*(stretch + (bottom / 8) + 16) & mask) >> (8 - shift); return 1; @@ -278,25 +281,25 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad, /* Calculate the number of blocks of AAD provided now, and so far */ num_blocks = len / 16; - all_num_blocks = num_blocks + ctx->blocks_hashed; + all_num_blocks = num_blocks + ctx->sess.blocks_hashed; /* Loop through all full blocks of AAD */ - for (i = ctx->blocks_hashed + 1; i <= all_num_blocks; i++) { + for (i = ctx->sess.blocks_hashed + 1; i <= all_num_blocks; i++) { OCB_BLOCK *lookup; /* Offset_i = Offset_{i-1} xor L_{ntz(i)} */ lookup = ocb_lookup_l(ctx, ocb_ntz(i)); if (lookup == NULL) return 0; - ocb_block16_xor(&ctx->offset_aad, lookup, &ctx->offset_aad); + ocb_block16_xor(&ctx->sess.offset_aad, lookup, &ctx->sess.offset_aad); memcpy(tmp.c, aad, 16); aad += 16; /* Sum_i = Sum_{i-1} xor ENCIPHER(K, A_i xor Offset_i) */ - ocb_block16_xor(&ctx->offset_aad, &tmp, &tmp); + ocb_block16_xor(&ctx->sess.offset_aad, &tmp, &tmp); ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&tmp, &ctx->sum, &ctx->sum); + ocb_block16_xor(&tmp, &ctx->sess.sum, &ctx->sess.sum); } /* @@ -307,20 +310,21 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad, if (last_len > 0) { /* Offset_* = Offset_m xor L_* */ - ocb_block16_xor(&ctx->offset_aad, &ctx->l_star, &ctx->offset_aad); + ocb_block16_xor(&ctx->sess.offset_aad, &ctx->l_star, + &ctx->sess.offset_aad); /* CipherInput = (A_* || 1 || zeros(127-bitlen(A_*))) xor Offset_* */ memset(tmp.c, 0, 16); memcpy(tmp.c, aad, last_len); tmp.c[last_len] = 0x80; - ocb_block16_xor(&ctx->offset_aad, &tmp, &tmp); + ocb_block16_xor(&ctx->sess.offset_aad, &tmp, &tmp); /* Sum = Sum_m xor ENCIPHER(K, CipherInput) */ ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&tmp, &ctx->sum, &ctx->sum); + ocb_block16_xor(&tmp, &ctx->sess.sum, &ctx->sess.sum); } - ctx->blocks_hashed = all_num_blocks; + ctx->sess.blocks_hashed = all_num_blocks; return 1; } @@ -341,7 +345,7 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, * so far */ num_blocks = len / 16; - all_num_blocks = num_blocks + ctx->blocks_processed; + all_num_blocks = num_blocks + ctx->sess.blocks_processed; if (num_blocks && all_num_blocks == (size_t)all_num_blocks && ctx->stream != NULL) { @@ -357,11 +361,11 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, return 0; ctx->stream(in, out, num_blocks, ctx->keyenc, - (size_t)ctx->blocks_processed + 1, ctx->offset.c, - (const unsigned char (*)[16])ctx->l, ctx->checksum.c); + (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c, + (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c); } else { /* Loop through all full blocks to be encrypted */ - for (i = ctx->blocks_processed + 1; i <= all_num_blocks; i++) { + for (i = ctx->sess.blocks_processed + 1; i <= all_num_blocks; i++) { OCB_BLOCK *lookup; OCB_BLOCK tmp; @@ -369,18 +373,18 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, lookup = ocb_lookup_l(ctx, ocb_ntz(i)); if (lookup == NULL) return 0; - ocb_block16_xor(&ctx->offset, lookup, &ctx->offset); + ocb_block16_xor(&ctx->sess.offset, lookup, &ctx->sess.offset); memcpy(tmp.c, in, 16); in += 16; /* Checksum_i = Checksum_{i-1} xor P_i */ - ocb_block16_xor(&tmp, &ctx->checksum, &ctx->checksum); + ocb_block16_xor(&tmp, &ctx->sess.checksum, &ctx->sess.checksum); /* C_i = Offset_i xor ENCIPHER(K, P_i xor Offset_i) */ - ocb_block16_xor(&ctx->offset, &tmp, &tmp); + ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&ctx->offset, &tmp, &tmp); + ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); memcpy(out, tmp.c, 16); out += 16; @@ -397,10 +401,10 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, OCB_BLOCK pad; /* Offset_* = Offset_m xor L_* */ - ocb_block16_xor(&ctx->offset, &ctx->l_star, &ctx->offset); + ocb_block16_xor(&ctx->sess.offset, &ctx->l_star, &ctx->sess.offset); /* Pad = ENCIPHER(K, Offset_*) */ - ctx->encrypt(ctx->offset.c, pad.c, ctx->keyenc); + ctx->encrypt(ctx->sess.offset.c, pad.c, ctx->keyenc); /* C_* = P_* xor Pad[1..bitlen(P_*)] */ ocb_block_xor(in, pad.c, last_len, out); @@ -409,10 +413,10 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, memset(pad.c, 0, 16); /* borrow pad */ memcpy(pad.c, in, last_len); pad.c[last_len] = 0x80; - ocb_block16_xor(&pad, &ctx->checksum, &ctx->checksum); + ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum); } - ctx->blocks_processed = all_num_blocks; + ctx->sess.blocks_processed = all_num_blocks; return 1; } @@ -433,7 +437,7 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, * so far */ num_blocks = len / 16; - all_num_blocks = num_blocks + ctx->blocks_processed; + all_num_blocks = num_blocks + ctx->sess.blocks_processed; if (num_blocks && all_num_blocks == (size_t)all_num_blocks && ctx->stream != NULL) { @@ -449,30 +453,30 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, return 0; ctx->stream(in, out, num_blocks, ctx->keydec, - (size_t)ctx->blocks_processed + 1, ctx->offset.c, - (const unsigned char (*)[16])ctx->l, ctx->checksum.c); + (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c, + (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c); } else { OCB_BLOCK tmp; /* Loop through all full blocks to be decrypted */ - for (i = ctx->blocks_processed + 1; i <= all_num_blocks; i++) { + for (i = ctx->sess.blocks_processed + 1; i <= all_num_blocks; i++) { /* Offset_i = Offset_{i-1} xor L_{ntz(i)} */ OCB_BLOCK *lookup = ocb_lookup_l(ctx, ocb_ntz(i)); if (lookup == NULL) return 0; - ocb_block16_xor(&ctx->offset, lookup, &ctx->offset); + ocb_block16_xor(&ctx->sess.offset, lookup, &ctx->sess.offset); memcpy(tmp.c, in, 16); in += 16; /* P_i = Offset_i xor DECIPHER(K, C_i xor Offset_i) */ - ocb_block16_xor(&ctx->offset, &tmp, &tmp); + ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); ctx->decrypt(tmp.c, tmp.c, ctx->keydec); - ocb_block16_xor(&ctx->offset, &tmp, &tmp); + ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); /* Checksum_i = Checksum_{i-1} xor P_i */ - ocb_block16_xor(&tmp, &ctx->checksum, &ctx->checksum); + ocb_block16_xor(&tmp, &ctx->sess.checksum, &ctx->sess.checksum); memcpy(out, tmp.c, 16); out += 16; @@ -489,10 +493,10 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, OCB_BLOCK pad; /* Offset_* = Offset_m xor L_* */ - ocb_block16_xor(&ctx->offset, &ctx->l_star, &ctx->offset); + ocb_block16_xor(&ctx->sess.offset, &ctx->l_star, &ctx->sess.offset); /* Pad = ENCIPHER(K, Offset_*) */ - ctx->encrypt(ctx->offset.c, pad.c, ctx->keyenc); + ctx->encrypt(ctx->sess.offset.c, pad.c, ctx->keyenc); /* P_* = C_* xor Pad[1..bitlen(C_*)] */ ocb_block_xor(in, pad.c, last_len, out); @@ -501,39 +505,46 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, memset(pad.c, 0, 16); /* borrow pad */ memcpy(pad.c, out, last_len); pad.c[last_len] = 0x80; - ocb_block16_xor(&pad, &ctx->checksum, &ctx->checksum); + ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum); } - ctx->blocks_processed = all_num_blocks; + ctx->sess.blocks_processed = all_num_blocks; return 1; } -/* - * Calculate the tag and verify it against the supplied tag - */ -int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag, - size_t len) +static int ocb_finish(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len, + int write) { OCB_BLOCK tmp; + if (len > 16 || len < 1) { + return -1; + } + /* * Tag = ENCIPHER(K, Checksum_* xor Offset_* xor L_$) xor HASH(K,A) */ - ocb_block16_xor(&ctx->checksum, &ctx->offset, &tmp); + ocb_block16_xor(&ctx->sess.checksum, &ctx->sess.offset, &tmp); ocb_block16_xor(&ctx->l_dollar, &tmp, &tmp); ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&tmp, &ctx->sum, &ctx->tag); + ocb_block16_xor(&tmp, &ctx->sess.sum, &tmp); - if (len > 16 || len < 1) { - return -1; + if (write) { + memcpy(tag, &tmp, len); + return 1; + } else { + return CRYPTO_memcmp(&tmp, tag, len); } +} - /* Compare the tag if we've been given one */ - if (tag) - return CRYPTO_memcmp(&ctx->tag, tag, len); - else - return -1; +/* + * Calculate the tag and verify it against the supplied tag + */ +int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag, + size_t len) +{ + return ocb_finish(ctx, (unsigned char*)tag, len, 0); } /* @@ -541,17 +552,7 @@ int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag, */ int CRYPTO_ocb128_tag(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len) { - if (len > 16 || len < 1) { - return -1; - } - - /* Calculate the tag */ - CRYPTO_ocb128_finish(ctx, NULL, 0); - - /* Copy the tag into the supplied buffer */ - memcpy(tag, ctx->tag.c, len); - - return 1; + return ocb_finish(ctx, tag, len, 1); } /* diff --git a/worker/deps/openssl/openssl/crypto/o_fopen.c b/worker/deps/openssl/openssl/crypto/o_fopen.c index a3a006574d..bfd5af1151 100644 --- a/worker/deps/openssl/openssl/crypto/o_fopen.c +++ b/worker/deps/openssl/openssl/crypto/o_fopen.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,6 +7,24 @@ * https://www.openssl.org/source/license.html */ +# if defined(__linux) || defined(__sun) || defined(__hpux) +/* + * Following definition aliases fopen to fopen64 on above mentioned + * platforms. This makes it possible to open and sequentially access files + * larger than 2GB from 32-bit application. It does not allow to traverse + * them beyond 2GB with fseek/ftell, but on the other hand *no* 32-bit + * platform permits that, not with fseek/ftell. Not to mention that breaking + * 2GB limit for seeking would require surgery to *our* API. But sequential + * access suffices for practical cases when you can run into large files, + * such as fingerprinting, so we can let API alone. For reference, the list + * of 32-bit platforms which allow for sequential access of large files + * without extra "magic" comprise *BSD, Darwin, IRIX... + */ +# ifndef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 64 +# endif +# endif + #include "internal/cryptlib.h" #if !defined(OPENSSL_NO_STDIO) diff --git a/worker/deps/openssl/openssl/crypto/o_time.c b/worker/deps/openssl/openssl/crypto/o_time.c index b2fb38a541..6d764f55e2 100644 --- a/worker/deps/openssl/openssl/crypto/o_time.c +++ b/worker/deps/openssl/openssl/crypto/o_time.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -41,6 +41,10 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result) if (gmtime_r(timer, result) == NULL) return NULL; ts = result; +#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400 + if (gmtime_s(result, timer)) + return NULL; + ts = result; #else ts = gmtime(timer); if (ts == NULL) diff --git a/worker/deps/openssl/openssl/crypto/objects/o_names.c b/worker/deps/openssl/openssl/crypto/objects/o_names.c index e06d5439f2..7fb0136c58 100644 --- a/worker/deps/openssl/openssl/crypto/objects/o_names.c +++ b/worker/deps/openssl/openssl/crypto/objects/o_names.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -16,27 +16,26 @@ #include #include #include -#include +#include "internal/thread_once.h" +#include "internal/lhash.h" #include "obj_lcl.h" +#include "e_os.h" /* * We define this wrapper for two reasons. Firstly, later versions of * DEC C add linkage information to certain functions, which makes it * tricky to use them as values to regular function pointers. - * Secondly, in the EDK2 build environment, the strcmp function is - * actually an external function (AsciiStrCmp) with the Microsoft ABI, - * so we can't transparently assign function pointers to it. - * Arguably the latter is a stupidity of the UEFI environment, but - * since the wrapper solves the DEC C issue too, let's just use the - * same solution. + * Secondly, in the EDK2 build environment, the strcasecmp function is + * actually an external function with the Microsoft ABI, so we can't + * transparently assign function pointers to it. */ #if defined(OPENSSL_SYS_VMS_DECC) || defined(OPENSSL_SYS_UEFI) -static int obj_strcmp(const char *a, const char *b) +static int obj_strcasecmp(const char *a, const char *b) { - return strcmp(a, b); + return strcasecmp(a, b); } #else -#define obj_strcmp strcmp +#define obj_strcasecmp strcasecmp #endif /* @@ -111,8 +110,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), ret = 0; goto out; } - name_funcs->hash_func = OPENSSL_LH_strhash; - name_funcs->cmp_func = obj_strcmp; + name_funcs->hash_func = openssl_lh_strcasehash; + name_funcs->cmp_func = obj_strcasecmp; CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); push = sk_NAME_FUNCS_push(name_funcs_stack, name_funcs); @@ -149,7 +148,7 @@ static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b) ret = sk_NAME_FUNCS_value(name_funcs_stack, a->type)->cmp_func(a->name, b->name); } else - ret = strcmp(a->name, b->name); + ret = strcasecmp(a->name, b->name); } return ret; } @@ -164,7 +163,7 @@ static unsigned long obj_name_hash(const OBJ_NAME *a) sk_NAME_FUNCS_value(name_funcs_stack, a->type)->hash_func(a->name); } else { - ret = OPENSSL_LH_strhash(a->name); + ret = openssl_lh_strcasehash(a->name); } ret ^= a->type; return ret; @@ -202,7 +201,7 @@ const char *OBJ_NAME_get(const char *name, int type) } } - CRYPTO_THREAD_unlock(lock); + CRYPTO_THREAD_unlock(lock); return value; } @@ -212,9 +211,7 @@ int OBJ_NAME_add(const char *name, int type, const char *data) int alias, ok = 0; if (!OBJ_NAME_init()) - return 0; - - CRYPTO_THREAD_write_lock(lock); + return 0; alias = type & OBJ_NAME_ALIAS; type &= ~OBJ_NAME_ALIAS; @@ -230,6 +227,8 @@ int OBJ_NAME_add(const char *name, int type, const char *data) onp->type = type; onp->data = data; + CRYPTO_THREAD_write_lock(lock); + ret = lh_OBJ_NAME_insert(names_lh, onp); if (ret != NULL) { /* free things */ diff --git a/worker/deps/openssl/openssl/crypto/objects/objects.txt b/worker/deps/openssl/openssl/crypto/objects/objects.txt index f1da8071ad..fc0781d1c9 100644 --- a/worker/deps/openssl/openssl/crypto/objects/objects.txt +++ b/worker/deps/openssl/openssl/crypto/objects/objects.txt @@ -1482,3 +1482,4 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : AuthGOST12 : auth-gost12 : AuthSRP : auth-srp : AuthNULL : auth-null + diff --git a/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c b/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c index a42b80fa5b..b638694e2d 100644 --- a/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c +++ b/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -166,6 +166,16 @@ const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs) return bs->signature; } +const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs) +{ + return &bs->signatureAlgorithm; +} + +const OCSP_RESPDATA *OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs) +{ + return &bs->tbsResponseData; +} + /* * Return number of OCSP_SINGLERESP responses present in a basic response. */ diff --git a/worker/deps/openssl/openssl/crypto/pem/pem_lib.c b/worker/deps/openssl/openssl/crypto/pem/pem_lib.c index e9202f44ae..6f06c5291f 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pem_lib.c +++ b/worker/deps/openssl/openssl/crypto/pem/pem_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -28,23 +28,23 @@ static int load_iv(char **fromp, unsigned char *to, int num); static int check_pem(const char *nm, const char *name); int pem_check_suffix(const char *pem_str, const char *suffix); -int PEM_def_callback(char *buf, int num, int w, void *key) +int PEM_def_callback(char *buf, int num, int rwflag, void *userdata) { -#if defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_UI) int i; -#else - int i, j; +#ifndef OPENSSL_NO_UI + int min_len; const char *prompt; #endif - if (key) { - i = strlen(key); + /* We assume that the user passes a default password as userdata */ + if (userdata) { + i = strlen(userdata); i = (i > num) ? num : i; - memcpy(buf, key, i); + memcpy(buf, userdata, i); return i; } -#if defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_UI) +#ifdef OPENSSL_NO_UI PEMerr(PEM_F_PEM_DEF_CALLBACK, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; #else @@ -52,28 +52,22 @@ int PEM_def_callback(char *buf, int num, int w, void *key) if (prompt == NULL) prompt = "Enter PEM pass phrase:"; - for (;;) { - /* - * We assume that w == 0 means decryption, - * while w == 1 means encryption - */ - int min_len = w ? MIN_LENGTH : 0; + /* + * rwflag == 0 means decryption + * rwflag == 1 means encryption + * + * We assume that for encryption, we want a minimum length, while for + * decryption, we cannot know any minimum length, so we assume zero. + */ + min_len = rwflag ? MIN_LENGTH : 0; - i = EVP_read_pw_string_min(buf, min_len, num, prompt, w); - if (i != 0) { - PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD); - memset(buf, 0, (unsigned int)num); - return -1; - } - j = strlen(buf); - if (min_len && j < min_len) { - fprintf(stderr, - "phrase is too short, needs to be at least %d chars\n", - min_len); - } else - break; + i = EVP_read_pw_string_min(buf, min_len, num, prompt, rwflag); + if (i != 0) { + PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD); + memset(buf, 0, (unsigned int)num); + return -1; } - return j; + return strlen(buf); #endif } @@ -414,7 +408,7 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, keylen = PEM_def_callback(buf, PEM_BUFSIZE, 0, u); else keylen = callback(buf, PEM_BUFSIZE, 0, u); - if (keylen <= 0) { + if (keylen < 0) { PEMerr(PEM_F_PEM_DO_HEADER, PEM_R_BAD_PASSWORD_READ); return 0; } @@ -472,6 +466,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) char *dekinfostart, c; cipher->cipher = NULL; + memset(cipher->iv, 0, sizeof(cipher->iv)); if ((header == NULL) || (*header == '\0') || (*header == '\n')) return 1; diff --git a/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c b/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c index 5caad9faab..a8363b39b9 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c +++ b/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -124,7 +124,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, klen = cb(psbuf, PEM_BUFSIZE, 0, u); else klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); - if (klen <= 0) { + if (klen < 0) { PEMerr(PEM_F_D2I_PKCS8PRIVATEKEY_BIO, PEM_R_BAD_PASSWORD_READ); X509_SIG_free(p8); return NULL; diff --git a/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c b/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c index 671b374f36..7dadc1391c 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c +++ b/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -59,7 +59,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, klen = cb(psbuf, PEM_BUFSIZE, 0, u); else klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); - if (klen <= 0) { + if (klen < 0) { PEMerr(PEM_F_PEM_READ_BIO_PRIVATEKEY, PEM_R_BAD_PASSWORD_READ); X509_SIG_free(p8); goto err; diff --git a/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c b/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c index d0a423957c..96a82eb520 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c +++ b/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c @@ -675,17 +675,17 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, const unsigned char *p = *in; unsigned int magic; unsigned char *enctmp = NULL, *q; + unsigned char keybuf[20]; EVP_CIPHER_CTX *cctx = EVP_CIPHER_CTX_new(); if (saltlen) { char psbuf[PEM_BUFSIZE]; - unsigned char keybuf[20]; int enctmplen, inlen; if (cb) inlen = cb(psbuf, PEM_BUFSIZE, 0, u); else inlen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); - if (inlen <= 0) { + if (inlen < 0) { PEMerr(PEM_F_DO_PVK_BODY, PEM_R_BAD_PASSWORD_READ); goto err; } @@ -719,7 +719,6 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, memset(keybuf + 5, 0, 11); if (!EVP_DecryptInit_ex(cctx, EVP_rc4(), NULL, keybuf, NULL)) goto err; - OPENSSL_cleanse(keybuf, 20); if (!EVP_DecryptUpdate(cctx, q, &enctmplen, p, inlen)) goto err; if (!EVP_DecryptFinal_ex(cctx, q + enctmplen, &enctmplen)) @@ -729,15 +728,17 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, PEMerr(PEM_F_DO_PVK_BODY, PEM_R_BAD_DECRYPT); goto err; } - } else - OPENSSL_cleanse(keybuf, 20); + } p = enctmp; } ret = b2i_PrivateKey(&p, keylen); err: EVP_CIPHER_CTX_free(cctx); - OPENSSL_free(enctmp); + if (enctmp != NULL) { + OPENSSL_cleanse(keybuf, sizeof(keybuf)); + OPENSSL_free(enctmp); + } return ret; } diff --git a/worker/deps/openssl/openssl/crypto/perlasm/readme b/worker/deps/openssl/openssl/crypto/perlasm/readme index 15f139d354..e90bd8e014 100644 --- a/worker/deps/openssl/openssl/crypto/perlasm/readme +++ b/worker/deps/openssl/openssl/crypto/perlasm/readme @@ -61,7 +61,7 @@ So a very simple version of this function could be coded as push(@INC,"perlasm","../../perlasm"); require "x86asm.pl"; - + &asm_init($ARGV[0],"cacl.pl"); &external_label("other"); @@ -121,3 +121,4 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, &cbc("des_ncbc_encrypt","des_encrypt","des_encrypt",0,4,5,3,5,-1); &cbc("des_ede3_cbc_encrypt","des_encrypt3","des_decrypt3",0,6,7,3,4,5); + diff --git a/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c b/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c index f2bfe32ebd..422dfc398f 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c +++ b/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,7 +51,7 @@ ASN1_ADB_TEMPLATE(safebag_default) = ASN1_EXP(PKCS12_SAFEBAG, value.other, ASN1_ ASN1_ADB(PKCS12_SAFEBAG) = { ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)), ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)), - ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SET_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)), + ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SEQUENCE_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)), ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)), ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)), ADB_ENTRY(NID_secretBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)) diff --git a/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c b/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c index a78e183c95..88db0f2dc4 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c +++ b/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -22,7 +22,8 @@ PKCS12 *PKCS12_init(int mode) PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE); return NULL; } - ASN1_INTEGER_set(pkcs12->version, 3); + if (!ASN1_INTEGER_set(pkcs12->version, 3)) + goto err; pkcs12->authsafes->type = OBJ_nid2obj(mode); switch (mode) { case NID_pkcs7_data: diff --git a/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c b/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c index a9e22026c3..0cbbed364a 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c +++ b/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,13 +7,13 @@ * https://www.openssl.org/source/license.html */ -# include -# include "internal/cryptlib.h" -# include -# include -# include -# include -# include "p12_lcl.h" +#include +#include "internal/cryptlib.h" +#include +#include +#include +#include +#include "p12_lcl.h" int PKCS12_mac_present(const PKCS12 *p12) { @@ -44,7 +44,7 @@ void PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac, } } -# define TK26_MAC_KEY_LEN 32 +#define TK26_MAC_KEY_LEN 32 static int pkcs12_gen_gost_mac_key(const char *pass, int passlen, const unsigned char *salt, int saltlen, @@ -75,6 +75,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *out, const EVP_MD *md_type)) { + int ret = 0; const EVP_MD *md_type; HMAC_CTX *hmac = NULL; unsigned char key[EVP_MAX_MD_SIZE], *salt; @@ -111,29 +112,32 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen, if ((md_type_nid == NID_id_GostR3411_94 || md_type_nid == NID_id_GostR3411_2012_256 || md_type_nid == NID_id_GostR3411_2012_512) - && !getenv("LEGACY_GOST_PKCS12")) { + && ossl_safe_getenv("LEGACY_GOST_PKCS12") == NULL) { md_size = TK26_MAC_KEY_LEN; if (!pkcs12_gen_gost_mac_key(pass, passlen, salt, saltlen, iter, md_size, key, md_type)) { PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR); - return 0; + goto err; } } else if (!(*pkcs12_key_gen)(pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter, md_size, key, md_type)) { PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR); - return 0; + goto err; } if ((hmac = HMAC_CTX_new()) == NULL || !HMAC_Init_ex(hmac, key, md_size, md_type, NULL) || !HMAC_Update(hmac, p12->authsafes->d.data->data, p12->authsafes->d.data->length) || !HMAC_Final(hmac, mac, maclen)) { - HMAC_CTX_free(hmac); - return 0; + goto err; } + ret = 1; + +err: + OPENSSL_cleanse(key, sizeof(key)); HMAC_CTX_free(hmac); - return 1; + return ret; } int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, diff --git a/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c b/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c index 69c68cf5f3..371b9c99ff 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c +++ b/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -134,7 +134,6 @@ int PKCS7_set_type(PKCS7 *p7, int type) if ((p7->d.signed_and_enveloped = PKCS7_SIGN_ENVELOPE_new()) == NULL) goto err; - ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1); if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1)) goto err; p7->d.signed_and_enveloped->enc_data->content_type diff --git a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl index fc899ced86..5cdb6be059 100755 --- a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -186,6 +186,7 @@ .type poly1305_blocks,%function .align 5 poly1305_blocks: +.Lpoly1305_blocks: stmdb sp!,{r3-r11,lr} ands $len,$len,#-16 @@ -677,7 +678,7 @@ cmp $len,#64 bhs .Lenter_neon tst ip,ip @ is_base2_26? - beq poly1305_blocks + beq .Lpoly1305_blocks .Lenter_neon: stmdb sp!,{r4-r7} diff --git a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl index 024696a599..d2b3e90d93 100755 --- a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl +++ b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl @@ -422,3 +422,4 @@ $output=pop and open STDOUT,">$output"; print $code; close STDOUT; + diff --git a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl index ab24dfcfad..93179e37d5 100755 --- a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl +++ b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -70,7 +70,7 @@ $avx = ($1>=2.09) + ($1>=2.10); } - if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) { + if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) { $avx = ($2>=3.0) + ($2>3.0); } } diff --git a/worker/deps/openssl/openssl/crypto/rand/md_rand.c b/worker/deps/openssl/openssl/crypto/rand/md_rand.c index 7d5fcb7f67..eb6a14b14f 100644 --- a/worker/deps/openssl/openssl/crypto/rand/md_rand.c +++ b/worker/deps/openssl/openssl/crypto/rand/md_rand.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -275,7 +275,6 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) static volatile int stirred_pool = 0; int i, j, k; size_t num_ceil, st_idx, st_num; - int ok; long md_c[2]; unsigned char local_md[MD_DIGEST_LENGTH]; EVP_MD_CTX *m; @@ -362,14 +361,13 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) if (!initialized) { RAND_poll(); - initialized = 1; + initialized = (entropy >= ENTROPY_NEEDED); } if (!stirred_pool) do_stir_pool = 1; - ok = (entropy >= ENTROPY_NEEDED); - if (!ok) { + if (!initialized) { /* * If the PRNG state is not yet unpredictable, then seeing the PRNG * output may help attackers to determine the new state; thus we have @@ -408,7 +406,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) rand_add(DUMMY_SEED, MD_DIGEST_LENGTH, 0.0); n -= MD_DIGEST_LENGTH; } - if (ok) + if (initialized) stirred_pool = 1; } @@ -500,7 +498,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) CRYPTO_THREAD_unlock(rand_lock); EVP_MD_CTX_free(m); - if (ok) + if (initialized) return (1); else if (pseudo) return 0; diff --git a/worker/deps/openssl/openssl/crypto/rand/randfile.c b/worker/deps/openssl/openssl/crypto/rand/randfile.c index dbd03ff2bd..c827407705 100644 --- a/worker/deps/openssl/openssl/crypto/rand/randfile.c +++ b/worker/deps/openssl/openssl/crypto/rand/randfile.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -314,14 +314,9 @@ const char *RAND_file_name(char *buf, size_t size) } } #else - if (OPENSSL_issetugid() != 0) { + if ((s = ossl_safe_getenv("RANDFILE")) == NULL || *s == '\0') { use_randfile = 0; - } else { - s = getenv("RANDFILE"); - if (s == NULL || *s == '\0') { - use_randfile = 0; - s = getenv("HOME"); - } + s = ossl_safe_getenv("HOME"); } #endif #ifdef DEFAULT_HOME diff --git a/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl b/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl index 1354d18214..184922c128 100644 --- a/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl +++ b/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl @@ -89,7 +89,7 @@ || NOP 5 STB $XX,*${KEYA}[-2] ; key->x || SUB4 $YY,$TX,$YY -|| BNOP B3 +|| BNOP B3 STB $YY,*${KEYB}[-1] ; key->y || NOP 5 .endasmfunc diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c index 9af43e0586..79f77e3eaf 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c @@ -89,6 +89,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, if (BN_copy(rsa->e, e_value) == NULL) goto err; + BN_set_flags(rsa->p, BN_FLG_CONSTTIME); + BN_set_flags(rsa->q, BN_FLG_CONSTTIME); BN_set_flags(r2, BN_FLG_CONSTTIME); /* generate p and q */ for (;;) { diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c index e1377a0690..d99d04916d 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -94,7 +94,7 @@ RSA *RSA_new_method(ENGINE *engine) return ret; -err: + err: RSA_free(ret); return NULL; } @@ -112,7 +112,7 @@ void RSA_free(RSA *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth->finish) + if (r->meth != NULL && r->meth->finish != NULL) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE ENGINE_finish(r->engine); diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c index be84923b34..ba40cff287 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -75,7 +75,7 @@ int RSA_meth_set1_name(RSA_METHOD *meth, const char *name) return 1; } -int RSA_meth_get_flags(RSA_METHOD *meth) +int RSA_meth_get_flags(const RSA_METHOD *meth) { return meth->flags; } @@ -163,13 +163,13 @@ int RSA_meth_set_priv_dec(RSA_METHOD *meth, /* Can be null */ int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) - (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) + (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx) { return meth->rsa_mod_exp; } int RSA_meth_set_mod_exp(RSA_METHOD *meth, - int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, + int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)) { meth->rsa_mod_exp = mod_exp; @@ -270,3 +270,4 @@ int RSA_meth_set_keygen(RSA_METHOD *meth, meth->rsa_keygen = keygen; return 1; } + diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c index 4878d495fe..df08a2f53e 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -43,10 +43,12 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, const unsigned char *param, int plen, const EVP_MD *md, const EVP_MD *mgf1md) { + int rv = 0; int i, emlen = tlen - 1; unsigned char *db, *seed; - unsigned char *dbmask, seedmask[EVP_MAX_MD_SIZE]; - int mdlen; + unsigned char *dbmask = NULL; + unsigned char seedmask[EVP_MAX_MD_SIZE]; + int mdlen, dbmask_len = 0; if (md == NULL) md = EVP_sha1(); @@ -72,40 +74,41 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, db = to + mdlen + 1; if (!EVP_Digest((void *)param, plen, db, NULL, md, NULL)) - return 0; + goto err; memset(db + mdlen, 0, emlen - flen - 2 * mdlen - 1); db[emlen - flen - mdlen - 1] = 0x01; memcpy(db + emlen - flen - mdlen, from, (unsigned int)flen); if (RAND_bytes(seed, mdlen) <= 0) - return 0; + goto err; + #ifdef PKCS_TESTVECT memcpy(seed, "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f", 20); #endif - dbmask = OPENSSL_malloc(emlen - mdlen); + dbmask_len = emlen - mdlen; + dbmask = OPENSSL_malloc(dbmask_len); if (dbmask == NULL) { RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1, ERR_R_MALLOC_FAILURE); - return 0; + goto err; } - if (PKCS1_MGF1(dbmask, emlen - mdlen, seed, mdlen, mgf1md) < 0) + if (PKCS1_MGF1(dbmask, dbmask_len, seed, mdlen, mgf1md) < 0) goto err; - for (i = 0; i < emlen - mdlen; i++) + for (i = 0; i < dbmask_len; i++) db[i] ^= dbmask[i]; - if (PKCS1_MGF1(seedmask, mdlen, db, emlen - mdlen, mgf1md) < 0) + if (PKCS1_MGF1(seedmask, mdlen, db, dbmask_len, mgf1md) < 0) goto err; for (i = 0; i < mdlen; i++) seed[i] ^= seedmask[i]; - - OPENSSL_free(dbmask); - return 1; + rv = 1; err: - OPENSSL_free(dbmask); - return 0; + OPENSSL_cleanse(seedmask, sizeof(seedmask)); + OPENSSL_clear_free(dbmask, dbmask_len); + return rv; } int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen, @@ -155,32 +158,40 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, dblen = num - mdlen - 1; db = OPENSSL_malloc(dblen); - em = OPENSSL_malloc(num); - if (db == NULL || em == NULL) { + if (db == NULL) { RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1, ERR_R_MALLOC_FAILURE); goto cleanup; } - /* - * Always do this zero-padding copy (even when num == flen) to avoid - * leaking that information. The copy still leaks some side-channel - * information, but it's impossible to have a fixed memory access - * pattern since we can't read out of the bounds of |from|. - * - * TODO(emilia): Consider porting BN_bn2bin_padded from BoringSSL. - */ - memset(em, 0, num); - memcpy(em + num - flen, from, flen); + if (flen != num) { + em = OPENSSL_zalloc(num); + if (em == NULL) { + RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1, + ERR_R_MALLOC_FAILURE); + goto cleanup; + } + + /* + * Caller is encouraged to pass zero-padded message created with + * BN_bn2binpad, but if it doesn't, we do this zero-padding copy + * to avoid leaking that information. The copy still leaks some + * side-channel information, but it's impossible to have a fixed + * memory access pattern since we can't read out of the bounds of + * |from|. + */ + memcpy(em + num - flen, from, flen); + from = em; + } /* * The first byte must be zero, however we must not leak if this is * true. See James H. Manger, "A Chosen Ciphertext Attack on RSA * Optimal Asymmetric Encryption Padding (OAEP) [...]", CRYPTO 2001). */ - good = constant_time_is_zero(em[0]); + good = constant_time_is_zero(from[0]); - maskedseed = em + 1; - maskeddb = em + 1 + mdlen; + maskedseed = from + 1; + maskeddb = from + 1 + mdlen; if (PKCS1_MGF1(seed, mdlen, maskeddb, dblen, mgf1md)) goto cleanup; @@ -239,6 +250,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1, RSA_R_OAEP_DECODING_ERROR); cleanup: + OPENSSL_cleanse(seed, sizeof(seed)); OPENSSL_clear_free(db, dblen); OPENSSL_clear_free(em, num); return mlen; @@ -281,6 +293,7 @@ int PKCS1_MGF1(unsigned char *mask, long len, } rv = 0; err: + OPENSSL_cleanse(md, sizeof(md)); EVP_MD_CTX_free(c); return rv; } diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c index 62a88959fa..23f948fbbb 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -62,7 +62,7 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { BIGNUM *f, *ret; - int i, j, k, num = 0, r = -1; + int i, num = 0, r = -1; unsigned char *buf = NULL; BN_CTX *ctx = NULL; @@ -127,8 +127,8 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, } if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked - (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) + if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, + rsa->n, ctx)) goto err; if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx, @@ -136,15 +136,10 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, goto err; /* - * put in leading 0 bytes if the number is less than the length of the - * modulus + * BN_bn2binpad puts in leading 0 bytes if the number is less than + * the length of the modulus. */ - j = BN_num_bytes(ret); - i = BN_bn2bin(ret, &(to[num - j])); - for (k = 0; k < (num - i); k++) - to[k] = 0; - - r = num; + r = BN_bn2binpad(ret, to, num); err: if (ctx != NULL) BN_CTX_end(ctx); @@ -233,7 +228,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { BIGNUM *f, *ret, *res; - int i, j, k, num = 0, r = -1; + int i, num = 0, r = -1; unsigned char *buf = NULL; BN_CTX *ctx = NULL; int local_blinding = 0; @@ -317,8 +312,8 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME); if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked - (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) { + if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, + rsa->n, ctx)) { BN_free(d); goto err; } @@ -337,7 +332,8 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, goto err; if (padding == RSA_X931_PADDING) { - BN_sub(f, rsa->n, ret); + if (!BN_sub(f, rsa->n, ret)) + goto err; if (BN_cmp(ret, f) > 0) res = f; else @@ -346,15 +342,10 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, res = ret; /* - * put in leading 0 bytes if the number is less than the length of the - * modulus + * BN_bn2binpad puts in leading 0 bytes if the number is less than + * the length of the modulus. */ - j = BN_num_bytes(res); - i = BN_bn2bin(res, &(to[num - j])); - for (k = 0; k < (num - i); k++) - to[k] = 0; - - r = num; + r = BN_bn2binpad(res, to, num); err: if (ctx != NULL) BN_CTX_end(ctx); @@ -368,7 +359,6 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, { BIGNUM *f, *ret; int j, num = 0, r = -1; - unsigned char *p; unsigned char *buf = NULL; BN_CTX *ctx = NULL; int local_blinding = 0; @@ -445,8 +435,8 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME); if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked - (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) { + if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, + rsa->n, ctx)) { BN_free(d); goto err; } @@ -463,8 +453,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, if (!rsa_blinding_invert(blinding, ret, unblind, ctx)) goto err; - p = buf; - j = BN_bn2bin(ret, p); /* j is only used with no-padding mode */ + j = BN_bn2binpad(ret, buf, num); switch (padding) { case RSA_PKCS1_PADDING: @@ -477,7 +466,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, r = RSA_padding_check_SSLv23(to, num, buf, j, num); break; case RSA_NO_PADDING: - r = RSA_padding_check_none(to, num, buf, j, num); + memcpy(to, buf, (r = j)); break; default: RSAerr(RSA_F_RSA_OSSL_PRIVATE_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); @@ -500,7 +489,6 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, { BIGNUM *f, *ret; int i, num = 0, r = -1; - unsigned char *p; unsigned char *buf = NULL; BN_CTX *ctx = NULL; @@ -553,8 +541,8 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, } if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked - (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) + if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, + rsa->n, ctx)) goto err; if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx, @@ -565,8 +553,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, if (!BN_sub(ret, rsa->n, ret)) goto err; - p = buf; - i = BN_bn2bin(ret, p); + i = BN_bn2binpad(ret, buf, num); switch (padding) { case RSA_PKCS1_PADDING: @@ -576,7 +563,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, r = RSA_padding_check_X931(to, num, buf, i, num); break; case RSA_NO_PADDING: - r = RSA_padding_check_none(to, num, buf, i, num); + memcpy(to, buf, (r = i)); break; default: RSAerr(RSA_F_RSA_OSSL_PUBLIC_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); @@ -596,7 +583,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) { BIGNUM *r1, *m1, *vrfy; - int ret = 0; + int ret = 0, smooth = 0; BN_CTX_start(ctx); @@ -606,43 +593,80 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) if (vrfy == NULL) goto err; - { - BIGNUM *p = BN_new(), *q = BN_new(); + if (rsa->flags & RSA_FLAG_CACHE_PRIVATE) { + BIGNUM *factor = BN_new(); + + if (factor == NULL) + goto err; /* * Make sure BN_mod_inverse in Montgomery initialization uses the * BN_FLG_CONSTTIME flag */ - if (p == NULL || q == NULL) { - BN_free(p); - BN_free(q); + if (!(BN_with_flags(factor, rsa->p, BN_FLG_CONSTTIME), + BN_MONT_CTX_set_locked(&rsa->_method_mod_p, rsa->lock, + factor, ctx)) + || !(BN_with_flags(factor, rsa->q, BN_FLG_CONSTTIME), + BN_MONT_CTX_set_locked(&rsa->_method_mod_q, rsa->lock, + factor, ctx))) { + BN_free(factor); goto err; } - BN_with_flags(p, rsa->p, BN_FLG_CONSTTIME); - BN_with_flags(q, rsa->q, BN_FLG_CONSTTIME); - - if (rsa->flags & RSA_FLAG_CACHE_PRIVATE) { - if (!BN_MONT_CTX_set_locked - (&rsa->_method_mod_p, rsa->lock, p, ctx) - || !BN_MONT_CTX_set_locked(&rsa->_method_mod_q, - rsa->lock, q, ctx)) { - BN_free(p); - BN_free(q); - goto err; - } - } /* - * We MUST free p and q before any further use of rsa->p and rsa->q + * We MUST free |factor| before any further use of the prime factors */ - BN_free(p); - BN_free(q); + BN_free(factor); + + smooth = (rsa->meth->bn_mod_exp == BN_mod_exp_mont) + && (BN_num_bits(rsa->q) == BN_num_bits(rsa->p)); } if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked - (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) + if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, + rsa->n, ctx)) goto err; + if (smooth) { + /* + * Conversion from Montgomery domain, a.k.a. Montgomery reduction, + * accepts values in [0-m*2^w) range. w is m's bit width rounded up + * to limb width. So that at the very least if |I| is fully reduced, + * i.e. less than p*q, we can count on from-to round to perform + * below modulo operations on |I|. Unlike BN_mod it's constant time. + */ + if (/* m1 = I moq q */ + !bn_from_mont_fixed_top(m1, I, rsa->_method_mod_q, ctx) + || !bn_to_mont_fixed_top(m1, m1, rsa->_method_mod_q, ctx) + /* m1 = m1^dmq1 mod q */ + || !BN_mod_exp_mont_consttime(m1, m1, rsa->dmq1, rsa->q, ctx, + rsa->_method_mod_q) + /* r1 = I mod p */ + || !bn_from_mont_fixed_top(r1, I, rsa->_method_mod_p, ctx) + || !bn_to_mont_fixed_top(r1, r1, rsa->_method_mod_p, ctx) + /* r1 = r1^dmp1 mod p */ + || !BN_mod_exp_mont_consttime(r1, r1, rsa->dmp1, rsa->p, ctx, + rsa->_method_mod_p) + /* r1 = (r1 - m1) mod p */ + /* + * bn_mod_sub_fixed_top is not regular modular subtraction, + * it can tolerate subtrahend to be larger than modulus, but + * not bit-wise wider. This makes up for uncommon q>p case, + * when |m1| can be larger than |rsa->p|. + */ + || !bn_mod_sub_fixed_top(r1, r1, m1, rsa->p) + + /* r1 = r1 * iqmp mod p */ + || !bn_to_mont_fixed_top(r1, r1, rsa->_method_mod_p, ctx) + || !bn_mul_mont_fixed_top(r1, r1, rsa->iqmp, rsa->_method_mod_p, + ctx) + /* r0 = r1 * q + m1 */ + || !bn_mul_fixed_top(r0, r1, rsa->q, ctx) + || !bn_mod_add_fixed_top(r0, r0, m1, rsa->n)) + goto err; + + goto tail; + } + /* compute I mod q */ { BIGNUM *c = BN_new(); @@ -665,7 +689,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) /* compute r1^dmq1 mod q */ if (!rsa->meth->bn_mod_exp(m1, r1, dmq1, rsa->q, ctx, - rsa->_method_mod_q)) { + rsa->_method_mod_q)) { BN_free(c); BN_free(dmq1); goto err; @@ -741,10 +765,18 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) if (!BN_add(r0, r1, m1)) goto err; + tail: if (rsa->e && rsa->n) { - if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, - rsa->_method_mod_n)) - goto err; + if (rsa->meth->bn_mod_exp == BN_mod_exp_mont) { + if (!BN_mod_exp_mont(vrfy, r0, rsa->e, rsa->n, ctx, + rsa->_method_mod_n)) + goto err; + } else { + bn_correct_top(r0); + if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, + rsa->_method_mod_n)) + goto err; + } /* * If 'I' was greater than (or equal to) rsa->n, the operation will * be equivalent to using 'I mod n'. However, the result of the @@ -753,6 +785,11 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) */ if (!BN_sub(vrfy, vrfy, I)) goto err; + if (BN_is_zero(vrfy)) { + bn_correct_top(r0); + ret = 1; + goto err; /* not actually error */ + } if (!BN_mod(vrfy, vrfy, rsa->n, ctx)) goto err; if (BN_is_negative(vrfy)) @@ -779,6 +816,15 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) BN_free(d); } } + /* + * It's unfortunate that we have to bn_correct_top(r0). What hopefully + * saves the day is that correction is highly unlike, and private key + * operations are customarily performed on blinded message. Which means + * that attacker won't observe correlation with chosen plaintext. + * Secondly, remaining code would still handle it in same computational + * time and even conceal memory access pattern around corrected top. + */ + bn_correct_top(r0); ret = 1; err: BN_CTX_end(ctx); diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c index aeeb32c2dc..63d6c3a3b8 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -175,27 +175,30 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, if (num < 11) goto err; - em = OPENSSL_zalloc(num); - if (em == NULL) { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2, ERR_R_MALLOC_FAILURE); - return -1; + if (flen != num) { + em = OPENSSL_zalloc(num); + if (em == NULL) { + RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2, ERR_R_MALLOC_FAILURE); + return -1; + } + /* + * Caller is encouraged to pass zero-padded message created with + * BN_bn2binpad, but if it doesn't, we do this zero-padding copy + * to avoid leaking that information. The copy still leaks some + * side-channel information, but it's impossible to have a fixed + * memory access pattern since we can't read out of the bounds of + * |from|. + */ + memcpy(em + num - flen, from, flen); + from = em; } - /* - * Always do this zero-padding copy (even when num == flen) to avoid - * leaking that information. The copy still leaks some side-channel - * information, but it's impossible to have a fixed memory access - * pattern since we can't read out of the bounds of |from|. - * - * TODO(emilia): Consider porting BN_bn2bin_padded from BoringSSL. - */ - memcpy(em + num - flen, from, flen); - good = constant_time_is_zero(em[0]); - good &= constant_time_eq(em[1], 2); + good = constant_time_is_zero(from[0]); + good &= constant_time_eq(from[1], 2); found_zero_byte = 0; for (i = 2; i < num; i++) { - unsigned int equals0 = constant_time_is_zero(em[i]); + unsigned int equals0 = constant_time_is_zero(from[i]); zero_index = constant_time_select_int(~found_zero_byte & equals0, i, zero_index); @@ -203,7 +206,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, } /* - * PS must be at least 8 bytes long, and it starts two bytes into |em|. + * PS must be at least 8 bytes long, and it starts two bytes into |from|. * If we never found a 0-byte, then |zero_index| is 0 and the check * also fails. */ @@ -232,7 +235,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, goto err; } - memcpy(to, em + msg_index, mlen); + memcpy(to, from + msg_index, mlen); err: OPENSSL_clear_free(em, num); diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c index f8143387c8..4a1e599ed5 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -242,7 +242,7 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM, err: EVP_MD_CTX_free(ctx); - OPENSSL_free(salt); + OPENSSL_clear_free(salt, sLen); return ret; diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c index 9ef6b80ea8..77b28b46f2 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -63,6 +63,14 @@ int RSA_padding_check_SSLv23(unsigned char *to, int tlen, RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_DATA_TOO_SMALL); return (-1); } + /* Accept even zero-padded input */ + if (flen == num) { + if (*(p++) != 0) { + RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_BLOCK_TYPE_IS_NOT_02); + return -1; + } + flen--; + } if ((num != (flen + 1)) || (*(p++) != 02)) { RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_BLOCK_TYPE_IS_NOT_02); return (-1); diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl index 5adca23404..cf34b2c293 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -141,7 +141,7 @@ `ml 2>&1` =~ /Version ([0-9]+)\./ && $1>=10); # first version supporting AVX -$ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && +$ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0); # first version supporting AVX $shaext=$xmm; ### set to zero if compiling for 1.0.1 diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl index 6af1d84beb..72ee0c7b83 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -93,7 +93,7 @@ $avx = ($1>=10) + ($1>=11); } -if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) { +if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) { $avx = ($2>=3.0) + ($2>3.0); } diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl index 55d30cba3a..edcfc31278 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -254,7 +254,7 @@ sub BODY_16_XX { $code.=".Lrounds_16_xx:\n"; for (;$i<32;$i++) { &BODY_16_XX($i,@V); unshift(@V,pop(@V)); } $code.=<<___; -#if __ARM_ARCH__>=7 +#ifdef __thumb2__ ite eq @ Thumb2 thing, sanity check in ARM #endif ldreq $t3,[sp,#16*4] @ pull ctx diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl index 22b5a9d0b1..0b4c5674d9 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -157,7 +157,7 @@ () teq $t0,#$magic ldr $t3,[sp,#$Coff+0] @ c.lo -#if __ARM_ARCH__>=7 +#ifdef __thumb2__ it eq @ Thumb2 thing, sanity check in ARM #endif orreq $Ktbl,$Ktbl,#1 @@ -411,7 +411,7 @@ () ___ &BODY_00_15(0x17); $code.=<<___; -#if __ARM_ARCH__>=7 +#ifdef __thumb2__ ittt eq @ Thumb2 thing, sanity check in ARM #endif ldreq $t0,[sp,#`$Xoff+8*(16-1)`+0] diff --git a/worker/deps/openssl/openssl/crypto/threads_win.c b/worker/deps/openssl/openssl/crypto/threads_win.c index 4e0de908ee..27334e13f3 100644 --- a/worker/deps/openssl/openssl/crypto/threads_win.c +++ b/worker/deps/openssl/openssl/crypto/threads_win.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -98,7 +98,26 @@ int CRYPTO_THREAD_init_local(CRYPTO_THREAD_LOCAL *key, void (*cleanup)(void *)) void *CRYPTO_THREAD_get_local(CRYPTO_THREAD_LOCAL *key) { - return TlsGetValue(*key); + DWORD last_error; + void *ret; + + /* + * TlsGetValue clears the last error even on success, so that callers may + * distinguish it successfully returning NULL or failing. It is documented + * to never fail if the argument is a valid index from TlsAlloc, so we do + * not need to handle this. + * + * However, this error-mangling behavior interferes with the caller's use of + * GetLastError. In particular SSL_get_error queries the error queue to + * determine whether the caller should look at the OS's errors. To avoid + * destroying state, save and restore the Windows error. + * + * https://msdn.microsoft.com/en-us/library/windows/desktop/ms686812(v=vs.85).aspx + */ + last_error = GetLastError(); + ret = TlsGetValue(*key); + SetLastError(last_error); + return ret; } int CRYPTO_THREAD_set_local(CRYPTO_THREAD_LOCAL *key, void *val) diff --git a/worker/deps/openssl/openssl/crypto/ts/ts_lib.c b/worker/deps/openssl/openssl/crypto/ts/ts_lib.c index de36e0e084..ce2e12c593 100644 --- a/worker/deps/openssl/openssl/crypto/ts/ts_lib.c +++ b/worker/deps/openssl/openssl/crypto/ts/ts_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -22,10 +22,9 @@ int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num) int result = 0; char *hex; - num_bn = BN_new(); + num_bn = ASN1_INTEGER_to_BN(num, NULL); if (num_bn == NULL) return -1; - ASN1_INTEGER_to_BN(num, num_bn); if ((hex = BN_bn2hex(num_bn))) { result = BIO_write(bio, "0x", 2) > 0; result = result && BIO_write(bio, hex, strlen(hex)) > 0; diff --git a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c index aea7b922a3..0d714a71b7 100644 --- a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c +++ b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -16,6 +16,7 @@ #include #include #include +#include #include "ts_lcl.h" static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *); @@ -840,7 +841,7 @@ static ASN1_GENERALIZEDTIME long sec, long usec, unsigned precision) { time_t time_sec = (time_t)sec; - struct tm *tm = NULL; + struct tm *tm = NULL, tm_result; char genTime_str[17 + TS_MAX_CLOCK_PRECISION_DIGITS]; char *p = genTime_str; char *p_end = genTime_str + sizeof(genTime_str); @@ -848,7 +849,7 @@ static ASN1_GENERALIZEDTIME if (precision > TS_MAX_CLOCK_PRECISION_DIGITS) goto err; - if ((tm = gmtime(&time_sec)) == NULL) + if ((tm = OPENSSL_gmtime(&time_sec, &tm_result)) == NULL) goto err; /* diff --git a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c index 66f5be6f69..2755dd0ef3 100644 --- a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c +++ b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c @@ -480,7 +480,7 @@ static char *ts_get_status_text(STACK_OF(ASN1_UTF8STRING) *text) return result; } -static int ts_check_policy(const ASN1_OBJECT *req_oid, +static int ts_check_policy(const ASN1_OBJECT *req_oid, const TS_TST_INFO *tst_info) { const ASN1_OBJECT *resp_oid = tst_info->policy_id; diff --git a/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c b/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c index 8fa8deca66..a25934ccd1 100644 --- a/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c +++ b/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -436,6 +436,24 @@ static int open_console(UI *ui) is_a_tty = 0; else # endif +# ifdef ENXIO + /* + * Solaris can return ENXIO. + * This should be ok + */ + if (errno == ENXIO) + is_a_tty = 0; + else +# endif +# ifdef EIO + /* + * Linux can return EIO. + * This should be ok + */ + if (errno == EIO) + is_a_tty = 0; + else +# endif # ifdef ENODEV /* * MacOS X returns ENODEV (Operation not supported by device), @@ -524,17 +542,13 @@ static int echo_console(UI *ui) { #if defined(TTY_set) && !defined(OPENSSL_SYS_VMS) memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig)); - tty_new.TTY_FLAGS |= ECHO; -#endif - -#if defined(TTY_set) && !defined(OPENSSL_SYS_VMS) if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1)) return 0; #endif #ifdef OPENSSL_SYS_VMS if (is_a_tty) { tty_new[0] = tty_orig[0]; - tty_new[1] = tty_orig[1] & ~TT$M_NOECHO; + tty_new[1] = tty_orig[1]; tty_new[2] = tty_orig[2]; status = sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_new, 12, 0, 0, 0, 0); @@ -555,7 +569,6 @@ static int echo_console(UI *ui) #if defined(_WIN32) && !defined(_WIN32_WCE) if (is_a_tty) { tty_new = tty_orig; - tty_new |= ENABLE_ECHO_INPUT; SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), tty_new); } #endif diff --git a/worker/deps/openssl/openssl/crypto/x509/build.info b/worker/deps/openssl/openssl/crypto/x509/build.info index 7fc4b45048..afd0b6134e 100644 --- a/worker/deps/openssl/openssl/crypto/x509/build.info +++ b/worker/deps/openssl/openssl/crypto/x509/build.info @@ -4,7 +4,7 @@ SOURCE[../../libcrypto]=\ x509_obj.c x509_req.c x509spki.c x509_vfy.c \ x509_set.c x509cset.c x509rset.c x509_err.c \ x509name.c x509_v3.c x509_ext.c x509_att.c \ - x509type.c x509_lu.c x_all.c x509_txt.c \ + x509type.c x509_meth.c x509_lu.c x_all.c x509_txt.c \ x509_trs.c by_file.c by_dir.c x509_vpm.c \ x_crl.c t_crl.c x_req.c t_req.c x_x509.c t_x509.c \ x_pubkey.c x_x509a.c x_attrib.c x_exten.c x_name.c diff --git a/worker/deps/openssl/openssl/crypto/x509/by_dir.c b/worker/deps/openssl/openssl/crypto/x509/by_dir.c index 21672a7ef5..4fa1dd37b9 100644 --- a/worker/deps/openssl/openssl/crypto/x509/by_dir.c +++ b/worker/deps/openssl/openssl/crypto/x509/by_dir.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -78,7 +78,8 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, switch (cmd) { case X509_L_ADD_DIR: if (argl == X509_FILETYPE_DEFAULT) { - dir = (char *)getenv(X509_get_default_cert_dir_env()); + dir = (char *)ossl_safe_getenv(X509_get_default_cert_dir_env()); + if (dir) ret = add_cert_dir(ld, dir, X509_FILETYPE_PEM); else @@ -111,7 +112,7 @@ static int new_dir(X509_LOOKUP *lu) OPENSSL_free(a); return 0; } - lu->method_data = (char *)a; + lu->method_data = a; return 1; } diff --git a/worker/deps/openssl/openssl/crypto/x509/by_file.c b/worker/deps/openssl/openssl/crypto/x509/by_file.c index 0bcc6af30e..77a7c4a2a6 100644 --- a/worker/deps/openssl/openssl/crypto/x509/by_file.c +++ b/worker/deps/openssl/openssl/crypto/x509/by_file.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -47,7 +47,7 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, switch (cmd) { case X509_L_FILE_LOAD: if (argl == X509_FILETYPE_DEFAULT) { - file = getenv(X509_get_default_cert_file_env()); + file = ossl_safe_getenv(X509_get_default_cert_file_env()); if (file) ok = (X509_load_cert_crl_file(ctx, file, X509_FILETYPE_PEM) != 0); diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c b/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c index 01056356c5..49b0368dfc 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -174,7 +174,7 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) ret = a->canon_enclen - b->canon_enclen; - if (ret) + if (ret != 0 || a->canon_enclen == 0) return ret; return memcmp(a->canon_enc, b->canon_enc, a->canon_enclen); diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_err.c b/worker/deps/openssl/openssl/crypto/x509/x509_err.c index 3f4b8ef0bc..9f91188a76 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_err.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,6 +51,7 @@ static ERR_STRING_DATA X509_str_functs[] = { {ERR_FUNC(X509_F_X509_LOAD_CERT_CRL_FILE), "X509_load_cert_crl_file"}, {ERR_FUNC(X509_F_X509_LOAD_CERT_FILE), "X509_load_cert_file"}, {ERR_FUNC(X509_F_X509_LOAD_CRL_FILE), "X509_load_crl_file"}, + {ERR_FUNC(X509_F_X509_LOOKUP_METH_NEW), "X509_LOOKUP_meth_new"}, {ERR_FUNC(X509_F_X509_NAME_ADD_ENTRY), "X509_NAME_add_entry"}, {ERR_FUNC(X509_F_X509_NAME_ENTRY_CREATE_BY_NID), "X509_NAME_ENTRY_create_by_NID"}, diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h b/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h index 40bd102f70..8a47da4fef 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h +++ b/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -67,7 +67,7 @@ struct x509_crl_method_st { }; struct x509_lookup_method_st { - const char *name; + char *name; int (*new_item) (X509_LOOKUP *ctx); void (*free) (X509_LOOKUP *ctx); int (*init) (X509_LOOKUP *ctx); @@ -91,7 +91,7 @@ struct x509_lookup_st { int init; /* have we been started */ int skip; /* don't use us. */ X509_LOOKUP_METHOD *method; /* the functions */ - char *method_data; /* method data */ + void *method_data; /* method data */ X509_STORE *store_ctx; /* who owns us */ }; diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_lu.c b/worker/deps/openssl/openssl/crypto/x509/x509_lu.c index 90f23520f4..e5bea5b276 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_lu.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_lu.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -117,6 +117,23 @@ int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, return ctx->method->get_by_alias(ctx, type, str, len, ret); } +int X509_LOOKUP_set_method_data(X509_LOOKUP *ctx, void *data) +{ + ctx->method_data = data; + return 1; +} + +void *X509_LOOKUP_get_method_data(const X509_LOOKUP *ctx) +{ + return ctx->method_data; +} + +X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx) +{ + return ctx->store_ctx; +} + + static int x509_object_cmp(const X509_OBJECT *const *a, const X509_OBJECT *const *b) { @@ -265,6 +282,9 @@ int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type, X509_OBJECT stmp, *tmp; int i, j; + if (ctx == NULL) + return 0; + CRYPTO_THREAD_write_lock(ctx->lock); tmp = X509_OBJECT_retrieve_by_subject(ctx->objs, type, name); CRYPTO_THREAD_unlock(ctx->lock); @@ -290,26 +310,30 @@ int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type, return 1; } -int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) +static int x509_store_add(X509_STORE *ctx, void *x, int crl) { X509_OBJECT *obj; - int ret = 1, added = 1; + int ret = 0, added = 0; if (x == NULL) return 0; obj = X509_OBJECT_new(); if (obj == NULL) return 0; - obj->type = X509_LU_X509; - obj->data.x509 = x; + + if (crl) { + obj->type = X509_LU_CRL; + obj->data.crl = (X509_CRL *)x; + } else { + obj->type = X509_LU_X509; + obj->data.x509 = (X509 *)x; + } X509_OBJECT_up_ref_count(obj); CRYPTO_THREAD_write_lock(ctx->lock); if (X509_OBJECT_retrieve_match(ctx->objs, obj)) { - X509err(X509_F_X509_STORE_ADD_CERT, - X509_R_CERT_ALREADY_IN_HASH_TABLE); - ret = 0; + ret = 1; } else { added = sk_X509_OBJECT_push(ctx->objs, obj); ret = added != 0; @@ -317,46 +341,28 @@ int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) CRYPTO_THREAD_unlock(ctx->lock); - if (!ret) /* obj not pushed */ + if (added == 0) /* obj not pushed */ X509_OBJECT_free(obj); - if (!added) /* on push failure */ - X509err(X509_F_X509_STORE_ADD_CERT, ERR_R_MALLOC_FAILURE); return ret; } -int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) +int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) { - X509_OBJECT *obj; - int ret = 1, added = 1; - - if (x == NULL) - return 0; - obj = X509_OBJECT_new(); - if (obj == NULL) + if (!x509_store_add(ctx, x, 0)) { + X509err(X509_F_X509_STORE_ADD_CERT, ERR_R_MALLOC_FAILURE); return 0; - obj->type = X509_LU_CRL; - obj->data.crl = x; - X509_OBJECT_up_ref_count(obj); - - CRYPTO_THREAD_write_lock(ctx->lock); - - if (X509_OBJECT_retrieve_match(ctx->objs, obj)) { - X509err(X509_F_X509_STORE_ADD_CRL, X509_R_CERT_ALREADY_IN_HASH_TABLE); - ret = 0; - } else { - added = sk_X509_OBJECT_push(ctx->objs, obj); - ret = added != 0; } + return 1; +} - CRYPTO_THREAD_unlock(ctx->lock); - - if (!ret) /* obj not pushed */ - X509_OBJECT_free(obj); - if (!added) /* on push failure */ +int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) +{ + if (!x509_store_add(ctx, x, 1)) { X509err(X509_F_X509_STORE_ADD_CRL, ERR_R_MALLOC_FAILURE); - - return ret; + return 0; + } + return 1; } int X509_OBJECT_up_ref_count(X509_OBJECT *a) @@ -403,8 +409,7 @@ X509_OBJECT *X509_OBJECT_new() return ret; } - -void X509_OBJECT_free(X509_OBJECT *a) +static void x509_object_free_internal(X509_OBJECT *a) { if (a == NULL) return; @@ -418,6 +423,33 @@ void X509_OBJECT_free(X509_OBJECT *a) X509_CRL_free(a->data.crl); break; } +} + +int X509_OBJECT_set1_X509(X509_OBJECT *a, X509 *obj) +{ + if (a == NULL || !X509_up_ref(obj)) + return 0; + + x509_object_free_internal(a); + a->type = X509_LU_X509; + a->data.x509 = obj; + return 1; +} + +int X509_OBJECT_set1_X509_CRL(X509_OBJECT *a, X509_CRL *obj) +{ + if (a == NULL || !X509_CRL_up_ref(obj)) + return 0; + + x509_object_free_internal(a); + a->type = X509_LU_CRL; + a->data.crl = obj; + return 1; +} + +void X509_OBJECT_free(X509_OBJECT *a) +{ + x509_object_free_internal(a); OPENSSL_free(a); } @@ -489,6 +521,9 @@ STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *nm) X509 *x; X509_OBJECT *obj; + if (ctx->ctx == NULL) + return NULL; + CRYPTO_THREAD_write_lock(ctx->ctx->lock); idx = x509_object_idx_cnt(ctx->ctx->objs, X509_LU_X509, nm, &cnt); if (idx < 0) { @@ -538,8 +573,10 @@ STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *ctx, X509_NAME *nm) X509_OBJECT *obj, *xobj = X509_OBJECT_new(); /* Always do lookup to possibly add new CRLs to cache */ - if (sk == NULL || xobj == NULL || - !X509_STORE_CTX_get_by_subject(ctx, X509_LU_CRL, nm, xobj)) { + if (sk == NULL + || xobj == NULL + || ctx->ctx == NULL + || !X509_STORE_CTX_get_by_subject(ctx, X509_LU_CRL, nm, xobj)) { X509_OBJECT_free(xobj); sk_X509_CRL_free(sk); return NULL; @@ -633,6 +670,9 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) } X509_OBJECT_free(obj); + if (ctx->ctx == NULL) + return 0; + /* Else find index of first cert accepted by 'check_issued' */ ret = 0; CRYPTO_THREAD_write_lock(ctx->ctx->lock); diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_meth.c b/worker/deps/openssl/openssl/crypto/x509/x509_meth.c new file mode 100644 index 0000000000..9dc587a092 --- /dev/null +++ b/worker/deps/openssl/openssl/crypto/x509/x509_meth.c @@ -0,0 +1,166 @@ +/* + * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include + +#include "internal/cryptlib.h" +#include +#include +#include +#include "x509_lcl.h" + +X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name) +{ + X509_LOOKUP_METHOD *method = OPENSSL_zalloc(sizeof(X509_LOOKUP_METHOD)); + + if (method != NULL) { + method->name = OPENSSL_strdup(name); + if (method->name == NULL) { + X509err(X509_F_X509_LOOKUP_METH_NEW, ERR_R_MALLOC_FAILURE); + goto err; + } + } + + return method; + +err: + OPENSSL_free(method); + return NULL; +} + +void X509_LOOKUP_meth_free(X509_LOOKUP_METHOD *method) +{ + if (method != NULL) + OPENSSL_free(method->name); + OPENSSL_free(method); +} + +int X509_LOOKUP_meth_set_new_item(X509_LOOKUP_METHOD *method, + int (*new_item) (X509_LOOKUP *ctx)) +{ + method->new_item = new_item; + return 1; +} + +int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx) +{ + return method->new_item; +} + +int X509_LOOKUP_meth_set_free( + X509_LOOKUP_METHOD *method, + void (*free_fn) (X509_LOOKUP *ctx)) +{ + method->free = free_fn; + return 1; +} + +void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx) +{ + return method->free; +} + +int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method, + int (*init) (X509_LOOKUP *ctx)) +{ + method->init = init; + return 1; +} + +int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx) +{ + return method->init; +} + +int X509_LOOKUP_meth_set_shutdown( + X509_LOOKUP_METHOD *method, + int (*shutdown) (X509_LOOKUP *ctx)) +{ + method->shutdown = shutdown; + return 1; +} + +int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx) +{ + return method->shutdown; +} + +int X509_LOOKUP_meth_set_ctrl( + X509_LOOKUP_METHOD *method, + X509_LOOKUP_ctrl_fn ctrl) +{ + method->ctrl = ctrl; + return 1; +} + +X509_LOOKUP_ctrl_fn X509_LOOKUP_meth_get_ctrl(const X509_LOOKUP_METHOD *method) +{ + return method->ctrl; +} + +int X509_LOOKUP_meth_set_get_by_subject(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_subject_fn get_by_subject) +{ + method->get_by_subject = get_by_subject; + return 1; +} + +X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject( + const X509_LOOKUP_METHOD *method) +{ + return method->get_by_subject; +} + + +int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_issuer_serial_fn get_by_issuer_serial) +{ + method->get_by_issuer_serial = get_by_issuer_serial; + return 1; +} + +X509_LOOKUP_get_by_issuer_serial_fn + X509_LOOKUP_meth_get_get_by_issuer_serial(const X509_LOOKUP_METHOD *method) +{ + return method->get_by_issuer_serial; +} + + +int X509_LOOKUP_meth_set_get_by_fingerprint(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_fingerprint_fn get_by_fingerprint) +{ + method->get_by_fingerprint = get_by_fingerprint; + return 1; +} + +X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint( + const X509_LOOKUP_METHOD *method) +{ + return method->get_by_fingerprint; +} + +int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_alias_fn get_by_alias) +{ + method->get_by_alias = get_by_alias; + return 1; +} + +X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias( + const X509_LOOKUP_METHOD *method) +{ + return method->get_by_alias; +} + diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c b/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c index 3018c69ae4..ba186d30b0 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,6 +7,7 @@ * https://www.openssl.org/source/license.html */ +#include #include #include #include @@ -514,15 +515,14 @@ static int check_chain_extensions(X509_STORE_CTX *ctx) /* check_purpose() makes the callback as needed */ if (purpose > 0 && !check_purpose(ctx, x, purpose, i, must_be_ca)) return 0; - /* Check pathlen if not self issued */ - if ((i > 1) && !(x->ex_flags & EXFLAG_SI) - && (x->ex_pathlen != -1) - && (plen > (x->ex_pathlen + proxy_path_length + 1))) { + /* Check pathlen */ + if ((i > 1) && (x->ex_pathlen != -1) + && (plen > (x->ex_pathlen + proxy_path_length))) { if (!verify_cb_cert(ctx, x, i, X509_V_ERR_PATH_LENGTH_EXCEEDED)) return 0; } - /* Increment path length if not self issued */ - if (!(x->ex_flags & EXFLAG_SI)) + /* Increment path length if not a self issued intermediate CA */ + if (i > 0 && (x->ex_flags & EXFLAG_SI) == 0) plen++; /* * If this certificate is a proxy certificate, the next certificate @@ -557,6 +557,27 @@ static int check_chain_extensions(X509_STORE_CTX *ctx) return 1; } +static int has_san_id(X509 *x, int gtype) +{ + int i; + int ret = 0; + GENERAL_NAMES *gs = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL); + + if (gs == NULL) + return 0; + + for (i = 0; i < sk_GENERAL_NAME_num(gs); i++) { + GENERAL_NAME *g = sk_GENERAL_NAME_value(gs, i); + + if (g->type == gtype) { + ret = 1; + break; + } + } + GENERAL_NAMES_free(gs); + return ret; +} + static int check_name_constraints(X509_STORE_CTX *ctx) { int i; @@ -655,7 +676,12 @@ static int check_name_constraints(X509_STORE_CTX *ctx) int rv = NAME_CONSTRAINTS_check(x, nc); /* If EE certificate check commonName too */ - if (rv == X509_V_OK && i == 0) + if (rv == X509_V_OK && i == 0 + && (ctx->param->hostflags + & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT) == 0 + && ((ctx->param->hostflags + & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT) != 0 + || !has_san_id(x, GEN_DNS))) rv = NAME_CONSTRAINTS_check_CN(x, nc); switch (rv) { @@ -1756,119 +1782,67 @@ int X509_cmp_current_time(const ASN1_TIME *ctm) int X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time) { - char *str; - ASN1_TIME atm; - long offset; - char buff1[24], buff2[24], *p; - int i, j, remaining; + static const size_t utctime_length = sizeof("YYMMDDHHMMSSZ") - 1; + static const size_t generalizedtime_length = sizeof("YYYYMMDDHHMMSSZ") - 1; + ASN1_TIME *asn1_cmp_time = NULL; + int i, day, sec, ret = 0; - p = buff1; - remaining = ctm->length; - str = (char *)ctm->data; /* - * Note that the following (historical) code allows much more slack in the - * time format than RFC5280. In RFC5280, the representation is fixed: + * Note that ASN.1 allows much more slack in the time format than RFC5280. + * In RFC5280, the representation is fixed: * UTCTime: YYMMDDHHMMSSZ * GeneralizedTime: YYYYMMDDHHMMSSZ + * + * We do NOT currently enforce the following RFC 5280 requirement: + * "CAs conforming to this profile MUST always encode certificate + * validity dates through the year 2049 as UTCTime; certificate validity + * dates in 2050 or later MUST be encoded as GeneralizedTime." */ - if (ctm->type == V_ASN1_UTCTIME) { - /* YYMMDDHHMM[SS]Z or YYMMDDHHMM[SS](+-)hhmm */ - int min_length = sizeof("YYMMDDHHMMZ") - 1; - int max_length = sizeof("YYMMDDHHMMSS+hhmm") - 1; - if (remaining < min_length || remaining > max_length) + switch (ctm->type) { + case V_ASN1_UTCTIME: + if (ctm->length != (int)(utctime_length)) return 0; - memcpy(p, str, 10); - p += 10; - str += 10; - remaining -= 10; - } else { - /* YYYYMMDDHHMM[SS[.fff]]Z or YYYYMMDDHHMM[SS[.f[f[f]]]](+-)hhmm */ - int min_length = sizeof("YYYYMMDDHHMMZ") - 1; - int max_length = sizeof("YYYYMMDDHHMMSS.fff+hhmm") - 1; - if (remaining < min_length || remaining > max_length) + break; + case V_ASN1_GENERALIZEDTIME: + if (ctm->length != (int)(generalizedtime_length)) return 0; - memcpy(p, str, 12); - p += 12; - str += 12; - remaining -= 12; + break; + default: + return 0; } - if ((*str == 'Z') || (*str == '-') || (*str == '+')) { - *(p++) = '0'; - *(p++) = '0'; - } else { - /* SS (seconds) */ - if (remaining < 2) + /** + * Verify the format: the ASN.1 functions we use below allow a more + * flexible format than what's mandated by RFC 5280. + * Digit and date ranges will be verified in the conversion methods. + */ + for (i = 0; i < ctm->length - 1; i++) { + if (!isdigit(ctm->data[i])) return 0; - *(p++) = *(str++); - *(p++) = *(str++); - remaining -= 2; - /* - * Skip any (up to three) fractional seconds... - * TODO(emilia): in RFC5280, fractional seconds are forbidden. - * Can we just kill them altogether? - */ - if (remaining && *str == '.') { - str++; - remaining--; - for (i = 0; i < 3 && remaining; i++, str++, remaining--) { - if (*str < '0' || *str > '9') - break; - } - } - } - *(p++) = 'Z'; - *(p++) = '\0'; - - /* We now need either a terminating 'Z' or an offset. */ - if (!remaining) + if (ctm->data[ctm->length - 1] != 'Z') return 0; - if (*str == 'Z') { - if (remaining != 1) - return 0; - offset = 0; - } else { - /* (+-)HHMM */ - if ((*str != '+') && (*str != '-')) - return 0; - /* Historical behaviour: the (+-)hhmm offset is forbidden in RFC5280. */ - if (remaining != 5) - return 0; - if (str[1] < '0' || str[1] > '9' || str[2] < '0' || str[2] > '9' || - str[3] < '0' || str[3] > '9' || str[4] < '0' || str[4] > '9') - return 0; - offset = ((str[1] - '0') * 10 + (str[2] - '0')) * 60; - offset += (str[3] - '0') * 10 + (str[4] - '0'); - if (*str == '-') - offset = -offset; - } - atm.type = ctm->type; - atm.flags = 0; - atm.length = sizeof(buff2); - atm.data = (unsigned char *)buff2; - if (X509_time_adj(&atm, offset * 60, cmp_time) == NULL) - return 0; + /* + * There is ASN1_UTCTIME_cmp_time_t but no + * ASN1_GENERALIZEDTIME_cmp_time_t or ASN1_TIME_cmp_time_t, + * so we go through ASN.1 + */ + asn1_cmp_time = X509_time_adj(NULL, 0, cmp_time); + if (asn1_cmp_time == NULL) + goto err; + if (!ASN1_TIME_diff(&day, &sec, ctm, asn1_cmp_time)) + goto err; - if (ctm->type == V_ASN1_UTCTIME) { - i = (buff1[0] - '0') * 10 + (buff1[1] - '0'); - if (i < 50) - i += 100; /* cf. RFC 2459 */ - j = (buff2[0] - '0') * 10 + (buff2[1] - '0'); - if (j < 50) - j += 100; - - if (i < j) - return -1; - if (i > j) - return 1; - } - i = strcmp(buff1, buff2); - if (i == 0) /* wait a second then return younger :-) */ - return -1; - else - return i; + /* + * X509_cmp_time comparison is <=. + * The return value 0 is reserved for errors. + */ + ret = (day >= 0 && sec >= 0) ? -1 : 1; + + err: + ASN1_TIME_free(asn1_cmp_time); + return ret; } ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj) @@ -3264,6 +3238,10 @@ static int check_sig_level(X509_STORE_CTX *ctx, X509 *cert) if (level > NUM_AUTH_LEVELS) level = NUM_AUTH_LEVELS; + /* We are not able to look up the CA MD for RSA PSS in this version */ + if (nid == NID_rsassaPss) + return 1; + /* Lookup signature algorithm digest */ if (nid && OBJ_find_sigid_algs(nid, &mdnid, NULL)) { const EVP_MD *md; diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c b/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c index b5067220ad..9bc4c61101 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -412,6 +412,11 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, param->hostflags = flags; } +unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param) +{ + return param->hostflags; +} + char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param) { return param->peername; diff --git a/worker/deps/openssl/openssl/crypto/x509/x509name.c b/worker/deps/openssl/openssl/crypto/x509/x509name.c index f87dc7db99..81dce376f8 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509name.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509name.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -191,7 +191,7 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, loc = n; else if (loc < 0) loc = n; - + inc = (set == 0); name->modified = 1; if (set == -1) { @@ -200,7 +200,6 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, inc = 1; } else { set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set; - inc = 0; } } else { /* if (set >= 0) */ @@ -211,12 +210,11 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, set = 0; } else set = sk_X509_NAME_ENTRY_value(sk, loc)->set; - inc = (set == 0) ? 1 : 0; } /* * X509_NAME_ENTRY_dup is ASN1 generated code, that can't be easily - * const'ified; harmless cast as dup() don't modify its input. + * const'ified; harmless cast since dup() don't modify its input. */ if ((new_name = X509_NAME_ENTRY_dup((X509_NAME_ENTRY *)ne)) == NULL) goto err; @@ -228,7 +226,7 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, if (inc) { n = sk_X509_NAME_ENTRY_num(sk); for (i = loc + 1; i < n; i++) - sk_X509_NAME_ENTRY_value(sk, i - 1)->set += 1; + sk_X509_NAME_ENTRY_value(sk, i)->set += 1; } return (1); err: diff --git a/worker/deps/openssl/openssl/crypto/x509/x_name.c b/worker/deps/openssl/openssl/crypto/x509/x_name.c index 0af5df5cfc..1a33dc1daa 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x_name.c +++ b/worker/deps/openssl/openssl/crypto/x509/x_name.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -472,6 +472,8 @@ static int i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ENTRY) * _intname, int X509_NAME_set(X509_NAME **xn, X509_NAME *name) { + if (*xn == name) + return *xn != NULL; if ((name = X509_NAME_dup(name)) == NULL) return 0; X509_NAME_free(*xn); diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c index 3b0f197444..f39cb5ac2a 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c @@ -38,7 +38,7 @@ const X509V3_EXT_METHOD v3_crl_reason = { crl_reasons }; -char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, +char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, const ASN1_ENUMERATED *e) { ENUMERATED_NAMES *enam; diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c index 2eec405a36..bd7301e455 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c @@ -1,5 +1,5 @@ /* - * Copyright 2003-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2003-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -297,47 +297,140 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc) } +static int cn2dnsid(ASN1_STRING *cn, unsigned char **dnsid, size_t *idlen) +{ + int utf8_length; + unsigned char *utf8_value; + int i; + int isdnsname = 0; + + /* Don't leave outputs uninitialized */ + *dnsid = NULL; + *idlen = 0; + + /*- + * Per RFC 6125, DNS-IDs representing internationalized domain names appear + * in certificates in A-label encoded form: + * + * https://tools.ietf.org/html/rfc6125#section-6.4.2 + * + * The same applies to CNs which are intended to represent DNS names. + * However, while in the SAN DNS-IDs are IA5Strings, as CNs they may be + * needlessly encoded in 16-bit Unicode. We perform a conversion to UTF-8 + * to ensure that we get an ASCII representation of any CNs that are + * representable as ASCII, but just not encoded as ASCII. The UTF-8 form + * may contain some non-ASCII octets, and that's fine, such CNs are not + * valid legacy DNS names. + * + * Note, 'int' is the return type of ASN1_STRING_to_UTF8() so that's what + * we must use for 'utf8_length'. + */ + if ((utf8_length = ASN1_STRING_to_UTF8(&utf8_value, cn)) < 0) + return X509_V_ERR_OUT_OF_MEM; + + /* + * Some certificates have had names that include a *trailing* NUL byte. + * Remove these harmless NUL characters. They would otherwise yield false + * alarms with the following embedded NUL check. + */ + while (utf8_length > 0 && utf8_value[utf8_length - 1] == '\0') + --utf8_length; + + /* Reject *embedded* NULs */ + if ((size_t)utf8_length != strlen((char *)utf8_value)) { + OPENSSL_free(utf8_value); + return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX; + } + + /* + * XXX: Deviation from strict DNS name syntax, also check names with '_' + * Check DNS name syntax, any '-' or '.' must be internal, + * and on either side of each '.' we can't have a '-' or '.'. + * + * If the name has just one label, we don't consider it a DNS name. This + * means that "CN=sometld" cannot be precluded by DNS name constraints, but + * that is not a problem. + */ + for (i = 0; i < utf8_length; ++i) { + unsigned char c = utf8_value[i]; + + if ((c >= 'a' && c <= 'z') + || (c >= 'A' && c <= 'Z') + || (c >= '0' && c <= '9') + || c == '_') + continue; + + /* Dot and hyphen cannot be first or last. */ + if (i > 0 && i < utf8_length - 1) { + if (c == '-') + continue; + /* + * Next to a dot the preceding and following characters must not be + * another dot or a hyphen. Otherwise, record that the name is + * plausible, since it has two or more labels. + */ + if (c == '.' + && utf8_value[i + 1] != '.' + && utf8_value[i - 1] != '-' + && utf8_value[i + 1] != '-') { + isdnsname = 1; + continue; + } + } + isdnsname = 0; + break; + } + + if (isdnsname) { + *dnsid = utf8_value; + *idlen = (size_t)utf8_length; + return X509_V_OK; + } + OPENSSL_free(utf8_value); + return X509_V_OK; +} + +/* + * Check CN against DNS-ID name constraints. + */ int NAME_CONSTRAINTS_check_CN(X509 *x, NAME_CONSTRAINTS *nc) { int r, i; - X509_NAME *nm; - + X509_NAME *nm = X509_get_subject_name(x); ASN1_STRING stmp; GENERAL_NAME gntmp; + stmp.flags = 0; stmp.type = V_ASN1_IA5STRING; gntmp.type = GEN_DNS; gntmp.d.dNSName = &stmp; - nm = X509_get_subject_name(x); - /* Process any commonName attributes in subject name */ for (i = -1;;) { X509_NAME_ENTRY *ne; - ASN1_STRING *hn; + ASN1_STRING *cn; + unsigned char *idval; + size_t idlen; + i = X509_NAME_get_index_by_NID(nm, NID_commonName, i); if (i == -1) break; ne = X509_NAME_get_entry(nm, i); - hn = X509_NAME_ENTRY_get_data(ne); - /* Only process attributes that look like host names */ - if (asn1_valid_host(hn)) { - unsigned char *h; - int hlen = ASN1_STRING_to_UTF8(&h, hn); - if (hlen <= 0) - return X509_V_ERR_OUT_OF_MEM; + cn = X509_NAME_ENTRY_get_data(ne); - stmp.length = hlen; - stmp.data = h; - - r = nc_match(&gntmp, nc); - - OPENSSL_free(h); + /* Only process attributes that look like host names */ + if ((r = cn2dnsid(cn, &idval, &idlen)) != X509_V_OK) + return r; + if (idlen == 0) + continue; - if (r != X509_V_OK) - return r; - } + stmp.length = idlen; + stmp.data = idval; + r = nc_match(&gntmp, nc); + OPENSSL_free(idval); + if (r != X509_V_OK) + return r; } return X509_V_OK; } diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c index 6d2f354d70..7ac067229f 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c @@ -78,11 +78,9 @@ int X509_check_purpose(X509 *x, int id, int ca) { int idx; const X509_PURPOSE *pt; - if (!(x->ex_flags & EXFLAG_SET)) { - CRYPTO_THREAD_write_lock(x->lock); - x509v3_cache_extensions(x); - CRYPTO_THREAD_unlock(x->lock); - } + + x509v3_cache_extensions(x); + /* Return if side-effect only call */ if (id == -1) return 1; @@ -352,10 +350,18 @@ static void x509v3_cache_extensions(X509 *x) ASN1_BIT_STRING *ns; EXTENDED_KEY_USAGE *extusage; X509_EXTENSION *ex; - int i; - if (x->ex_flags & EXFLAG_SET) + + /* fast lock-free check, see end of the function for details. */ + if (x->ex_cached) + return; + + CRYPTO_THREAD_write_lock(x->lock); + if (x->ex_flags & EXFLAG_SET) { + CRYPTO_THREAD_unlock(x->lock); return; + } + X509_digest(x, EVP_sha1(), x->sha1_hash, NULL); /* V1 should mean no extensions ... */ if (!X509_get_version(x)) @@ -489,6 +495,13 @@ static void x509v3_cache_extensions(X509 *x) } } x->ex_flags |= EXFLAG_SET; + CRYPTO_THREAD_unlock(x->lock); + /* + * It has to be placed after memory barrier, which is implied by unlock. + * Worst thing that can happen is that another thread proceeds to lock + * and checks x->ex_flags & EXFLAGS_SET. See beginning of the function. + */ + x->ex_cached = 1; } /*- @@ -541,11 +554,7 @@ void X509_set_proxy_pathlen(X509 *x, long l) int X509_check_ca(X509 *x) { - if (!(x->ex_flags & EXFLAG_SET)) { - CRYPTO_THREAD_write_lock(x->lock); - x509v3_cache_extensions(x); - CRYPTO_THREAD_unlock(x->lock); - } + x509v3_cache_extensions(x); return check_ca(x); } @@ -759,6 +768,7 @@ int X509_check_issued(X509 *issuer, X509 *subject) if (X509_NAME_cmp(X509_get_subject_name(issuer), X509_get_issuer_name(subject))) return X509_V_ERR_SUBJECT_ISSUER_MISMATCH; + x509v3_cache_extensions(issuer); x509v3_cache_extensions(subject); diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c index 749f51b2f0..39597dc41d 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c @@ -24,7 +24,7 @@ const X509V3_EXT_METHOD v3_skey_id = { NULL }; -char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, +char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, const ASN1_OCTET_STRING *oct) { return OPENSSL_buf2hexstr(oct->data, oct->length); diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c index fec67243f8..d93781e1b7 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -121,13 +121,12 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method, } } - ai = ASN1_INTEGER_new(); - if (ai == NULL) { + if ((ai = ASN1_INTEGER_new()) == NULL + || !ASN1_INTEGER_set(ai, tlsextid) + || sk_ASN1_INTEGER_push(tlsf, ai) <= 0) { X509V3err(X509V3_F_V2I_TLS_FEATURE, ERR_R_MALLOC_FAILURE); goto err; } - ASN1_INTEGER_set(ai, tlsextid); - sk_ASN1_INTEGER_push(tlsf, ai); } return tlsf; diff --git a/worker/deps/openssl/openssl/demos/bio/descrip.mms b/worker/deps/openssl/openssl/demos/bio/descrip.mms index d49725ffd1..8e127b079a 100644 --- a/worker/deps/openssl/openssl/demos/bio/descrip.mms +++ b/worker/deps/openssl/openssl/demos/bio/descrip.mms @@ -23,7 +23,7 @@ SHARED = TRUE @ ! # Because we use an option file, we need to redefine this -.obj.exe : +.obj.exe : $(LINK) $(LINKFLAGS) $<,OPT:/OPT all : client-arg.exe client-conf.exe saccept.exe sconnect.exe - diff --git a/worker/deps/openssl/openssl/demos/certs/README b/worker/deps/openssl/openssl/demos/certs/README index 88cf56b1f8..126663a1d8 100644 --- a/worker/deps/openssl/openssl/demos/certs/README +++ b/worker/deps/openssl/openssl/demos/certs/README @@ -8,7 +8,7 @@ automatically using scripts. Example creates a root CA, an intermediate CA signed by the root and several certificates signed by the intermediate CA. The script then creates an empty index.txt file and adds entries for the -certificates and generates a CRL. Then one certificate is revoked and a +certificates and generates a CRL. Then one certificate is revoked and a second CRL generated. The script ocsprun.sh runs the test responder on port 8888 covering the @@ -16,3 +16,6 @@ client certificates. The script ocspquery.sh queries the status of the certificates using the test responder. + + + diff --git a/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf b/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf index f02d43bad0..531afe64b2 100644 --- a/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf +++ b/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf @@ -65,3 +65,5 @@ subjectKeyIdentifier=hash authorityKeyIdentifier=keyid:always basicConstraints = critical,CA:true keyUsage = critical, cRLSign, keyCertSign + + diff --git a/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh b/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh index ebe1920432..0f88a48fb8 100644 --- a/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh +++ b/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh @@ -13,7 +13,7 @@ CN="OpenSSL Test RSA SHA-512 cert" $OPENSSL req \ -config apps.cnf -extensions usr_cert -x509 -nodes \ -keyout tsha512.pem -out tsha512.pem -new -days 3650 -sha512 -# Create EC parameters +# Create EC parameters $OPENSSL ecparam -name P-256 -out ecp256.pem $OPENSSL ecparam -name P-384 -out ecp384.pem diff --git a/worker/deps/openssl/openssl/demos/certs/mkcerts.sh b/worker/deps/openssl/openssl/demos/certs/mkcerts.sh index 498595d28c..18daa6bcfb 100644 --- a/worker/deps/openssl/openssl/demos/certs/mkcerts.sh +++ b/worker/deps/openssl/openssl/demos/certs/mkcerts.sh @@ -42,7 +42,7 @@ CN="Test OCSP Responder Cert" $OPENSSL req -config ca.cnf -nodes \ $OPENSSL x509 -req -in respreq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ -extfile ca.cnf -extensions ocsp_cert -CAcreateserial -out resp.pem -# Example creating a PKCS#3 DH certificate. +# Example creating a PKCS#3 DH certificate. # First DH parameters @@ -93,3 +93,4 @@ openssl ca -revoke rev.pem -crl_reason superseded \ # Generate another CRL $OPENSSL ca -gencrl -keyfile root.pem -cert root.pem -config ca.cnf \ -md sha1 -crldays 1 -out crl2.pem + diff --git a/worker/deps/openssl/openssl/demos/evp/Makefile b/worker/deps/openssl/openssl/demos/evp/Makefile index 4a753e9247..72c6e81d7a 100644 --- a/worker/deps/openssl/openssl/demos/evp/Makefile +++ b/worker/deps/openssl/openssl/demos/evp/Makefile @@ -11,7 +11,7 @@ CFLAGS = $(OPENSSL_INCS_LOCATION) LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto -all: aesccm aesgcm +all: aesccm aesgcm aesccm: aesccm.o aesgcm: aesgcm.o diff --git a/worker/deps/openssl/openssl/demos/evp/aesgcm.c b/worker/deps/openssl/openssl/demos/evp/aesgcm.c index 46d9a5639b..df59f469fd 100644 --- a/worker/deps/openssl/openssl/demos/evp/aesgcm.c +++ b/worker/deps/openssl/openssl/demos/evp/aesgcm.c @@ -102,7 +102,7 @@ void aes_gcm_decrypt(void) printf("Plaintext:\n"); BIO_dump_fp(stdout, outbuf, outlen); /* Set expected tag value. */ - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(gcm_tag), + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(gcm_tag), (void *)gcm_tag); /* Finalise: note get no output for GCM */ rv = EVP_DecryptFinal_ex(ctx, outbuf, &outlen); diff --git a/worker/deps/openssl/openssl/doc/apps/ca.pod b/worker/deps/openssl/openssl/doc/apps/ca.pod index 9918a1364a..9885bb2392 100644 --- a/worker/deps/openssl/openssl/doc/apps/ca.pod +++ b/worker/deps/openssl/openssl/doc/apps/ca.pod @@ -243,8 +243,10 @@ for all available algorithms. =item B<-subj arg> supersedes subject name given in the request. -The arg must be formatted as I, -characters may be escaped by \ (backslash), no spaces are skipped. +The arg must be formatted as I. +Keyword characters may be escaped by \ (backslash), and whitespace is retained. +Empty values are permitted, but the corresponding type will not be included +in the resulting certificate. =item B<-utf8> diff --git a/worker/deps/openssl/openssl/doc/apps/cms.pod b/worker/deps/openssl/openssl/doc/apps/cms.pod index 96acd315d4..64ec106b09 100644 --- a/worker/deps/openssl/openssl/doc/apps/cms.pod +++ b/worker/deps/openssl/openssl/doc/apps/cms.pod @@ -393,6 +393,9 @@ When encrypting a message this option may be used multiple times to specify each recipient. This form B be used if customised parameters are required (for example to specify RSA-OAEP). +Only certificates carrying RSA, Diffie-Hellman or EC keys are supported by this +option. + =item B<-keyid> use subject key identifier to identify certificates instead of issuer name and @@ -712,23 +715,20 @@ No revocation checking is done on the signer's certificate. =head1 HISTORY The use of multiple B<-signer> options and the B<-resign> command were first -added in OpenSSL 1.0.0 - -The B option was first added in OpenSSL 1.1.0 +added in OpenSSL 1.0.0. -The use of B<-recip> to specify the recipient when encrypting mail was first -added to OpenSSL 1.1.0 +The B option was first added in OpenSSL 1.0.2 -Support for RSA-OAEP and RSA-PSS was first added to OpenSSL 1.1.0. +Support for RSA-OAEP and RSA-PSS was first added to OpenSSL 1.0.2. The use of non-RSA keys with B<-encrypt> and B<-decrypt> was first added -to OpenSSL 1.1.0. +to OpenSSL 1.0.2. -The -no_alt_chains options was first added to OpenSSL 1.1.0. +The -no_alt_chains options was first added to OpenSSL 1.0.2b. =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/config.pod b/worker/deps/openssl/openssl/doc/apps/config.pod index 76f282f28c..a5153a65f1 100644 --- a/worker/deps/openssl/openssl/doc/apps/config.pod +++ b/worker/deps/openssl/openssl/doc/apps/config.pod @@ -20,7 +20,7 @@ started or end of file is reached. A section name can consist of alphanumeric characters and underscores. The first section of a configuration file is special and is referred -to as the B section this is usually unnamed and is from the +to as the B section. This section is usually unnamed and spans from the start of file until the first named section. When a name is being looked up it is first looked up in a named section (if any) and then the default section. @@ -377,7 +377,7 @@ L, L, L =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/crl.pod b/worker/deps/openssl/openssl/doc/apps/crl.pod index fded3972dd..82c77d60d5 100644 --- a/worker/deps/openssl/openssl/doc/apps/crl.pod +++ b/worker/deps/openssl/openssl/doc/apps/crl.pod @@ -120,7 +120,7 @@ Convert a CRL file from PEM to DER: Output the text form of a DER encoded certificate: - openssl crl -in crl.der -text -noout + openssl crl -in crl.der -inform DER -text -noout =head1 BUGS @@ -133,7 +133,7 @@ L, L, L =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/genpkey.pod b/worker/deps/openssl/openssl/doc/apps/genpkey.pod index d48695200b..91b12e249b 100644 --- a/worker/deps/openssl/openssl/doc/apps/genpkey.pod +++ b/worker/deps/openssl/openssl/doc/apps/genpkey.pod @@ -12,7 +12,7 @@ B B [B<-out filename>] [B<-outform PEM|DER>] [B<-pass arg>] -[B<-cipher>] +[B<-I>] [B<-engine id>] [B<-paramfile file>] [B<-algorithm alg>] @@ -39,21 +39,21 @@ standard output is used. =item B<-outform DER|PEM> -This specifies the output format DER or PEM. +This specifies the output format DER or PEM. The default format is PEM. =item B<-pass arg> -the output file password source. For more information about the format of B +The output file password source. For more information about the format of B see the B section in L. -=item B<-cipher> +=item B<-I> This option encrypts the private key with the supplied cipher. Any algorithm name accepted by EVP_get_cipherbyname() is acceptable such as B. =item B<-engine id> -specifying an engine (by its unique B string) will cause B +Specifying an engine (by its unique B string) will cause B to attempt to obtain a functional reference to the specified engine, thus initialising it if needed. The engine will then be set as the default for all available algorithms. If used this option should precede all other @@ -61,19 +61,32 @@ options. =item B<-algorithm alg> -public key algorithm to use such as RSA, DSA or DH. If used this option must +Public key algorithm to use such as RSA, DSA or DH. If used this option must precede any B<-pkeyopt> options. The options B<-paramfile> and B<-algorithm> -are mutually exclusive. +are mutually exclusive. Engines may add algorithms in addition to the standard +built-in ones. + +Valid built-in algorithm names for private key generation are RSA and EC. + +Valid built-in algorithm names for parameter generation (see the B<-genparam> +option) are DH, DSA and EC. + +Note that the algorithm name X9.42 DH may be used as a synonym for the DH +algorithm. These are identical and do not indicate the type of parameters that +will be generated. Use the B option to indicate whether PKCS#3 +or X9.42 DH parameters are required. See L +below for more details. =item B<-pkeyopt opt:value> -set the public key algorithm option B to B. The precise set of +Set the public key algorithm option B to B. The precise set of options supported depends on the public key algorithm used and its -implementation. See B below for more details. +implementation. See L and +L below for more details. =item B<-genparam> -generate a set of parameters instead of a private key. If used this option must +Generate a set of parameters instead of a private key. If used this option must precede any B<-algorithm>, B<-paramfile> or B<-pkeyopt> options. =item B<-paramfile filename> @@ -97,7 +110,7 @@ The options supported by each algorithm and indeed each implementation of an algorithm can vary. The options for the OpenSSL implementations are detailed below. -=head1 RSA KEY GENERATION OPTIONS +=head2 RSA Key Generation Options =over 4 @@ -112,91 +125,92 @@ hexadecimal value if preceded by B<0x>. Default value is 65537. =back -=head1 DSA PARAMETER GENERATION OPTIONS +=head2 EC Key Generation Options + +The EC key generation options can also be used for parameter generation. =over 4 -=item B +=item B + +The EC curve to use. OpenSSL supports NIST curve names such as "P-256". -The number of bits in the generated parameters. If not specified 1024 is used. +=item B + +The encoding to use for parameters. The "encoding" parameter must be either +"named_curve" or "explicit". The default value is "named_curve". =back -=head1 DH PARAMETER GENERATION OPTIONS +=head1 PARAMETER GENERATION OPTIONS + +The options supported by each algorithm and indeed each implementation of an +algorithm can vary. The options for the OpenSSL implementations are detailed +below. + +=head2 DSA Parameter Generation Options =over 4 -=item B +=item B -The number of bits in the prime parameter B

. +The number of bits in the generated prime. If not specified 1024 is used. -=item B +=item B -The value to use for the generator B. +The number of bits in the q parameter. Must be one of 160, 224 or 256. If not +specified 160 is used. -=item B +=item B -If this option is set then the appropriate RFC5114 parameters are used -instead of generating new parameters. The value B can take the -values 1, 2 or 3 corresponding to RFC5114 DH parameters consisting of -1024 bit group with 160 bit subgroup, 2048 bit group with 224 bit subgroup -and 2048 bit group with 256 bit subgroup as mentioned in RFC5114 sections -2.1, 2.2 and 2.3 respectively. +The digest to use during parameter generation. Must be one of B, B +or B. If set, then the number of bits in B will match the output size +of the specified digest and the B parameter will be +ignored. If not set, then a digest will be used that gives an output matching +the number of bits in B, i.e. B if q length is 160, B if it 224 +or B if it is 256. =back -=head1 EC PARAMETER GENERATION OPTIONS - -The EC parameter generation options below can also -be supplied as EC key generation options. This can (for example) generate a -key from a named curve without the need to use an explicit parameter file. +=head2 DH Parameter Generation Options =over 4 -=item B - -the EC curve to use. OpenSSL supports NIST curve names such as "P-256". +=item B -=item B +The number of bits in the prime parameter B

. The default is 1024. -the encoding to use for parameters. The "encoding" parameter must be either -"named_curve" or "explicit". +=item B -=back +The number of bits in the sub prime parameter B. The default is 256 if the +prime is at least 2048 bits long or 160 otherwise. Only relevant if used in +conjunction with the B option to generate X9.42 DH parameters. -=head1 GOST2001 KEY GENERATION AND PARAMETER OPTIONS - -Gost 2001 support is not enabled by default. To enable this algorithm, -one should load the ccgost engine in the OpenSSL configuration file. -See README.gost file in the engines/ccgost directory of the source -distribution for more details. +=item B -Use of a parameter file for the GOST R 34.10 algorithm is optional. -Parameters can be specified during key generation directly as well as -during generation of parameter file. +The value to use for the generator B. The default is 2. -=over 4 +=item B -=item B +The type of DH parameters to generate. Use 0 for PKCS#3 DH and 1 for X9.42 DH. +The default is 0. -Specifies GOST R 34.10-2001 parameter set according to RFC 4357. -Parameter set can be specified using abbreviated name, object short name or -numeric OID. Following parameter sets are supported: +=item B - paramset OID Usage - A 1.2.643.2.2.35.1 Signature - B 1.2.643.2.2.35.2 Signature - C 1.2.643.2.2.35.3 Signature - XA 1.2.643.2.2.36.0 Key exchange - XB 1.2.643.2.2.36.1 Key exchange - test 1.2.643.2.2.35.0 Test purposes +If this option is set, then the appropriate RFC5114 parameters are used +instead of generating new parameters. The value B can take the +values 1, 2 or 3 corresponding to RFC5114 DH parameters consisting of +1024 bit group with 160 bit subgroup, 2048 bit group with 224 bit subgroup +and 2048 bit group with 256 bit subgroup as mentioned in RFC5114 sections +2.1, 2.2 and 2.3 respectively. If present this overrides all other DH parameter +options. =back -=head1 X25519 KEY GENERATION OPTIONS - -The X25519 algorithm does not currently support any key generation options. +=head2 EC Parameter Generation Options +The EC parameter generation options are the same as for key generation. See +L above. =head1 NOTES @@ -219,19 +233,25 @@ Generate a 2048 bit RSA key using 3 as the public exponent: openssl genpkey -algorithm RSA -out key.pem -pkeyopt rsa_keygen_bits:2048 \ -pkeyopt rsa_keygen_pubexp:3 -Generate 1024 bit DSA parameters: +Generate 2048 bit DSA parameters: openssl genpkey -genparam -algorithm DSA -out dsap.pem \ - -pkeyopt dsa_paramgen_bits:1024 + -pkeyopt dsa_paramgen_bits:2048 Generate DSA key from parameters: openssl genpkey -paramfile dsap.pem -out dsakey.pem -Generate 1024 bit DH parameters: +Generate 2048 bit DH parameters: openssl genpkey -genparam -algorithm DH -out dhp.pem \ - -pkeyopt dh_paramgen_prime_len:1024 + -pkeyopt dh_paramgen_prime_len:2048 + +Generate 2048 bit X9.42 DH parameters: + + openssl genpkey -genparam -algorithm DH -out dhpx.pem \ + -pkeyopt dh_paramgen_prime_len:2048 \ + -pkeyopt dh_paramgen_type:1 Output RFC5114 2048 bit DH parameters with 224 bit subgroup: @@ -264,11 +284,12 @@ Generate an X25519 private key: =head1 HISTORY The ability to use NIST curve names, and to generate an EC key directly, -were added in OpenSSL 1.0.2. +were added in OpenSSL 1.0.2. The ability to generate X25519 keys was added in +OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/rehash.pod b/worker/deps/openssl/openssl/doc/apps/rehash.pod index 79268d4792..22f3b7a40a 100644 --- a/worker/deps/openssl/openssl/doc/apps/rehash.pod +++ b/worker/deps/openssl/openssl/doc/apps/rehash.pod @@ -99,6 +99,12 @@ Note that current versions will not use the old style. Do not remove existing links. This is needed when keeping new and old-style links in the same directory. +=item B<-compat> + +Generate links for both old-style (MD5) and new-style (SHA1) hashing. +This allows releases before 1.0.0 to use these links along-side newer +releases. + =item B<-v> Print messages about old links removed and new links created. @@ -130,7 +136,7 @@ L. =head1 COPYRIGHT -Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/req.pod b/worker/deps/openssl/openssl/doc/apps/req.pod index c5b5260c20..291b1dac83 100644 --- a/worker/deps/openssl/openssl/doc/apps/req.pod +++ b/worker/deps/openssl/openssl/doc/apps/req.pod @@ -213,8 +213,10 @@ see L. sets subject name for new request or supersedes the subject name when processing a request. -The arg must be formatted as I, -characters may be escaped by \ (backslash), no spaces are skipped. +The arg must be formatted as I. +Keyword characters may be escaped by \ (backslash), and whitespace is retained. +Empty values are permitted, but the corresponding type will not be included +in the request. =item B<-multivalue-rdn> @@ -369,7 +371,6 @@ option. For compatibility B is an equivalent option. This option specifies the digest algorithm to use. Any digest supported by the OpenSSL B command can be used. -If not present then MD5 is used. This option can be overridden on the command line. =item B @@ -652,7 +653,7 @@ L =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/s_client.pod b/worker/deps/openssl/openssl/doc/apps/s_client.pod index 01a6c5f7fc..9c17075337 100644 --- a/worker/deps/openssl/openssl/doc/apps/s_client.pod +++ b/worker/deps/openssl/openssl/doc/apps/s_client.pod @@ -281,8 +281,9 @@ be used as a test that session caching is working. =item B<-showcerts> -display the whole server certificate chain: normally only the server -certificate itself is displayed. +Displays the server certificate list as sent by the server: it only consists of +certificates the server has sent (in the order the server has sent them). It is +B a verified chain. =item B<-prexit> @@ -579,7 +580,8 @@ a client certificate. Therefor merely including a client certificate on the command line is no guarantee that the certificate works. If there are problems verifying a server certificate then the -B<-showcerts> option can be used to show the whole chain. +B<-showcerts> option can be used to show all the certificates sent by the +server. The B utility is a test tool and is designed to continue the handshake after any certificate verification errors. As a result it will @@ -609,7 +611,7 @@ The -no_alt_chains options was first added to OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod b/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod index f61268d6ac..d0a6a3c810 100644 --- a/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod +++ b/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod @@ -11,10 +11,10 @@ ASN1_INTEGER_get_int64, ASN1_INTEGER_get, ASN1_INTEGER_set_int64, ASN1_INTEGER_s #include int ASN1_INTEGER_get_int64(int64_t *pr, const ASN1_INTEGER *a); - int ASN1_INTEGER_get(const ASN1_INTEGER *a, long v); + long ASN1_INTEGER_get(const ASN1_INTEGER *a); int ASN1_INTEGER_set_int64(ASN1_INTEGER *a, int64_t r); - long ASN1_INTEGER_set(const ASN1_INTEGER *a); + int ASN1_INTEGER_set(const ASN1_INTEGER *a, long v); int ASN1_INTEGER_get_uint64(uint64_t *pr, const ASN1_INTEGER *a); int ASN1_INTEGER_set_uint64(ASN1_INTEGER *a, uint64_t r); @@ -123,7 +123,7 @@ were added to OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod index f682c37d17..89179a46e7 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod @@ -17,26 +17,26 @@ BIO_meth_set_callback_ctrl - Routines to build up BIO methods int BIO_get_new_index(void); BIO_METHOD *BIO_meth_new(int type, const char *name); void BIO_meth_free(BIO_METHOD *biom); - int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int); + int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int); int BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int)); - int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int); + int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int)); - int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *); + int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *); int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); - int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int); + int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int)); - long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *); + long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); - int (*BIO_meth_get_create(BIO_METHOD *bion)) (BIO *); + int (*BIO_meth_get_create(const BIO_METHOD *bion)) (BIO *); int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)); - int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *); + int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *); int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)); - long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) + long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *); int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, long (*callback_ctrl) (BIO *, int, @@ -121,7 +121,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BN_add.pod b/worker/deps/openssl/openssl/doc/crypto/BN_add.pod index db3b0d45b4..b2c5dd2cc5 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BN_add.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BN_add.pod @@ -92,7 +92,9 @@ BN_exp() raises I to the I

-th power and places the result in I BN_mul(). BN_mod_exp() computes I to the I

-th power modulo I (C). This function uses less time and space than BN_exp(). +m>). This function uses less time and space than BN_exp(). Do not call this +function when B is even and any of the parameters have the +B flag set. BN_gcd() computes the greatest common divisor of I and I and places the result in I. I may be the same B as I or @@ -117,7 +119,7 @@ L, L =head1 COPYRIGHT -Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod b/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod index ac46948477..c9ca33fd13 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod @@ -55,8 +55,8 @@ freed later using OPENSSL_free(). BN_hex2bn() takes as many characters as possible from the string B, including the leading character '-' which means negative, to form a valid hexadecimal number representation and converts them to a B and -stores it in **B. If *B is NULL, a new B is created. If -B is NULL, it only computes the length of valid representation. +stores it in **B. If *B is NULL, a new B is created. If +B is NULL, it only computes the length of valid representation. A "negative zero" is converted to zero. BN_dec2bn() is the same using the decimal system. @@ -106,7 +106,7 @@ L =head1 COPYRIGHT -Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod b/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod index c97536b5c4..4cd667e2e3 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod @@ -100,7 +100,17 @@ If B, this test is skipped. Both BN_is_prime_ex() and BN_is_prime_fasttest_ex() perform a Miller-Rabin probabilistic primality test with B iterations. If B, a number of iterations is used that -yields a false positive rate of at most 2^-80 for random input. +yields a false positive rate of at most 2^-64 for random input. +The error rate depends on the size of the prime and goes down for bigger primes. +The rate is 2^-80 starting at 308 bits, 2^-112 at 852 bits, 2^-128 at 1080 bits, +2^-192 at 3747 bits and 2^-256 at 6394 bits. + +When the source of the prime is not random or not trusted, the number +of checks needs to be much higher to reach the same level of assurance: +It should equal half of the targeted security level in bits (rounded up to the +next integer if necessary). +For instance, to reach the 128 bit security level, B should be set to +64. If B is not B, B is called after the j-th iteration (j = 0, 1, ...). B is a @@ -184,7 +194,7 @@ and BN_GENCB_get_arg() were added in OpenSSL 1.1.0 =head1 COPYRIGHT -Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod b/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod index 0ed42628c3..cbd5a21353 100644 --- a/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod +++ b/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod @@ -18,9 +18,8 @@ B is the symmetric cipher to use. B is an optional set of flags. =head1 NOTES -Only certificates carrying RSA keys are supported so the recipient certificates -supplied to this function must all contain RSA public keys, though they do not -have to be signed using the RSA algorithm. +Only certificates carrying RSA, Diffie-Hellman or EC keys are supported by this +function. EVP_des_ede3_cbc() (triple DES) is the algorithm of choice for S/MIME use because most clients will support it. @@ -94,7 +93,7 @@ The B flag was first supported in OpenSSL 1.0.0. =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod b/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod index e5532c96f4..cea088857a 100644 --- a/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod +++ b/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod @@ -54,7 +54,7 @@ CMS_SignerInfo_set1_signer_cert(). Once all signer certificates have been set CMS_verify() can be used. -Although CMS_get0_SignerInfos() can return NULL is an error occur B if +Although CMS_get0_SignerInfos() can return NULL if an error occurs B if there are no signers this is not a problem in practice because the only error which can occur is if the B structure is not of type signedData due to application error. @@ -79,7 +79,7 @@ L, L =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod b/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod index 79f5f4232d..cb961be797 100644 --- a/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod +++ b/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod @@ -48,7 +48,7 @@ CMS_verify(). CMS_ReceiptRequest_create0() returns a signed receipt request structure or NULL if an error occurred. -CMS_add1_ReceiptRequest() returns 1 for success or 0 is an error occurred. +CMS_add1_ReceiptRequest() returns 1 for success or 0 if an error occurred. CMS_get1_ReceiptRequest() returns 1 is a signed receipt request is found and decoded. It returns 0 if a signed receipt request is not present and -1 if @@ -62,7 +62,7 @@ L =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod index d768da8c6e..ef0a80b195 100644 --- a/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod @@ -19,7 +19,7 @@ DH_meth_set_generate_params - Routines to build up DH methods DH_METHOD *DH_meth_dup(const DH_METHOD *dhm); const char *DH_meth_get0_name(const DH_METHOD *dhm); int DH_meth_set1_name(DH_METHOD *dhm, const char *name); - int DH_meth_get_flags(DH_METHOD *dhm); + int DH_meth_get_flags(const DH_METHOD *dhm); int DH_meth_set_flags(DH_METHOD *dhm, int flags); void *DH_meth_get0_app_data(const DH_METHOD *dhm); int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data); @@ -146,7 +146,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod index 948ab29b58..8ebf7ab6bc 100644 --- a/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod @@ -21,7 +21,7 @@ DSA_meth_set_keygen - Routines to build up DSA methods DSA_METHOD *DSA_meth_dup(const DSA_METHOD *meth); const char *DSA_meth_get0_name(const DSA_METHOD *dsam); int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name); - int DSA_meth_get_flags(DSA_METHOD *dsam); + int DSA_meth_get_flags(const DSA_METHOD *dsam); int DSA_meth_set_flags(DSA_METHOD *dsam, int flags); void *DSA_meth_get0_app_data(const DSA_METHOD *dsam); int DSA_meth_set0_app_data(DSA_METHOD *dsam, void *app_data); @@ -183,7 +183,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod b/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod index ba0f6b863e..b91f89f073 100644 --- a/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod +++ b/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod @@ -24,13 +24,12 @@ digest B using the private key B and places its ASN.1 DER encoding at B. The length of the signature is places in *B. B must point to DSA_size(B) bytes of memory. -DSA_sign_setup() may be used to precompute part of the signing -operation in case signature generation is time-critical. It expects -B to contain DSA parameters. It places the precomputed values -in newly allocated Bs at *B and *B, after freeing -the old ones unless *B and *B are NULL. These values may -be passed to DSA_sign() in Bkinv> and Br>. -B is a pre-allocated B or NULL. +DSA_sign_setup() is defined only for backward binary compatibility and +should not be used. +Since OpenSSL 1.1.0 the DSA type is opaque and the output of +DSA_sign_setup() cannot be used anyway: calling this function will only +cause overhead, and does not affect the actual signature +(pre-)computation. DSA_verify() verifies that the signature B of size B matches a given message digest B of size B. @@ -60,7 +59,7 @@ L =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod b/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod index 9e1f662c62..f544ccbb32 100644 --- a/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod @@ -114,6 +114,8 @@ returned as a newly allocated B structure (or NULL on error). =head1 RETURN VALUES +ECDSA_SIG_new() returns NULL if the allocation fails. + ECDSA_SIG_set0() returns 1 on success or 0 on failure. ECDSA_size() returns the maximum length signature or 0 on error. @@ -197,7 +199,7 @@ L =head1 COPYRIGHT -Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod index bb7ef7a28f..9fda29ba07 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod @@ -3,11 +3,12 @@ =head1 NAME EVP_MD_CTX_new, EVP_MD_CTX_reset, EVP_MD_CTX_free, EVP_MD_CTX_copy_ex, +EVP_MD_CTX_set_flags, EVP_MD_CTX_clear_flags, EVP_MD_CTX_test_flags, EVP_DigestInit_ex, EVP_DigestUpdate, EVP_DigestFinal_ex, EVP_DigestInit, EVP_DigestFinal, EVP_MD_CTX_copy, EVP_MD_type, EVP_MD_pkey_type, EVP_MD_size, EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size, -EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, EVP_sha1, -EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_mdc2, +EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_MD_CTX_md_data, EVP_md_null, EVP_md2, +EVP_md5, EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_mdc2, EVP_ripemd160, EVP_blake2b512, EVP_blake2s256, EVP_get_digestbyname, EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines @@ -18,6 +19,9 @@ EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines EVP_MD_CTX *EVP_MD_CTX_new(void); int EVP_MD_CTX_reset(EVP_MD_CTX *ctx); void EVP_MD_CTX_free(EVP_MD_CTX *ctx); + void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags); + void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags); + int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags); int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl); int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, size_t cnt); @@ -41,6 +45,7 @@ EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines int EVP_MD_CTX_size(const EVP_MD *ctx); int EVP_MD_CTX_block_size(const EVP_MD *ctx); int EVP_MD_CTX_type(const EVP_MD *ctx); + void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx); const EVP_MD *EVP_md_null(void); const EVP_MD *EVP_md2(void); @@ -73,6 +78,9 @@ to reuse an already existing context. EVP_MD_CTX_free() cleans up digest context B and frees up the space allocated to it. +EVP_MD_CTX_set_flags(), EVP_MD_CTX_clear_flags() and EVP_MD_CTX_test_flags() +sets, clears and tests B flags. See L below for more information. + EVP_DigestInit_ex() sets up digest context B to use a digest B from ENGINE B. B must be initialized before calling this function. B will typically be supplied by a function such as EVP_sha1(). @@ -117,6 +125,11 @@ representing the given message digest when passed an B structure. For example EVP_MD_type(EVP_sha1()) returns B. This function is normally used when setting ASN1 OIDs. +EVP_MD_CTX_md_data() return the digest method private data for the passed +B. +The space is allocated by OpenSSL and has the size originally set with +EVP_MD_meth_set_app_datasize(). + EVP_MD_CTX_md() returns the B structure corresponding to the passed B. @@ -139,6 +152,38 @@ EVP_get_digestbyname(), EVP_get_digestbynid() and EVP_get_digestbyobj() return an B structure when passed a digest name, a digest NID or an ASN1_OBJECT structure respectively. +=head1 FLAGS + +EVP_MD_CTX_set_flags(), EVP_MD_CTX_clear_flags() and EVP_MD_CTX_test_flags() +can be used the manipulate and test these B flags: + +=over 4 + +=item EVP_MD_CTX_FLAG_ONESHOT + +This flag instructs the digest to optimize for one update only, if possible. + +=for comment EVP_MD_CTX_FLAG_CLEANED is internal, don't mention it + +=for comment EVP_MD_CTX_FLAG_REUSE is internal, don't mention it + +=for comment We currently avoid documenting flags that are only bit holder: +EVP_MD_CTX_FLAG_NON_FIPS_ALLOW, EVP_MD_CTX_FLAGS_PAD_* + +=item EVP_MD_CTX_FLAG_NO_INIT + +This flag instructs EVP_DigestInit() and similar not to initialise the +implementation specific data. + +=item EVP_MD_CTX_FLAG_FINALISE + +Some functions such as EVP_DigestSign only finalise copies of internal +contexts so additional data can be included after the finalisation call. +This is inefficient if this functionality is not required, and can be +disabled with this flag. + +=back + =head1 RETURN VALUES EVP_DigestInit_ex(), EVP_DigestUpdate() and EVP_DigestFinal_ex() return 1 for @@ -178,7 +223,7 @@ EVP_MD_CTX_copy_ex() because they can efficiently reuse a digest context instead of initializing and cleaning it up on each call and allow non default implementations of digests to be specified. -If digest contexts are not cleaned up after use +If digest contexts are not cleaned up after use, memory leaks will occur. EVP_MD_CTX_size(), EVP_MD_CTX_block_size(), EVP_MD_CTX_type(), @@ -249,7 +294,7 @@ was removed in OpenSSL 1.1.0 =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod index 7ec06b7a27..a3938d5800 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod @@ -19,26 +19,69 @@ The EVP signature routines are a high level interface to digital signatures. EVP_DigestSignInit() sets up signing context B to use digest B from ENGINE B and private key B. B must be created with -EVP_MD_CTX_new() before calling this function. If B is not NULL the +EVP_MD_CTX_new() before calling this function. If B is not NULL, the EVP_PKEY_CTX of the signing operation will be written to B<*pctx>: this can -be used to set alternative signing options. +be used to set alternative signing options. Note that any existing value in +B<*pctx> is overwritten. The EVP_PKEY_CTX value returned must not be freed +directly by the application (it will be freed automatically when the EVP_MD_CTX +is freed). The digest B may be NULL if the signing algorithm supports it. + +Only EVP_PKEY types that support signing can be used with these functions. This +includes MAC algorithms where the MAC generation is considered as a form of +"signing". Built-in EVP_PKEY types supported by these functions are CMAC, DSA, +ECDSA, HMAC and RSA. + +Not all digests can be used for all key types. The following combinations apply. + +=over 4 + +=item DSA + +Supports SHA1, SHA224, SHA256, SHA384 and SHA512 + +=item ECDSA + +Supports SHA1, SHA224, SHA256, SHA384 and SHA512 + +=item RSA with no padding + +Supports no digests (the digest B must be NULL) + +=item RSA with X931 padding + +Supports SHA1, SHA256, SHA384 and SHA512 + +=item All other RSA padding types + +Support SHA1, SHA224, SHA256, SHA384, SHA512, MD5, MD5_SHA1, MD2, MD4, MDC2, +RIPEMD160 + +=item HMAC + +Supports any digest + +=item CMAC + +Will ignore any digest provided. + +=back EVP_DigestSignUpdate() hashes B bytes of data at B into the signature context B. This function can be called several times on the same B to include additional data. This function is currently implemented using a macro. -EVP_DigestSignFinal() signs the data in B places the signature in B. +EVP_DigestSignFinal() signs the data in B and places the signature in B. If B is B then the maximum size of the output buffer is written to the B parameter. If B is not B then before the call the -B parameter should contain the length of the B buffer, if the +B parameter should contain the length of the B buffer. If the call is successful the signature is written to B and the amount of data written to B. =head1 RETURN VALUES EVP_DigestSignInit() EVP_DigestSignUpdate() and EVP_DigestSignaFinal() return -1 for success and 0 or a negative value for failure. In particular a return +1 for success and 0 or a negative value for failure. In particular, a return value of -2 indicates the operation is not supported by the public key algorithm. @@ -62,7 +105,7 @@ The call to EVP_DigestSignFinal() internally finalizes a copy of the digest context. This means that calls to EVP_DigestSignUpdate() and EVP_DigestSignFinal() can be called later to digest and sign additional data. -Since only a copy of the digest context is ever finalized the context must +Since only a copy of the digest context is ever finalized, the context must be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak will occur. @@ -86,7 +129,7 @@ were first added to OpenSSL 1.0.0. =head1 COPYRIGHT -Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod index ce59422d3e..ff1153b644 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod @@ -19,9 +19,12 @@ The EVP signature routines are a high level interface to digital signatures. EVP_DigestVerifyInit() sets up verification context B to use digest B from ENGINE B and public key B. B must be created -with EVP_MD_CTX_new() before calling this function. If B is not NULL the +with EVP_MD_CTX_new() before calling this function. If B is not NULL, the EVP_PKEY_CTX of the verification operation will be written to B<*pctx>: this -can be used to set alternative verification options. +can be used to set alternative verification options. Note that any existing +value in B<*pctx> is overwritten. The EVP_PKEY_CTX value returned must not be +freed directly by the application (it will be freed automatically when the +EVP_MD_CTX is freed). EVP_DigestVerifyUpdate() hashes B bytes of data at B into the verification context B. This function can be called several times on the @@ -62,7 +65,7 @@ The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest context. This means that EVP_VerifyUpdate() and EVP_VerifyFinal() can be called later to digest and verify additional data. -Since only a copy of the digest context is ever finalized the context must +Since only a copy of the digest context is ever finalized, the context must be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak will occur. @@ -81,7 +84,7 @@ were first added to OpenSSL 1.0.0. =head1 COPYRIGHT -Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod index 61e0eec528..459e7a02ff 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod @@ -59,7 +59,7 @@ All these functions are implemented as macros. A context for HKDF can be obtained by calling: - EVP_PKEY_CTX *pctx = EVP_PKEY_new_id(EVP_PKEY_HKDF, NULL); + EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL); The digest, key, salt and info values must be set before a key is derived or an error occurs. @@ -118,7 +118,7 @@ L =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod index f1f0ae4fbe..fe35a5ece8 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod @@ -50,7 +50,7 @@ All these functions are implemented as macros. A context for the TLS PRF can be obtained by calling: - EVP_PKEY_CTX *pctx = EVP_PKEY_new_id(EVP_PKEY_TLS1_PRF, NULL); + EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_TLS1_PRF, NULL); The digest, secret value and seed must be set before a key is derived or an error occurs. @@ -98,7 +98,7 @@ L =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod index a190f5e9ab..9ad2daed4f 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod @@ -48,7 +48,7 @@ engine that implements it. EVP_PKEY_asn1_get0_info() returns the public key ID, base public key ID (both NIDs), any flags, the method description and PEM type string -associated with the public key ASN.1 method B<*ameth>. +associated with the public key ASN.1 method B<*ameth>. EVP_PKEY_asn1_count(), EVP_PKEY_asn1_get0(), EVP_PKEY_asn1_find() and EVP_PKEY_asn1_find_str() are not thread safe, but as long as all diff --git a/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod b/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod index 3ada6679cf..c84adb2e46 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod @@ -54,7 +54,7 @@ constants. OBJ_nid2obj(), OBJ_nid2ln() and OBJ_nid2sn() convert the NID B to an ASN1_OBJECT structure, its long name and its short name respectively, -or B is an error occurred. +or B if an error occurred. OBJ_obj2nid(), OBJ_ln2nid(), OBJ_sn2nid() return the corresponding NID for the object B, the long name or the short name respectively @@ -188,7 +188,7 @@ OBJ_cleanup() was deprecated in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod b/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod index 5123f0ad6d..a4e3c1c2f0 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod @@ -6,8 +6,12 @@ OCSP_resp_get0_certs, OCSP_resp_get0_signer, OCSP_resp_get0_id, OCSP_resp_get0_produced_at, +OCSP_resp_get0_signature, +OCSP_resp_get0_tbs_sigalg, +OCSP_resp_get0_respdata, OCSP_resp_find_status, OCSP_resp_count, OCSP_resp_get0, OCSP_resp_find, -OCSP_single_get0_status, OCSP_check_validity +OCSP_single_get0_status, OCSP_check_validity, +OCSP_basic_verify - OCSP response utility functions =head1 SYNOPSIS @@ -31,6 +35,9 @@ OCSP_single_get0_status, OCSP_check_validity const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at( const OCSP_BASICRESP* single); + const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs); + const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs); + const OCSP_RESPDATA *OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs); const STACK_OF(X509) *OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); int OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer, @@ -44,6 +51,9 @@ OCSP_single_get0_status, OCSP_check_validity ASN1_GENERALIZEDTIME *nextupd, long sec, long maxsec); + int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs, + X509_STORE *st, unsigned long flags); + =head1 DESCRIPTION OCSP_resp_find_status() searches B for an OCSP response for B. If it is @@ -74,6 +84,12 @@ B<*revtime>, B<*thisupd> and B<*nextupd>. OCSP_resp_get0_produced_at() extracts the B field from the single response B. +OCSP_resp_get0_signature() returns the signature from B. + +OCSP_resp_get0_tbs_sigalg() returns the B from B. + +OCSP_resp_get0_respdata() returns the B from B. + OCSP_resp_get0_certs() returns any certificates included in B. OCSP_resp_get0_signer() attempts to retrieve the certificate that directly @@ -93,6 +109,27 @@ OCSP_single_get0_status(). If B is non-zero it indicates how many seconds leeway should be allowed in the check. If B is positive it indicates the maximum age of B in seconds. +OCSP_basic_verify() checks that the basic response message B is correctly +signed and that the signer certificate can be validated. It takes B as +the trusted store and B as a set of untrusted intermediate certificates. +The function first tries to find the signer certificate of the response +in . It also searches the certificates the responder may have included +in B unless the B contain B. +It fails if the signer certificate cannot be found. +Next, the function checks the signature of B and fails on error +unless the B contain B. Then the function already returns +success if the B contain B or if the signer certificate +was found in B and the B contain B. +Otherwise the function continues by validating the signer certificate. +To this end, all certificates in B and in B are considered as +untrusted certificates for the construction of the validation path for the +signer certificate unless the B flag is set. After successful path +validation the function returns success if the B flag is set. +Otherwise it verifies that the signer certificate meets the OCSP issuer +criteria including potential delegation. If this does not succeed and the +B do not contain B the function checks for explicit +trust for OCSP signing in the root CA certificate. + =head1 RETURN VALUES OCSP_resp_find_status() returns 1 if B is found in B and 0 otherwise. @@ -112,6 +149,9 @@ occurred. OCSP_resp_get0_signer() returns 1 if the signing certificate was located, or 0 on error. +OCSP_basic_verify() returns 1 on success, 0 on error, or -1 on fatal error such +as malloc failure. + =head1 NOTES Applications will typically call OCSP_resp_find_status() using the certificate @@ -142,7 +182,7 @@ L =head1 COPYRIGHT -Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod index f50faec772..01623bac76 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod @@ -2,13 +2,14 @@ =head1 NAME -OPENSSL_VERSION_NUMBER, OpenSSL_version, +OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, OpenSSL_version, OpenSSL_version_num - get OpenSSL version number =head1 SYNOPSIS #include #define OPENSSL_VERSION_NUMBER 0xnnnnnnnnnL + #define OPENSSL_VERSION_TEXT "OpenSSL x.y.z xx XXX xxxx" #include @@ -45,12 +46,11 @@ Version 0.9.5a had an interim interpretation that is like the current one, except the patch level got the highest bit set, to keep continuity. The number was therefore 0x0090581f. -OpenSSL_version_num() returns the version number. +OPENSSL_VERSION_TEXT is the text variant of the version number and the +release date. For example, +"OpenSSL 1.0.1a 15 Oct 2015". -The macro OPENSSL_VERSION_AT_LEAST(major,minor) can be used at compile -time test if the current version is at least as new as the version provided. -The arguments major, minor and fix correspond to the version information -as given above. +OpenSSL_version_num() returns the version number. OpenSSL_version() returns different strings depending on B: diff --git a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod index f0b3c8aa8d..f9664ee352 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod @@ -190,10 +190,10 @@ resources should be freed at an earlier time, or under the circumstances described in the NOTES section below. The B flag will load a default configuration -file. To specify a different file, an B must -be created and used. The routines -OPENSSL_init_new() and OPENSSL_INIT_set_config_appname() can be used to -allocate the object and set the application name, and then the +file. For optional configuration file settings, an B +must be created and used. +The routines OPENSSL_init_new() and OPENSSL_INIT_set_config_appname() can +be used to allocate the object and set the application name, and then the object can be released with OPENSSL_INIT_free() when done. =head1 NOTES @@ -235,7 +235,7 @@ and OPENSSL_INIT_free() functions were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod index 2104f43108..ba5dc1069f 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod @@ -68,8 +68,8 @@ CRYPTO_mem_leaks, CRYPTO_mem_leaks_fp - Memory allocation functions int CRYPTO_mem_debug_push(const char *info, const char *file, int line); int CRYPTO_mem_debug_pop(void); - void CRYPTO_mem_leaks(BIO *b); - void CRYPTO_mem_leaks_fp(FILE *fp); + int CRYPTO_mem_leaks(BIO *b); + int CRYPTO_mem_leaks_fp(FILE *fp); =head1 DESCRIPTION @@ -197,7 +197,7 @@ only, say, the malloc() implementation is outright dangerous.> =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod b/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod index 6b3006ef35..b0ba62a3b3 100644 --- a/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod +++ b/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod @@ -294,7 +294,7 @@ for it twice) if B is 1. The B parameter has the same value as the B parameter passed to the PEM routine. It allows arbitrary data to be passed to the callback by the application (for example a window handle in a GUI application). The callback -B return the number of characters in the passphrase or 0 if +B return the number of characters in the passphrase or -1 if an error occurred. =head1 EXAMPLES @@ -348,17 +348,16 @@ Skeleton pass phrase callback: int pass_cb(char *buf, int size, int rwflag, void *u) { - int len; - char *tmp; /* We'd probably do something else if 'rwflag' is 1 */ printf("Enter pass phrase for \"%s\"\n", (char *)u); /* get pass phrase, length 'len' into 'tmp' */ - tmp = "hello"; - len = strlen(tmp); - if (len <= 0) - return 0; + char *tmp = "hello"; + if (tmp == NULL) /* An error occurred */ + return -1; + + size_t len = strlen(tmp); if (len > size) len = size; @@ -471,7 +470,7 @@ L, L =head1 COPYRIGHT -Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod index 9970aa6b73..8f6d428afc 100644 --- a/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod @@ -24,7 +24,7 @@ RSA_meth_set_verify, RSA_meth_get_keygen, RSA_meth_set_keygen RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth); const char *RSA_meth_get0_name(const RSA_METHOD *meth); int RSA_meth_set1_name(RSA_METHOD *meth, const char *name); - int RSA_meth_get_flags(RSA_METHOD *meth); + int RSA_meth_get_flags(const RSA_METHOD *meth); int RSA_meth_set_flags(RSA_METHOD *meth, int flags); void *RSA_meth_get0_app_data(const RSA_METHOD *meth); int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data); @@ -58,9 +58,9 @@ RSA_meth_set_verify, RSA_meth_get_keygen, RSA_meth_set_keygen int padding)); /* Can be null */ int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) - (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx); + (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx); int RSA_meth_set_mod_exp(RSA_METHOD *rsa, - int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, + int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)); /* Can be null */ int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth)) @@ -225,7 +225,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod b/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod index 3eb8bbc9a0..c11090891a 100644 --- a/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod +++ b/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod @@ -57,7 +57,7 @@ streaming single pass option should be available. =head1 RETURN VALUES SMIME_read_PKCS7() returns a valid B structure or B -is an error occurred. The error can be obtained from ERR_get_error(3). +if an error occurred. The error can be obtained from ERR_get_error(3). =head1 SEE ALSO @@ -68,7 +68,7 @@ L =head1 COPYRIGHT -Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod b/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod index 8a0d9f2d25..340d9b2ae2 100644 --- a/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod +++ b/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod @@ -132,3 +132,4 @@ in the file LICENSE in the source distribution or at L. =cut + diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod b/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod index 5f8dfa93b0..4f2768d4f4 100644 --- a/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod +++ b/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod @@ -117,10 +117,11 @@ L, L, L, L, +L, =head1 COPYRIGHT -Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_meth_new.pod new file mode 100644 index 0000000000..fb165fd6ad --- /dev/null +++ b/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_meth_new.pod @@ -0,0 +1,189 @@ +=pod + +=head1 NAME + +X509_LOOKUP_meth_new, X509_LOOKUP_meth_free, X509_LOOKUP_meth_set_new_item, +X509_LOOKUP_meth_get_new_item, X509_LOOKUP_meth_set_free, +X509_LOOKUP_meth_get_free, X509_LOOKUP_meth_set_init, +X509_LOOKUP_meth_get_init, X509_LOOKUP_meth_set_shutdown, +X509_LOOKUP_meth_get_shutdown, +X509_LOOKUP_ctrl_fn, X509_LOOKUP_meth_set_ctrl, X509_LOOKUP_meth_get_ctrl, +X509_LOOKUP_get_by_subject_fn, X509_LOOKUP_meth_set_get_by_subject, +X509_LOOKUP_meth_get_get_by_subject, +X509_LOOKUP_get_by_issuer_serial_fn, X509_LOOKUP_meth_set_get_by_issuer_serial, +X509_LOOKUP_meth_get_get_by_issuer_serial, +X509_LOOKUP_get_by_fingerprint_fn, X509_LOOKUP_meth_set_get_by_fingerprint, +X509_LOOKUP_meth_get_get_by_fingerprint, +X509_LOOKUP_get_by_alias_fn, X509_LOOKUP_meth_set_get_by_alias, +X509_LOOKUP_meth_get_get_by_alias, +X509_LOOKUP_set_method_data, X509_LOOKUP_get_method_data, +X509_LOOKUP_get_store, X509_OBJECT_set1_X509, X509_OBJECT_set1_X509_CRL +- Routines to build up X509_LOOKUP methods + +=head1 SYNOPSIS + + #include + + X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name); + void X509_LOOKUP_meth_free(X509_LOOKUP_METHOD *method); + + int X509_LOOKUP_meth_set_new_item(X509_LOOKUP_METHOD *method, + int (*new_item) (X509_LOOKUP *ctx)); + int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + + int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method, + void (*free) (X509_LOOKUP *ctx)); + void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + + int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method, + int (*init) (X509_LOOKUP *ctx)); + int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + + int X509_LOOKUP_meth_set_shutdown(X509_LOOKUP_METHOD *method, + int (*shutdown) (X509_LOOKUP *ctx)); + int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + + typedef int (*X509_LOOKUP_ctrl_fn)(X509_LOOKUP *ctx, int cmd, const char *argc, + long argl, char **ret); + int X509_LOOKUP_meth_set_ctrl(X509_LOOKUP_METHOD *method, + X509_LOOKUP_ctrl_fn ctrl_fn); + X509_LOOKUP_ctrl_fn X509_LOOKUP_meth_get_ctrl(const X509_LOOKUP_METHOD *method); + + typedef int (*X509_LOOKUP_get_by_subject_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + X509_NAME *name, + X509_OBJECT *ret); + int X509_LOOKUP_meth_set_get_by_subject(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_subject_fn fn); + X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject( + const X509_LOOKUP_METHOD *method); + + typedef int (*X509_LOOKUP_get_by_issuer_serial_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + X509_NAME *name, + ASN1_INTEGER *serial, + X509_OBJECT *ret); + int X509_LOOKUP_meth_set_get_by_issuer_serial( + X509_LOOKUP_METHOD *method, X509_LOOKUP_get_by_issuer_serial_fn fn); + X509_LOOKUP_get_by_issuer_serial_fn X509_LOOKUP_meth_get_get_by_issuer_serial( + const X509_LOOKUP_METHOD *method); + + typedef int (*X509_LOOKUP_get_by_fingerprint_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + const unsigned char* bytes, + int len, + X509_OBJECT *ret); + int X509_LOOKUP_meth_set_get_by_fingerprint(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_fingerprint_fn fn); + X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint( + const X509_LOOKUP_METHOD *method); + + typedef int (*X509_LOOKUP_get_by_alias_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + const char *str, + int len, + X509_OBJECT *ret); + int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_alias_fn fn); + X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias( + const X509_LOOKUP_METHOD *method); + + int X509_LOOKUP_set_method_data(X509_LOOKUP *ctx, void *data); + void *X509_LOOKUP_get_method_data(const X509_LOOKUP *ctx); + + X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx); + + int X509_OBJECT_set1_X509(X509_OBJECT *a, X509 *obj); + int X509_OBJECT_set1_X509_CRL(X509_OBJECT *a, X509_CRL *obj); + +=head1 DESCRIPTION + +The B type is a structure used for the implementation of new +X509_LOOKUP types. It provides a set of functions used by OpenSSL for the +implementation of various X509 and X509_CRL lookup capabilities. One instance +of an X509_LOOKUP_METHOD can be associated to many instantiations of an +B structure. + +X509_LOOKUP_meth_new() creates a new B structure. It should +be given a human-readable string containing a brief description of the lookup +method. + +X509_LOOKUP_meth_free() destroys a B structure. + +X509_LOOKUP_get_new_item() and X509_LOOKUP_set_new_item() get and set the +function that is called when an B object is created with +X509_LOOKUP_new(). If an X509_LOOKUP_METHOD requires any per-X509_LOOKUP +specific data, the supplied new_item function should allocate this data and +invoke X509_LOOKUP_set_method_data(). + +X509_LOOKUP_get_free() and X509_LOOKUP_set_free() get and set the function +that is used to free any method data that was allocated and set from within +new_item function. + +X509_LOOKUP_meth_get_init() and X509_LOOKUP_meth_set_init() get and set the +function that is used to initialize the method data that was set with +X509_LOOKUP_set_method_data() as part of the new_item routine. + +X509_LOOKUP_meth_get_shutdown() and X509_LOOKUP_meth_set_shutdown() get and set +the function that is used to shut down the method data whose state was +previously initialized in the init function. + +X509_LOOKUP_meth_get_ctrl() and X509_LOOKUP_meth_set_ctrl() get and set a +function to be used to handle arbitrary control commands issued by +X509_LOOKUP_ctrl(). The control function is given the X509_LOOKUP +B, along with the arguments passed by X509_LOOKUP_ctrl. B is +an arbitrary integer that defines some operation. B is a pointer +to an array of characters. B is an integer. B, if set, +points to a location where any return data should be written to. How +B and B are used depends entirely on the control function. + + +X509_LOOKUP_set_get_by_subject(), X509_LOOKUP_set_get_by_issuer_serial(), +X509_LOOKUP_set_get_by_fingerprint(), X509_LOOKUP_set_get_by_alias() set +the functions used to retrieve an X509 or X509_CRL object by the object's +subject, issuer, fingerprint, and alias respectively. These functions are given +the X509_LOOKUP context, the type of the X509_OBJECT being requested, parameters +related to the lookup, and an X509_OBJECT that will receive the requested +object. + +Implementations should use either X509_OBJECT_set1_X509() or +X509_OBJECT_set1_X509_CRL() to set the result. Any method data that was +created as a result of the new_item function set by +X509_LOOKUP_meth_set_new_item() can be accessed with +X509_LOOKUP_get_method_data(). The B object that owns the +X509_LOOKUP may be accessed with X509_LOOKUP_get_store(). Successful lookups +should return 1, and unsuccessful lookups should return 0. + +X509_LOOKUP_get_get_by_subject(), X509_LOOKUP_get_get_by_issuer_serial(), +X509_LOOKUP_get_get_by_fingerprint(), X509_LOOKUP_get_get_by_alias() retrieve +the function set by the corresponding setter. + +=head1 RETURN VALUES + +The B functions return 1 on success or 0 on error. + +The B functions return the corresponding function +pointers. + +=head1 SEE ALSO + +L, L + +=head1 HISTORY + +The functions described here were added in OpenSSL 1.1.0i. + +=head1 COPYRIGHT + +Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the OpenSSL license (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod index 5263facfd4..320b258a85 100644 --- a/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod +++ b/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod @@ -11,7 +11,9 @@ X509_VERIFY_PARAM_get_auth_level, X509_VERIFY_PARAM_set_time, X509_VERIFY_PARAM_get_time, X509_VERIFY_PARAM_add0_policy, X509_VERIFY_PARAM_set1_policies, X509_VERIFY_PARAM_set1_host, X509_VERIFY_PARAM_add1_host, -X509_VERIFY_PARAM_set_hostflags, X509_VERIFY_PARAM_get0_peername, +X509_VERIFY_PARAM_set_hostflags, +X509_VERIFY_PARAM_get_hostflags, +X509_VERIFY_PARAM_get0_peername, X509_VERIFY_PARAM_set1_email, X509_VERIFY_PARAM_set1_ip, X509_VERIFY_PARAM_set1_ip_asc - X509 verification parameters @@ -54,6 +56,7 @@ X509_VERIFY_PARAM_set1_ip_asc const char *name, size_t namelen); void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags); + unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param); char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param); int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, size_t emaillen); @@ -130,14 +133,32 @@ B clearing any previously specified host name or names. If B is NULL, or empty the list of hostnames is cleared, and name checks are not performed on the peer certificate. If B is NUL-terminated, B may be zero, otherwise B -must be set to the length of B. When a hostname is specified, +must be set to the length of B. + +When a hostname is specified, certificate verification automatically invokes L with flags equal to the B argument given to X509_VERIFY_PARAM_set_hostflags() (default zero). Applications are strongly advised to use this interface in preference to explicitly -calling L, hostname checks are out of scope +calling L, hostname checks may be out of scope with the DANE-EE(3) certificate usage, and the internal check will -be suppressed as appropriate when DANE support is added to OpenSSL. +be suppressed as appropriate when DANE verification is enabled. + +When the subject CommonName will not be ignored, whether as a result of the +B host flag, or because no DNS subject +alternative names are present in the certificate, any DNS name constraints in +issuer certificates apply to the subject CommonName as well as the subject +alternative name extension. + +When the subject CommonName will be ignored, whether as a result of the +B host flag, or because some DNS subject +alternative names are present in the certificate, DNS name constraints in +issuer certificates will not be applied to the subject DN. +As described in X509_check_host(3) the B +flag takes precendence over the B flag. + +X509_VERIFY_PARAM_get_hostflags() returns any host flags previously set via a +call to X509_VERIFY_PARAM_set_hostflags(). X509_VERIFY_PARAM_add1_host() adds B as an additional reference identifier that can match the peer's certificate. Any previous names @@ -186,6 +207,8 @@ failure. X509_VERIFY_PARAM_get_flags() returns the current verification flags. +X509_VERIFY_PARAM_get_hostflags() returns any current host flags. + X509_VERIFY_PARAM_get_inh_flags() returns the current inheritance flags. X509_VERIFY_PARAM_set_time() and X509_VERIFY_PARAM_set_depth() do not return @@ -347,6 +370,8 @@ The B flag was added in OpenSSL 1.1.0 The legacy B flag is deprecated as of OpenSSL 1.1.0, and has no effect. +X509_VERIFY_PARAM_get_hostflags() was added in OpenSSL 1.1.0i. + =head1 COPYRIGHT Copyright 2009-2018 The OpenSSL Project Authors. All Rights Reserved. diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod b/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod index 93848152b5..fb9f6a64ec 100644 --- a/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod +++ b/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod @@ -93,6 +93,9 @@ consider the subject DN even if the certificate contains no subject alternative names of the right type (DNS name or email address as appropriate); the default is to use the subject DN when no corresponding subject alternative names are present. +If both B and +B are specified, the latter takes +precedence and the subject DN is not checked for matching names. If set, B disables wildcard expansion; this only applies to B. @@ -128,9 +131,9 @@ NULs. Applications are encouraged to use X509_VERIFY_PARAM_set1_host() rather than explicitly calling L. Host name -checks are out of scope with the DANE-EE(3) certificate usage, +checks may be out of scope with the DANE-EE(3) certificate usage, and the internal checks will be suppressed as appropriate when -DANE support is added to OpenSSL. +DANE support is enabled. =head1 SEE ALSO @@ -147,7 +150,7 @@ These functions were added in OpenSSL 1.0.2. =head1 COPYRIGHT -Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_cmp_time.pod b/worker/deps/openssl/openssl/doc/crypto/X509_cmp_time.pod new file mode 100644 index 0000000000..5bf5111451 --- /dev/null +++ b/worker/deps/openssl/openssl/doc/crypto/X509_cmp_time.pod @@ -0,0 +1,39 @@ +=pod + +=head1 NAME + +X509_cmp_time - X509 time functions + +=head1 SYNOPSIS + + X509_cmp_time(const ASN1_TIME *asn1_time, time_t *cmp_time); + +=head1 DESCRIPTION + +X509_cmp_time() compares the ASN1_TIME in B with the time in +. + +B must satisfy the ASN1_TIME format mandated by RFC 5280, i.e., +its format must be either YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ. + +If B is NULL the current time is used. + +=head1 BUGS + +Unlike many standard comparison functions, X509_cmp_time returns 0 on error. + +=head1 RETURN VALUES + +X509_cmp_time() returns -1 if B is earlier than, or equal to, +B, and 1 otherwise. It returns 0 on error. + +=head1 COPYRIGHT + +Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. + +Licensed under the OpenSSL license (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. + +=cut diff --git a/worker/deps/openssl/openssl/doc/crypto/bio.pod b/worker/deps/openssl/openssl/doc/crypto/bio.pod index 7be3121fd1..1e1dd02106 100644 --- a/worker/deps/openssl/openssl/doc/crypto/bio.pod +++ b/worker/deps/openssl/openssl/doc/crypto/bio.pod @@ -87,3 +87,4 @@ in the file LICENSE in the source distribution or at L. =cut + diff --git a/worker/deps/openssl/openssl/doc/fingerprints.txt b/worker/deps/openssl/openssl/doc/fingerprints.txt index 1863224df3..2cb74aec27 100644 --- a/worker/deps/openssl/openssl/doc/fingerprints.txt +++ b/worker/deps/openssl/openssl/doc/fingerprints.txt @@ -18,10 +18,7 @@ uid Richard Levitte uid Richard Levitte uid Richard Levitte -pub 4096R/FA40E9E2 2005-03-19 - Key fingerprint = 6260 5AA4 334A F9F0 DDE5 D349 D357 7507 FA40 E9E2 -uid Dr Stephen N Henson - pub 2048R/0E604491 2013-04-30 Key fingerprint = 8657 ABB2 60F0 56B1 E519 0839 D9C4 D26D 0E60 4491 +uid Matt Caswell uid Matt Caswell diff --git a/worker/deps/openssl/openssl/doc/openssl-c-indent.el b/worker/deps/openssl/openssl/doc/openssl-c-indent.el index cca118303e..852f794f96 100644 --- a/worker/deps/openssl/openssl/doc/openssl-c-indent.el +++ b/worker/deps/openssl/openssl/doc/openssl-c-indent.el @@ -54,6 +54,7 @@ (arglist-close . c-lineup-arglist) ; From "gnu" style (inline-open . 0) ; From "gnu" style (brace-list-open . +) ; From "gnu" style + (inextern-lang . 0) ; Don't indent inside extern block (topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont) ; From "gnu" style ) diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod index a28e218332..12fdcab83c 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod @@ -506,10 +506,6 @@ Set supported curves to P-256, P-384: SSL_CONF_cmd(ctx, "Curves", "P-256:P-384"); -Set automatic support for any elliptic curve for key exchange: - - SSL_CONF_cmd(ctx, "ECDHParameters", "Automatic"); - =head1 RETURN VALUES SSL_CONF_cmd() returns 1 if the value of B is recognised and B is diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod index 1dead1dbfc..4a2fa946fe 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod @@ -24,7 +24,7 @@ See L for the file format. =head1 NOTES These functions will not clear the existing CT log list - it will be appended -to. To replace the existing list, use L first. +to. To replace the existing list, use L first. If an error occurs whilst parsing a particular log entry in the file, that log entry will be skipped. diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod index c645f58078..8ed7b5ea15 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod @@ -153,6 +153,13 @@ L. of view, it however does not make sense as the data in the certificate is considered public anyway.) +All of the functions to set a new certificate will replace any existing +certificate of the same type that has already been set. Similarly all of the +functions to set a new private key will replace any private key that has already +been set. Applications should call L or +L as appropriate after loading a new certificate and +private key to confirm that the certificate and key match. + =head1 RETURN VALUES On success, the functions return 1. @@ -170,7 +177,7 @@ L =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod index cc55095d47..2759cc3cc6 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod @@ -2,8 +2,12 @@ =head1 NAME -SSL_get1_supported_ciphers, SSL_get_client_ciphers, -SSL_get_ciphers, SSL_CTX_get_ciphers, SSL_get_cipher_list +SSL_get1_supported_ciphers, +SSL_get_client_ciphers, +SSL_get_ciphers, +SSL_CTX_get_ciphers, +SSL_get_cipher_list, +SSL_get_shared_ciphers - get list of available SSL_CIPHERs =head1 SYNOPSIS @@ -15,6 +19,7 @@ SSL_get_ciphers, SSL_CTX_get_ciphers, SSL_get_cipher_list STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s); STACK_OF(SSL_CIPHER) *SSL_get_client_ciphers(const SSL *ssl); const char *SSL_get_cipher_list(const SSL *ssl, int priority); + char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size); =head1 DESCRIPTION @@ -25,16 +30,16 @@ is returned. SSL_CTX_get_ciphers() returns the stack of available SSL_CIPHERs for B. SSL_get1_supported_ciphers() returns the stack of enabled SSL_CIPHERs for -B, sorted by preference. +B as would be sent in a ClientHello (that is, sorted by preference). The list depends on settings like the cipher list, the supported protocol versions, the security level, and the enabled signature algorithms. SRP and PSK ciphers are only enabled if the appropriate callbacks or settings have been applied. -This is the list that will be sent by the client to the server. -The list supported by the server might include more ciphers in case there is a -hole in the list of supported protocols. -The server will also not use ciphers from this list depending on the -configured certificates and DH parameters. +The list of ciphers that would be sent in a ClientHello can differ from +the list of ciphers that would be acceptable when acting as a server. +For example, additional ciphers may be usable by a server if there is +a gap in the list of supported protocols, and some ciphers may not be +usable by a server if there is not a suitable certificate configured. If B is NULL or no ciphers are available, NULL is returned. SSL_get_client_ciphers() returns the stack of available SSL_CIPHERs matching the @@ -46,6 +51,19 @@ listed for B with B. If B is NULL, no ciphers are available, or there are less ciphers than B available, NULL is returned. +SSL_get_shared_ciphers() creates a colon separated and NUL terminated list of +SSL_CIPHER names that are available in both the client and the server. B is +the buffer that should be populated with the list of names and B is the +size of that buffer. A pointer to B is returned on success or NULL on +error. If the supplied buffer is not large enough to contain the complete list +of names then a truncated list of names will be returned. Note that just because +a ciphersuite is available (i.e. it is configured in the cipher list) and shared +by both the client and the server it does not mean that it is enabled (see the +description of SSL_get1_supported_ciphers() above). This function will return +available shared ciphersuites whether or not they are enabled. This is a server +side function only and must only be called after the completion of the initial +handshake. + =head1 NOTES The details of the ciphers obtained by SSL_get_ciphers(), SSL_CTX_get_ciphers() @@ -74,7 +92,7 @@ L =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod index 99936ad765..2de241fcda 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod @@ -28,6 +28,11 @@ count of the B is incremented by one. The ssl session contains all information required to re-establish the connection without a new handshake. +A session will be automatically removed from the session cache and marked as +non-resumable if the connection is not closed down cleanly, e.g. if a fatal +error occurs on the connection or L is not called prior to +L. + SSL_get0_session() returns a pointer to the actual session. As the reference counter is not incremented, the pointer is only valid while the connection is in use. If L or @@ -72,7 +77,7 @@ L =head1 COPYRIGHT -Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod index 23b6497d4f..507ca9f362 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod @@ -15,7 +15,9 @@ SSL_get_version, SSL_is_dtls - get the protocol information of a connection =head1 DESCRIPTION SSL_get_version() returns the name of the protocol used for the -connection B. +connection B. It should only be called after the initial handshake has been +completed. Prior to that the results returned from this function may be +unreliable. SSL_is_dtls() returns one if the connection is using DTLS, zero if not. @@ -43,7 +45,7 @@ The connection uses the TLSv1.2 protocol. =item unknown -This indicates that no version has been set (no connection established). +This indicates an unknown protocol version. =back @@ -57,7 +59,7 @@ SSL_is_dtls() was added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod index 3339a0e803..715845e1f7 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod @@ -56,7 +56,7 @@ is cleared or freed, or a renegotiation takes place. Applications must not free the return value. SSL clients are advised to use these functions in preference to -explicitly calling L. Hostname checks are out +explicitly calling L. Hostname checks may be out of scope with the RFC7671 DANE-EE(3) certificate usage, and the internal check will be suppressed as appropriate when DANE is enabled. @@ -111,7 +111,7 @@ These functions were first added to OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/ssl.pod b/worker/deps/openssl/openssl/doc/ssl/ssl.pod index 4d919072ea..da12e29c63 100644 --- a/worker/deps/openssl/openssl/doc/ssl/ssl.pod +++ b/worker/deps/openssl/openssl/doc/ssl/ssl.pod @@ -91,12 +91,6 @@ includes both more private SSL headers and headers from the B library. Whenever you need hard-core details on the internals of the SSL API, look inside this header file. -OPENSSL_VERSION_AT_LEAST(major,minor) can be -used in C<#if> statements in order to determine which version of the library is -being used. This can be used to either enable optional features at compile -time, or work around issues with a previous version. -See L. - =item B Unused. Present for backwards compatibility only. @@ -574,7 +568,7 @@ fresh handle for each connection. =item SSL_SESSION *B(const SSL *ssl); -=item char *B(const SSL *ssl, char *buf, int len); +=item char *B(const SSL *ssl, char *buf, int size); =item int B(const SSL *ssl); diff --git a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl index fec99bfb65..bf6b312cd1 100644 --- a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl +++ b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl @@ -448,7 +448,7 @@ sub generate_mode { &mov ("esi",&wparam(1)); &mov ("ecx",&wparam(2)); if ($::win32 or $::coff) { - &push (&::islabel("_win32_segv_handler")); + &push (&::islabel("_win32_segv_handler")); &data_byte(0x64,0xff,0x30); # push %fs:(%eax) &data_byte(0x64,0x89,0x20); # mov %esp,%fs:(%eax) } @@ -499,7 +499,7 @@ sub generate_mode { &mov ("edi",&wparam(0)); &movups (&QWP(0,"edi"),"xmm0"); # copy-out context &mov (&DWP(16,"edi"),"eax"); - &pop ("esi"); + &pop ("esi"); &pop ("edi"); &ret (); &function_end_B("padlock_sha1_blocks"); @@ -512,7 +512,7 @@ sub generate_mode { &mov ("esi",&wparam(1)); &mov ("ecx",&wparam(2)); if ($::win32 or $::coff) { - &push (&::islabel("_win32_segv_handler")); + &push (&::islabel("_win32_segv_handler")); &data_byte(0x64,0xff,0x30); # push %fs:(%eax) &data_byte(0x64,0x89,0x20); # mov %esp,%fs:(%eax) } diff --git a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl index 834b1ea79c..da285abc61 100644 --- a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl +++ b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl @@ -535,7 +535,7 @@ sub generate_mode { sub $len,%rsp shr \$3,$len lea (%rsp),$out - .byte 0xf3,0x48,0xa5 # rep movsq + .byte 0xf3,0x48,0xa5 # rep movsq lea (%r8),$out lea (%rsp),$inp mov $chunk,$len diff --git a/worker/deps/openssl/openssl/engines/e_capi.c b/worker/deps/openssl/openssl/engines/e_capi.c index 4660f1a340..a1de0b4b3c 100644 --- a/worker/deps/openssl/openssl/engines/e_capi.c +++ b/worker/deps/openssl/openssl/engines/e_capi.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -917,6 +917,7 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from, unsigned char *tmpbuf; CAPI_KEY *capi_key; CAPI_CTX *ctx; + DWORD flags = 0; DWORD dlen; if (flen <= 0) @@ -932,12 +933,23 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from, return -1; } - if (padding != RSA_PKCS1_PADDING) { - char errstr[10]; - BIO_snprintf(errstr, 10, "%d", padding); - CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_UNSUPPORTED_PADDING); - ERR_add_error_data(2, "padding=", errstr); - return -1; + switch (padding) { + case RSA_PKCS1_PADDING: + /* Nothing to do */ + break; +#ifdef CRYPT_DECRYPT_RSA_NO_PADDING_CHECK + case RSA_NO_PADDING: + flags = CRYPT_DECRYPT_RSA_NO_PADDING_CHECK; + break; +#endif + default: + { + char errstr[10]; + BIO_snprintf(errstr, 10, "%d", padding); + CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_UNSUPPORTED_PADDING); + ERR_add_error_data(2, "padding=", errstr); + return -1; + } } /* Create temp reverse order version of input */ @@ -950,14 +962,16 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from, /* Finally decrypt it */ dlen = flen; - if (!CryptDecrypt(capi_key->key, 0, TRUE, 0, tmpbuf, &dlen)) { + if (!CryptDecrypt(capi_key->key, 0, TRUE, flags, tmpbuf, &dlen)) { CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_DECRYPT_ERROR); capi_addlasterror(); + OPENSSL_cleanse(tmpbuf, dlen); OPENSSL_free(tmpbuf); return -1; } else { memcpy(to, tmpbuf, (flen = (int)dlen)); } + OPENSSL_cleanse(tmpbuf, flen); OPENSSL_free(tmpbuf); return flen; diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL index 466f8e5040..7c5e4c6bde 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL @@ -21,7 +21,7 @@ Detailed documentation is at the bottom of the lib/Text/Template.pm file. You may be able to view it with the following command: perldoc Text::Template - + Or: perldoc lib/Text/Template.pm diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README index bdd3dd4a42..e184d8cd2f 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README @@ -5,7 +5,7 @@ This is a library for generating form letters, building HTML pages, or filling in templates generally. A `template' is a piece of text that has little Perl programs embedded in it here and there. When you `fill in' a template, you evaluate the little programs and replace -them with their values. +them with their values. Here's an example of a template: @@ -45,7 +45,7 @@ encourages functional separation. You can fill in the template in a `Safe' compartment. This means that if you don't trust the person who wrote the code in the template, you won't have to worry that they are tampering with your program when you -execute it. +execute it. ---------------------------------------------------------------- @@ -87,7 +87,7 @@ What's new in v1.46 since v1.44: parameter to ->new is omitted. ---------------------------------------------------------------- -What's new in v1.44 since v1.43: +What's new in v1.44 since v1.43: This is a maintentance release. There are no feature changes. @@ -182,7 +182,7 @@ What's new in v1.40 since v1.31: ---------------------------------------------------------------- What's new in v1.31 since v1.23: - Just bug fixes---fill_in_string was failing. Thanks to + Just bug fixes---fill_in_string was failing. Thanks to Donald L. Greer Jr. for the test case. ---------------------------------------------------------------- @@ -252,7 +252,7 @@ What's new in v1.10 since v1.03: New OUTPUT option delivers template results directly to a filehandle instead of making them into a string. Saves space - and time. + and time. PACKAGE and HASH now work intelligently with SAFE. @@ -263,16 +263,16 @@ What's new in v1.10 since v1.03: { my $blist = ''; foreach $i (@items) { $blist .= qq{ * $i\n}; - } + } $blist; - } + } You can now write this instead, because $OUT is special. { foreach $i (@items) { $OUT.= " * $i\n"; - } - } + } + } (`A spoonful of sugar makes the medicine go down.') @@ -281,7 +281,7 @@ What's new in v1.10 since v1.03: More documentation. Errors fixed. - Lots more tests. + Lots more tests. ---------------------------------------------------------------- @@ -289,22 +289,22 @@ What's new in v1.03 since v1.0: Code added to support HASH option to fill_in. (Incl. `_gensym' function.) - + Documentation for HASH. - + New test file for HASH. - + Note about failure of lexical variables to propagate into - templates. Why does this surprise people? - + templates. Why does this surprise people? + Bug fix: program fragments are evaluated in an environment with - `no strict' by default. Otherwise, you get a lot of `Global - symbol "$v" requires explicit package name' failures. Why didn't - the test program pick this up? Because the only variable the test - program ever used was `$a', which is exempt. Duhhhhh. - + `no strict' by default. Otherwise, you get a lot of `Global + symbol "$v" requires explicit package name' failures. Why didn't + the test program pick this up? Because the only variable the test + program ever used was `$a', which is exempt. Duhhhhh. + Fixed the test program. - + Various minor documentation fixes. @@ -315,24 +315,25 @@ Improvements of 1.0 over the old 0.1beta: New features: - At least twice as fast + At least twice as fast - Better support for filling out the same template more than once + Better support for filling out the same template more than once Now supports evaluation of program fragments in Safe - compartments. (Thanks, Jonathan!) + compartments. (Thanks, Jonathan!) - Better argument syntax + Better argument syntax - More convenience functions + More convenience functions - The parser is much better and simpler. + The parser is much better and simpler. Once a template is parsed, the parsed version is stored so that - it needn't be parsed again. + it needn't be parsed again. BROKEN function behavior is rationalized. You can now pass an arbitrary argument to your BROKEN function, or return a value - from it to the main program. + from it to the main program. + + Documentation overhauled. - Documentation overhauled. diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm index 2b8a391b53..dc4f3bac77 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm @@ -5,7 +5,7 @@ # # Copyright 2013 M. J. Dominus. # You may copy and distribute this program under the -# same terms as Perl iteself. +# same terms as Perl iteself. # If in doubt, write to mjd-perl-template+@plover.com for a license. # # Version 1.46 @@ -44,7 +44,7 @@ sub always_prepend { my %LEGAL_TYPE; - BEGIN { + BEGIN { %LEGAL_TYPE = map {$_=>1} qw(FILE FILEHANDLE STRING ARRAY); } sub new { @@ -78,7 +78,7 @@ sub always_prepend bless $self => $pack; return unless $self->_acquire_data; - + $self; } } @@ -89,7 +89,7 @@ sub _acquire_data { my ($self) = @_; my $type = $self->{TYPE}; if ($type eq 'STRING') { - # nothing necessary + # nothing necessary } elsif ($type eq 'FILE') { my $data = _load_text($self->{SOURCE}); unless (defined $data) { @@ -115,7 +115,7 @@ sub _acquire_data { } $self->{SOURCE} = $data; } else { - # This should have been caught long ago, so it represents a + # This should have been caught long ago, so it represents a # drastic `can't-happen' sort of failure my $pack = ref $self; die "Can only acquire data for $pack objects of subtype STRING, but this is $type; aborting"; @@ -145,7 +145,7 @@ sub compile { return undef unless $self->_acquire_data; unless ($self->{TYPE} eq 'STRING') { my $pack = ref $self; - # This should have been caught long ago, so it represents a + # This should have been caught long ago, so it represents a # drastic `can't-happen' sort of failure die "Can only compile $pack objects of subtype STRING, but this is $self->{TYPE}; aborting"; } @@ -153,7 +153,7 @@ sub compile { my @tokens; my $delim_pats = shift() || $self->{DELIM}; - + my ($t_open, $t_close) = ('{', '}'); my $DELIM; # Regex matches a delimiter if $delim_pats @@ -215,7 +215,7 @@ sub compile { } else { die "Can't happen error #1"; } - + $self->{TYPE} = 'PREPARSED'; $self->{SOURCE} = \@content; 1; @@ -247,7 +247,7 @@ sub fill_in { my $fi_varhash = _param('hash', %fi_a); my $fi_package = _param('package', %fi_a) ; - my $fi_broken = + my $fi_broken = _param('broken', %fi_a) || $fi_self->{BROKEN} || \&_default_broken; my $fi_broken_arg = _param('broken_arg', %fi_a) || []; my $fi_safe = _param('safe', %fi_a); @@ -305,7 +305,7 @@ sub fill_in { } elsif ($fi_type eq 'PROG') { no strict; my $fi_lcomment = "#line $fi_lineno $fi_filename"; - my $fi_progtext = + my $fi_progtext = "package $fi_eval_package; $fi_prepend;\n$fi_lcomment\n$fi_text;"; my $fi_res; my $fi_eval_err = ''; @@ -445,7 +445,7 @@ sub _unconditionally_untaint { } } } - + # Given a hashful of variables (or a list of such hashes) # install the variables into the specified package, # overwriting whatever variables were there before. @@ -467,7 +467,7 @@ sub _install_hash { } elsif (ref $val) { *SYM = $val; } else { - *SYM = \$val; + *SYM = \$val; } } } @@ -478,7 +478,7 @@ sub TTerror { $ERROR } 1; -=head1 NAME +=head1 NAME Text::Template - Expand template text with embedded Perl @@ -539,7 +539,7 @@ This file documents C version B<1.46> $text = fill_in_string( < 'T', ...); Dear {$recipient}, Pay me at once. - Love, + Love, G.V. EOM @@ -555,7 +555,7 @@ This is a library for generating form letters, building HTML pages, or filling in templates generally. A `template' is a piece of text that has little Perl programs embedded in it here and there. When you `fill in' a template, you evaluate the little programs and replace -them with their values. +them with their values. You can store a template in a file outside your program. People can modify the template without modifying the program. You can separate @@ -683,16 +683,16 @@ The fragments are evaluated in order, and side effects from earlier fragments will persist into later fragments: {$x = @things; ''}The Lord High Chamberlain has gotten {$x} - things for me this year. - { $diff = $x - 17; + things for me this year. + { $diff = $x - 17; $more = 'more' if ($diff == 0) { $diff = 'no'; } elsif ($diff < 0) { $more = 'fewer'; - } + } ''; - } + } That is {$diff} {$more} than he gave me last year. The value of C<$x> set in the first line will persist into the next @@ -701,11 +701,11 @@ C<$more> set in the second fragment will persist and be interpolated into the last line. The output will look something like this: The Lord High Chamberlain has gotten 42 - things for me this year. + things for me this year. That is 25 more than he gave me last year. -That is all the syntax there is. +That is all the syntax there is. =head2 The C<$OUT> variable @@ -726,9 +726,9 @@ One way to do it is with a template like this: { my $blist = ''; foreach $i (@items) { $blist .= qq{ * $i\n}; - } + } $blist; - } + } Here we construct the list in a variable called C<$blist>, which we return at the end. This is a little cumbersome. There is a shortcut. @@ -743,11 +743,11 @@ This means that you can write the template above like this: Here is a list of the things I have got for you since 1907: { foreach $i (@items) { $OUT .= " * $i\n"; - } - } + } + } C<$OUT> is reinitialized to the empty string at the start of each -program fragment. It is private to C, so +program fragment. It is private to C, so you can't use a variable named C<$OUT> in your template without invoking the special behavior. @@ -780,15 +780,15 @@ else that makes sense with C. The C can also be C, in which case the C should be a string: - new Text::Template ( TYPE => 'STRING', + new Text::Template ( TYPE => 'STRING', SOURCE => "This is the actual template!" ); The C can be C, in which case the source should be a reference to an array of strings. The concatenation of these strings is the template: - new Text::Template ( TYPE => 'ARRAY', - SOURCE => [ "This is ", "the actual", + new Text::Template ( TYPE => 'ARRAY', + SOURCE => [ "This is ", "the actual", " template!", ] ); @@ -800,7 +800,7 @@ C will read the text from the filehandle up to end-of-file, and that text is the template: # Read template source code from STDIN: - new Text::Template ( TYPE => 'FILEHANDLE', + new Text::Template ( TYPE => 'FILEHANDLE', SOURCE => \*STDIN ); @@ -870,7 +870,7 @@ overridden in the arguments to C. See L> below. Loads all the template text from the template's source, parses and compiles it. If successful, returns true; otherwise returns false and sets C<$Text::Template::ERROR>. If the template is already compiled, -it returns true and does nothing. +it returns true and does nothing. You don't usually need to invoke this function, because C (see below) compiles the template if it isn't compiled already. @@ -977,10 +977,10 @@ variables. You may not want to put the template variables into a package. Packages can be hard to manage: You can't copy them, for example. -C provides an alternative. +C provides an alternative. The value for C should be a reference to a hash that maps -variable names to values. For example, +variable names to values. For example, $template->fill_in(HASH => { recipient => "The King", items => ['gold', 'frankincense', 'myrrh'], @@ -996,19 +996,19 @@ should be passed by reference. We also want to pass an object, which is in C<$self>; note that we pass a reference to the object, C<\$self> instead. Since we've passed a reference to a scalar, inside the template the object appears as -C<$object>. +C<$object>. The full details of how it works are a little involved, so you might want to skip to the next section. -Suppose the key in the hash is I and the value is I. +Suppose the key in the hash is I and the value is I. =over 4 =item * If the I is C, then any variables named C<$key>, -C<@key>, C<%key>, etc., are undefined. +C<@key>, C<%key>, etc., are undefined. =item * @@ -1032,7 +1032,7 @@ and have almost exactly the same effect. (The difference is that in the former case, the value is copied, and in the latter case it is -aliased.) +aliased.) =item * @@ -1074,7 +1074,7 @@ You can also use this to set two variables with the same name: ] ); -This sets C<$v> to C<"The King"> and C<@v> to C<(1,2,3)>. +This sets C<$v> to C<"The King"> and C<@v> to C<(1,2,3)>. =item C @@ -1082,13 +1082,13 @@ If any of the program fragments fails to compile or aborts for any reason, and you have set the C option to a function reference, C will invoke the function. This function is called the I function>. The C function will tell -C what to do next. +C what to do next. If the C function returns C, C will immediately abort processing the template and return the text that it has accumulated so far. If your function does this, it should set a flag that you can examine after C returns so that you can -tell whether there was a premature return or not. +tell whether there was a premature return or not. If the C function returns any other value, that value will be interpolated into the template as if that value had been the return @@ -1150,7 +1150,7 @@ If you supply the C option to C, the value of the option is passed to the C function whenever it is called. The default C function ignores the C, but you can write a custom C function that uses the C to get -more information about what went wrong. +more information about what went wrong. The C function could also use the C as a reference to store an error message or some other information that it wants to @@ -1158,7 +1158,7 @@ communicate back to the caller. For example: $error = ''; - sub my_broken { + sub my_broken { my %args = @_; my $err_ref = $args{arg}; ... @@ -1191,7 +1191,7 @@ operations that can be performed in them. If you use the C option with C, the package you specify will be placed into the safe compartment and evaluation will take -place in that package as usual. +place in that package as usual. If not, C operation is a little different from the default. Usually, if you don't specify a package, evaluation of program @@ -1235,11 +1235,11 @@ If this option is present, its value should be a reference to a list of two strings. The first string is the string that signals the beginning of each program fragment, and the second string is the string that signals the end of each program fragment. See -L<"Alternative Delimiters">, below. +L<"Alternative Delimiters">, below. If you specify C in the call to C, they override any delimiters you set when you created the template object with -C. +C. =back @@ -1266,7 +1266,7 @@ An example: $text = Text::Template->fill_this_in( <<'EOM', PACKAGE => Q); Dear {$name}, - You owe me \\${sprintf('%.2f', $amount)}. + You owe me \\${sprintf('%.2f', $amount)}. Pay or I will break your {$part}. Love, Grand Vizopteryx of Irkutsk. @@ -1371,7 +1371,7 @@ The text C doesn't get into the form letter. Why not? Because C<$recipient> is a C variable, and the whole point of C variables is that they're private and inaccessible except in the scope in which they're declared. The template is not part of that -scope, so the template can't see C<$recipient>. +scope, so the template can't see C<$recipient>. If that's not the behavior you want, don't use C. C means a private variable, and in this case you don't want the variable to be @@ -1380,7 +1380,7 @@ package, and use the C option to C: $Q::recipient = $recipient; my $text = fill_in_file('formletter.tmpl', PACKAGE => 'Q'); - + or pass the names and values in a hash with the C option: @@ -1397,8 +1397,8 @@ rest of your program and wreck something. Nevertheless, there's really no way (except with C) to protect against a template that says - { $Important::Secret::Security::Enable = 0; - # Disable security checks in this program + { $Important::Secret::Security::Enable = 0; + # Disable security checks in this program } or @@ -1462,12 +1462,12 @@ you may be able to make it work by doing this instead: --@] It may be safer to choose delimiters that begin with a newline -character. +character. Because the parsing of templates is simplified by the absence of backslash escapes, using alternative C may speed up the parsing process by 20-25%. This shows that my original choice of C<{> -and C<}> was very bad. +and C<}> was very bad. =head2 C feature and using C in templates @@ -1492,11 +1492,11 @@ each and every code fragment: Because we didn't put C at the top of the second fragment, it was only active in the first fragment, and we didn't get any C checking in the second fragment. Then we mispelled C<$foo> -and the error wasn't caught. +and the error wasn't caught. C version 1.22 and higher has a new feature to make this easier. You can specify that any text at all be automatically -added to the beginning of each program fragment. +added to the beginning of each program fragment. When you make a call to C, you can specify a @@ -1541,7 +1541,7 @@ except where overridden by C options to C or C. =head2 Prepending in Derived Classes This section is technical, and you should skip it on the first few -readings. +readings. Normally there are three places that prepended text could come from. It could come from the C option in the C call, from @@ -1551,12 +1551,12 @@ C looks for these three things in order and takes the first one that it finds. In a subclass of C, this last possibility is -ambiguous. Suppose C is a subclass of C. Should +ambiguous. Suppose C is a subclass of C. Should Text::Template->always_prepend(...); affect objects in class C? The answer is that you can have it -either way. +either way. The C value for C is normally stored in a hash variable named C<%GLOBAL_PREPEND> under the key @@ -1587,7 +1587,7 @@ method to get an arbitrary effect. Jennifer D. St Clair asks: > Most of my pages contain JavaScript and Stylesheets. - > How do I change the template identifier? + > How do I change the template identifier? Jennifer is worried about the braces in the JavaScript being taken as the delimiters of the Perl program fragments. Of course, disaster @@ -1600,13 +1600,13 @@ some reason, there are two easy workarounds: 1. You can put C<\> in front of C<{>, C<}>, or C<\> to remove its special meaning. So, for example, instead of - if (br== "n3") { + if (br== "n3") { // etc. } you can put - if (br== "n3") \{ + if (br== "n3") \{ // etc. \} @@ -1627,21 +1627,21 @@ So if we wrote {q{foo}} -it would turn into +it would turn into foo So for your JavaScript, just write - {q{if (br== "n3") { - // etc. + {q{if (br== "n3") { + // etc. }} } and it'll come out as - if (br== "n3") { - // etc. + if (br== "n3") { + // etc. } which is what you want. @@ -1657,7 +1657,7 @@ their templates, like this: } Then they complain because there is a C<17> at the top of the output -that they didn't want to have there. +that they didn't want to have there. Remember that a program fragment is replaced with its own return value, and that in Perl the return value of a code block is the value @@ -1723,14 +1723,14 @@ complicated to remember, but probably easier to use. The rule is now: Backslashes are always passed to Perl unchanged I they occur as part of a sequence like C<\\\\\\{> or C<\\\\\\}>. In these contexts, they are special; C<\\> is replaced with C<\>, and C<\{> and -C<\}> signal a literal brace. +C<\}> signal a literal brace. Examples: \{ foo \} is I evaluated, because the C<\> before the braces signals that -they should be taken literally. The result in the output looks like this: +they should be taken literally. The result in the output looks like this: { foo } @@ -1797,7 +1797,7 @@ It's totally straightforward. Just call the C functions from inside the template: { $q->checkbox_group(NAME => 'toppings', - LINEBREAK => true, + LINEBREAK => true, COLUMNS => 3, VALUES => \@toppings, ); @@ -1864,7 +1864,7 @@ of the mailing list. The mailing list address is a secret.) =head1 THANKS Many thanks to the following people for offering support, -encouragement, advice, bug reports, and all the other good stuff. +encouragement, advice, bug reports, and all the other good stuff. David H. Adler / Joel Appelbaum / @@ -1895,7 +1895,7 @@ Matt X. Hunter / Robert M. Ioffe / Daniel LaLiberte / Reuven M. Lerner / -Trip Lilley / +Trip Lilley / Yannis Livassof / Val Luck / Kevin Madsen / @@ -1941,12 +1941,12 @@ Special thanks to: =over 2 -=item Jonathan Roy +=item Jonathan Roy for telling me how to do the C support (I spent two years worrying about it, and then Jonathan pointed out that it was trivial.) -=item Ranjit Bhatnagar +=item Ranjit Bhatnagar for demanding less verbose fragments like they have in ASP, for helping me figure out the Right Thing, and, especially, for talking me diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm index c6e3298ee2..1e41037bd3 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm @@ -28,7 +28,7 @@ sub preprocessor { 1; -=head1 NAME +=head1 NAME Text::Template::Preprocess - Expand template text with embedded Perl @@ -82,8 +82,8 @@ this: Plain text here... { perl code } { more perl code } @@ -96,7 +96,7 @@ JavaScript program with executable Perl code. One strategy: s()(q{$1})gsi; } -Then use C \"e_scripts>. This will transform +Then use C \"e_scripts>. This will transform @@ -141,3 +141,4 @@ For updates, visit C. =cut + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t index 4784ba008e..5f9560f898 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t @@ -8,3 +8,4 @@ if ($Text::Template::VERSION == 1.46) { } else { print "not ok 1\n"; } + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t index d983797786..be43390c67 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t @@ -33,12 +33,12 @@ if (defined($template)) { $n++; # (3) Fill in template from file -$X::v = "abc"; +$X::v = "abc"; $resultX = < abc We will evaluate 1+1 here -> 2 EOM -$Y::v = "ABC"; +$Y::v = "ABC"; $resultY = < ABC We will evaluate 1+1 here -> 2 @@ -74,7 +74,7 @@ $n++; # (6) test creation of template from filehandle if (open (TMPL, "< $TEMPFILE")) { - $template = new Text::Template ('type' => 'FILEHANDLE', + $template = new Text::Template ('type' => 'FILEHANDLE', 'source' => *TMPL); if (defined($template)) { print "ok $n\n"; @@ -109,9 +109,9 @@ if (open (TMPL, "< $TEMPFILE")) { # (9) test creation of template from array -$template = new Text::Template - ('type' => 'ARRAY', - 'source' => [ +$template = new Text::Template + ('type' => 'ARRAY', + 'source' => [ 'We will put value of $v (which is "abc") here -> {$v}', "\n", 'We will evaluate 1+1 here -> {1+1}', @@ -209,7 +209,7 @@ for ($i=0; $i<@tests; $i+=2) { # MJD 20010827 # (28) test creation of template from filehandle if (open (TMPL, "< $TEMPFILE")) { - $template = new Text::Template ('type' => 'FILEHANDLE', + $template = new Text::Template ('type' => 'FILEHANDLE', 'source' => \*TMPL); if (defined($template)) { print "ok $n\n"; diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t index 050638c853..29ba51a40e 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t @@ -68,13 +68,13 @@ my $WARNINGS = 0; local $^W = 1; # Make sure this is on for this test $template8 = 'We will put value of $v (which is "good") here -> {defined $v ? "bad" : "good"}'; $result8 = 'We will put value of $v (which is "good") here -> good'; - my $template = + my $template = new Text::Template ('type' => 'STRING', 'source' => $template8); my $text = $template->fill_in(HASH => {'v' => undef}); # (8) Did we generate a warning? print +($WARNINGS == 0 ? '' : 'not '), "ok $n\n"; $n++; - + # (9) Was the output correct? print +($text eq $result8 ? '' : 'not '), "ok $n\n"; $n++; @@ -85,7 +85,7 @@ my $WARNINGS = 0; # (10) Did we generate a warning? print +($WARNINGS == 0 ? '' : 'not '), "ok $n\n"; $n++; - + # (11) Was the output correct? if ($] < 5.005) { print "ok $n # skipped -- not supported before 5.005\n"; @@ -98,7 +98,7 @@ my $WARNINGS = 0; # (12) Now we'll test the multiple-hash option (Added for 1.20.) $text = Text::Template::fill_in_string(q{$v: {$v}. @v: [{"@v"}].}, - HASH => [{'v' => 17}, + HASH => [{'v' => 17}, {'v' => ['a', 'b', 'c']}, {'v' => \23}, ]); @@ -108,3 +108,4 @@ $n++; exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t index 8094392dca..0ba65a54dc 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t @@ -46,10 +46,11 @@ $textOUT = $templateOUT->fill_in() print +($text eq $textOUT ? '' : 'not '), "ok $n\n"; $n++; -# Missing: Test this feature in Safe compartments; +# Missing: Test this feature in Safe compartments; # it's a totally different code path. # Decision: Put that into safe.t, because that file should # be skipped when Safe.pm is unavailable. exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t index 6d94820d2a..4c07121b44 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t @@ -141,13 +141,13 @@ print +($text1 eq $text2 ? '' : 'not '), "ok $n\n"; $n++; # (16) Try the BROKEN routine in safe compartments -sub my_broken { +sub my_broken { my %a = @_; $a{error} =~ s/ at.*//s; "OK! text:$a{text} error:$a{error} lineno:$a{lineno} arg:$a{arg}" ; } $templateB = new Text::Template (TYPE => 'STRING', SOURCE => '{die}') or die; -$text1 = $templateB->fill_in(BROKEN => \&my_broken, +$text1 = $templateB->fill_in(BROKEN => \&my_broken, BROKEN_ARG => 'barg', SAFE => new Safe, ); @@ -158,3 +158,4 @@ $n++; exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t index 71f242592f..03534770f1 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t @@ -96,7 +96,10 @@ print +($Q::H eq 'good7' ? '' : 'not '), "ok $n\n"; $Q::H = $Q::H; $n++; -# (12) +# (12) print +($Q2::H eq 'good8' ? '' : 'not '), "ok $n\n"; $Q2::H = $Q2::H; $n++; + + + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t index 22d4a1c841..6865ad1945 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t @@ -36,3 +36,4 @@ print +($t eq "My process ID is $$" ? '' : 'not '), "ok $n\n"; $n++; exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t index 8baaf7ad44..5f438f6148 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t @@ -88,3 +88,4 @@ $n++; } exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t index 6014400840..ef9cfafdee 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t @@ -14,7 +14,7 @@ Aborting" print "1..6\n"; $n=1; -$Q::n = $Q::n = 119; +$Q::n = $Q::n = 119; # (1) Test fill_in_string $out = fill_in_string('The value of $n is {$n}.', PACKAGE => 'Q' ); @@ -26,7 +26,7 @@ $TEMPFILE = "tt$$"; open F, "> $TEMPFILE" or die "Couldn't open test file: $!; aborting"; print F 'The value of $n is {$n}.', "\n"; close F or die "Couldn't write test file: $!; aborting"; -$R::n = $R::n = 8128; +$R::n = $R::n = 8128; $out = fill_in_file($TEMPFILE, PACKAGE => 'R'); print +($out eq "The value of \$n is 8128.\n" ? '' : 'not '), "ok $n\n"; @@ -42,7 +42,7 @@ print +($out eq "With a message here? It is good!\n" ? '' : 'not '), "ok $n\n"; $n++; # (4) It probably occurs in fill_this_in also: -$out = +$out = Text::Template->fill_this_in("With a message here? [% \$var %]\n", DELIMITERS => ['[%', '%]'], HASH => { "var" => \"It is good!" }); @@ -50,7 +50,7 @@ print +($out eq "With a message here? It is good!\n" ? '' : 'not '), "ok $n\n"; $n++; # (5) This test failed in 1.25. It was supplied by Donald L. Greer Jr. -# Note that it's different from (1) in that there's no explicit +# Note that it's different from (1) in that there's no explicit # package=> argument. use vars qw($string $foo $r); $string='Hello {$foo}'; @@ -72,3 +72,4 @@ package main; END { $TEMPFILE && unlink $TEMPFILE } exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t index c9d03f27f8..40f9fac6cb 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t @@ -49,14 +49,15 @@ if ($@ =~ /^\QIllegal value `WLUNCH' for TYPE parameter/) { $n++; # (4-5) File does not exist -my $o = Text::Template->new(TYPE => 'file', +my $o = Text::Template->new(TYPE => 'file', SOURCE => 'this file does not exist'); print $o ? "not ok $n\n" : "ok $n\n"; $n++; -print defined($Text::Template::ERROR) +print defined($Text::Template::ERROR) && $Text::Template::ERROR =~ /^Couldn't open file/ ? "ok $n\n" : "not ok $n\n"; $n++; exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t index 4b32ce0411..f74d591cc7 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t @@ -19,7 +19,7 @@ $n = 1; $V = $V = 119; $template = q{The value of $V is <<$V>>.}; $result = q{The value of $V is 119.}; -$template1 = Text::Template->new(TYPE => STRING, +$template1 = Text::Template->new(TYPE => STRING, SOURCE => $template, DELIMITERS => ['<<', '>>'] ) @@ -37,7 +37,7 @@ $n++; # (3) Now we'll try using regex metacharacters # First with the delimiters specified at object creation time $template = q{The value of $V is [$V].}; -$template1 = Text::Template->new(TYPE => STRING, +$template1 = Text::Template->new(TYPE => STRING, SOURCE => $template, DELIMITERS => ['[', ']'] ) @@ -63,10 +63,10 @@ my @tests = ('{""}' => '', # (5) '{"}"}' => undef, '{"\\}"}' => undef, # One backslash '{"\\\\}"}' => undef, # Two backslashes - '{"\\\\\\}"}' => undef, # Three backslashes + '{"\\\\\\}"}' => undef, # Three backslashes '{"\\\\\\\\}"}' => undef, # Four backslashes (10) '{"\\\\\\\\\\}"}' => undef, # Five backslashes - + # Backslashes are always passed directly to Perl '{"x20"}' => 'x20', '{"\\x20"}' => ' ', # One backslash @@ -96,3 +96,4 @@ for ($i=0; $i<@tests; $i+=2) { exit; + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t index 833a5fa444..fe242e5898 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t @@ -22,11 +22,11 @@ my $tin = q{The value of $foo is: {$foo}}; Text::Template->always_prepend(q{$foo = "global"}); $tmpl1 = Text::Template->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, ); $tmpl2 = Text::Template->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, PREPEND => q{$foo = "template"}, ); @@ -46,11 +46,11 @@ print "ok $n\n"; $n++; Emptyclass1->always_prepend(q{$foo = 'Emptyclass global';}); $tmpl1 = Emptyclass1->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, ); $tmpl2 = Emptyclass1->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, PREPEND => q{$foo = "template"}, ); @@ -69,11 +69,11 @@ print "ok $n\n"; $n++; print "ok $n\n"; $n++; $tmpl1 = Emptyclass2->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, ); $tmpl2 = Emptyclass2->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, PREPEND => q{$foo = "template"}, ); @@ -90,3 +90,5 @@ print "ok $n\n"; $n++; print "ok $n\n"; $n++; ($t3 eq 'The value of $foo is: fillin') or print "not "; print "ok $n\n"; $n++; + + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t index 422b10ec9a..60b6b0c65b 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t @@ -32,16 +32,16 @@ for my $trial (1, 0) { for my $test (0 .. 3) { my $tmpl; if ($trial == 0) { - $tmpl = new Text::Template::Preprocess + $tmpl = new Text::Template::Preprocess (TYPE => 'STRING', SOURCE => $t) or die; } else { open TF, "< $TMPFILE" or die "Couldn't open test file: $!; aborting"; - $tmpl = new Text::Template::Preprocess + $tmpl = new Text::Template::Preprocess (TYPE => 'FILEHANDLE', SOURCE => \*TF) or die; } $tmpl->preprocessor($py) if ($test & 1) == 1; my @args = ((($test & 2) == 2) ? (PREPROCESSOR => $pz) : ()); - my $o = $tmpl->fill_in(@args, + my $o = $tmpl->fill_in(@args, HASH => {x => 119, 'y' => 23, z => 5}); # print STDERR "$o/$result[$test]\n"; print +(($o eq $result[$test]) ? '' : 'not '), "ok $n\n"; diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t index 30664993ac..d92a37463a 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t @@ -58,14 +58,14 @@ sub should_be_tainted { if (Text::Template::_is_clean($_[0])) { print "not ok $n\n"; $n++; return; } - print "ok $n\n"; $n++; return; + print "ok $n\n"; $n++; return; } sub should_be_clean { unless (Text::Template::_is_clean($_[0])) { print "not ok $n\n"; $n++; return; } - print "ok $n\n"; $n++; return; + print "ok $n\n"; $n++; return; } # Tainted filename should die with and without UNTAINT option @@ -116,3 +116,4 @@ Text::Template::_unconditionally_untaint($tfile); should_be_clean($tfile); END { unlink $file } + diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t index db88a0711f..d362395cfb 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t @@ -68,7 +68,7 @@ Aborting" # (5) BROKEN sub passed correct args when called in ->fill_in? { my $r = Text::Template->new(TYPE => 'string', SOURCE => '{1/0}', - )->fill_in(BROKEN => + )->fill_in(BROKEN => sub { my %a = @_; qq{$a{lineno},$a{error},$a{text}} }); @@ -79,3 +79,4 @@ Aborting" } $n++; } + diff --git a/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm b/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm index 7dbfe3f84f..b21f875312 100644 --- a/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm +++ b/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm @@ -1,4 +1,4 @@ -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -7,6 +7,9 @@ # Quick transfer to the downloaded Text::Template +package transfer::Text::Template; +$VERSION = 1.46; + BEGIN { use File::Spec::Functions; use File::Basename; diff --git a/worker/deps/openssl/openssl/fuzz/test-corpus.c b/worker/deps/openssl/openssl/fuzz/test-corpus.c index c553697d6c..628e633536 100644 --- a/worker/deps/openssl/openssl/fuzz/test-corpus.c +++ b/worker/deps/openssl/openssl/fuzz/test-corpus.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL licenses, (the "License"); * you may not use this file except in compliance with the License. @@ -16,31 +16,86 @@ #include #include +#include #include #include #include "fuzzer.h" +#include "internal/o_dir.h" -int main(int argc, char **argv) { - int n; +#if defined(_WIN32) && defined(_MAX_PATH) +# define PATH_MAX _MAX_PATH +#endif - FuzzerInitialize(&argc, &argv); +#ifndef PATH_MAX +# define PATH_MAX 4096 +#endif - for (n = 1; n < argc; ++n) { - struct stat st; - FILE *f; - unsigned char *buf; - size_t s; - - stat(argv[n], &st); - f = fopen(argv[n], "rb"); - if (f == NULL) - continue; - buf = malloc(st.st_size); +# if !defined(S_ISREG) +# define S_ISREG(m) ((m) & S_IFREG) +# endif + +static void testfile(const char *pathname) +{ + struct stat st; + FILE *f; + unsigned char *buf; + size_t s; + + if (stat(pathname, &st) < 0 || !S_ISREG(st.st_mode)) + return; + printf("# %s\n", pathname); + fflush(stdout); + f = fopen(pathname, "rb"); + if (f == NULL) + return; + buf = malloc(st.st_size); + if (buf != NULL) { s = fread(buf, 1, st.st_size, f); OPENSSL_assert(s == (size_t)st.st_size); FuzzerTestOneInput(buf, s); free(buf); - fclose(f); + } + fclose(f); +} + +int main(int argc, char **argv) { + int n; + + FuzzerInitialize(&argc, &argv); + + for (n = 1; n < argc; ++n) { + size_t dirname_len = strlen(argv[n]); + const char *filename = NULL; + char *pathname = NULL; + OPENSSL_DIR_CTX *ctx = NULL; + int wasdir = 0; + + /* + * We start with trying to read the given path as a directory. + */ + while ((filename = OPENSSL_DIR_read(&ctx, argv[n])) != NULL) { + wasdir = 1; + if (pathname == NULL) { + pathname = malloc(PATH_MAX); + if (pathname == NULL) + break; + strcpy(pathname, argv[n]); +#ifdef __VMS + if (strchr(":<]", pathname[dirname_len - 1]) == NULL) +#endif + pathname[dirname_len++] = '/'; + pathname[dirname_len] = '\0'; + } + strcpy(pathname + dirname_len, filename); + testfile(pathname); + } + OPENSSL_DIR_end(&ctx); + + /* If it wasn't a directory, treat it as a file instead */ + if (!wasdir) + testfile(argv[n]); + + free(pathname); } return 0; } diff --git a/worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_EPILOGUE.H b/worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_EPILOGUE.H new file mode 100644 index 0000000000..5f63860808 --- /dev/null +++ b/worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_EPILOGUE.H @@ -0,0 +1,16 @@ +/* + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * This file is only used by HP C on VMS, and is included automatically + * after each header file from this directory + */ + +/* restore state. Must correspond to the save in __decc_include_prologue.h */ +#pragma names restore diff --git a/worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_PROLOGUE.H b/worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_PROLOGUE.H new file mode 100644 index 0000000000..78b2a87d88 --- /dev/null +++ b/worker/deps/openssl/openssl/include/internal/__DECC_INCLUDE_PROLOGUE.H @@ -0,0 +1,20 @@ +/* + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* + * This file is only used by HP C on VMS, and is included automatically + * after each header file from this directory + */ + +/* save state */ +#pragma names save +/* have the compiler shorten symbols larger than 31 chars to 23 chars + * followed by a 8 hex char CRC + */ +#pragma names as_is,shortened diff --git a/worker/deps/openssl/openssl/include/internal/numbers.h b/worker/deps/openssl/openssl/include/internal/numbers.h index cf2c30eebb..31931df3c2 100644 --- a/worker/deps/openssl/openssl/include/internal/numbers.h +++ b/worker/deps/openssl/openssl/include/internal/numbers.h @@ -65,3 +65,4 @@ # endif #endif + diff --git a/worker/deps/openssl/openssl/include/internal/sslconf.h b/worker/deps/openssl/openssl/include/internal/sslconf.h new file mode 100644 index 0000000000..d538f8614f --- /dev/null +++ b/worker/deps/openssl/openssl/include/internal/sslconf.h @@ -0,0 +1,20 @@ +/* + * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef HEADER_SSLCONF_H +# define HEADER_SSLCONF_H + +typedef struct ssl_conf_cmd_st SSL_CONF_CMD; + +const SSL_CONF_CMD *conf_ssl_get(size_t idx, const char **name, size_t *cnt); +int conf_ssl_name_find(const char *name, size_t *idx); +void conf_ssl_get_cmd(const SSL_CONF_CMD *cmd, size_t idx, char **cmdstr, + char **arg); + +#endif diff --git a/worker/deps/openssl/openssl/include/openssl/asn1.h b/worker/deps/openssl/openssl/include/openssl/asn1.h index 05ae1dbe1c..d0b1099a4f 100644 --- a/worker/deps/openssl/openssl/include/openssl/asn1.h +++ b/worker/deps/openssl/openssl/include/openssl/asn1.h @@ -953,8 +953,10 @@ int ERR_load_ASN1_strings(void); # define ASN1_F_D2I_AUTOPRIVATEKEY 207 # define ASN1_F_D2I_PRIVATEKEY 154 # define ASN1_F_D2I_PUBLICKEY 155 +# define ASN1_F_DO_BUF 142 # define ASN1_F_DO_TCREATE 222 # define ASN1_F_I2D_ASN1_BIO_STREAM 211 +# define ASN1_F_I2D_ASN1_OBJECT 143 # define ASN1_F_I2D_DSA_PUBKEY 161 # define ASN1_F_I2D_EC_PUBKEY 181 # define ASN1_F_I2D_PRIVATEKEY 163 diff --git a/worker/deps/openssl/openssl/include/openssl/bio.h b/worker/deps/openssl/openssl/include/openssl/bio.h index f435bd8ef6..3a72862561 100644 --- a/worker/deps/openssl/openssl/include/openssl/bio.h +++ b/worker/deps/openssl/openssl/include/openssl/bio.h @@ -730,26 +730,26 @@ __bio_h__attr__((__format__(__printf__, 3, 0))); BIO_METHOD *BIO_meth_new(int type, const char *name); void BIO_meth_free(BIO_METHOD *biom); -int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int); +int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int); int BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int)); -int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int); +int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int)); -int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *); +int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *); int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); -int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int); +int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int)); -long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *); +long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); -int (*BIO_meth_get_create(BIO_METHOD *bion)) (BIO *); +int (*BIO_meth_get_create(const BIO_METHOD *bion)) (BIO *); int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)); -int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *); +int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *); int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)); -long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) +long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *); int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, long (*callback_ctrl) (BIO *, int, diff --git a/worker/deps/openssl/openssl/include/openssl/bn.h b/worker/deps/openssl/openssl/include/openssl/bn.h index 54ae760152..301edd5250 100644 --- a/worker/deps/openssl/openssl/include/openssl/bn.h +++ b/worker/deps/openssl/openssl/include/openssl/bn.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -119,25 +119,76 @@ void *BN_GENCB_get_arg(BN_GENCB *cb); * on the size of the number */ /* - * number of Miller-Rabin iterations for an error rate of less than 2^-80 for - * random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook of - * Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996]; - * original paper: Damgaard, Landrock, Pomerance: Average case error - * estimates for the strong probable prime test. -- Math. Comp. 61 (1993) - * 177-194) + * BN_prime_checks_for_size() returns the number of Miller-Rabin iterations + * that will be done for checking that a random number is probably prime. The + * error rate for accepting a composite number as prime depends on the size of + * the prime |b|. The error rates used are for calculating an RSA key with 2 primes, + * and so the level is what you would expect for a key of double the size of the + * prime. + * + * This table is generated using the algorithm of FIPS PUB 186-4 + * Digital Signature Standard (DSS), section F.1, page 117. + * (https://dx.doi.org/10.6028/NIST.FIPS.186-4) + * + * The following magma script was used to generate the output: + * securitybits:=125; + * k:=1024; + * for t:=1 to 65 do + * for M:=3 to Floor(2*Sqrt(k-1)-1) do + * S:=0; + * // Sum over m + * for m:=3 to M do + * s:=0; + * // Sum over j + * for j:=2 to m do + * s+:=(RealField(32)!2)^-(j+(k-1)/j); + * end for; + * S+:=2^(m-(m-1)*t)*s; + * end for; + * A:=2^(k-2-M*t); + * B:=8*(Pi(RealField(32))^2-6)/3*2^(k-2)*S; + * pkt:=2.00743*Log(2)*k*2^-k*(A+B); + * seclevel:=Floor(-Log(2,pkt)); + * if seclevel ge securitybits then + * printf "k: %5o, security: %o bits (t: %o, M: %o)\n",k,seclevel,t,M; + * break; + * end if; + * end for; + * if seclevel ge securitybits then break; end if; + * end for; + * + * It can be run online at: + * http://magma.maths.usyd.edu.au/calc + * + * And will output: + * k: 1024, security: 129 bits (t: 6, M: 23) + * + * k is the number of bits of the prime, securitybits is the level we want to + * reach. + * + * prime length | RSA key size | # MR tests | security level + * -------------+--------------|------------+--------------- + * (b) >= 6394 | >= 12788 | 3 | 256 bit + * (b) >= 3747 | >= 7494 | 3 | 192 bit + * (b) >= 1345 | >= 2690 | 4 | 128 bit + * (b) >= 1080 | >= 2160 | 5 | 128 bit + * (b) >= 852 | >= 1704 | 5 | 112 bit + * (b) >= 476 | >= 952 | 5 | 80 bit + * (b) >= 400 | >= 800 | 6 | 80 bit + * (b) >= 347 | >= 694 | 7 | 80 bit + * (b) >= 308 | >= 616 | 8 | 80 bit + * (b) >= 55 | >= 110 | 27 | 64 bit + * (b) >= 6 | >= 12 | 34 | 64 bit */ -# define BN_prime_checks_for_size(b) ((b) >= 1300 ? 2 : \ - (b) >= 850 ? 3 : \ - (b) >= 650 ? 4 : \ - (b) >= 550 ? 5 : \ - (b) >= 450 ? 6 : \ - (b) >= 400 ? 7 : \ - (b) >= 350 ? 8 : \ - (b) >= 300 ? 9 : \ - (b) >= 250 ? 12 : \ - (b) >= 200 ? 15 : \ - (b) >= 150 ? 18 : \ - /* b >= 100 */ 27) + +# define BN_prime_checks_for_size(b) ((b) >= 3747 ? 3 : \ + (b) >= 1345 ? 4 : \ + (b) >= 476 ? 5 : \ + (b) >= 400 ? 6 : \ + (b) >= 347 ? 7 : \ + (b) >= 308 ? 8 : \ + (b) >= 55 ? 27 : \ + /* b >= 6 */ 34) # define BN_num_bytes(a) ((BN_num_bits(a)+7)/8) diff --git a/worker/deps/openssl/openssl/include/openssl/conf.h b/worker/deps/openssl/openssl/include/openssl/conf.h index 980a51b157..e0539e3128 100644 --- a/worker/deps/openssl/openssl/include/openssl/conf.h +++ b/worker/deps/openssl/openssl/include/openssl/conf.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -191,6 +191,7 @@ int ERR_load_CONF_strings(void); # define CONF_F_NCONF_LOAD_BIO 110 # define CONF_F_NCONF_LOAD_FP 114 # define CONF_F_NCONF_NEW 111 +# define CONF_F_SSL_MODULE_INIT 123 # define CONF_F_STR_COPY 101 /* Reason codes. */ @@ -206,6 +207,10 @@ int ERR_load_CONF_strings(void); # define CONF_R_NO_SECTION 107 # define CONF_R_NO_SUCH_FILE 114 # define CONF_R_NO_VALUE 108 +# define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 +# define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 +# define CONF_R_SSL_SECTION_EMPTY 119 +# define CONF_R_SSL_SECTION_NOT_FOUND 120 # define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 # define CONF_R_UNKNOWN_MODULE_NAME 113 # define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116 diff --git a/worker/deps/openssl/openssl/include/openssl/crypto.h b/worker/deps/openssl/openssl/include/openssl/crypto.h index 1ba7f25f01..fa3f12af3b 100644 --- a/worker/deps/openssl/openssl/include/openssl/crypto.h +++ b/worker/deps/openssl/openssl/include/openssl/crypto.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -371,7 +371,9 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, # define OPENSSL_INIT_ENGINE_CAPI 0x00002000L # define OPENSSL_INIT_ENGINE_PADLOCK 0x00004000L # define OPENSSL_INIT_ENGINE_AFALG 0x00008000L -/* OPENSSL_INIT flag 0x00010000 reserved for internal use */ +/* OPENSSL_INIT_ZLIB 0x00010000L */ +/* currently unused 0x00020000L */ +/* OPENSSL_INIT_BASE_ONLY 0x00040000L */ /* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */ /* Max OPENSSL_INIT flag value is 0x80000000 */ diff --git a/worker/deps/openssl/openssl/include/openssl/dh.h b/worker/deps/openssl/openssl/include/openssl/dh.h index fbd479039e..8cf879e14f 100644 --- a/worker/deps/openssl/openssl/include/openssl/dh.h +++ b/worker/deps/openssl/openssl/include/openssl/dh.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -187,7 +187,7 @@ void DH_meth_free(DH_METHOD *dhm); DH_METHOD *DH_meth_dup(const DH_METHOD *dhm); const char *DH_meth_get0_name(const DH_METHOD *dhm); int DH_meth_set1_name(DH_METHOD *dhm, const char *name); -int DH_meth_get_flags(DH_METHOD *dhm); +int DH_meth_get_flags(const DH_METHOD *dhm); int DH_meth_set_flags(DH_METHOD *dhm, int flags); void *DH_meth_get0_app_data(const DH_METHOD *dhm); int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data); diff --git a/worker/deps/openssl/openssl/include/openssl/dsa.h b/worker/deps/openssl/openssl/include/openssl/dsa.h index 139718edb9..3a7b1a626e 100644 --- a/worker/deps/openssl/openssl/include/openssl/dsa.h +++ b/worker/deps/openssl/openssl/include/openssl/dsa.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -146,10 +146,12 @@ int DSAparams_print_fp(FILE *fp, const DSA *x); int DSA_print_fp(FILE *bp, const DSA *x, int off); # endif -# define DSS_prime_checks 50 +# define DSS_prime_checks 64 /* - * Primality test according to FIPS PUB 186[-1], Appendix 2.1: 50 rounds of - * Rabin-Miller + * Primality test according to FIPS PUB 186-4, Appendix C.3. Since we only + * have one value here we set the number of checks to 64 which is the 128 bit + * security level that is the highest level and valid for creating a 3072 bit + * DSA key. */ # define DSA_is_prime(n, callback, cb_arg) \ BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg) @@ -186,7 +188,7 @@ void DSA_meth_free(DSA_METHOD *dsam); DSA_METHOD *DSA_meth_dup(const DSA_METHOD *dsam); const char *DSA_meth_get0_name(const DSA_METHOD *dsam); int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name); -int DSA_meth_get_flags(DSA_METHOD *dsam); +int DSA_meth_get_flags(const DSA_METHOD *dsam); int DSA_meth_set_flags(DSA_METHOD *dsam, int flags); void *DSA_meth_get0_app_data(const DSA_METHOD *dsam); int DSA_meth_set0_app_data(DSA_METHOD *dsam, void *app_data); @@ -260,6 +262,7 @@ int ERR_load_DSA_strings(void); # define DSA_F_DSA_SIG_NEW 102 # define DSA_F_OLD_DSA_PRIV_DECODE 122 # define DSA_F_PKEY_DSA_CTRL 120 +# define DSA_F_PKEY_DSA_CTRL_STR 104 # define DSA_F_PKEY_DSA_KEYGEN 121 /* Reason codes. */ diff --git a/worker/deps/openssl/openssl/include/openssl/ec.h b/worker/deps/openssl/openssl/include/openssl/ec.h index f06680a788..d6b36c77c0 100644 --- a/worker/deps/openssl/openssl/include/openssl/ec.h +++ b/worker/deps/openssl/openssl/include/openssl/ec.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1424,6 +1424,7 @@ int ERR_load_EC_strings(void); # define EC_F_EC_GFP_NIST_FIELD_MUL 200 # define EC_F_EC_GFP_NIST_FIELD_SQR 201 # define EC_F_EC_GFP_NIST_GROUP_SET_CURVE 202 +# define EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES 287 # define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT 165 # define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE 166 # define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE 102 diff --git a/worker/deps/openssl/openssl/include/openssl/evp.h b/worker/deps/openssl/openssl/include/openssl/evp.h index 43c97a7560..36e2934485 100644 --- a/worker/deps/openssl/openssl/include/openssl/evp.h +++ b/worker/deps/openssl/openssl/include/openssl/evp.h @@ -1351,34 +1351,34 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, const char *type, const char *value)); -void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth, int (**pinit) (EVP_PKEY_CTX *ctx)); -void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth, int (**pcopy) (EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)); -void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth, void (**pcleanup) (EVP_PKEY_CTX *ctx)); -void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth, int (**pparamgen_init) (EVP_PKEY_CTX *ctx), int (**pparamgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)); -void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth, int (**pkeygen_init) (EVP_PKEY_CTX *ctx), int (**pkeygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)); -void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth, int (**psign_init) (EVP_PKEY_CTX *ctx), int (**psign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, const unsigned char *tbs, size_t tbslen)); -void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth, int (**pverify_init) (EVP_PKEY_CTX *ctx), int (**pverify) (EVP_PKEY_CTX *ctx, const unsigned char *sig, @@ -1386,7 +1386,7 @@ void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth, const unsigned char *tbs, size_t tbslen)); -void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth, int (**pverify_recover_init) (EVP_PKEY_CTX *ctx), int (**pverify_recover) (EVP_PKEY_CTX @@ -1398,7 +1398,7 @@ void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth, char *tbs, size_t tbslen)); -void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth, int (**psignctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**psignctx) (EVP_PKEY_CTX *ctx, @@ -1406,7 +1406,7 @@ void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth, size_t *siglen, EVP_MD_CTX *mctx)); -void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth, int (**pverifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**pverifyctx) (EVP_PKEY_CTX *ctx, @@ -1414,7 +1414,7 @@ void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth, int siglen, EVP_MD_CTX *mctx)); -void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth, int (**pencrypt_init) (EVP_PKEY_CTX *ctx), int (**pencryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -1422,7 +1422,7 @@ void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth, const unsigned char *in, size_t inlen)); -void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth, int (**pdecrypt_init) (EVP_PKEY_CTX *ctx), int (**pdecrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -1430,13 +1430,13 @@ void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, const unsigned char *in, size_t inlen)); -void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth, int (**pderive_init) (EVP_PKEY_CTX *ctx), int (**pderive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)); -void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth, int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2), int (**pctrl_str) (EVP_PKEY_CTX *ctx, @@ -1506,6 +1506,8 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_PKEY_GET0_RSA 121 # define EVP_F_EVP_PKEY_KEYGEN 146 # define EVP_F_EVP_PKEY_KEYGEN_INIT 147 +# define EVP_F_EVP_PKEY_METH_ADD0 172 +# define EVP_F_EVP_PKEY_METH_NEW 173 # define EVP_F_EVP_PKEY_NEW 106 # define EVP_F_EVP_PKEY_PARAMGEN 148 # define EVP_F_EVP_PKEY_PARAMGEN_INIT 149 @@ -1570,6 +1572,7 @@ int ERR_load_EVP_strings(void); # define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150 # define EVP_R_OPERATON_NOT_INITIALIZED 151 # define EVP_R_PARTIALLY_OVERLAPPING 162 +# define EVP_R_PBKDF2_ERROR 176 # define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 175 # define EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED 164 # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145 diff --git a/worker/deps/openssl/openssl/include/openssl/lhash.h b/worker/deps/openssl/openssl/include/openssl/lhash.h index 82d40c1e0e..8ecc588484 100644 --- a/worker/deps/openssl/openssl/include/openssl/lhash.h +++ b/worker/deps/openssl/openssl/include/openssl/lhash.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -95,7 +95,7 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out); # define _LHASH OPENSSL_LHASH # define LHASH_NODE OPENSSL_LH_NODE # define lh_error OPENSSL_LH_error -# define lh_new OPENSSL_lh_new +# define lh_new OPENSSL_LH_new # define lh_free OPENSSL_LH_free # define lh_insert OPENSSL_LH_insert # define lh_delete OPENSSL_LH_delete diff --git a/worker/deps/openssl/openssl/include/openssl/ocsp.h b/worker/deps/openssl/openssl/include/openssl/ocsp.h index 90ebe5ccd0..ba1b97315b 100644 --- a/worker/deps/openssl/openssl/include/openssl/ocsp.h +++ b/worker/deps/openssl/openssl/include/openssl/ocsp.h @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -92,7 +92,6 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES; # define V_OCSP_RESPID_KEY 1 DEFINE_STACK_OF(OCSP_RESPID) -DECLARE_ASN1_FUNCTIONS(OCSP_RESPID) typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO; @@ -159,8 +158,6 @@ int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, int OCSP_REQ_CTX_nbio_d2i(OCSP_REQ_CTX *rctx, ASN1_VALUE **pval, const ASN1_ITEM *it); BIO *OCSP_REQ_CTX_get0_mem_bio(OCSP_REQ_CTX *rctx); -int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, - ASN1_VALUE *val); int OCSP_REQ_CTX_http(OCSP_REQ_CTX *rctx, const char *op, const char *path); int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req); int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx, @@ -194,6 +191,8 @@ int OCSP_response_status(OCSP_RESPONSE *resp); OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp); const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs); +const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs); +const OCSP_RESPDATA *OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs); int OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer, STACK_OF(X509) *extra_certs); diff --git a/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in b/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in index 9f8634a3a2..17807fb6bd 100644 --- a/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in +++ b/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in @@ -68,12 +68,18 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#ifndef DECLARE_DEPRECATED +# if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +# else +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif +# endif #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/openssl/include/openssl/opensslv.h b/worker/deps/openssl/openssl/include/openssl/opensslv.h index 4fb437f2ee..49f3c0a780 100644 --- a/worker/deps/openssl/openssl/include/openssl/opensslv.h +++ b/worker/deps/openssl/openssl/include/openssl/opensslv.h @@ -39,18 +39,13 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1010008fL +# define OPENSSL_VERSION_NUMBER 0x101000afL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-fips 27 Mar 2018" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j-fips 20 Nov 2018" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h 27 Mar 2018" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j 20 Nov 2018" # endif -#define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch) - -/* use this for #if tests, should never depend upon fix/patch */ -#define OPENSSL_VERSION_AT_LEAST(maj,min) (OPENSSL_MAKE_VERSION(maj,min, 0, 0) >= OPENSSL_VERSION_NUMBER) - /*- * The macros below are to be used for shared library (.so, .dll, ...) * versioning. That kind of versioning works a bit differently between diff --git a/worker/deps/openssl/openssl/include/openssl/pem.h b/worker/deps/openssl/openssl/include/openssl/pem.h index 2375d63553..f7ce3c61f5 100644 --- a/worker/deps/openssl/openssl/include/openssl/pem.h +++ b/worker/deps/openssl/openssl/include/openssl/pem.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -322,7 +322,8 @@ int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt); int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, EVP_PKEY *pkey); -int PEM_def_callback(char *buf, int num, int w, void *key); +/* The default pem_password_cb that's used internally */ +int PEM_def_callback(char *buf, int num, int rwflag, void *userdata); void PEM_proc_type(char *buf, int type); void PEM_dek_info(char *buf, const char *type, int len, char *str); diff --git a/worker/deps/openssl/openssl/include/openssl/rsa.h b/worker/deps/openssl/openssl/include/openssl/rsa.h index d97d6e075a..9c28329f1d 100644 --- a/worker/deps/openssl/openssl/include/openssl/rsa.h +++ b/worker/deps/openssl/openssl/include/openssl/rsa.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -374,7 +374,7 @@ void RSA_meth_free(RSA_METHOD *meth); RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth); const char *RSA_meth_get0_name(const RSA_METHOD *meth); int RSA_meth_set1_name(RSA_METHOD *meth, const char *name); -int RSA_meth_get_flags(RSA_METHOD *meth); +int RSA_meth_get_flags(const RSA_METHOD *meth); int RSA_meth_set_flags(RSA_METHOD *meth, int flags); void *RSA_meth_get0_app_data(const RSA_METHOD *meth); int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data); @@ -407,9 +407,9 @@ int RSA_meth_set_priv_dec(RSA_METHOD *rsa, unsigned char *to, RSA *rsa, int padding)); int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) - (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx); + (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx); int RSA_meth_set_mod_exp(RSA_METHOD *rsa, - int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, + int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)); int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth)) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p, diff --git a/worker/deps/openssl/openssl/include/openssl/ssl.h b/worker/deps/openssl/openssl/include/openssl/ssl.h index 1cb3462f48..56e2056260 100644 --- a/worker/deps/openssl/openssl/include/openssl/ssl.h +++ b/worker/deps/openssl/openssl/include/openssl/ssl.h @@ -381,7 +381,7 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); # define SSL_OP_PKCS1_CHECK_1 0x0 /* Removed from OpenSSL 1.0.1. Was 0x10000000L */ # define SSL_OP_PKCS1_CHECK_2 0x0 -/* Removed from OpenSSL 1.1.0. Was 0x20000000L */ +/* Removed from OpenSSL 1.1.0. Was 0x20000000L */ # define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 /* Removed from OpenSSL 1.1.0. Was 0x40000000L */ # define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0 @@ -967,8 +967,8 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count); # define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02 # define SSL_VERIFY_CLIENT_ONCE 0x04 -# define OpenSSL_add_ssl_algorithms() SSL_library_init() # if OPENSSL_API_COMPAT < 0x10100000L +# define OpenSSL_add_ssl_algorithms() SSL_library_init() # define SSLeay_add_ssl_algorithms() SSL_library_init() # endif @@ -1358,7 +1358,7 @@ __owur int SSL_get_fd(const SSL *s); __owur int SSL_get_rfd(const SSL *s); __owur int SSL_get_wfd(const SSL *s); __owur const char *SSL_get_cipher_list(const SSL *s, int n); -__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len); +__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size); __owur int SSL_get_read_ahead(const SSL *s); __owur int SSL_pending(const SSL *s); __owur int SSL_has_pending(const SSL *s); diff --git a/worker/deps/openssl/openssl/include/openssl/ssl3.h b/worker/deps/openssl/openssl/include/openssl/ssl3.h index 4ca434e760..115940ad31 100644 --- a/worker/deps/openssl/openssl/include/openssl/ssl3.h +++ b/worker/deps/openssl/openssl/include/openssl/ssl3.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -252,9 +252,15 @@ extern "C" { # define SSL3_CT_FORTEZZA_DMS 20 /* * SSL3_CT_NUMBER is used to size arrays and it must be large enough to - * contain all of the cert types defined either for SSLv3 and TLSv1. + * contain all of the cert types defined for *either* SSLv3 and TLSv1. */ -# define SSL3_CT_NUMBER 9 +# define SSL3_CT_NUMBER 10 + +# if defined(TLS_CT_NUMBER) +# if TLS_CT_NUMBER != SSL3_CT_NUMBER +# error "SSL/TLS CT_NUMBER values do not match" +# endif +# endif # define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001 diff --git a/worker/deps/openssl/openssl/include/openssl/symhacks.h b/worker/deps/openssl/openssl/include/openssl/symhacks.h index caf1f1a75d..156ea6e4ee 100644 --- a/worker/deps/openssl/openssl/include/openssl/symhacks.h +++ b/worker/deps/openssl/openssl/include/openssl/symhacks.h @@ -1,5 +1,5 @@ /* - * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -28,21 +28,6 @@ # undef i2d_ECPKPARAMETERS # define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS -/* - * These functions do not seem to exist! However, I'm paranoid... Original - * command in x509v3.h: These functions are being redefined in another - * directory, and clash when the linker is case-insensitive, so let's hide - * them a little, by giving them an extra 'o' at the beginning of the name... - */ -# undef X509v3_cleanup_extensions -# define X509v3_cleanup_extensions oX509v3_cleanup_extensions -# undef X509v3_add_extension -# define X509v3_add_extension oX509v3_add_extension -# undef X509v3_add_netscape_extensions -# define X509v3_add_netscape_extensions oX509v3_add_netscape_extensions -# undef X509v3_add_standard_extensions -# define X509v3_add_standard_extensions oX509v3_add_standard_extensions - /* This one clashes with CMS_data_create */ # undef cms_Data_create # define cms_Data_create priv_cms_Data_create diff --git a/worker/deps/openssl/openssl/include/openssl/tls1.h b/worker/deps/openssl/openssl/include/openssl/tls1.h index 3fe01fe813..732e87ab35 100644 --- a/worker/deps/openssl/openssl/include/openssl/tls1.h +++ b/worker/deps/openssl/openssl/include/openssl/tls1.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -883,7 +883,13 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see * comment there) */ -# define TLS_CT_NUMBER 9 +# define TLS_CT_NUMBER 10 + +# if defined(SSL3_CT_NUMBER) +# if TLS_CT_NUMBER != SSL3_CT_NUMBER +# error "SSL/TLS CT_NUMBER values do not match" +# endif +# endif # define TLS1_FINISH_MAC_LENGTH 12 diff --git a/worker/deps/openssl/openssl/include/openssl/x509.h b/worker/deps/openssl/openssl/include/openssl/x509.h index d23fad8e35..780386d530 100644 --- a/worker/deps/openssl/openssl/include/openssl/x509.h +++ b/worker/deps/openssl/openssl/include/openssl/x509.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -805,7 +805,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const unsigned char *bytes, int len); X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, - int type, + int type, const unsigned char *bytes, int len); int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, @@ -1055,6 +1055,7 @@ int ERR_load_X509_strings(void); # define X509_F_X509_LOAD_CERT_CRL_FILE 132 # define X509_F_X509_LOAD_CERT_FILE 111 # define X509_F_X509_LOAD_CRL_FILE 112 +# define X509_F_X509_LOOKUP_METH_NEW 160 # define X509_F_X509_NAME_ADD_ENTRY 113 # define X509_F_X509_NAME_ENTRY_CREATE_BY_NID 114 # define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT 131 diff --git a/worker/deps/openssl/openssl/include/openssl/x509_vfy.h b/worker/deps/openssl/openssl/include/openssl/x509_vfy.h index 1aa0a33b8a..131b6cf791 100644 --- a/worker/deps/openssl/openssl/include/openssl/x509_vfy.h +++ b/worker/deps/openssl/openssl/include/openssl/x509_vfy.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -257,7 +257,9 @@ X509_OBJECT *X509_OBJECT_new(void); void X509_OBJECT_free(X509_OBJECT *a); X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a); X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a); +int X509_OBJECT_set1_X509(X509_OBJECT *a, X509 *obj); X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *a); +int X509_OBJECT_set1_X509_CRL(X509_OBJECT *a, X509_CRL *obj); X509_STORE *X509_STORE_new(void); void X509_STORE_free(X509_STORE *v); int X509_STORE_lock(X509_STORE *ctx); @@ -364,6 +366,76 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m); X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void); X509_LOOKUP_METHOD *X509_LOOKUP_file(void); +typedef int (*X509_LOOKUP_ctrl_fn)(X509_LOOKUP *ctx, int cmd, const char *argc, + long argl, char **ret); +typedef int (*X509_LOOKUP_get_by_subject_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + X509_NAME *name, + X509_OBJECT *ret); +typedef int (*X509_LOOKUP_get_by_issuer_serial_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + X509_NAME *name, + ASN1_INTEGER *serial, + X509_OBJECT *ret); +typedef int (*X509_LOOKUP_get_by_fingerprint_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + const unsigned char* bytes, + int len, + X509_OBJECT *ret); +typedef int (*X509_LOOKUP_get_by_alias_fn)(X509_LOOKUP *ctx, + X509_LOOKUP_TYPE type, + const char *str, + int len, + X509_OBJECT *ret); + +X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name); +void X509_LOOKUP_meth_free(X509_LOOKUP_METHOD *method); + +int X509_LOOKUP_meth_set_new_item(X509_LOOKUP_METHOD *method, + int (*new_item) (X509_LOOKUP *ctx)); +int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + +int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method, + void (*free_fn) (X509_LOOKUP *ctx)); +void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + +int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method, + int (*init) (X509_LOOKUP *ctx)); +int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + +int X509_LOOKUP_meth_set_shutdown(X509_LOOKUP_METHOD *method, + int (*shutdown) (X509_LOOKUP *ctx)); +int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method)) + (X509_LOOKUP *ctx); + +int X509_LOOKUP_meth_set_ctrl(X509_LOOKUP_METHOD *method, + X509_LOOKUP_ctrl_fn ctrl_fn); +X509_LOOKUP_ctrl_fn X509_LOOKUP_meth_get_ctrl(const X509_LOOKUP_METHOD *method); + +int X509_LOOKUP_meth_set_get_by_subject(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_subject_fn fn); +X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject( + const X509_LOOKUP_METHOD *method); + +int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_issuer_serial_fn fn); +X509_LOOKUP_get_by_issuer_serial_fn X509_LOOKUP_meth_get_get_by_issuer_serial( + const X509_LOOKUP_METHOD *method); + +int X509_LOOKUP_meth_set_get_by_fingerprint(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_fingerprint_fn fn); +X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint( + const X509_LOOKUP_METHOD *method); + +int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method, + X509_LOOKUP_get_by_alias_fn fn); +X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias( + const X509_LOOKUP_METHOD *method); + + int X509_STORE_add_cert(X509_STORE *ctx, X509 *x); int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x); @@ -393,6 +465,9 @@ int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, X509_OBJECT *ret); int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, const char *str, int len, X509_OBJECT *ret); +int X509_LOOKUP_set_method_data(X509_LOOKUP *ctx, void *data); +void *X509_LOOKUP_get_method_data(const X509_LOOKUP *ctx); +X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx); int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); int X509_STORE_load_locations(X509_STORE *ctx, @@ -475,6 +550,7 @@ int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, const char *name, size_t namelen); void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags); +unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param); char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *); void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *); int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, diff --git a/worker/deps/openssl/openssl/ms/uplink-x86.pl b/worker/deps/openssl/openssl/ms/uplink-x86.pl index e25668ea35..2c0b12b86e 100755 --- a/worker/deps/openssl/openssl/ms/uplink-x86.pl +++ b/worker/deps/openssl/openssl/ms/uplink-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -41,4 +41,4 @@ } &asm_finish(); -close OUTPUT; +close STDOUT; diff --git a/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c b/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c index b3ff5f1fbf..6111a2e191 100644 --- a/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c +++ b/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c @@ -423,6 +423,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, /* get new packet if necessary */ if ((SSL3_RECORD_get_length(rr) == 0) || (s->rlayer.rstate == SSL_ST_READ_BODY)) { + RECORD_LAYER_set_numrpipes(&s->rlayer, 0); ret = dtls1_get_record(s); if (ret <= 0) { ret = dtls1_read_failed(s, ret); @@ -432,6 +433,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, else goto start; } + RECORD_LAYER_set_numrpipes(&s->rlayer, 1); } /* @@ -442,6 +444,19 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, && SSL3_RECORD_get_length(rr) != 0) s->rlayer.alert_count = 0; + if (SSL3_RECORD_get_type(rr) != SSL3_RT_HANDSHAKE + && SSL3_RECORD_get_type(rr) != SSL3_RT_CHANGE_CIPHER_SPEC + && !SSL_in_init(s) + && (s->d1->next_timeout.tv_sec != 0 + || s->d1->next_timeout.tv_usec != 0)) { + /* + * The timer is still running but we've received something that isn't + * handshake data - so the peer must have finished processing our + * last handshake flight. Stop the timer. + */ + dtls1_stop_timer(s); + } + /* we now have a packet which can be read and processed */ if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec, @@ -458,6 +473,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, return -1; } SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); goto start; } @@ -467,8 +483,9 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, */ if (s->shutdown & SSL_RECEIVED_SHUTDOWN) { SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); s->rwstate = SSL_NOTHING; - return (0); + return 0; } if (type == SSL3_RECORD_get_type(rr) @@ -493,8 +510,16 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, if (recvd_type != NULL) *recvd_type = SSL3_RECORD_get_type(rr); - if (len <= 0) - return (len); + if (len <= 0) { + /* + * Mark a zero length record as read. This ensures multiple calls to + * SSL_read() with a zero length buffer will eventually cause + * SSL_pending() to report data as being available. + */ + if (SSL3_RECORD_get_length(rr) == 0) + SSL3_RECORD_set_read(rr); + return len; + } if ((unsigned int)len > SSL3_RECORD_get_length(rr)) n = SSL3_RECORD_get_length(rr); @@ -502,12 +527,16 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, n = (unsigned int)len; memcpy(buf, &(SSL3_RECORD_get_data(rr)[SSL3_RECORD_get_off(rr)]), n); - if (!peek) { + if (peek) { + if (SSL3_RECORD_get_length(rr) == 0) + SSL3_RECORD_set_read(rr); + } else { SSL3_RECORD_sub_length(rr, n); SSL3_RECORD_add_off(rr, n); if (SSL3_RECORD_get_length(rr) == 0) { s->rlayer.rstate = SSL_ST_READ_HEADER; SSL3_RECORD_set_off(rr, 0); + SSL3_RECORD_set_read(rr); } } #ifndef OPENSSL_NO_SCTP @@ -558,6 +587,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, } /* Exit and notify application to read again */ SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); s->rwstate = SSL_READING; BIO_clear_retry_flags(SSL_get_rbio(s)); BIO_set_retry_read(SSL_get_rbio(s)); @@ -602,6 +632,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, #endif s->rlayer.rstate = SSL_ST_READ_HEADER; SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); goto start; } @@ -611,6 +642,8 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, SSL3_RECORD_add_off(rr, 1); SSL3_RECORD_add_length(rr, -1); } + if (SSL3_RECORD_get_length(rr) == 0) + SSL3_RECORD_set_read(rr); *dest_len = dest_maxlen; } } @@ -681,6 +714,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, } } else { SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION); } /* @@ -705,6 +739,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, || (s->options & SSL_OP_NO_RENEGOTIATION) != 0)) { s->rlayer.d->handshake_fragment_len = 0; SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION); goto start; } @@ -732,6 +767,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, if (alert_level == SSL3_AL_WARNING) { s->s3->warn_alert = alert_descr; + SSL3_RECORD_set_read(rr); s->rlayer.alert_count++; if (s->rlayer.alert_count == MAX_WARN_ALERT_COUNT) { @@ -796,6 +832,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, BIO_snprintf(tmp, sizeof(tmp), "%d", alert_descr); ERR_add_error_data(2, "SSL alert number ", tmp); s->shutdown |= SSL_RECEIVED_SHUTDOWN; + SSL3_RECORD_set_read(rr); SSL_CTX_remove_session(s->session_ctx, s->session); return (0); } else { @@ -811,7 +848,8 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, * shutdown */ s->rwstate = SSL_NOTHING; SSL3_RECORD_set_length(rr, 0); - return (0); + SSL3_RECORD_set_read(rr); + return 0; } if (SSL3_RECORD_get_type(rr) == SSL3_RT_CHANGE_CIPHER_SPEC) { @@ -820,6 +858,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, * are still missing, so just drop it. */ SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); goto start; } @@ -834,6 +873,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, dtls1_get_message_header(rr->data, &msg_hdr); if (SSL3_RECORD_get_epoch(rr) != s->rlayer.d->r_epoch) { SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); goto start; } @@ -847,6 +887,19 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, dtls1_retransmit_buffered_messages(s); SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); + if (!(s->mode & SSL_MODE_AUTO_RETRY)) { + if (SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0) { + /* no read-ahead left? */ + BIO *bio; + + s->rwstate = SSL_READING; + bio = SSL_get_rbio(s); + BIO_clear_retry_flags(bio); + BIO_set_retry_read(bio); + return -1; + } + } goto start; } @@ -889,6 +942,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, /* TLS just ignores unknown message types */ if (s->version == TLS1_VERSION) { SSL3_RECORD_set_length(rr, 0); + SSL3_RECORD_set_read(rr); goto start; } al = SSL_AD_UNEXPECTED_MESSAGE; diff --git a/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c b/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c index 20225d2db7..1ffc1205d9 100644 --- a/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c +++ b/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c @@ -368,7 +368,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) * promptly send beyond the end of the users buffer ... so we trap and * report the error in a way the user will notice */ - if (((unsigned int)len < s->rlayer.wnum) + if (((unsigned int)len < s->rlayer.wnum) || ((wb->left != 0) && ((unsigned int)len < (s->rlayer.wnum + s->rlayer.wpend_tot)))) { SSLerr(SSL_F_SSL3_WRITE_BYTES, SSL_R_BAD_LENGTH); return -1; diff --git a/worker/deps/openssl/openssl/ssl/record/ssl3_record.c b/worker/deps/openssl/openssl/ssl/record/ssl3_record.c index c7a54feb12..c80add37f9 100644 --- a/worker/deps/openssl/openssl/ssl/record/ssl3_record.c +++ b/worker/deps/openssl/openssl/ssl/record/ssl3_record.c @@ -1531,6 +1531,7 @@ int dtls1_get_record(SSL *s) p += 6; n2s(p, rr->length); + rr->read = 0; /* * Lets check the version. We tolerate alerts that don't have the exact @@ -1540,6 +1541,7 @@ int dtls1_get_record(SSL *s) if (version != s->version) { /* unexpected version, silently discard */ rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } @@ -1548,6 +1550,7 @@ int dtls1_get_record(SSL *s) if ((version & 0xff00) != (s->version & 0xff00)) { /* wrong version, silently discard record */ rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } @@ -1555,10 +1558,10 @@ int dtls1_get_record(SSL *s) if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH) { /* record too long, silently discard it */ rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } - /* now s->rlayer.rstate == SSL_ST_READ_BODY */ } @@ -1572,6 +1575,7 @@ int dtls1_get_record(SSL *s) /* this packet contained a partial record, dump it */ if (n != i) { rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } @@ -1588,6 +1592,7 @@ int dtls1_get_record(SSL *s) bitmap = dtls1_get_bitmap(s, rr, &is_next_epoch); if (bitmap == NULL) { rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); /* dump this record */ goto again; /* get another record */ } @@ -1602,6 +1607,7 @@ int dtls1_get_record(SSL *s) */ if (!dtls1_record_replay_check(s, bitmap)) { rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); /* dump this record */ goto again; /* get another record */ } @@ -1610,8 +1616,10 @@ int dtls1_get_record(SSL *s) #endif /* just read a 0 length packet */ - if (rr->length == 0) + if (rr->length == 0) { + rr->read = 1; goto again; + } /* * If this record is from the next epoch (either HM or ALERT), and a @@ -1626,12 +1634,14 @@ int dtls1_get_record(SSL *s) return -1; } rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } if (!dtls1_process_record(s, bitmap)) { rr->length = 0; + rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); /* dump this record */ goto again; /* get another record */ } diff --git a/worker/deps/openssl/openssl/ssl/s3_enc.c b/worker/deps/openssl/openssl/ssl/s3_enc.c index e08857df9b..65fe913141 100644 --- a/worker/deps/openssl/openssl/ssl/s3_enc.c +++ b/worker/deps/openssl/openssl/ssl/s3_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -404,13 +404,14 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p) } if (!EVP_MD_CTX_copy_ex(ctx, s->s3->handshake_dgst)) { SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_INTERNAL_ERROR); - return 0; + ret = 0; + goto err; } ret = EVP_MD_CTX_size(ctx); if (ret < 0) { - EVP_MD_CTX_reset(ctx); - return 0; + ret = 0; + goto err; } if ((sender != NULL && EVP_DigestUpdate(ctx, sender, len) <= 0) @@ -422,6 +423,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p) ret = 0; } + err: EVP_MD_CTX_free(ctx); return ret; diff --git a/worker/deps/openssl/openssl/ssl/ssl_ciph.c b/worker/deps/openssl/openssl/ssl/ssl_ciph.c index 7a393cbe80..b8da982105 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_ciph.c +++ b/worker/deps/openssl/openssl/ssl/ssl_ciph.c @@ -101,10 +101,7 @@ static const ssl_cipher_table ssl_cipher_table_cipher[SSL_ENC_NUM_IDX] = { {SSL_CHACHA20POLY1305, NID_chacha20_poly1305}, }; -static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL -}; +static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]; #define SSL_COMP_NULL_IDX 0 #define SSL_COMP_ZLIB_IDX 1 diff --git a/worker/deps/openssl/openssl/ssl/ssl_conf.c b/worker/deps/openssl/openssl/ssl/ssl_conf.c index 7f894885dc..9d9309ac15 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_conf.c +++ b/worker/deps/openssl/openssl/ssl/ssl_conf.c @@ -222,8 +222,9 @@ static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value) int nid; /* Ignore values supported by 1.0.2 for the automatic selection */ - if ((cctx->flags & SSL_CONF_FLAG_FILE) && - strcasecmp(value, "+automatic") == 0) + if ((cctx->flags & SSL_CONF_FLAG_FILE) + && (strcasecmp(value, "+automatic") == 0 + || strcasecmp(value, "automatic") == 0)) return 1; if ((cctx->flags & SSL_CONF_FLAG_CMDLINE) && strcmp(value, "auto") == 0) diff --git a/worker/deps/openssl/openssl/ssl/ssl_init.c b/worker/deps/openssl/openssl/ssl/ssl_init.c index 3e62d48111..dc16e39bf3 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_init.c +++ b/worker/deps/openssl/openssl/ssl/ssl_init.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -12,6 +12,7 @@ #include "internal/err.h" #include #include +#include #include #include "ssl_locl.h" #include "internal/thread_once.h" @@ -126,8 +127,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings) "ERR_load_SSL_strings()\n"); # endif ERR_load_SSL_strings(); -#endif ssl_strings_inited = 1; +#endif return 1; } @@ -191,11 +192,13 @@ int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS * settings) return 0; } - if (!RUN_ONCE(&ssl_base, ossl_init_ssl_base)) + if (!OPENSSL_init_crypto(opts + | OPENSSL_INIT_ADD_ALL_CIPHERS + | OPENSSL_INIT_ADD_ALL_DIGESTS, + settings)) return 0; - if (!OPENSSL_init_crypto(opts | OPENSSL_INIT_ADD_ALL_CIPHERS - | OPENSSL_INIT_ADD_ALL_DIGESTS, settings)) + if (!RUN_ONCE(&ssl_base, ossl_init_ssl_base)) return 0; if ((opts & OPENSSL_INIT_NO_LOAD_SSL_STRINGS) diff --git a/worker/deps/openssl/openssl/ssl/ssl_lib.c b/worker/deps/openssl/openssl/ssl/ssl_lib.c index 8a190d23e8..2002c1712f 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_lib.c +++ b/worker/deps/openssl/openssl/ssl/ssl_lib.c @@ -2213,28 +2213,37 @@ int SSL_set_cipher_list(SSL *s, const char *str) return 1; } -char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len) +char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size) { char *p; - STACK_OF(SSL_CIPHER) *sk; + STACK_OF(SSL_CIPHER) *clntsk, *srvrsk; const SSL_CIPHER *c; int i; - if ((s->session == NULL) || (s->session->ciphers == NULL) || (len < 2)) - return (NULL); + if (!s->server + || s->session == NULL + || s->session->ciphers == NULL + || size < 2) + return NULL; p = buf; - sk = s->session->ciphers; + clntsk = s->session->ciphers; + srvrsk = SSL_get_ciphers(s); + if (clntsk == NULL || srvrsk == NULL) + return NULL; - if (sk_SSL_CIPHER_num(sk) == 0) + if (sk_SSL_CIPHER_num(clntsk) == 0 || sk_SSL_CIPHER_num(srvrsk) == 0) return NULL; - for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) { + for (i = 0; i < sk_SSL_CIPHER_num(clntsk); i++) { int n; - c = sk_SSL_CIPHER_value(sk, i); + c = sk_SSL_CIPHER_value(clntsk, i); + if (sk_SSL_CIPHER_find(srvrsk, c) < 0) + continue; + n = strlen(c->name); - if (n + 1 > len) { + if (n + 1 > size) { if (p != buf) --p; *p = '\0'; @@ -2243,7 +2252,7 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len) memcpy(p, c->name, n + 1); p += n; *(p++) = ':'; - len -= n + 1; + size -= n + 1; } p[-1] = '\0'; return (buf); @@ -3035,12 +3044,13 @@ void ssl_update_cache(SSL *s, int mode) /* * If sid_ctx_length is 0 there is no specific application context * associated with this session, so when we try to resume it and - * SSL_VERIFY_PEER is requested, we have no indication that this is - * actually a session for the proper application context, and the - * *handshake* will fail, not just the resumption attempt. - * Do not cache these sessions that are not resumable. + * SSL_VERIFY_PEER is requested to verify the client identity, we have no + * indication that this is actually a session for the proper application + * context, and the *handshake* will fail, not just the resumption attempt. + * Do not cache (on the server) these sessions that are not resumable + * (clients can set SSL_VERIFY_PEER without needing a sid_ctx set). */ - if (s->session->sid_ctx_length == 0 + if (s->server && s->session->sid_ctx_length == 0 && (s->verify_mode & SSL_VERIFY_PEER) != 0) return; @@ -3519,7 +3529,6 @@ void ssl_free_wbio_buffer(SSL *s) return; s->wbio = BIO_pop(s->wbio); - assert(s->wbio != NULL); BIO_free(s->bbio); s->bbio = NULL; } diff --git a/worker/deps/openssl/openssl/ssl/ssl_locl.h b/worker/deps/openssl/openssl/ssl/ssl_locl.h index d86bd7e8e2..3c7c1a8e64 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_locl.h +++ b/worker/deps/openssl/openssl/ssl/ssl_locl.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -164,6 +164,8 @@ (c)[1]=(unsigned char)(((l)>> 8)&0xff), \ (c)[2]=(unsigned char)(((l) )&0xff)),(c)+=3) +# define SSL_MAX_2_BYTE_LEN (0xffff) + /* * DTLS version numbers are strange because they're inverted. Except for * DTLS1_BAD_VER, which should be considered "lower" than the rest. @@ -347,6 +349,9 @@ /* we have used 0000003f - 26 bits left to go */ +# define SSL_IS_FIRST_HANDSHAKE(S) ((s)->s3->tmp.finish_md_len == 0 \ + || (s)->s3->tmp.peer_finish_md_len == 0) + /* Check if an SSL structure is using DTLS */ # define SSL_IS_DTLS(s) (s->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) /* See if we need explicit IV */ @@ -537,7 +542,7 @@ struct ssl_session_st { const SSL_CIPHER *cipher; unsigned long cipher_id; /* when ASN.1 loaded, this needs to be used to * load the 'cipher' structure */ - STACK_OF(SSL_CIPHER) *ciphers; /* shared ciphers? */ + STACK_OF(SSL_CIPHER) *ciphers; /* ciphers offered by the client */ CRYPTO_EX_DATA ex_data; /* application specific data */ /* * These are used to make removal of session-ids more efficient and to diff --git a/worker/deps/openssl/openssl/ssl/ssl_mcnf.c b/worker/deps/openssl/openssl/ssl/ssl_mcnf.c index c2d9dba64a..24742660e4 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_mcnf.c +++ b/worker/deps/openssl/openssl/ssl/ssl_mcnf.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,148 +11,35 @@ #include #include #include "ssl_locl.h" +#include "internal/sslconf.h" /* SSL library configuration module. */ -struct ssl_conf_name { - /* Name of this set of commands */ - char *name; - /* List of commands */ - struct ssl_conf_cmd *cmds; - /* Number of commands */ - size_t cmd_count; -}; - -struct ssl_conf_cmd { - /* Command */ - char *cmd; - /* Argument */ - char *arg; -}; - -static struct ssl_conf_name *ssl_names; -static size_t ssl_names_count; - -static void ssl_module_free(CONF_IMODULE *md) -{ - size_t i, j; - if (ssl_names == NULL) - return; - for (i = 0; i < ssl_names_count; i++) { - struct ssl_conf_name *tname = ssl_names + i; - OPENSSL_free(tname->name); - for (j = 0; j < tname->cmd_count; j++) { - OPENSSL_free(tname->cmds[j].cmd); - OPENSSL_free(tname->cmds[j].arg); - } - OPENSSL_free(tname->cmds); - } - OPENSSL_free(ssl_names); - ssl_names = NULL; - ssl_names_count = 0; -} - -static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf) -{ - size_t i, j, cnt; - int rv = 0; - const char *ssl_conf_section; - STACK_OF(CONF_VALUE) *cmd_lists; - ssl_conf_section = CONF_imodule_get_value(md); - cmd_lists = NCONF_get_section(cnf, ssl_conf_section); - if (sk_CONF_VALUE_num(cmd_lists) <= 0) { - if (cmd_lists == NULL) - SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_SECTION_NOT_FOUND); - else - SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_SECTION_EMPTY); - ERR_add_error_data(2, "section=", ssl_conf_section); - goto err; - } - cnt = sk_CONF_VALUE_num(cmd_lists); - ssl_names = OPENSSL_zalloc(sizeof(*ssl_names) * cnt); - ssl_names_count = cnt; - for (i = 0; i < ssl_names_count; i++) { - struct ssl_conf_name *ssl_name = ssl_names + i; - CONF_VALUE *sect = sk_CONF_VALUE_value(cmd_lists, i); - STACK_OF(CONF_VALUE) *cmds = NCONF_get_section(cnf, sect->value); - if (sk_CONF_VALUE_num(cmds) <= 0) { - if (cmds == NULL) - SSLerr(SSL_F_SSL_MODULE_INIT, - SSL_R_SSL_COMMAND_SECTION_NOT_FOUND); - else - SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_COMMAND_SECTION_EMPTY); - ERR_add_error_data(4, "name=", sect->name, ", value=", sect->value); - goto err; - } - ssl_name->name = BUF_strdup(sect->name); - if (ssl_name->name == NULL) - goto err; - cnt = sk_CONF_VALUE_num(cmds); - ssl_name->cmds = OPENSSL_zalloc(cnt * sizeof(struct ssl_conf_cmd)); - if (ssl_name->cmds == NULL) - goto err; - ssl_name->cmd_count = cnt; - for (j = 0; j < cnt; j++) { - const char *name; - CONF_VALUE *cmd_conf = sk_CONF_VALUE_value(cmds, j); - struct ssl_conf_cmd *cmd = ssl_name->cmds + j; - /* Skip any initial dot in name */ - name = strchr(cmd_conf->name, '.'); - if (name != NULL) - name++; - else - name = cmd_conf->name; - cmd->cmd = BUF_strdup(name); - cmd->arg = BUF_strdup(cmd_conf->value); - if (cmd->cmd == NULL || cmd->arg == NULL) - goto err; - } - - } - rv = 1; - err: - if (rv == 0) - ssl_module_free(md); - return rv; -} - void SSL_add_ssl_module(void) { - CONF_module_add("ssl_conf", ssl_module_init, ssl_module_free); -} - -static const struct ssl_conf_name *ssl_name_find(const char *name) -{ - size_t i; - const struct ssl_conf_name *nm; - if (name == NULL) - return NULL; - for (i = 0, nm = ssl_names; i < ssl_names_count; i++, nm++) { - if (strcmp(nm->name, name) == 0) - return nm; - } - return NULL; + /* Just load all of the crypto builtin modules. This includes the SSL one */ + OPENSSL_load_builtin_modules(); } static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name) { SSL_CONF_CTX *cctx = NULL; - size_t i; + size_t i, idx, cmd_count; int rv = 0; unsigned int flags; const SSL_METHOD *meth; - const struct ssl_conf_name *nm; - struct ssl_conf_cmd *cmd; + const SSL_CONF_CMD *cmds; + if (s == NULL && ctx == NULL) { SSLerr(SSL_F_SSL_DO_CONFIG, ERR_R_PASSED_NULL_PARAMETER); goto err; } - nm = ssl_name_find(name); - if (nm == NULL) { + if (!conf_ssl_name_find(name, &idx)) { SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_INVALID_CONFIGURATION_NAME); ERR_add_error_data(2, "name=", name); goto err; } + cmds = conf_ssl_get(idx, &name, &cmd_count); cctx = SSL_CONF_CTX_new(); if (cctx == NULL) goto err; @@ -170,15 +57,18 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name) if (meth->ssl_connect != ssl_undefined_function) flags |= SSL_CONF_FLAG_CLIENT; SSL_CONF_CTX_set_flags(cctx, flags); - for (i = 0, cmd = nm->cmds; i < nm->cmd_count; i++, cmd++) { - rv = SSL_CONF_cmd(cctx, cmd->cmd, cmd->arg); + for (i = 0; i < cmd_count; i++) { + char *cmdstr, *arg; + + conf_ssl_get_cmd(cmds, i, &cmdstr, &arg); + rv = SSL_CONF_cmd(cctx, cmdstr, arg); if (rv <= 0) { if (rv == -2) SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_UNKNOWN_COMMAND); else SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_BAD_VALUE); - ERR_add_error_data(6, "section=", name, ", cmd=", cmd->cmd, - ", arg=", cmd->arg); + ERR_add_error_data(6, "section=", name, ", cmd=", cmdstr, + ", arg=", arg); goto err; } } diff --git a/worker/deps/openssl/openssl/ssl/ssl_sess.c b/worker/deps/openssl/openssl/ssl/ssl_sess.c index 0dea8b5224..926b55c7ba 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_sess.c +++ b/worker/deps/openssl/openssl/ssl/ssl_sess.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -734,11 +734,11 @@ static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck) if (lck) CRYPTO_THREAD_unlock(ctx->lock); - if (ret) - SSL_SESSION_free(r); - if (ctx->remove_session_cb != NULL) ctx->remove_session_cb(ctx, c); + + if (ret) + SSL_SESSION_free(r); } else ret = 0; return (ret); diff --git a/worker/deps/openssl/openssl/ssl/ssl_txt.c b/worker/deps/openssl/openssl/ssl/ssl_txt.c index dbbf9d9e8d..f149a3ad09 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_txt.c +++ b/worker/deps/openssl/openssl/ssl/ssl_txt.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -70,18 +70,18 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) if (x->cipher == NULL) { if (((x->cipher_id) & 0xff000000) == 0x02000000) { - if (BIO_printf - (bp, " Cipher : %06lX\n", x->cipher_id & 0xffffff) <= 0) + if (BIO_printf(bp, " Cipher : %06lX\n", + x->cipher_id & 0xffffff) <= 0) goto err; } else { - if (BIO_printf - (bp, " Cipher : %04lX\n", x->cipher_id & 0xffff) <= 0) + if (BIO_printf(bp, " Cipher : %04lX\n", + x->cipher_id & 0xffff) <= 0) goto err; } } else { - if (BIO_printf - (bp, " Cipher : %s\n", - ((x->cipher == NULL) ? "unknown" : x->cipher->name)) <= 0) + if (BIO_printf(bp, " Cipher : %s\n", + ((x->cipher->name == NULL) ? "unknown" + : x->cipher->name)) <= 0) goto err; } if (BIO_puts(bp, " Session-ID: ") <= 0) diff --git a/worker/deps/openssl/openssl/ssl/statem/README b/worker/deps/openssl/openssl/ssl/statem/README index 4467bd1e58..145c69db8d 100644 --- a/worker/deps/openssl/openssl/ssl/statem/README +++ b/worker/deps/openssl/openssl/ssl/statem/README @@ -60,3 +60,4 @@ Conceptually the state machine component is designed as follows: | Non core functions common | | Non core functions common to | | to both servers and clients | | both DTLS servers and clients | |_____________________________| |_______________________________| + diff --git a/worker/deps/openssl/openssl/ssl/statem/statem.c b/worker/deps/openssl/openssl/ssl/statem/statem.c index b91ec0a360..69bb40f00e 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem.c @@ -556,10 +556,8 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) * Validate that we are allowed to move to the new state and move * to that state if so */ - if (!transition(s, mt)) { - ossl_statem_set_error(s); + if (!transition(s, mt)) return SUB_STATE_ERROR; - } if (s->s3->tmp.message_size > max_message_size(s)) { ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER); diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c b/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c index 6fa3f1db67..ed993553c5 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -265,6 +265,21 @@ int ossl_statem_client_read_transition(SSL *s, int mt) err: /* No valid transition found */ + if (SSL_IS_DTLS(s) && mt == SSL3_MT_CHANGE_CIPHER_SPEC) { + BIO *rbio; + + /* + * CCS messages don't have a message sequence number so this is probably + * because of an out-of-order CCS. We'll just drop it. + */ + s->init_num = 0; + s->rwstate = SSL_READING; + rbio = SSL_get_rbio(s); + BIO_clear_retry_flags(rbio); + BIO_set_retry_read(rbio); + return 0; + } + ossl_statem_set_error(s); ssl3_send_alert(s, SSL3_AL_FATAL, SSL3_AD_UNEXPECTED_MESSAGE); SSLerr(SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION, SSL_R_UNEXPECTED_MESSAGE); return 0; diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c b/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c index 6b80620ee9..5b34425445 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c @@ -493,7 +493,8 @@ static int dtls1_retrieve_buffered_fragment(SSL *s, int *ok) al = dtls1_preprocess_fragment(s, &frag->msg_header); - if (al == 0) { /* no alert */ + /* al will be 0 if no alert */ + if (al == 0 && frag->msg_header.frag_len > 0) { unsigned char *p = (unsigned char *)s->init_buf->data + DTLS1_HM_HEADER_LENGTH; memcpy(&p[frag->msg_header.frag_off], frag->fragment, diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_lib.c b/worker/deps/openssl/openssl/ssl/statem/statem_lib.c index 36d410bdf7..eba4c6fb40 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_lib.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_lib.c @@ -299,6 +299,15 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst) s->ctx->stats.sess_accept_good++; s->handshake_func = ossl_statem_accept; + + if (SSL_IS_DTLS(s) && !s->hit) { + /* + * We are finishing after the client. We start the timer going + * in case there are any retransmits of our final flight + * required. + */ + dtls1_start_timer(s); + } } else { ssl_update_cache(s, SSL_SESS_CACHE_CLIENT); if (s->hit) @@ -306,6 +315,15 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst) s->handshake_func = ossl_statem_connect; s->ctx->stats.sess_connect_good++; + + if (SSL_IS_DTLS(s) && s->hit) { + /* + * We are finishing after the server. We start the timer going + * in case there are any retransmits of our final flight + * required. + */ + dtls1_start_timer(s); + } } if (s->info_callback != NULL) @@ -1073,6 +1091,13 @@ int ssl_set_client_hello_version(SSL *s) { int ver_min, ver_max, ret; + /* + * In a renegotiation we always send the same client_version that we sent + * last time, regardless of which version we eventually negotiated. + */ + if (!SSL_IS_FIRST_HANDSHAKE(s)) + return 0; + ret = ssl_get_client_min_max_version(s, &ver_min, &ver_max); if (ret != 0) diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c b/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c index c7cd9eb662..f81fa5e199 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -213,6 +213,21 @@ int ossl_statem_server_read_transition(SSL *s, int mt) } /* No valid transition found */ + if (SSL_IS_DTLS(s) && mt == SSL3_MT_CHANGE_CIPHER_SPEC) { + BIO *rbio; + + /* + * CCS messages don't have a message sequence number so this is probably + * because of an out-of-order CCS. We'll just drop it. + */ + s->init_num = 0; + s->rwstate = SSL_READING; + rbio = SSL_get_rbio(s); + BIO_clear_retry_flags(rbio); + BIO_set_retry_read(rbio); + return 0; + } + ossl_statem_set_error(s); ssl3_send_alert(s, SSL3_AL_FATAL, SSL3_AD_UNEXPECTED_MESSAGE); SSLerr(SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION, SSL_R_UNEXPECTED_MESSAGE); return 0; @@ -1698,6 +1713,12 @@ int tls_construct_server_key_exchange(SSL *s) } dh = EVP_PKEY_get0_DH(s->s3->tmp.pkey); + if (dh == NULL) { + al = SSL_AD_INTERNAL_ERROR; + SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, + ERR_R_INTERNAL_ERROR); + goto err; + } EVP_PKEY_free(pkdh); pkdh = NULL; @@ -1985,6 +2006,11 @@ int tls_construct_certificate_request(SSL *s) const unsigned char *psigs; unsigned char *etmp = p; nl = tls12_get_psigalgs(s, 1, &psigs); + if (nl > SSL_MAX_2_BYTE_LEN) { + SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, + SSL_R_LENGTH_TOO_LONG); + goto err; + } /* Skip over length for now */ p += 2; nl = tls12_copy_sigalgs(s, p, psigs, nl); @@ -2004,6 +2030,11 @@ int tls_construct_certificate_request(SSL *s) for (i = 0; i < sk_X509_NAME_num(sk); i++) { name = sk_X509_NAME_value(sk, i); j = i2d_X509_NAME(name, NULL); + if (j > SSL_MAX_2_BYTE_LEN) { + SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, + SSL_R_LENGTH_TOO_LONG); + goto err; + } if (!BUF_MEM_grow_clean(buf, SSL_HM_HEADER_LENGTH(s) + n + j + 2)) { SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_BUF_LIB); goto err; @@ -2013,6 +2044,11 @@ int tls_construct_certificate_request(SSL *s) i2d_X509_NAME(name, &p); n += 2 + j; nl += 2 + j; + if (nl > SSL_MAX_2_BYTE_LEN) { + SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, + SSL_R_LENGTH_TOO_LONG); + goto err; + } } } /* else no CA names */ @@ -2303,13 +2339,12 @@ static int tls_process_cke_dhe(SSL *s, PACKET *pkt, int *al) SSLerr(SSL_F_TLS_PROCESS_CKE_DHE, SSL_R_BN_LIB); goto err; } + cdh = EVP_PKEY_get0_DH(ckey); pub_key = BN_bin2bn(data, i, NULL); - - if (pub_key == NULL || !DH_set0_key(cdh, pub_key, NULL)) { + if (pub_key == NULL || cdh == NULL || !DH_set0_key(cdh, pub_key, NULL)) { SSLerr(SSL_F_TLS_PROCESS_CKE_DHE, ERR_R_INTERNAL_ERROR); - if (pub_key != NULL) - BN_free(pub_key); + BN_free(pub_key); goto err; } diff --git a/worker/deps/openssl/openssl/ssl/t1_lib.c b/worker/deps/openssl/openssl/ssl/t1_lib.c index 7a5721a1e2..95711fb6df 100644 --- a/worker/deps/openssl/openssl/ssl/t1_lib.c +++ b/worker/deps/openssl/openssl/ssl/t1_lib.c @@ -408,7 +408,7 @@ int tls1_set_curves(unsigned char **pext, size_t *pextlen, return 1; } -# define MAX_CURVELIST 28 +# define MAX_CURVELIST OSSL_NELEM(nid_list) typedef struct { size_t nidcnt; @@ -490,13 +490,16 @@ static int tls1_set_ec_id(unsigned char *curve_id, unsigned char *comp_id, return 1; } +# define DONT_CHECK_OWN_GROUPS 0 +# define CHECK_OWN_GROUPS 1 /* Check an EC key is compatible with extensions */ -static int tls1_check_ec_key(SSL *s, - unsigned char *curve_id, unsigned char *comp_id) +static int tls1_check_ec_key(SSL *s, unsigned char *curve_id, + unsigned char *comp_id, int check_own_groups) { const unsigned char *pformats, *pcurves; size_t num_formats, num_curves, i; int j; + /* * If point formats extension present check it, otherwise everything is * supported (see RFC4492). @@ -513,8 +516,12 @@ static int tls1_check_ec_key(SSL *s, } if (!curve_id) return 1; + + if (!s->server && !check_own_groups) + return 1; + /* Check curve is consistent with client and server preferences */ - for (j = 0; j <= 1; j++) { + for (j = check_own_groups ? 0 : 1; j <= 1; j++) { if (!tls1_get_curvelist(s, j, &pcurves, &num_curves)) return 0; if (j == 1 && num_curves == 0) { @@ -579,9 +586,12 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md) return 0; /* * Can't check curve_id for client certs as we don't have a supported - * curves extension. + * curves extension. For server certs we will tolerate certificates that + * aren't in our own list of curves. If we've been configured to use an EC + * cert then we should use it - therefore we use DONT_CHECK_OWN_GROUPS here. */ - rv = tls1_check_ec_key(s, s->server ? curve_id : NULL, &comp_id); + rv = tls1_check_ec_key(s, s->server ? curve_id : NULL, &comp_id, + DONT_CHECK_OWN_GROUPS); if (!rv) return 0; /* @@ -644,7 +654,7 @@ int tls1_check_ec_tmp_key(SSL *s, unsigned long cid) return 0; curve_id[0] = 0; /* Check this curve is acceptable */ - if (!tls1_check_ec_key(s, curve_id, NULL)) + if (!tls1_check_ec_key(s, curve_id, NULL, CHECK_OWN_GROUPS)) return 0; return 1; } @@ -746,8 +756,9 @@ size_t tls12_get_psigalgs(SSL *s, int sent, const unsigned char **psigs) } /* - * Check signature algorithm is consistent with sent supported signature - * algorithms and if so return relevant digest. + * Check signature algorithm received from the peer with a signature is + * consistent with the sent supported signature algorithms and if so return + * relevant digest. */ int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s, const unsigned char *sig, EVP_PKEY *pkey) @@ -769,7 +780,8 @@ int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s, /* Check compression and curve matches extensions */ if (!tls1_set_ec_id(curve_id, &comp_id, EVP_PKEY_get0_EC_KEY(pkey))) return 0; - if (!s->server && !tls1_check_ec_key(s, curve_id, &comp_id)) { + if (!s->server && !tls1_check_ec_key(s, curve_id, &comp_id, + CHECK_OWN_GROUPS)) { SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_CURVE); return 0; } @@ -2144,6 +2156,10 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al) } } } else if (type == TLSEXT_TYPE_status_request) { + /* Ignore this if resuming */ + if (s->hit) + continue; + if (!PACKET_get_1(&extension, (unsigned int *)&s->tlsext_status_type)) { return 0; @@ -2784,7 +2800,7 @@ int tls1_set_server_sigalgs(SSL *s) if (!s->cert->shared_sigalgs) { SSLerr(SSL_F_TLS1_SET_SERVER_SIGALGS, SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS); - al = SSL_AD_ILLEGAL_PARAMETER; + al = SSL_AD_HANDSHAKE_FAILURE; goto err; } } else { @@ -4125,13 +4141,16 @@ DH *ssl_get_auto_dh(SSL *s) if (dhp == NULL) return NULL; g = BN_new(); - if (g != NULL) - BN_set_word(g, 2); + if (g == NULL || !BN_set_word(g, 2)) { + DH_free(dhp); + BN_free(g); + return NULL; + } if (dh_secbits >= 192) p = BN_get_rfc3526_prime_8192(NULL); else p = BN_get_rfc3526_prime_3072(NULL); - if (p == NULL || g == NULL || !DH_set0_pqg(dhp, p, NULL, g)) { + if (p == NULL || !DH_set0_pqg(dhp, p, NULL, g)) { DH_free(dhp); BN_free(p); BN_free(g); @@ -4172,6 +4191,9 @@ static int ssl_security_cert_sig(SSL *s, SSL_CTX *ctx, X509 *x, int op) if ((X509_get_extension_flags(x) & EXFLAG_SS) != 0) return 1; sig_nid = X509_get_signature_nid(x); + /* We are not able to look up the CA MD for RSA PSS in this version */ + if (sig_nid == NID_rsassaPss) + return 1; if (sig_nid && OBJ_find_sigid_algs(sig_nid, &md_nid, NULL)) { const EVP_MD *md; if (md_nid && (md = EVP_get_digestbynid(md_nid))) diff --git a/worker/deps/openssl/openssl/ssl/t1_trce.c b/worker/deps/openssl/openssl/ssl/t1_trce.c index 76bdf792ae..588cb8cc3d 100644 --- a/worker/deps/openssl/openssl/ssl/t1_trce.c +++ b/worker/deps/openssl/openssl/ssl/t1_trce.c @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -725,6 +725,8 @@ static int ssl_print_extensions(BIO *bio, int indent, int server, BIO_puts(bio, "No Extensions\n"); return 1; } + if (msglen < 2) + return 0; extslen = (msg[0] << 8) | msg[1]; if (extslen != msglen - 2) return 0; @@ -1092,6 +1094,8 @@ static int ssl_print_cert_request(BIO *bio, int indent, SSL *s, msglen -= xlen + 2; skip_sig: + if (msglen < 2) + return 0; xlen = (msg[0] << 8) | msg[1]; BIO_indent(bio, indent, 80); if (msglen < xlen + 2) @@ -1271,7 +1275,16 @@ void SSL_trace(int write_p, int version, int content_type, switch (content_type) { case SSL3_RT_HEADER: { - int hvers = msg[1] << 8 | msg[2]; + int hvers; + + /* avoid overlapping with length at the end of buffer */ + if (msglen < (size_t)(SSL_IS_DTLS(ssl) ? + DTLS1_RT_HEADER_LENGTH : SSL3_RT_HEADER_LENGTH)) { + BIO_puts(bio, write_p ? "Sent" : "Received"); + ssl_print_hex(bio, 0, " too short message", msg, msglen); + break; + } + hvers = msg[1] << 8 | msg[2]; BIO_puts(bio, write_p ? "Sent" : "Received"); BIO_printf(bio, " Record\nHeader:\n Version = %s (0x%x)\n", ssl_trace_str(hvers, ssl_version_tbl), hvers); diff --git a/worker/deps/openssl/openssl/test/README b/worker/deps/openssl/openssl/test/README index b1222399f7..ef39d38ac9 100644 --- a/worker/deps/openssl/openssl/test/README +++ b/worker/deps/openssl/openssl/test/README @@ -38,9 +38,9 @@ A recipe that just runs a test executable A script that just runs a program looks like this: #! /usr/bin/perl - + use OpenSSL::Test::Simple; - + simple_test("test_{name}", "{name}test", "{name}"); {name} is the unique name you have chosen for your test. @@ -62,28 +62,28 @@ documentation. For OpenSSL::Test, do `perldoc test/testlib/OpenSSL/Test.pm'. A script to start from could be this: #! /usr/bin/perl - + use strict; use warnings; use OpenSSL::Test; - + setup("test_{name}"); - + plan tests => 2; # The number of tests being performed - + ok(test1, "test1"); ok(test2, "test1"); - + sub test1 { # test feature 1 } - + sub test2 { # test feature 2 } - + Changes to test/Makefile ======================== diff --git a/worker/deps/openssl/openssl/test/bioprinttest.c b/worker/deps/openssl/openssl/test/bioprinttest.c index d8bb2c2e34..b2d26225e5 100644 --- a/worker/deps/openssl/openssl/test/bioprinttest.c +++ b/worker/deps/openssl/openssl/test/bioprinttest.c @@ -221,3 +221,5 @@ int main(int argc, char **argv) } return 0; } + + diff --git a/worker/deps/openssl/openssl/test/build.info b/worker/deps/openssl/openssl/test/build.info index c262248b6f..2367ab841a 100644 --- a/worker/deps/openssl/openssl/test/build.info +++ b/worker/deps/openssl/openssl/test/build.info @@ -1,7 +1,8 @@ IF[{- !$disabled{tests} -}] PROGRAMS_NO_INST=\ + versions \ aborttest \ - sanitytest exdatatest bntest \ + sanitytest rsa_complex exdatatest bntest \ ectest ecdsatest gmdifftest pbelutest ideatest \ md2test md4test md5test \ hmactest wp_test \ @@ -17,7 +18,11 @@ IF[{- !$disabled{tests} -}] dtlsv1listentest ct_test threadstest afalgtest d2i_test \ ssl_test_ctx_test ssl_test x509aux cipherlist_test asynciotest \ bioprinttest sslapitest dtlstest sslcorrupttest bio_enc_test \ - ocspapitest fatalerrtest + ocspapitest fatalerrtest x509_time_test x509_dup_cert_test errtest + + SOURCE[versions]=versions.c + INCLUDE[versions]=../include + DEPEND[versions]=../libcrypto SOURCE[aborttest]=aborttest.c INCLUDE[aborttest]=../include @@ -27,6 +32,9 @@ IF[{- !$disabled{tests} -}] INCLUDE[sanitytest]=../include DEPEND[sanitytest]=../libcrypto + SOURCE[rsa_complex]=rsa_complex.c + INCLUDE[rsa_complex]=../include + SOURCE[exdatatest]=exdatatest.c INCLUDE[exdatatest]=../include DEPEND[exdatatest]=../libcrypto @@ -292,11 +300,23 @@ IF[{- !$disabled{tests} -}] INCLUDE[bio_enc_test]=../include DEPEND[bio_enc_test]=../libcrypto + SOURCE[x509_time_test]=x509_time_test.c testutil.c + INCLUDE[x509_time_test]=.. ../include + DEPEND[x509_time_test]=../libcrypto + + SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c + INCLUDE[x509_dup_cert_test]=../include + DEPEND[x509_dup_cert_test]=../libcrypto + IF[{- !$disabled{shared} -}] PROGRAMS_NO_INST=shlibloadtest SOURCE[shlibloadtest]=shlibloadtest.c INCLUDE[shlibloadtest]=../include ENDIF + + SOURCE[errtest]=errtest.c testutil.c + INCLUDE[errtest]=../include + DEPEND[errtest]=../libcrypto ENDIF {- diff --git a/worker/deps/openssl/openssl/test/certs/alt1-cert.pem b/worker/deps/openssl/openssl/test/certs/alt1-cert.pem index b94d0eaf9d..d68b0e5193 100644 --- a/worker/deps/openssl/openssl/test/certs/alt1-cert.pem +++ b/worker/deps/openssl/openssl/test/certs/alt1-cert.pem @@ -1,22 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDlTCCAn2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 -IE5DIENBIDEwIBcNMTYwNzA5MTQ0ODExWhgPMjExNjA3MTAxNDQ4MTFaMGgxIzAh -BgNVBAoMGkdvb2QgTkMgVGVzdCBDZXJ0aWZpY2F0ZSAxMRUwEwYDVQQDDAx3d3cu -Z29vZC5vcmcxEzARBgNVBAMMCkpvZSBCbG9nZ3MxFTATBgNVBAMMDGFueS5nb29k -LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAv1X8S8uUpnjTa -3bv7m1jJbbX7bC9w7k4TfxiU5XL/m3EhN//EUBJSoamy6vFC6oy/6jA8XmptlVrY -Sp3ZKFdjdZh+CyYZKcrv4JReF2lfRIINn6d6EgcAobGTNwdcv67xuNtMi0meAvmK -gLjOa/IhCHNC+l8vNDJx/a+7mxH+yNxPL6lC/kJMja6oaYndx74WJpPC22LJ/cCp -xspKKsoPYYjk0BX9RvbKO8s4b86Wjzzntht+NpQ4LLh9XwPZog11qGE4UIrsV8XA -YxJrMGQNZd69cnCOz8vnOVCszFOa4qVvXeAGr0iFlZAXbQJevpiiXaXHMEt8C1qH -xpcW8DcCAwEAAaOBmDCBlTAdBgNVHQ4EFgQUw8nB25NP0gUaFCrOwAO5KzllnREw -HwYDVR0jBBgwFoAUCNGb+ebVZHCg8Wsanu1S2t31UEMwCQYDVR0TBAIwADBIBgNV -HREEQTA/ggx3d3cuZ29vZC5vcmeCDGFueS5nb29kLmNvbYENZ29vZEBnb29kLm9y -Z4EMYW55QGdvb2QuY29thwTAqAABMA0GCSqGSIb3DQEBCwUAA4IBAQBUnDMrg1py -8/iYXzs11Qbw7bBhc/HQDpu5QVgriaX2zDUpTLSEUV7qZFSHmwWm91ILw2VA1Xni -ua2sF19o/tJT0ZHpapkfqGpfsym2H04NDMKy0l0fSZhlCB5Kv5wpiFt9hBUrxS/2 -Dd6Kg+Ka02nD5QBXSAk/xz0FmgezzGGCLjg85/Sfe9Y7tNhQXh3HuGXuJizYccdQ -Fh1IAFYW3DZoDKS7dDTCltvDEma/2IE684+CRJiA6PH9rYfJ1CCUfAMpyA85CxKT -P68GDKI++WoUgM8LDfxS0KOL7A9cqcpM2L27hjyEgnqIBPHFfm9fxztBotuCTl5L -vRlTFVjv65nn +MIIDgTCCAmmgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTgwNTE2MDIzODEzWhgPMjExODA1MTcwMjM4MTNaMFQxIzAh +BgNVBAoMGkdvb2QgTkMgVGVzdCBDZXJ0aWZpY2F0ZSAxMRgwFgYDVQQDDA93d3cu +ZXhhbXBsZS5uZXQxEzARBgNVBAMMCkpvZSBCbG9nZ3MwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDTqvf6j+WxCtn4RU8/6uXXgCTcksv6NDXCZ9JAz4Vv +cQbJfhFbDWpGZQZDOCqwtj+7CSVIraxItHzPlrt36cevsoPmpuqGbHrUaOLneme2 +x81SXUq0z/DmDvwxVENmRj1u7iCt3sL7awcid4SiotLOY2F1jBazmqprqKZBUiyQ +XqpSp+9uSav77ydwDXCrQozBdns1YRshgU9omQrTcIqHCj1f9Lo+A2y4+TZYZkvS +DuUZiTfPTPouR6sopM8JLyAZc+TvFFncEg24N+zz3O3jwH82BZEjzavw92J9npJB +UXvKb8O9z7UA65WYuL2he7kSQCsPNLoRWZnVpchwr3VHAgMBAAGjgZgwgZUwHQYD +VR0OBBYEFHvLhGWckFjVXdDI3ds9Wti6zgXAMB8GA1UdIwQYMBaAFAjRm/nm1WRw +oPFrGp7tUtrd9VBDMAkGA1UdEwQCMAAwSAYDVR0RBEEwP4IMd3d3Lmdvb2Qub3Jn +ggxhbnkuZ29vZC5jb22BDWdvb2RAZ29vZC5vcmeBDGFueUBnb29kLmNvbYcEwKgA +ATANBgkqhkiG9w0BAQsFAAOCAQEATVcTyrAxsehdQNrkL6kquXxWlyegJcxvVxUe +hfh9+Lw4620b2S1/l2YxFM3peLAsRgJOznmJOeG18+y7/kx/3UNqYGY7e8iJQ3Gl +JwDIJp5JCaUOlodjhMJtRc7jn9RcsL97oizXdcryyWT0vSlM9Pie9NtHG5iq5X4+ +oL3X8+OG25MOkF2h3YVCEG3vDu7quyTlHc2ebwpdLZRndcOewO2Cap1ettyWXUPP +Mha6wyJE8LJhrGmrI8Lw+i7gGscP0xYZn3yCLk5BtOabn4dvCiDmb+TPruKQQARw +BG45LEZzGxz+Ad3xRdZyVi1I67v9YShoYTCpMTSxJaR0erH74g== -----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/alt1-key.pem b/worker/deps/openssl/openssl/test/certs/alt1-key.pem index b5d4d326c5..6df050a38f 100644 --- a/worker/deps/openssl/openssl/test/certs/alt1-key.pem +++ b/worker/deps/openssl/openssl/test/certs/alt1-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCwL9V/EvLlKZ40 -2t27+5tYyW21+2wvcO5OE38YlOVy/5txITf/xFASUqGpsurxQuqMv+owPF5qbZVa -2Eqd2ShXY3WYfgsmGSnK7+CUXhdpX0SCDZ+nehIHAKGxkzcHXL+u8bjbTItJngL5 -ioC4zmvyIQhzQvpfLzQycf2vu5sR/sjcTy+pQv5CTI2uqGmJ3ce+FiaTwttiyf3A -qcbKSirKD2GI5NAV/Ub2yjvLOG/Olo8857YbfjaUOCy4fV8D2aINdahhOFCK7FfF -wGMSazBkDWXevXJwjs/L5zlQrMxTmuKlb13gBq9IhZWQF20CXr6Yol2lxzBLfAta -h8aXFvA3AgMBAAECggEAa073DcqQvhq3DSIw4wm/+DfW5nwXzF1QB6XAR0yI453j -IuhEnzcGPeKuLBmZFxDWoptRG8fpCZFs4kPSTomxFGizewlp6O5ykfPAKR2VzMwF -geCiWPL0f+dWlD1Byu4moXsASDE6tL/UuAAvnl+7R2HvL6SfsdGiTQc4qAvvyukM -szks+MePHSlXmL5Eld7HfKgpvxY1SbYOQU0aPXAQAnLaOT931q+tgZMG6nBWN+pu -w5bgKCA26BMAAaUAdIIDEa9fjzkpXjElCT4qhJYVKQn9Pb7aSc4jihSpCknqbb9c -55nW5PWMZJyCbCOUG/SVTblXV+NmhdtwrgUbHImXIQKBgQDcb/7vp+rq06uNx3b4 -AjTZdzCVbHM8gp7b1GkGD0SncrzX6RxPSzNn7d4AUKY065bwa89A+TRwV8DSo7G8 -hxjzdU/FKCg8ce0eqoCtWjIT2r+rV2P9dFhfRT5jdOwHrym8LeSGzANjIBNV7FOf -FIRkQ1BVD0QSPla+26ASqsw60wKBgQDMnEzChQWgAsBelALmGaj/wDdWDUXK8xRg -s7dG1Sx41SLk39SAjCUYXPyy8IHBitJtPZNDp23tR4/m8Ui1pB2T0EnlzBsuzrZ/ -0aCbJnQ08FXE8iVajrgce4ZCdT8vkeH8EVhqDpJIlAhoKy3HaoAr4o2/uRoGDpHZ -iAbDLTEOjQKBgFrp4dXLhkqFNArMShetKUjLLIFj8f7xzDzT1ODH6UO6QYI2xRM6 -65+gbd/pYzMOOvk7LYYZgXQX7RGyq3oaqcK3Dkg88KNFRUtRfLKCMYcYv9YVu8pr -cosQTtPMBBCDQI44yziA6aC3OOJGDpLcbmG/lWEPY762cSZUBCfOw147AoGAd8S+ -AdcPtdwmcrY9BCfdDuea/JoEUon7UaehDqtVvt0z8bk7kIt4Y0x69ttleL8j8aHr -g9yLsisDhvGR2BFa5t0zhHn3J20E0skINAlMWHieHAyJ5PpJtxJvQpOTCutf1sbo -dBxXcHiGe0NbJrGmmQmiY6mcHBOHOEgxfSoE3zkCgYAc+ozIr3xmUcooUeA7uqpd -LvGGqHThGrtXVFIErOIcajC9bHEeZw4Do/oT5L7Wr7pOZ20VUmuRvwytd7IYYTVV -g+nIyKaMttEaCzHEsO0CQUHexOkJbL4rpc3HiK5hIhL8Yo2L/obQgCxYmvyChpo3 -sXJAoFllBNfAK3aanFOR1Q== +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDTqvf6j+WxCtn4 +RU8/6uXXgCTcksv6NDXCZ9JAz4VvcQbJfhFbDWpGZQZDOCqwtj+7CSVIraxItHzP +lrt36cevsoPmpuqGbHrUaOLneme2x81SXUq0z/DmDvwxVENmRj1u7iCt3sL7awci +d4SiotLOY2F1jBazmqprqKZBUiyQXqpSp+9uSav77ydwDXCrQozBdns1YRshgU9o +mQrTcIqHCj1f9Lo+A2y4+TZYZkvSDuUZiTfPTPouR6sopM8JLyAZc+TvFFncEg24 +N+zz3O3jwH82BZEjzavw92J9npJBUXvKb8O9z7UA65WYuL2he7kSQCsPNLoRWZnV +pchwr3VHAgMBAAECggEACPTB+1sdV+lioaulF8pDoWOtq5uWf+a3o5sq/U0Kk1WP ++PSZnWWq6oGZyzxUKhf8CFjxt+qJUKY6Zbo2AnPk3B1MkXTclYV/iP9LIoo+WzCH +EoYaBB6MTd+ycg/jri8oqEnxHgo/681yhtXRyePj0ZHI7OVZjI3tyhJfvoHQmuci +u6qYYUP0GWuyM+kHS11vn6Q1U8nOZWvXpEDXDDdJ7+2QRuv01AXcjFxpbFzkMn2W +JkhKkCTIQpUU66VMRHwNexi+TR2rRESq0G+fa+6gaVFVIs0vBukq48IeC5W21j1L +zyftHxci67FlYC9iaiUxDVt3KB+lcukx6Cz5mjtzqQKBgQD/GrAtFfjiXKj9O5ld +K7dnnBHE8fzyWQWyOfwpVjNAC1J7tgwFvDpBpTHOwS5JnCwMWWM3rkBPRhCusmrF +AtfE8b643G+cJbTgDuEhGh11QR0p9VWMVFQL9kZxx12PegDtFBfzcfcI3XQwKVKL +ZbQn4ibW3BKSt9+Nh3APa0s5iwKBgQDUaTxZBajTdzoDd6Pg3warL5BhsxWr2tUQ +qf+iVoba2Y9NTBdxBht2whSaYweU9kxmeNZvnCu95B8HeRGE69Dxb7IWwpsaxoaf +ND0NcCF7aPZgx7hvhbHF7duzt3nuv+q5sOuuyHPzm+nF2snAuY3Zg+Bpv3nlYekf +18aXZdwStQKBgEpF8e9ei1UUl1sLZC6dUMvIw9+sePHye1cVzNYYM9m8sio0qbFt +ySRdvW+uDRT/dE+wItQOVsj95FOIvM9ZcYr0u4vFGnXDALOPgXqKyPLfn2cc9+hg +kQvei0oLOrFQWz6rcAHAN6WMHIz9KvxNAzPtg1NhRcMT5/Gj8jt7CK7bAoGAIeKz +7OO5Phr8F0eDzkDmGHMbDmr6XxMnAGSOUoCJPOqOMN+dsbsusHBfxw1bTUlJgONw +GhgI5l85EAEhaVoRWCLgfz8GbWwUV9uGjdlAjiZ9f4z9AFWMua2rae0wN4VIVd1C +i/yQeuF5lsXDf8paNcQTDeus74oCHcFXfhmS1S0CgYB2q8E+H0kFHbUxkIZYwhsM +r0lTecn+kVsyPPje2UlzfTwvcC9dFIC4ppCdJGUJAwi/PJnr6xNyOH6I1pjUA8ER +Aofm4Oj2DwX8W+81oO71/RXSfEFUjdOw0H6iRDyvWa1gqftj2/aWjV7Ifdo49thx +EzX/9GdsRInifN6FfOfo/A== -----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem b/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem index fbe040b52c..f41568f6ee 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem @@ -1,22 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDljCCAn6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 -IE5DIENBIDEwIBcNMTYwNzA5MTQ0ODExWhgPMjExNjA3MTAxNDQ4MTFaMGkxIjAg +MIIDeDCCAmCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTgwNTE2MDMyNjMyWhgPMjExODA1MTcwMzI2MzJaMGkxIjAg BgNVBAoMGUJhZCBOQyBUZXN0IENlcnRpZmljYXRlIDYxFzAVBgNVBAMMDm90aGVy Lmdvb2Qub3JnMRMwEQYDVQQDDApKb2UgQmxvZ2dzMRUwEwYDVQQDDAxhbnkuZ29v -ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKz8F/ndKz0vuv -BymjTUjtrWSQsnsuisR+oW8CIliNBi8yqqeNrtoa2s+e2GBC7gxDlK9IOqGo4Ulu -9jY5On6RysrFWLpK97I7EP9cg63alH+NRFEwczRzErHtYx54yiBjcovcCVeTtdnd -7/P4T8hIGy6QjdW68lzwnN/I9x11NWoipIKvAOGXz0L/WaPPWZ0GJFlBqEX//O3+ -6sweSUX4ivAC9txou3rwDA8kJx5Ge9trQ9dPPG/jpL96f1DLE9H2SkVff1KLTPmb -jUwiYj161lsKLxGkbdmPWRjt1pP4+5UUhioo1Y0WrTd5ELwB1eKTtWsOlRsdLOa8 -1L6m8ngXAgMBAAGjgZgwgZUwHQYDVR0OBBYEFBIKyD5bUUNIFxlQJl/rBvvIm0XZ -MB8GA1UdIwQYMBaAFAjRm/nm1WRwoPFrGp7tUtrd9VBDMAkGA1UdEwQCMAAwSAYD -VR0RBEEwP4IMd3d3Lmdvb2Qub3JnggxhbnkuZ29vZC5jb22BDWdvb2RAZ29vZC5v -cmeBDGFueUBnb29kLmNvbYcEwKgAATANBgkqhkiG9w0BAQsFAAOCAQEAa2lydA7a -YgRhYeIuPEtR+bKyDkIKNjvx2IRL/FL70s/IWFWDK1rpsMYLGNa7rWpW5gq4T6zb -JIwC/770Rw1p+0j9eAC95d2wCEhyNcLdoP4ch7whr0MhxYHUJ8zQGPdQ97DWGoEB -2seLjrhMrX004TM4UlM+lpjsb88QEcD+kOEhdDTKm0ABUygOr1KRay437mtUhAzb -WyUbAjKbhgyv6IFRNHKy6YtCMugPihn+Pd1NY6c2ACRVOAUS/+rvVyjxBCATW5Wk -zAtNIxYgcm3rYRroGYT2BGj8Ic7oqPOWPdGWhsieX0c+y2ZnS727Kwc5tXFfW9By -GH32QmEN5o5jZQ== +ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl46xhstHmmYhp +XY/FcnQStR4XHtHcNRyvq1perl0fezeCY85KkddGppic5qIWQDL4ViP3HfvhMlDZ +E0tAjEfr8Auac9gpa2IFVJAzMnnzOkhO6cr5kmid4392tNCG5sUWS99t2Z4f9sOP +DQKdoN7lnmxnpZqNf9NUERsN5i4fcvErfQZ4LqV5ld810ZAQZUfarn1rg6/U/ADc +qA0uQgk9RxVgSDt3M5mi8AaC73Be9nAefXQUybzs6J8EfsDijhD85msxs4Fha4pg +gM+bXHv9C7whxM5F2WTeET0cIcAfE3+jzQlkjcjlS1rTEq4d0Pd+1rXkhMwZeze2 +KRL2Le8jAgMBAAGjezB5MB0GA1UdDgQWBBRJJljvheyfKr9neNplhIMIFx25QjAf +BgNVHSMEGDAWgBQI0Zv55tVkcKDxaxqe7VLa3fVQQzAJBgNVHRMEAjAAMCwGA1Ud +EQQlMCOBDWdvb2RAZ29vZC5vcmeBDGFueUBnb29kLmNvbYcEwKgAATANBgkqhkiG +9w0BAQsFAAOCAQEAPfRFkpkTsPlH54n/i3kxR8Hw17kUOV0/v39fnNzV+PXS/IIU +9OFfP7qNeuoWVQKXCwNWGWYXb7O0LNJMJQWWtyXtzWH3rOSxdSRIrTsCVHA41Lbo +te2nrfnGMtg6em51Do6Kk0JM304sVAWl5OY/eckBmuDgN/5WfZudOLd8Ohv8vZ6U +ZNoSBNpu1x5gfEPywMUGAgbkNZVpzNAfulx3/D2kWk0qwEKqnphUyaXiTVqO49gr +n1LwSVdqBcmapBmEO3puV4TBWFwM49iMMNGn0fp/JBVsLjt+q7TK96qGBo/BSEL+ +e2TXTNpdkn3l+ZK2FYdf7s8fytoe+6o92dN+fA== -----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt6-key.pem b/worker/deps/openssl/openssl/test/certs/badalt6-key.pem index 203a4c7a00..782d69334a 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt6-key.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt6-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDKz8F/ndKz0vuv -BymjTUjtrWSQsnsuisR+oW8CIliNBi8yqqeNrtoa2s+e2GBC7gxDlK9IOqGo4Ulu -9jY5On6RysrFWLpK97I7EP9cg63alH+NRFEwczRzErHtYx54yiBjcovcCVeTtdnd -7/P4T8hIGy6QjdW68lzwnN/I9x11NWoipIKvAOGXz0L/WaPPWZ0GJFlBqEX//O3+ -6sweSUX4ivAC9txou3rwDA8kJx5Ge9trQ9dPPG/jpL96f1DLE9H2SkVff1KLTPmb -jUwiYj161lsKLxGkbdmPWRjt1pP4+5UUhioo1Y0WrTd5ELwB1eKTtWsOlRsdLOa8 -1L6m8ngXAgMBAAECggEBAJNMHK8BAvzTqTPPsfAGu4bTvgxRdKGy609FFAiqxUF3 -UmQsCZEfgwyqCszFPfSeS43xuPRukObE6L6MV4ls8GwWqvp1nKfCClJX3/9jK6tq -2tDQ416a7Wb+FvfgW0tDEg7oLKfcqRyAoQFNuxWHbGDiTQlz2dzzFYkzhlzBDUYH -/pu9qkNFGfYMFwsBUd8pp8zMnv552CCIgalBBFr1hy9q47HBaJPaF2/CjZJmsqkp -rVMBH7+j0y1DW3JO5rSKcRdz+mgEd9m/yQIazvBPJKxeGza8JfLBuACYFLIoO1S+ -b8s/zmQPHeZwTxSsM64M1uYi4dmJy0viozLlWsjrE1ECgYEA/GxGG/lB1mL+Hzmc -kXzWmA2nLPxZXGxMBOYH/n8l4OyDmKi2Bmly7kS0kLdY6gYTVBWFCRcvPxf+UJu9 -x4NcKDkjXVXSg7Muux3Bh1JoRCOKB2Hk3pqdDe55GcT5bSikkd5PYCNobcnqzSK1 -HzKveDdukraZxIPFpVs1VM9/gxMCgYEAza+BJUAEWoq925a1RKlMwdXW1ONBhFqU -fXon15fgycHkiYIBGbGE65Oyz8BwE6jNAT+SwKlNCc6jPAkXvEUpczEi5Rcox8Ec -hNoXBHcBxHEhtfV2VKX5I9JFAadmvnfS5St7HjRLzE2Y6xym1+fKfnAlSLpdb3W2 -eRqVBi3F020CgYEA6K/yrQTHwRX+BdC42JCIzSAA1IJG6eDW7skR43NX+pBr+sTD -DwQTszrYbHLnXst888zmluutXO8EO1Bl0E3yHQ4W4IolhcweLtUOOm0nunA8Y/PE -48MJNfd34N5nw01s7x5Mc2YQdOxmKvVsmzbA9AO9RTdYZgPGpVh/wA+LDssCgYBh -F2+G/ekQNF3awhFfD+vDtAVtCLlsmLVvZbJY+sCJfJU8s7mBP2LXMSk/GD/Ph+b9 -p9zGRSSwdHJpbIFfxeYDEja+nWgKowWrUKd83BBhgmW/Vtc8rfwlBKS+Wx8M2dMb -iqLbZyRAlICSuzumvyu+84EmC5L/gjlYgUvHVuQDIQKBgHH7q3hrKI5mQ0BR9h75 -4yP98c+Duz8IsQllIG0gzCiiOYIVTl3uzTCa/E9Sa+jG+kFsCeUDchmC6LmHdF/Z -ZHfECcQT4B37xMMwvjwNW7E6/FyRx3XC762Fd5vlz3fBuVKburfh1JpfpcO85Wvo -R1UfsJugW9Yetsqd9WB6q3ln +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDl46xhstHmmYhp +XY/FcnQStR4XHtHcNRyvq1perl0fezeCY85KkddGppic5qIWQDL4ViP3HfvhMlDZ +E0tAjEfr8Auac9gpa2IFVJAzMnnzOkhO6cr5kmid4392tNCG5sUWS99t2Z4f9sOP +DQKdoN7lnmxnpZqNf9NUERsN5i4fcvErfQZ4LqV5ld810ZAQZUfarn1rg6/U/ADc +qA0uQgk9RxVgSDt3M5mi8AaC73Be9nAefXQUybzs6J8EfsDijhD85msxs4Fha4pg +gM+bXHv9C7whxM5F2WTeET0cIcAfE3+jzQlkjcjlS1rTEq4d0Pd+1rXkhMwZeze2 +KRL2Le8jAgMBAAECggEBAMcDjTTa2GmYWoZUr+UPizqyvsTnMmg/NoFBhy9WJVne +kpR3kJvvm30XNiEGbCV1GGryL5p7w5UVuPXjhQ7xIkY3feQNC4H361iP93HK7dXJ +i9V9AfGCdLzSuILsT2Wpm88MifUQIpqrRmqtqakKHkyMFG655409rpYlZNVogl9H +vzrTE8rjysNMjP+bpbgkxUJfeATw8OYhEwd9ahj/E0r0r2enYhGEP3j+1zYsGdmM +L2Uy4M+modaAWpZg5pUWpFjxl+V2cSJHdaQc8KYg8Z8RUyzYipFk3YzjP5jtprq5 +dHf9FqlcXk+MtzcYe+x8mIb3uwZhOtdpnUqe5l+GTyECgYEA9j++rS9sajQzMqp0 +p+EptacD/p7A3wldIDGEpPJsSQL+vhcigyn4iPCM1pGWR4iuR7Od9RpQSf3Tfnqc +ZwUJQOpiYpxo1+QlqlBJkDjDRztp+kETZAgzc084ZhwQv9PfYyxa+8layQFhnClt +Z9G0o4AV1povVeQLO5+9CQZQ4VMCgYEA7v4WuydzlLGKppsJEG8vvieR64mjOfO4 +gHBMEYnzEeTZPDvIfEfguM1upJCvt5GXp3huVHCAsFgs6kDjVbpIL1A2HzrMPtOa +MNDSOrpuLcakAgEgx2VFv4TMnA1QKPg3//YCqEqqTJyX0C4OwaADRZJS7YfHp9lg +mpv90baE8PECgYAv3oxulj15F9SsEL7Es9yr11/La4kK0oMr8vRaLFYoi1CCG3U2 +Ej6iQEDgpUSVe1iFz8DxGMBq4dDvUV5+GFiIKggeK1GmRk+cICdsxdwQSNh9MZFX +bNCzpb7M+r+2yrUuTj0RnT7svDwBY3xFJlr7PbcBFNAG3mHgoVjaHEQ0yQKBgHbS +zepvSv/65bzACFmrbklU0zAQVp9RlcIGE0wFEl0rMvbHon5oHkrDmOcpKLRUJtqU +/gXtiY4jyPEPIfhVjd44OzB7w2DZRChRKrUYS/9ma9SzSuDYcT0vgat00w4Lm4wf +fGK//Lvqf3B59cw/CmFkxuZiQ9ooMees9x11adOBAoGBAMdb0r8sAtgh+KTbA8Kq +guIWiknOk6/LYUTuT3fidPIPbErrUQQR9WWHuXjrj2RyHI/RLjYLFamikvhU7PmE +jPjPAo4p1a0WBwrYgjGDIRjTVjbUK282vuYkunGWYfgnZurAyjJCndL/eNZuX2F5 +m1rTfab8O+tOOGKGyzfouD2A -----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem b/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem index b515ba43d9..4fa81b3c6f 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem @@ -1,23 +1,22 @@ -----BEGIN CERTIFICATE----- -MIID1DCCArygAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 -IE5DIENBIDEwIBcNMTYwNzA5MTQ0ODExWhgPMjExNjA3MTAxNDQ4MTFaMIGmMTsw +MIIDtjCCAp6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTgwNTE2MDMyNzA5WhgPMjExODA1MTcwMzI3MDlaMIGmMTsw OQYDVQQKHjIAQgBhAGQAIABOAEMAIABUAGUAcwB0ACAAQwBlAHIAdABpAGYAaQBj AGEAdABlACAANzElMCMGA1UEAx4cAG8AdABoAGUAcgAuAGcAbwBvAGQALgBvAHIA ZzEdMBsGA1UEAx4UAEoAbwBlACAAQgBsAG8AZwBnAHMxITAfBgNVBAMeGABhAG4A eQAuAGcAbwBvAGQALgBjAG8AbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBANStByWr70u2A49OO+LYu0ivQP+uBu2n3E6RoEYf+op/+JF3clwfMQCGqiSg -QxOJMHkcu4gJDudRLCSXqHPnR0hOd+mQ5wQQJmLj8A99ImcD2oN5R3V5I4bSlXP9 -GCq2pFDnwXuEcJ3d2Dt1HYO4jA4Ol/RBT3NIqmwSnQzXv98mjYFpy6AuAIaYGmbh -1DLWxsTPI2NjNafJYS85NrQDLkTpq48nCmQCJ+ly6Zzu7WuJiDKD1Rxs7ZwgNtLi -Zhp41TeFHxCbfSFKe9u4rnUmImKxwgc9KuzOLpLAzD9avWpPGHtkCsLFsiw/EJYf -UdeCXc7tz9WhXZzOk/ffLOcrorMCAwEAAaOBmDCBlTAdBgNVHQ4EFgQUwYsR1XfZ -2cPcAR7i5i9obalnJcIwHwYDVR0jBBgwFoAUCNGb+ebVZHCg8Wsanu1S2t31UEMw -CQYDVR0TBAIwADBIBgNVHREEQTA/ggx3d3cuZ29vZC5vcmeCDGFueS5nb29kLmNv -bYENZ29vZEBnb29kLm9yZ4EMYW55QGdvb2QuY29thwTAqAABMA0GCSqGSIb3DQEB -CwUAA4IBAQAN/klfzMLi2acp5KdH9UZR4XCk3cZBOuMuI0vU+wrU/ETgY6rFhAwY -gSZsO6vX0mt/G6QfOmY5+kW4FY5XavGhhNVY2x5ATZKvQCf+orIsUHOBxVTjH6az -uEnxGDRTbjXSkBTCTSoOqdJNeOmEwiaHEVy/atumUW2B2KP5FeBGdud/94c4Q9/O -WBJ0EICGF6hYTDra63lAjxyARTvocVakIE8zytT1SbU4yO05mYPyNdXxiXikepFE -phPQWNSLx4EPBIorGCFj7MPDmFCH/+EjDjGz3SNUvqsak6MstzK94KVriQyIHKex -IL5WuKFm0XSGKTX8SzyMGErMGeriveL2 +ggEBAOG4PegItzkmJDwlSA/FyVHWLWUIQrnxgS0KSds3On2CMsjDJ+X77B4s1IPI +yKHuqNbXqV/hJGAxKnZRZe0D6VsmKlYOYpz9QtFxvpo5DwA3q6BTx6sIElFn/lip +Pbu5ZeIMNeN4bot7x5sBobr6OgidAVaAuqQHHJnD7mQ1s22qY0UqkBqNBhhJWOmx +YC0Q56WDi9+C7Cy2+kiiSlT4jCZ8m1K0F7tTK5mF0p4HppXmXLzcecZ/Sw8jOqQK +JM/4UCj/nxWCGYKWkv8zLJtG+ryfZMf15/0Cd1dzHAS9mYU4mFssPdFyT+WFpw7b +K3TOTXkS/tAPbj0xin2wqBJz8m8CAwEAAaN7MHkwHQYDVR0OBBYEFOWYNq+H1LH6 +lZUpgijb/S/sAiDsMB8GA1UdIwQYMBaAFAjRm/nm1WRwoPFrGp7tUtrd9VBDMAkG +A1UdEwQCMAAwLAYDVR0RBCUwI4ENZ29vZEBnb29kLm9yZ4EMYW55QGdvb2QuY29t +hwTAqAABMA0GCSqGSIb3DQEBCwUAA4IBAQAwUxnqq0gBgKmEHIRgZVu10KtOknjt +p/wEcqQ9METvXb+4/a4U6ftjTgaOrPVjamNFlaoUcTgx2nk2zRsjM+e+tpnxDgRR +/yoVB3HsISpdeN70s/WYAgvev/FdV3O+JWhUYHdKrDB4DMfPhlRIfSgOymJljo6+ +wL8qa7lVonF91Im4SCbq4dqtAnbg4ttblQ3yjFfQtuwzyJD/3ism6FQPLbg1K4eu +1Si0EDL4Fct581Gb5D+NU8PYiwg7Nk8ubNlRHXydoVGDLmT0hLE+/IsPd1M8tMqm +sifRl2Is+lGVeg4pPHFjB0npTNkaYafu89dz/3PNRRr5If06B+apk4AX -----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt7-key.pem b/worker/deps/openssl/openssl/test/certs/badalt7-key.pem index 50557e8968..b453f1ff30 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt7-key.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt7-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDUrQclq+9LtgOP -Tjvi2LtIr0D/rgbtp9xOkaBGH/qKf/iRd3JcHzEAhqokoEMTiTB5HLuICQ7nUSwk -l6hz50dITnfpkOcEECZi4/APfSJnA9qDeUd1eSOG0pVz/RgqtqRQ58F7hHCd3dg7 -dR2DuIwODpf0QU9zSKpsEp0M17/fJo2BacugLgCGmBpm4dQy1sbEzyNjYzWnyWEv -OTa0Ay5E6auPJwpkAifpcumc7u1riYgyg9UcbO2cIDbS4mYaeNU3hR8Qm30hSnvb -uK51JiJiscIHPSrszi6SwMw/Wr1qTxh7ZArCxbIsPxCWH1HXgl3O7c/VoV2czpP3 -3yznK6KzAgMBAAECggEADjQ0Kv7tr3fLixGljEP/Vh5mT+02hz7TxueQ9b4DBKcB -We3JVH+8zRUxXdraP/7EnwIdQDuipC5WrWb3mC4VI64h8hZ8Z1gQyEAC83XfC1RF -jsxVynG5vrJnyuRXbdre5Ixl7rLsto5vd6EdxINZz0KIQYbvIHr07tzbYlUyelvA -mu0kYdtbjm2p2AGJJ99zN3EiQ9lZDyiFirOXEA9P/YdKKVlIwpDPbn/TmNY/k6Ul -mRxgAJKwKiR6Gg3QMdTUKeaXBpKf/pa+5rzR7zxNbiQO3IXOVx7ZzQ2R0Wuivpqk -yjMaqUa7dDuvtIHJBpJB7TIL6SlQkiS1lEQFhO7EAQKBgQDz30obdymxqQVy7IsH -NLo5xRX1hRRN9h34Y4qC0JXkCTG1fWJ19KYHod0S5peaIo/ThDVf1UXln6amdCjM -oIfhmo0baNIdMMpxxBdsdLfUKwyVh8qROaBscPE4FGBUrfEW/wSn1WRYcWh+oda3 -LuLVf5Qt9a9f6ZYuy1X6dDi8swKBgQDfQJTSFUNkV8yKfMX54x0DcUkiWOu3LaET -GSu0UXqBVn1Q+u6CUAkh5jA9fpyM5sp9+t5FuwjO+ITHfiNFoD/LCeMUfYVDF7O2 -uCLTsN+7gTGpKMnfL/rg9exrsfDdsmbQe4BhrUFBsYfKgBlBraL0QGD+25qgU8CS -CQ6toGCCAQKBgQDCYJskwRoObPXW4AsAN1qnaRtTkjrY2O6SaGSiV7bhByMD0WiF -M/aR5sXapsj3Jc0Vfi88rzUDDPk7eyJ51wn3G8SUsDuo4Ja7jtxMqctL5PQmyxD+ -J7xiMrNRS4xscifTeHgxfbh5dgsfw8bsQwaxvPpSl5ytCfWWXqOs+K2wWQKBgBM4 -Mher8PNQg7FgcILExJipRgyI7zID4ZwNTK/nW86KrZstHx9k2IRslraUkdGnhMM3 -t671HRsEVhn+h/bUhulp3nzDGZffEH+odocW8QvpYWcYtdha/xQi18mltgC//Q3x -s+m0yqtnJzONt57p3d99M1x9d2BaFXf9A6B68BQBAoGBAOatu9+wGaIEB//fpaQt -mnsS2XBJco5gHTjOegCSNe3gQQsB5mhTEekOeMzJ8WLTMVXQVCXx9/8HxKoycbq8 -M/7ScH1iT/wJTkSsjyeycUgH31GPeRvmo9YU2PsW3NN6ZyNpxWJFdcPYHAzZqJeA -cZtQWiEyaf026DdR8YBYn6tf +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDhuD3oCLc5JiQ8 +JUgPxclR1i1lCEK58YEtCknbNzp9gjLIwyfl++weLNSDyMih7qjW16lf4SRgMSp2 +UWXtA+lbJipWDmKc/ULRcb6aOQ8AN6ugU8erCBJRZ/5YqT27uWXiDDXjeG6Le8eb +AaG6+joInQFWgLqkBxyZw+5kNbNtqmNFKpAajQYYSVjpsWAtEOelg4vfguwstvpI +okpU+IwmfJtStBe7UyuZhdKeB6aV5ly83HnGf0sPIzqkCiTP+FAo/58VghmClpL/ +MyybRvq8n2TH9ef9AndXcxwEvZmFOJhbLD3Rck/lhacO2yt0zk15Ev7QD249MYp9 +sKgSc/JvAgMBAAECggEAZG2cJawTEXtV7ejMii//Jck8g1JMlfzM86Q7Pizxejw+ +qjKiguI2qSpbF5NzKRFNz+E+e+lpTN8zPFd1GSJ/Zk2x0n4uBBlu7E9GdcnjUb5z +Py9njEJYHB4//WS3kdmoag3ywBWqYaceJWpxcga5YXGx0bIO2MJNSGDzpWR7Q9QQ +tG/lWmno5goY2BxI08BTKSlqNIBkg/rr9jJo3axRcEmbx7hj4vUkAlypFKtmR4dW +bNo0f6VAd5Y6c9YbnKybR/44lScBksuSkZjm076cbbbp5PpsiLGe/12bqUcwCH+T +8hRVndmOLdOxC11OZOvMbX6x2uXNh3/Qr/GMyfzZcQKBgQD4we7E9vOygk1J5Vbl +1zETR9x3dujpBBx3xaHXUSJNUTNwmnZ+0JoFTqPkRmmPMNK7XfZuPymBehtk8WYt +NnezM2UNTdbfVOnJWnU6igRNGBaDW6F9AezlADBNwIbFVw6RqP4fTUFsmm9TQ/8M +4kZmmlW4uLZyX0WQO+AJa7NShwKBgQDoSpnQgmWqXMcaHwY2l8fEDuDc41nDoJIm +/CMppPbr7GkUX4OU785p6E0N0o1ONt+xCBT1lxHwWEeMAKZXrNC1XGpfvhpVZ72v +VruATDFs1rcL3S2Sty7A+jhFKKXlGeDWNcpaKY8nDvv2uJG0+J3bLprdMqnY/gQ1 +C+FzyQ6S2QKBgDnHIaRSD6xoo3cEc7iS0O0/ha+hyNtGfy46kyqlx6fZsm73EYrG +/N86ssp0qFP/7RJj8rcMqKFQMUiy4R6jRg4zY8dBSyU4XczM2+mq4PDfJWuBPvMA +HXvbHV0R2LvBSrr+W3f9w7Jr9GuMoZLmg5+VPU/YZ1gNVOT5Y0IM5+vFAoGBANx9 +CzlGvLeTrw1VS3GAaobn1Hr2dlrhTDki9UFvK03PLgK/ksdJRLV0YcdwBt6p6XRB +hpuC1O087lSuvTXVfJnZacMNUDOm7/7BpeJm8DcuK7tgKwTrSb61A7ppleY7xRWv +Iy6n6hCaAYIzuWJ85mGJAEhb8apdmqK7bzmXK3UpAoGBALdOvJfqbF0YlHbdQCVi +ftjtxs/dZKdF1rNARR0VMqUtZX+WP2b6OPXlwux94Cr//iNv5ih3B4Z4LIgTpgBJ +AKGXEBGMMthAlptC4BcOAEs9cYeWGLAoYk8jpNmXvXjhGqvzhPO2YrX5xy46dVOG +iiCseyA7Kr8Axt9QhUzoi5f7 -----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/badcn1-cert.pem b/worker/deps/openssl/openssl/test/certs/badcn1-cert.pem new file mode 100644 index 0000000000..3b3bad658b --- /dev/null +++ b/worker/deps/openssl/openssl/test/certs/badcn1-cert.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDQDCCAiigAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTgwNTE2MDI0MTMyWhgPMjExODA1MTcwMjQxMzJaME4xIzAh +BgNVBAoMGkdvb2QgTkMgVGVzdCBDZXJ0aWZpY2F0ZSAxMRUwEwYDVQQDDAx3d3cu +Z29vZC5vcmcxEDAOBgNVBAMMB2JhZC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDN9WI6OyxnW+R98FqrWwMo3JE165bRB8iQOdDP3xE1+bvUMDYh +8wFR9gfNrKhqXubJ3lCHKgaApTXNKM/jwrT/pqhF6iNfPIbKAMTT4VZPy4/eI45R +03Yn+dJnZLDz7BDpnuhORp8XzQqfxSGBX0Rdr17xYOwGHcruwoitRyS/w8p8EKos +/LIDvjzye5GaPXqXkAkcBcLBpWlgMm+j8xE+LzGw1NVw8vWMSpP2WX9kp7aPbh+A +jSbT522yHy1r6WeElbSY7WOFvnmgbZ19pUdyz8CN6KKb87dBA0joyWSly5ZsNbjh +/YuRhCgRExvdQ6kImwdKAfO7RLkxho6jny1HAgMBAAGjXjBcMB0GA1UdDgQWBBT5 +fenRjyFKUb1XvUnm4GV9kZmONDAfBgNVHSMEGDAWgBQI0Zv55tVkcKDxaxqe7VLa +3fVQQzAJBgNVHRMEAjAAMA8GA1UdEQQIMAaHBMCoAAEwDQYJKoZIhvcNAQELBQAD +ggEBACKtfZCcP/pY8Bu+lb/pGZj5txsmNbJ1l2RVACQA7CGjwfUr7VaQGMuT+FuA +Erlh+UnEC3R/e1xQwgJeuAXBOWFkxA61isVSrmM7YM6vDB0+t8N9lMUFjPbRyEkM +A5kaSLPrgSOg7ONsO6YGbaWm1XCoUC6Ilrdzy+ckzklgjYRth99b2d5WrjIxEWIq +BX2DI2ruetjXYGRzsqSK+O9d4fsqrb5M0ZCNWQZ4WnrMNaAeHWpW6NqSvof/N21x +WC5zcU7GXLrDigwWPMDLQhVtu4OihWjsqugh6Jl7DxDBhi8JKO6tJQAISHjKaL98 +yXZFsQ//q7ATwlcHyB81B+X16AI= +-----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/badcn1-key.pem b/worker/deps/openssl/openssl/test/certs/badcn1-key.pem new file mode 100644 index 0000000000..dbcf4b5d44 --- /dev/null +++ b/worker/deps/openssl/openssl/test/certs/badcn1-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDN9WI6OyxnW+R9 +8FqrWwMo3JE165bRB8iQOdDP3xE1+bvUMDYh8wFR9gfNrKhqXubJ3lCHKgaApTXN +KM/jwrT/pqhF6iNfPIbKAMTT4VZPy4/eI45R03Yn+dJnZLDz7BDpnuhORp8XzQqf +xSGBX0Rdr17xYOwGHcruwoitRyS/w8p8EKos/LIDvjzye5GaPXqXkAkcBcLBpWlg +Mm+j8xE+LzGw1NVw8vWMSpP2WX9kp7aPbh+AjSbT522yHy1r6WeElbSY7WOFvnmg +bZ19pUdyz8CN6KKb87dBA0joyWSly5ZsNbjh/YuRhCgRExvdQ6kImwdKAfO7RLkx +ho6jny1HAgMBAAECggEBAKDxiUHx7cATShm0ElZnd6+dtQfKwv8zsuIpm+hk62Ef +d0zYI+UhrT1sIiryKmV9JaJITOtixtQOxl088D+Obrx8cnC4B84rUTVXpnfgVf9j +FljDtjpxIZsZmPbc836ZUZoOaICKpVYHD69Mb+NWG+mN2oaLc8VP0L4FXKLzvl7u +69NQlTPG2CS61BktVqMtWWc/9CvdOwqwVbckyISj9QLUgSXIyB4IP3bjp0RYSpOu +m3nhuhil1G3c05R4UfiE2d9Er7SBBoQ304ld892YRinSgtZqC1G25uZmWJ3ekAAM +bg6P0hBd86F/G2TxNdelYrxTazjqZShYi1N48SK6kUECgYEA+51O19Q5XkskD/Dn +VfaCjSOTFwDlb5ATmVCrJu+13/5IJfmJgWA6xdqfWoqxSOsJzXBEETKWgkahoo4K +OU1UaBTHEJ588xOpoMzbJkKlb5hPseEQsvu055Ky0euMgmlrALPQQ9e1DUSlowui +Cq9wCak4dqq9NNs6FMIeGhqczGECgYEA0YxcajJFxPHJsdFCVa4tdy9jgfC64t4Y +CWDzRfUnuX24ILbW9+olvvoZkMSzoVpiQ9YU8kPJUaOyFrw6jUV5GRHUCMgfkx2Y +nqe+7aSFmv0Nlo0RMV2PqaOZzlxnG9FzyNE+4PygZqtFhN21b5Idc69k2Ltu7K4J +J4MG1kMUGqcCgYEA0ttUPEisPtoHgZhntUFczHx4gnmMzH5X/k5876dIqkrFGZXR +5urGthHtIwpBYZMeZtxjHmpfeRNJ1xjjdnvYdVScMdAvc+ERcSDbsmd9jlR8zNuI +jAWl576nPoX//TXspu0JZiE5p8HUcRuJkxzMbjwyhje1Ubs6JDU81rFgn2ECgYAG +3WVNqVX1zMIBzEwzCGC+7dOBt0Q4GHSLIhz2JsDlZ8P3dmX2ezo/Vmwt/POxjod3 +l3TaNvRKc2VrL0FvzV3ZP2dF3mCCbk7Iq9AqcuBZon6mdvqgNmN1eEGarBZIqAT2 +CDzaHAyZMHU3lBfUjuHeH1nba9CHenAcVkOME2h+MwKBgQDiHAnTK4ovCNmT5E9i +03x/wPSH8FZ3Wrb1GMtNlTc7lOtB5eYIvwkaloJkNKHbUDv57V66hnYT6CyH4u45 +dPtuohtafL9mdScYqmicGLtbLLglSQpJYt4J59hffNZ30E84dKXtyDN7E5P5Z00Z +8PbOMUy3oK6j+GMP/xRNI76RtA== +-----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/goodcn1-cert.pem b/worker/deps/openssl/openssl/test/certs/goodcn1-cert.pem new file mode 100644 index 0000000000..d9205e03b0 --- /dev/null +++ b/worker/deps/openssl/openssl/test/certs/goodcn1-cert.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDkTCCAnmgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTgwNTE2MDI0MDA0WhgPMjExODA1MTcwMjQwMDRaMIGeMSMw +IQYDVQQKDBpHb29kIE5DIFRlc3QgQ2VydGlmaWNhdGUgMTEVMBMGA1UEAwwMd3d3 +Lmdvb2Qub3JnMRUwEwYDVQQDDAxhbnkuZ29vZC5jb20xETAPBgNVBAMMCG5vdC4u +ZG5zMRAwDgYDVQQDDAdub3RAZG5zMREwDwYDVQQDDAhub3QtLmRuczERMA8GA1UE +AwwIbm90LmRucy4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDigxI +nlYVjHtrFI+Iv/3b0jeZbs1jVnPF6ZREk46BTNAVNZsq24jKFG6yK4n9vKA/JuS7 +jZe+gMX+sWh/S1IlsNDY8/Io1UsG/s1tmsvE2UrURUX4s8HnqB6AZ4Y9Cp4rSADe +mD/YdekRf3HFA0IKQvIFRkpegj8uuWwILC0n/ozMNUlNmxCBlOmtFwjFxmNr9Txa +ZeFvWvvc6oTubAETK4HcjLdimx1tePdd4+0mxJ/akQ3wVzUAI2ysijMmMJDzTxLs +FPkw4yUtJHK0/H2yJtpoJ4wQjsWd6a8F7wY/pHszAud1M8QZJKQDzkJOMnqLKNLT +OKw6dm1UG2J7iuqtAgMBAAGjXjBcMB0GA1UdDgQWBBSTKvqap2ab0z/UPrdDgc0V +m88R3TAfBgNVHSMEGDAWgBQI0Zv55tVkcKDxaxqe7VLa3fVQQzAJBgNVHRMEAjAA +MA8GA1UdEQQIMAaHBMCoAAEwDQYJKoZIhvcNAQELBQADggEBADcdm62qaOHbIDoa +5oUjXGHSQjV1g4BFe6DLH5/CZ0wOws3QzfQbPIxJrp3yJgDcQyZNOE/xQlq/nASS +thU6cUTB07voFVnbotB8YQuNU1wM9TAJOHC9LT1Y0J2GIP6QeXts6Cz6aBlqaQEZ +IrGRLuKVZePTO0Haup0mZ91XoXs3CBzkSerl0XpFL7BeugSigrhprFRPB4UC3IWb +pdNar61Wk4bN/COb6utRkK3iYk5YUTqYFib9EG4VBdxYfXv/tiBIGqQLnqPbId6w +q+McpSEPF1DIcCyL0vEDdIVN0SzxMfnfHMx0Qp0sh2aydIZk4xfEqXHZgZthSrse +u7nhn7s= +-----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/goodcn1-key.pem b/worker/deps/openssl/openssl/test/certs/goodcn1-key.pem new file mode 100644 index 0000000000..2ad660c6db --- /dev/null +++ b/worker/deps/openssl/openssl/test/certs/goodcn1-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDDigxInlYVjHtr +FI+Iv/3b0jeZbs1jVnPF6ZREk46BTNAVNZsq24jKFG6yK4n9vKA/JuS7jZe+gMX+ +sWh/S1IlsNDY8/Io1UsG/s1tmsvE2UrURUX4s8HnqB6AZ4Y9Cp4rSADemD/YdekR +f3HFA0IKQvIFRkpegj8uuWwILC0n/ozMNUlNmxCBlOmtFwjFxmNr9TxaZeFvWvvc +6oTubAETK4HcjLdimx1tePdd4+0mxJ/akQ3wVzUAI2ysijMmMJDzTxLsFPkw4yUt +JHK0/H2yJtpoJ4wQjsWd6a8F7wY/pHszAud1M8QZJKQDzkJOMnqLKNLTOKw6dm1U +G2J7iuqtAgMBAAECggEAeQ1xZVOAf36kuTnVUhdplTii6v3JcQIIUjG0dG/U/P8M +otS45uNZ36CelvaVStwHaJEvcVzK4EjgSjiSNJvwkxzPbkA3XkgNVptPmdcG5yqO +RLNOChVeqYdOurdcR1XXbXv57dPbUqpMS2TWjdzieW/QXKuTRsbjTo3D75tJqUO6 +1Bm4sSM3PogmsQwTP8HlZAmJXuSD+ZSB22Np5pT1dn5TvQU6xeA3NJR4ZO/HEZz4 +CHJEiOx2BuGD6M0V1ZL6DzEsyIS/KKsvj4I2F4ROAK1j3lSD5VqrYPXn3oEsQdlm +OW8aVnHPYO6FI0LVLgcIEKxhdwGV3i6v/GRUe0Y9kQKBgQD0Zqn1trAuP5Peiy1K +Wc91yRjQxQTwSD00hzXMtvKzkEIiLEuVZq9qrqQ2TRRa5xneDGHDuUY9eZY8JwEr +l7f8CcfYC93PXLyRM2Gaz0jMxZxVPz5w7zssK3DZ+7JvH3nKkCUl7+Y0tH26qTO0 +wTD9w9jd9bf85SLVgk3zSbUDwwKBgQDM0b2ffZpxyA16h7w8ZBuk1Z+iumrxnn5/ +lKtffR2b4dZN37KiWw2c265vYhRfe/ANnVuagXb9aRM97yeQloRlWR10AaXJz3EB +sromqFShkorYRhwZoRiJC0laLG3W76wKMRr2T6TM1UG9gJ0szdGFG/yUDU+9pTRo +uq514rGgzwKBgQCGtsAgLF7YXzsGg/im7vInnn0LNk4OlAMInS7OdFk7GN0bMQdI +hp1SVIk3VS1PHetoNbL9y3YoFIj3BxjiCnLjfhClyYSt9BQMhSHbzz31gUc2xfGJ +FpSrOBawUMh97/+V4/ZV/vIJQyO6a+GQVJzIg9daIUMVJsgYoAaPf6VDOQKBgFyH +eHnf/XDfpq8vOOuzcgWieG7EduHW72DlohIObNzqRq2BnKraJakyWXh6P6fvTsBn +0WVYjY/n80hsjVw1k3RRsQuiXupv66aPvqcOLsWbdVxFOBaf/3yR+75gCfMq7Xbh +PkP+MP5UbVGWE+uUw821mgKsjNSpGKcjhwM8uXBjAoGAFEU3O8gQXfocVB8lxUeU +c0inLdAIgiw/36NPuW4NwKxzLOmHzlmvn7C98ihnbnGoQ0XBRfLw8siTbD3INgHY +NA0JeK8Qrt56b6wK14w9RzLQTu9gy1pULW21p1wswdNK4tlxfnnnozISZAYxeqAx +YMTtYZN77nb+yY4oE6XEugQ= +-----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/setup.sh b/worker/deps/openssl/openssl/test/certs/setup.sh index 7e1086a224..018e5fc690 100755 --- a/worker/deps/openssl/openssl/test/certs/setup.sh +++ b/worker/deps/openssl/openssl/test/certs/setup.sh @@ -241,15 +241,30 @@ NC="$NC excluded;DNS:bad.ok.good.com" NC=$NC ./mkcert.sh genca "Test NC sub CA" ncca3-key ncca3-cert \ ncca1-key ncca1-cert -# all subjectAltNames allowed by CA1. +# all subjectAltNames allowed by CA1. Some CNs are not! ./mkcert.sh req alt1-key "O = Good NC Test Certificate 1" \ - "1.CN=www.good.org" "2.CN=Joe Bloggs" "3.CN=any.good.com" | \ + "1.CN=www.example.net" "2.CN=Joe Bloggs" | \ ./mkcert.sh geneealt alt1-key alt1-cert ncca1-key ncca1-cert \ "DNS.1 = www.good.org" "DNS.2 = any.good.com" \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.1" "IP = 192.168.0.1" +# all DNS-like CNs allowed by CA1, no DNS SANs. + +./mkcert.sh req goodcn1-key "O = Good NC Test Certificate 1" \ + "1.CN=www.good.org" "2.CN=any.good.com" \ + "3.CN=not..dns" "4.CN=not@dns" "5.CN=not-.dns" "6.CN=not.dns." | \ + ./mkcert.sh geneealt goodcn1-key goodcn1-cert ncca1-key ncca1-cert \ + "IP = 127.0.0.1" "IP = 192.168.0.1" + +# Some DNS-like CNs not permitted by CA1, no DNS SANs. + +./mkcert.sh req badcn1-key "O = Good NC Test Certificate 1" \ + "1.CN=www.good.org" "3.CN=bad.net" | \ + ./mkcert.sh geneealt badcn1-key badcn1-cert ncca1-key ncca1-cert \ + "IP = 127.0.0.1" "IP = 192.168.0.1" + # no subjectAltNames excluded by CA2. ./mkcert.sh req alt2-key "O = Good NC Test Certificate 2" | \ @@ -293,19 +308,17 @@ NC=$NC ./mkcert.sh genca "Test NC sub CA" ncca3-key ncca3-cert \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.2" -# all subject alt names OK but subject CN not allowed by CA1. +# No DNS-ID SANs and subject CN not allowed by CA1. ./mkcert.sh req badalt6-key "O = Bad NC Test Certificate 6" \ "1.CN=other.good.org" "2.CN=Joe Bloggs" "3.CN=any.good.com" | \ ./mkcert.sh geneealt badalt6-key badalt6-cert ncca1-key ncca1-cert \ - "DNS.1 = www.good.org" "DNS.2 = any.good.com" \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.1" "IP = 192.168.0.1" -# all subject alt names OK but subject CN not allowed by CA1, BMPSTRING +# No DNS-ID SANS and subject CN not allowed by CA1, BMPSTRING REQMASK=MASK:0x800 ./mkcert.sh req badalt7-key "O = Bad NC Test Certificate 7" \ "1.CN=other.good.org" "2.CN=Joe Bloggs" "3.CN=any.good.com" | \ ./mkcert.sh geneealt badalt7-key badalt7-cert ncca1-key ncca1-cert \ - "DNS.1 = www.good.org" "DNS.2 = any.good.com" \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.1" "IP = 192.168.0.1" diff --git a/worker/deps/openssl/openssl/test/ct/log_list.conf b/worker/deps/openssl/openssl/test/ct/log_list.conf index 3724599a9d..4b68e53558 100644 --- a/worker/deps/openssl/openssl/test/ct/log_list.conf +++ b/worker/deps/openssl/openssl/test/ct/log_list.conf @@ -35,3 +35,4 @@ key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEluqsHEYMG1XcDfy1lCdGV0JwOmkY4r87xNuroP [venafi] description = Venafi log key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolpIHxdSlTXLo1s6H1OCdpSj/4DyHDc8wLG9wVmLqy1lk9fz4ATVmm+/1iN2Nk8jmctUKK2MFUtlWXZBSpym97M7frGlSaQXUWyA3CqQUEuIJOmlEjKTBEiQAvpfDjCHjlV2Be4qTM6jamkJbiWtgnYPhJL6ONaGTiSPm7Byy57iaz/hbckldSOIoRhYBiMzeNoA0DiRZ9KmfSeXZ1rB8y8X5urSW+iBzf2SaOfzBvDpcoTuAaWx2DPazoOl28fP1hZ+kHUYvxbcMjttjauCFx+JII0dmuZNIwjfeG/GBb9frpSX219k1O4Wi6OEbHEr8at/XQ0y7gTikOxBn/s5wQIDAQAB + diff --git a/worker/deps/openssl/openssl/test/ct_test.c b/worker/deps/openssl/openssl/test/ct_test.c index ea90923d74..49c46958ee 100644 --- a/worker/deps/openssl/openssl/test/ct_test.c +++ b/worker/deps/openssl/openssl/test/ct_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -542,8 +542,8 @@ static int test_default_ct_policy_eval_ctx_time_is_now() { int success = 0; CT_POLICY_EVAL_CTX *ct_policy_ctx = CT_POLICY_EVAL_CTX_new(); - const time_t default_time = CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / - 1000; + const time_t default_time = + (time_t)(CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / 1000); const time_t time_tolerance = 600; /* 10 minutes */ if (fabs(difftime(time(NULL), default_time)) > time_tolerance) { diff --git a/worker/deps/openssl/openssl/test/danetest.in b/worker/deps/openssl/openssl/test/danetest.in index c94f526aab..0cedf10a2a 100644 --- a/worker/deps/openssl/openssl/test/danetest.in +++ b/worker/deps/openssl/openssl/test/danetest.in @@ -26,7 +26,7 @@ # 3 1 0 3059301306072A8648CE3D020106082A8648CE3D03010703420004664995F47BDE35E7B4DE48B258E9E8A07ADEBBDB863B3D06F481A1946C83DA9F56CFF4D9389B855D2F364B1585B0C734FCFA263026964FF5A4308B3FC879BDB8 # 3 1 1 3111668338043DE264D0256A702248696C9484B6221A42740F920187B4C61838 # 3 1 2 CB861AF6DDED185EE04472A9092052CCC735120C34785E72C996C94B122EBA6F329BE630B1B4C6E2756E7A75392C21E253C6AEACC31FD45FF4595DED375FAF62 -# -- +# -- # subject= CN = Issuer CA # 2 0 0 308201683082010DA003020102020102300A06082A8648CE3D04030230123110300E06035504030C07526F6F742043413020170D3135313231333233323030395A180F33303135303431353233323030395A30143112301006035504030C094973737565722043413059301306072A8648CE3D020106082A8648CE3D030107034200047D4BAE18B49F5DC69D0A3C85C66A3E2119DE92CFAD081FAD55C12D510EC97B6C00E13695A8D9713548FE60DF15573390433E2A1BD92DB4B7AA016EC6185DC5AFA350304E301D0603551D0E041604147AB75A3CD295CA5DF7C5150916E18FF5CC376A15301F0603551D23041830168014E4BD405F052A820DDF9883F93D7D3F90AAEC723F300C0603551D13040530030101FF300A06082A8648CE3D0403020349003046022100831DCD882DA8785D50E41020898C0248879DDDF72D701D1DC1DE6BE08155B43E022100B84B2FB519C4CD3CBC791603D4488F7707597DB7980D9C173E7FDD0ECD7CA308 # 2 0 1 0DAA76425A1FC398C55A643D5A2485AE4CC2B64B9515A75054722B2E83C31BBD diff --git a/worker/deps/openssl/openssl/test/errtest.c b/worker/deps/openssl/openssl/test/errtest.c new file mode 100644 index 0000000000..df4cddb096 --- /dev/null +++ b/worker/deps/openssl/openssl/test/errtest.c @@ -0,0 +1,40 @@ +/* + * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include + +#include "testutil.h" + +#if defined(OPENSSL_SYS_WINDOWS) +# include +#else +# include +#endif + +/* Test that querying the error queue preserves the OS error. */ +static int preserves_system_error(void) +{ +#if defined(OPENSSL_SYS_WINDOWS) + SetLastError(ERROR_INVALID_FUNCTION); + ERR_get_error(); + return GetLastError() == ERROR_INVALID_FUNCTION; +#else + errno = EINVAL; + ERR_get_error(); + return errno == EINVAL; +#endif +} + +int main(int argc, char **argv) +{ + ADD_TEST(preserves_system_error); + + return run_tests(argv[0]); +} diff --git a/worker/deps/openssl/openssl/test/evp_extra_test.c b/worker/deps/openssl/openssl/test/evp_extra_test.c index 9217f3ae51..bc02fad4f2 100644 --- a/worker/deps/openssl/openssl/test/evp_extra_test.c +++ b/worker/deps/openssl/openssl/test/evp_extra_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -326,6 +327,46 @@ static int test_d2i_AutoPrivateKey(const unsigned char *input, return ret; } +static int test_EVP_Enveloped(void) +{ + int ret = 0; + EVP_CIPHER_CTX *ctx = NULL; + EVP_PKEY *keypair = NULL; + unsigned char *kek = NULL; + int kek_len; + unsigned char iv[EVP_MAX_IV_LENGTH]; + static const unsigned char msg[] = { 1, 2, 3, 4, 5, 6, 7, 8 }; + int len, ciphertext_len, plaintext_len; + unsigned char ciphertext[32], plaintext[16]; + const EVP_CIPHER *type = EVP_aes_256_cbc(); + + if ((keypair = load_example_rsa_key()) == NULL + || (kek = OPENSSL_zalloc(EVP_PKEY_size(keypair))) == NULL + || (ctx = EVP_CIPHER_CTX_new()) == NULL + || !EVP_SealInit(ctx, type, &kek, &kek_len, iv, &keypair, 1) + || !EVP_SealUpdate(ctx, ciphertext, &ciphertext_len, + msg, sizeof(msg)) + || !EVP_SealFinal(ctx, ciphertext + ciphertext_len, &len)) + goto err; + + ciphertext_len += len; + if (!EVP_OpenInit(ctx, type, kek, kek_len, iv, keypair) + || !EVP_OpenUpdate(ctx, plaintext, &plaintext_len, + ciphertext, ciphertext_len) + || !EVP_OpenFinal(ctx, plaintext + plaintext_len, &len) + || (plaintext_len += len) != sizeof(msg) + || memcmp(msg, plaintext, sizeof(msg)) != 0) + goto err; + + ret = 1; + +err: + OPENSSL_free(kek); + EVP_PKEY_free(keypair); + EVP_CIPHER_CTX_free(ctx); + return ret; +} + #ifndef OPENSSL_NO_EC /* Tests loading a bad key in PKCS8 format */ static int test_EVP_PKCS82PKEY(void) @@ -386,6 +427,11 @@ int main(void) return 1; } + if (!test_EVP_Enveloped()) { + fprintf(stderr, "test_EVP_Enveloped failed\n"); + return 1; + } + #ifndef OPENSSL_NO_EC if (!test_d2i_AutoPrivateKey(kExampleECKeyDER, sizeof(kExampleECKeyDER), EVP_PKEY_EC)) { diff --git a/worker/deps/openssl/openssl/test/evp_test.c b/worker/deps/openssl/openssl/test/evp_test.c index 4bea4ea2b9..ea9455374f 100644 --- a/worker/deps/openssl/openssl/test/evp_test.c +++ b/worker/deps/openssl/openssl/test/evp_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1592,19 +1592,19 @@ static int pderive_test_run(struct evp_test *t) struct pkey_data *kdata = t->data; unsigned char *out = NULL; size_t out_len; - const char *err = "INTERNAL_ERROR"; + const char *err = "DERIVE_ERROR"; - out_len = kdata->output_len; + if (EVP_PKEY_derive(kdata->ctx, NULL, &out_len) <= 0) + goto err; out = OPENSSL_malloc(out_len); if (!out) { fprintf(stderr, "Error allocating output buffer!\n"); exit(1); } - err = "DERIVE_ERROR"; if (EVP_PKEY_derive(kdata->ctx, out, &out_len) <= 0) goto err; err = "SHARED_SECRET_LENGTH_MISMATCH"; - if (out_len != kdata->output_len) + if (kdata->output == NULL || out_len != kdata->output_len) goto err; err = "SHARED_SECRET_MISMATCH"; if (check_output(t, kdata->output, out, out_len)) @@ -2169,3 +2169,4 @@ static const struct evp_test_method keypair_test_method = { void_test_parse, keypair_test_run }; + diff --git a/worker/deps/openssl/openssl/test/r160test.c b/worker/deps/openssl/openssl/test/r160test.c index 9ed453849e..06033eb91f 100644 --- a/worker/deps/openssl/openssl/test/r160test.c +++ b/worker/deps/openssl/openssl/test/r160test.c @@ -6,3 +6,4 @@ * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ + diff --git a/worker/deps/openssl/openssl/test/recipes/04-test_err.t b/worker/deps/openssl/openssl/test/recipes/04-test_err.t new file mode 100644 index 0000000000..dd7681afa4 --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/04-test_err.t @@ -0,0 +1,12 @@ +#! /usr/bin/env perl +# Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + + +use OpenSSL::Test::Simple; + +simple_test("test_err", "errtest"); diff --git a/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/cert-trailingwhitespace.pem b/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/cert-trailingwhitespace.pem index 99ddf079a4..ab0dfe85b7 100644 --- a/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/cert-trailingwhitespace.pem +++ b/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/cert-trailingwhitespace.pem @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE----- -MIIEzDCCA7QCCQCgxkRox+YljjANBgkqhkiG9w0BAQsFADCCASYxYzBhBgNVBAgM -WlRoZSBHcmVhdCBTdGF0ZSBvZiBMb25nLVdpbmRlZCBDZXJ0aWZpY2F0ZSBGaWVs -ZCBOYW1lcyBXaGVyZWJ5IHRvIEluY3JlYXNlIHRoZSBPdXRwdXQgU2l6ZTEfMB0G -A1UEBwwWVG9vbWFueWNoYXJhY3RlcnN2aWxsZTFIMEYGA1UECgw/VGhlIEJlbmV2 -b2xlbnQgU29jaWV0eSBvZiBMb3F1YWNpb3VzIGFuZCBQbGVvbmFzdGljIFBlcmlw -aHJhc2lzMT0wOwYDVQQLDDRFbmRvcnNlbWVudCBvZiBWb3VjaHNhZmUnZCBFdmlk -ZW50aWFyeSBDZXJ0aWZpY2F0aW9uMRUwEwYDVQQDDAxjZXJ0LmV4YW1wbGUwHhcN -MTcwMjIzMjAyNTM2WhcNMTcwMzI1MjAyNTM2WjCCASYxYzBhBgNVBAgMWlRoZSBH -cmVhdCBTdGF0ZSBvZiBMb25nLVdpbmRlZCBDZXJ0aWZpY2F0ZSBGaWVsZCBOYW1l -cyBXaGVyZWJ5IHRvIEluY3JlYXNlIHRoZSBPdXRwdXQgU2l6ZTEfMB0GA1UEBwwW -VG9vbWFueWNoYXJhY3RlcnN2aWxsZTFIMEYGA1UECgw/VGhlIEJlbmV2b2xlbnQg -U29jaWV0eSBvZiBMb3F1YWNpb3VzIGFuZCBQbGVvbmFzdGljIFBlcmlwaHJhc2lz -MT0wOwYDVQQLDDRFbmRvcnNlbWVudCBvZiBWb3VjaHNhZmUnZCBFdmlkZW50aWFy -eSBDZXJ0aWZpY2F0aW9uMRUwEwYDVQQDDAxjZXJ0LmV4YW1wbGUwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7MOIrqH+ZIJiZdroKMrelKMSvvRKg2MEg -j/sx9TaHHqrKys4AiL4Rq/ybQEigFC6G8mpZWbBrU+vN2SLr1ZsPftCHIY12LF56 -0WLYTYNqDgF5BdCZCrjJ2hhN+XwML2tgYdWioV/Eey8SJSqUskf03MpcwnLbVfSp -hwmowqNfiEFFqPBCf7E8IVarGWctbMpvlMbAM5owhMev/Ccmqqt81NFkb1WVejvN -5v/JKv243/Xedf4I7ZJv7zKeswoP9piFzWHXCd9SIVzWqF77u/crHufIhoEa7NkZ -hSC2aosQF619iKnfk0nqWaLDJ182CCXkHERoQC7q9X2IGLDLoA0XAgMBAAEwDQYJ -KoZIhvcNAQELBQADggEBAKbtLx+YlCGRCBmYn3dfYF+BIvK/b/e0DKNhDKhb4s9J -ywlJ4qnAB48tgPx0q+ZB+EdMYRqCwyvXJxEdZ7PsCdUeU6xI2ybkhSdUUfQbYem3 -aYRG+yukGzazySQJs8lGqxBlRMFl/FGCg+oSQ/I32eGf8micDskj2zkAJtCkUPHX -30YrWMfOwW1r2xYr2mBNXbNWXJhW/sIg5u8aa9fcALeuQcMXkbsbVoPmC5aLdiVZ -rvUFoJ8DPg0aYYwj64RwU0B5HW/7jKhQ25FgKVAzLGrgYx1DivkM7UQGdWYnU8IA -A8S89gRjGk2hnkeagWas3dxqTTpgJDhprgWzyKa9hII= +MIIEzDCCA7QCCQCgxkRox+YljjANBgkqhkiG9w0BAQsFADCCASYxYzBhBgNVBAgM +WlRoZSBHcmVhdCBTdGF0ZSBvZiBMb25nLVdpbmRlZCBDZXJ0aWZpY2F0ZSBGaWVs +ZCBOYW1lcyBXaGVyZWJ5IHRvIEluY3JlYXNlIHRoZSBPdXRwdXQgU2l6ZTEfMB0G +A1UEBwwWVG9vbWFueWNoYXJhY3RlcnN2aWxsZTFIMEYGA1UECgw/VGhlIEJlbmV2 +b2xlbnQgU29jaWV0eSBvZiBMb3F1YWNpb3VzIGFuZCBQbGVvbmFzdGljIFBlcmlw +aHJhc2lzMT0wOwYDVQQLDDRFbmRvcnNlbWVudCBvZiBWb3VjaHNhZmUnZCBFdmlk +ZW50aWFyeSBDZXJ0aWZpY2F0aW9uMRUwEwYDVQQDDAxjZXJ0LmV4YW1wbGUwHhcN +MTcwMjIzMjAyNTM2WhcNMTcwMzI1MjAyNTM2WjCCASYxYzBhBgNVBAgMWlRoZSBH +cmVhdCBTdGF0ZSBvZiBMb25nLVdpbmRlZCBDZXJ0aWZpY2F0ZSBGaWVsZCBOYW1l +cyBXaGVyZWJ5IHRvIEluY3JlYXNlIHRoZSBPdXRwdXQgU2l6ZTEfMB0GA1UEBwwW +VG9vbWFueWNoYXJhY3RlcnN2aWxsZTFIMEYGA1UECgw/VGhlIEJlbmV2b2xlbnQg +U29jaWV0eSBvZiBMb3F1YWNpb3VzIGFuZCBQbGVvbmFzdGljIFBlcmlwaHJhc2lz +MT0wOwYDVQQLDDRFbmRvcnNlbWVudCBvZiBWb3VjaHNhZmUnZCBFdmlkZW50aWFy +eSBDZXJ0aWZpY2F0aW9uMRUwEwYDVQQDDAxjZXJ0LmV4YW1wbGUwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7MOIrqH+ZIJiZdroKMrelKMSvvRKg2MEg +j/sx9TaHHqrKys4AiL4Rq/ybQEigFC6G8mpZWbBrU+vN2SLr1ZsPftCHIY12LF56 +0WLYTYNqDgF5BdCZCrjJ2hhN+XwML2tgYdWioV/Eey8SJSqUskf03MpcwnLbVfSp +hwmowqNfiEFFqPBCf7E8IVarGWctbMpvlMbAM5owhMev/Ccmqqt81NFkb1WVejvN +5v/JKv243/Xedf4I7ZJv7zKeswoP9piFzWHXCd9SIVzWqF77u/crHufIhoEa7NkZ +hSC2aosQF619iKnfk0nqWaLDJ182CCXkHERoQC7q9X2IGLDLoA0XAgMBAAEwDQYJ +KoZIhvcNAQELBQADggEBAKbtLx+YlCGRCBmYn3dfYF+BIvK/b/e0DKNhDKhb4s9J +ywlJ4qnAB48tgPx0q+ZB+EdMYRqCwyvXJxEdZ7PsCdUeU6xI2ybkhSdUUfQbYem3 +aYRG+yukGzazySQJs8lGqxBlRMFl/FGCg+oSQ/I32eGf8micDskj2zkAJtCkUPHX +30YrWMfOwW1r2xYr2mBNXbNWXJhW/sIg5u8aa9fcALeuQcMXkbsbVoPmC5aLdiVZ +rvUFoJ8DPg0aYYwj64RwU0B5HW/7jKhQ25FgKVAzLGrgYx1DivkM7UQGdWYnU8IA +A8S89gRjGk2hnkeagWas3dxqTTpgJDhprgWzyKa9hII= -----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem b/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem index 78ebd1b702..0b5de58c4c 100644 --- a/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem +++ b/worker/deps/openssl/openssl/test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem @@ -2,22 +2,22 @@ Proc-Type: 4,ENCRYPTED DEK-Info: AES-256-CBC,A2A7FA3E5E454B59C8777564E7AF3CD6 -EBDWX0Qfarl+QNsHgCUudLyb6DkC4zyaDU/vUqWyHX0m+8W2bbmT5TexlL3hsM5U -gz7KsGqyjeOuK9QT5LOM4VyK6BgmhqpQaJ1MgCWA/gbBPTgBp2jfp3oS0WC5D6GM -wcsdqoeIpD/wce3k0H2Gfu6+rINBmbITtn4DTf3PkOcDIwdDceN2qkZanloFVriS -3kABUIh1ehYIXQibLRFY5rXdQnhY2CZNrQFIMwl64hK5P5hQbcyJKGDHAYzXV7ou -pdXy5F9oyEd6eA5ix+n1jKFRB7PmApZmuiQjzfExVKmBPGxRzOGT0qR5vLylQhei -SC77nkerawUyjA2QlIa/SmNzXEYkN3goDzHSFKBauB0o5qFc1b1x7dXPCFL0atG5 -UxoRr/Ep7tiab4DZmYEnOGkL2dVN8jA04F+HQGBeP6nDOSKhXRjbUODUpDpDvj+F -Jf77Rv0p48l9ip8i/bquwukXlMed3O4d6rnEwkggdySS5itiShwaVLPf+icI/Yd4 -vcPXDPUHTkj1XmoZ4f1mUF17OtCohsJT7O4oMBBMBwqCkC7enrLaALi9jiKym47g -2bZH05xJPpWXS/kSEkwt/jI+a+o4CuDPly3XhIcYRtsaWBJWiam1OT7sGQ+zkjTG -Aa6NfwbR8ScQC8MzDfVnkJ3VnXjT345bz+F7HTAveQ8a7KGxNntPhE0KVjpl369K -q2TMLyexQARJapabBf/ST9zWP7wxzWfrEbX3OEZCuRDVkwWf18BH/Eh6Lqnqg5QM -4GuX708NiFpiwQt9p/DAuQdhBrP67BxL64CbI7CgW4Lv3z3qnKfFV9zY5/mxCERn -9mPOig2r8WvvXt7ch6nhzBPfCwq0BoPqLKUFgDpeXsNdJ9sW5IV3yi/3Bh98ZBYX -zj8g/7XMo6v998fct+EiHPscuqeYUaoJZ6+Zj7W45nGA9DGsnEmZ0Wux2tTj70mD -oH//21TiRAx6ypPP+Iq2YDzqh7VXc/gssOn/vU1Aj19gzL+MRn1Z55SMrA7nO90m -OgOyEP+uGrXyahfZGPbmpgIx+MTbtfvRtZBsG3EcXyW9NnHJfk4O8xN3hYPWXaBI -o15qB3jYbx1oktbcQPo0hzaNv+PJ5wtT47JLNcbMeMSnwKM8MB4CXlM43RUtKws6 +EBDWX0Qfarl+QNsHgCUudLyb6DkC4zyaDU/vUqWyHX0m+8W2bbmT5TexlL3hsM5U +gz7KsGqyjeOuK9QT5LOM4VyK6BgmhqpQaJ1MgCWA/gbBPTgBp2jfp3oS0WC5D6GM +wcsdqoeIpD/wce3k0H2Gfu6+rINBmbITtn4DTf3PkOcDIwdDceN2qkZanloFVriS +3kABUIh1ehYIXQibLRFY5rXdQnhY2CZNrQFIMwl64hK5P5hQbcyJKGDHAYzXV7ou +pdXy5F9oyEd6eA5ix+n1jKFRB7PmApZmuiQjzfExVKmBPGxRzOGT0qR5vLylQhei +SC77nkerawUyjA2QlIa/SmNzXEYkN3goDzHSFKBauB0o5qFc1b1x7dXPCFL0atG5 +UxoRr/Ep7tiab4DZmYEnOGkL2dVN8jA04F+HQGBeP6nDOSKhXRjbUODUpDpDvj+F +Jf77Rv0p48l9ip8i/bquwukXlMed3O4d6rnEwkggdySS5itiShwaVLPf+icI/Yd4 +vcPXDPUHTkj1XmoZ4f1mUF17OtCohsJT7O4oMBBMBwqCkC7enrLaALi9jiKym47g +2bZH05xJPpWXS/kSEkwt/jI+a+o4CuDPly3XhIcYRtsaWBJWiam1OT7sGQ+zkjTG +Aa6NfwbR8ScQC8MzDfVnkJ3VnXjT345bz+F7HTAveQ8a7KGxNntPhE0KVjpl369K +q2TMLyexQARJapabBf/ST9zWP7wxzWfrEbX3OEZCuRDVkwWf18BH/Eh6Lqnqg5QM +4GuX708NiFpiwQt9p/DAuQdhBrP67BxL64CbI7CgW4Lv3z3qnKfFV9zY5/mxCERn +9mPOig2r8WvvXt7ch6nhzBPfCwq0BoPqLKUFgDpeXsNdJ9sW5IV3yi/3Bh98ZBYX +zj8g/7XMo6v998fct+EiHPscuqeYUaoJZ6+Zj7W45nGA9DGsnEmZ0Wux2tTj70mD +oH//21TiRAx6ypPP+Iq2YDzqh7VXc/gssOn/vU1Aj19gzL+MRn1Z55SMrA7nO90m +OgOyEP+uGrXyahfZGPbmpgIx+MTbtfvRtZBsG3EcXyW9NnHJfk4O8xN3hYPWXaBI +o15qB3jYbx1oktbcQPo0hzaNv+PJ5wtT47JLNcbMeMSnwKM8MB4CXlM43RUtKws6 -----END DSA PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/recipes/15-test_genrsa.t b/worker/deps/openssl/openssl/test/recipes/15-test_genrsa.t index cc74e303f1..766ea4f0aa 100644 --- a/worker/deps/openssl/openssl/test/recipes/15-test_genrsa.t +++ b/worker/deps/openssl/openssl/test/recipes/15-test_genrsa.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -18,9 +18,38 @@ setup("test_genrsa"); plan tests => 5; +# We want to know that an absurdly small number of bits isn't support is(run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', '8'])), 0, "genrsa -3 8"); -ok(run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', '16'])), "genrsa -3 16"); -ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout'])), "rsa -check"); -ok(run(app([ 'openssl', 'genrsa', '-f4', '-out', 'genrsatest.pem', '16'])), "genrsa -f4 16"); -ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout'])), "rsa -check"); + +# Depending on the shared library, we might have different lower limits. +# Let's find it! This is a simple binary search +# ------------------------------------------------------------ +# NOTE: $good may need an update in the future +# ------------------------------------------------------------ +note "Looking for lowest amount of bits"; +my $bad = 3; # Log2 of number of bits (2 << 3 == 8) +my $good = 11; # Log2 of number of bits (2 << 11 == 2048) +while ($good > $bad + 1) { + my $checked = int(($good + $bad + 1) / 2); + if (run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', + 2 ** $checked ], stderr => undef))) { + note 2 ** $checked, " bits is good"; + $good = $checked; + } else { + note 2 ** $checked, " bits is bad"; + $bad = $checked; + } +} +$good++ if $good == $bad; +$good = 2 ** $good; +note "Found lowest allowed amount of bits to be $good"; + +ok(run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', $good ])), + "genrsa -3 $good"); +ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout' ])), + "rsa -check"); +ok(run(app([ 'openssl', 'genrsa', '-f4', '-out', 'genrsatest.pem', $good ])), + "genrsa -f4 $good"); +ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout' ])), + "rsa -check"); unlink 'genrsatest.pem'; diff --git a/worker/deps/openssl/openssl/test/recipes/25-test_verify.t b/worker/deps/openssl/openssl/test/recipes/25-test_verify.t index 11bd43090f..11f54d0486 100644 --- a/worker/deps/openssl/openssl/test/recipes/25-test_verify.t +++ b/worker/deps/openssl/openssl/test/recipes/25-test_verify.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -30,7 +30,7 @@ sub verify { run(app([@args])); } -plan tests => 127; +plan tests => 129; # Canonical success ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]), @@ -326,6 +326,12 @@ ok(verify("alt2-cert", "sslserver", ["root-cert"], ["ncca2-cert"], ), ok(verify("alt3-cert", "sslserver", ["root-cert"], ["ncca1-cert", "ncca3-cert"], ), "Name Constraints nested test all permitted"); +ok(verify("goodcn1-cert", "sslserver", ["root-cert"], ["ncca1-cert"], ), + "Name Constraints CNs permitted"); + +ok(!verify("badcn1-cert", "sslserver", ["root-cert"], ["ncca1-cert"], ), + "Name Constraints CNs not permitted"); + ok(!verify("badalt1-cert", "sslserver", ["root-cert"], ["ncca1-cert"], ), "Name Constraints hostname not permitted"); diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp.t b/worker/deps/openssl/openssl/test/recipes/30-test_evp.t index c277fcdfa0..da0eadad25 100644 --- a/worker/deps/openssl/openssl/test/recipes/30-test_evp.t +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -10,10 +10,17 @@ use strict; use warnings; -use OpenSSL::Test qw/:DEFAULT srctop_file/; +use OpenSSL::Test qw/:DEFAULT data_file/; setup("test_evp"); -plan tests => 1; -ok(run(test(["evp_test", srctop_file("test", "evptests.txt")])), - "running evp_test evptests.txt"); +my @files = ( "evpciph.txt", "evpdigest.txt", "evpencod.txt", "evpkdf.txt", + "evpmac.txt", "evppbe.txt", "evppkey.txt", "evppkey_ecc.txt", + "evpcase.txt" ); + +plan tests => scalar(@files); + +foreach my $f ( @files ) { + ok(run(test(["evp_test", data_file("$f")])), + "running evp_test $f"); +} diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpcase.txt b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpcase.txt new file mode 100644 index 0000000000..9f0955b97d --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpcase.txt @@ -0,0 +1,47 @@ +# +# Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# Tests start with one of these keywords +# Cipher Decrypt Derive Digest Encoding KDF MAC PBE +# PrivPubKeyPair Sign Verify VerifyRecover +# and continue until a blank line. Lines starting with a pound sign, +# like this prolog, are ignored. + +# These tests exercise the case insensitive handling of object names. +# They are contrived + +# Some name is case insensitive tests +Cipher = Aes-128-eCb +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3AD77BB40D7A3660A89ECAF32466EF97 + +Cipher = AeS-128-cbC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 73BED6B8E3C1743B7116E69E22229516 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 3FF1CAA1681FAC09120ECA307586E1A7 + +Cipher = aES-128-CTR +Key = AE6852F8121067CC4BF7A5765577F39E +IV = 00000030000000000000000000000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = E4095D4FB7A7B3792D6175A3261311B8 + +Cipher = AES-128-GcM +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = ab6e47d42cec13bdf53a67b21257bddf +Plaintext = 00000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78 + +Digest = shA512 +Input = "abc" +Output = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph.txt b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph.txt new file mode 100644 index 0000000000..7e78e08fc2 --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpciph.txt @@ -0,0 +1,2270 @@ +# +# Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# Tests start with one of these keywords +# Cipher Decrypt Derive Digest Encoding KDF MAC PBE +# PrivPubKeyPair Sign Verify VerifyRecover +# and continue until a blank line. Lines starting with a pound sign, +# like this prolog, are ignored. + + +# DES EDE3 CFB1 +# echo -n "Hello World" | +# apps/openssl enc -des-ede3-cfb1 \ +# -K 000102030405060708090A0B0C0D0E0F1011121314151617 -iv 0001020304050607 | +# xxd -ps -u + +Cipher = DES-EDE3-CFB1 +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +IV = 0001020304050607 +Plaintext = "Hello World" +Ciphertext = 3CF55D656E9C0664513358 + +Cipher = DES-EDE3-CFB1 +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +IV = 0001020304050607 +Operation = DECRYPT +Plaintext = "Hello World" +Ciphertext = 3CF55D656E9C0664513358 + +# AES 128 ECB tests (from FIPS-197 test vectors, encrypt) + +Cipher = AES-128-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 69C4E0D86A7B0430D8CDB78070B4C55A + +# AES 192 ECB tests (from FIPS-197 test vectors, encrypt) + +Cipher = AES-192-ECB +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = DDA97CA4864CDFE06EAF70A0EC0D7191 + + +# AES 256 ECB tests (from FIPS-197 test vectors, encrypt) + +Cipher = AES-256-ECB +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 8EA2B7CA516745BFEAFC49904B496089 + + +# AES 128 ECB tests (from NIST test vectors, encrypt) + +#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F:1 + +# AES 128 ECB tests (from NIST test vectors, decrypt) + +#AES-128-ECB:00000000000000000000000000000000::44416AC2D1F53C583303917E6BE9EBE0:00000000000000000000000000000000:0 + +# AES 192 ECB tests (from NIST test vectors, decrypt) + +#AES-192-ECB:000000000000000000000000000000000000000000000000::48E31E9E256718F29229319C19F15BA4:00000000000000000000000000000000:0 + +# AES 256 ECB tests (from NIST test vectors, decrypt) + +#AES-256-ECB:0000000000000000000000000000000000000000000000000000000000000000::058CCFFDBBCB382D1F6F56585D8A4ADE:00000000000000000000000000000000:0 + +# AES 128 CBC tests (from NIST test vectors, encrypt) + +#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:8A05FC5E095AF4848A08D328D3688E3D:1 + +# AES 192 CBC tests (from NIST test vectors, encrypt) + +#AES-192-CBC:000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:7BD966D53AD8C1BB85D2ADFAE87BB104:1 + +# AES 256 CBC tests (from NIST test vectors, encrypt) + +#AES-256-CBC:0000000000000000000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:FE3C53653E2F45B56FCD88B2CC898FF0:1 + +# AES 128 CBC tests (from NIST test vectors, decrypt) + +#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:FACA37E0B0C85373DF706E73F7C9AF86:00000000000000000000000000000000:0 + +# AES tests from NIST document SP800-38A +# For all ECB encrypts and decrypts, the transformed sequence is +# AES-bits-ECB:key::plaintext:ciphertext:encdec +# ECB-AES128.Encrypt and ECB-AES128.Decrypt +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3AD77BB40D7A3660A89ECAF32466EF97 + +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = F5D3D58503B9699DE785895A96FDBAAF + +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 43B1CD7F598ECE23881B00E3ED030688 + +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 7B0C785E27E8AD3F8223207104725DD4 + +# ECB-AES192.Encrypt and ECB-AES192.Decrypt +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = BD334F1D6E45F25FF712A214571FA5CC + +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 974104846D0AD3AD7734ECB3ECEE4EEF + +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = EF7AFD2270E2E60ADCE0BA2FACE6444E + +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 9A4B41BA738D6C72FB16691603C18E0E + +# ECB-AES256.Encrypt and ECB-AES256.Decrypt +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = F3EED1BDB5D2A03C064B5A7E3DB181F8 + +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 591CCB10D410ED26DC5BA74A31362870 + +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = B6ED21B99CA6F4F9F153E7B1BEAFED1D + +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 23304B7A39F9F3FF067D8D8F9E24ECC7 + +# For all CBC encrypts and decrypts, the transformed sequence is +# AES-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec +# CBC-AES128.Encrypt and CBC-AES128.Decrypt +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 7649ABAC8119B246CEE98E9B12E9197D + +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 7649ABAC8119B246CEE98E9B12E9197D +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 5086CB9B507219EE95DB113A917678B2 + +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 5086CB9B507219EE95DB113A917678B2 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 73BED6B8E3C1743B7116E69E22229516 + +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 73BED6B8E3C1743B7116E69E22229516 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 3FF1CAA1681FAC09120ECA307586E1A7 + +# CBC-AES192.Encrypt and CBC-AES192.Decrypt +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 4F021DB243BC633D7178183A9FA071E8 + +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 4F021DB243BC633D7178183A9FA071E8 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = B4D9ADA9AD7DEDF4E5E738763F69145A + +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = B4D9ADA9AD7DEDF4E5E738763F69145A +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 571B242012FB7AE07FA9BAAC3DF102E0 + +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 571B242012FB7AE07FA9BAAC3DF102E0 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 08B0E27988598881D920A9E64F5615CD + +# CBC-AES256.Encrypt and CBC-AES256.Decrypt +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = F58C4C04D6E5F1BA779EABFB5F7BFBD6 + +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = F58C4C04D6E5F1BA779EABFB5F7BFBD6 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 9CFC4E967EDB808D679F777BC6702C7D + +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 9CFC4E967EDB808D679F777BC6702C7D +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 39F23369A9D9BACFA530E26304231461 + +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 39F23369A9D9BACFA530E26304231461 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = B2EB05E2C39BE9FCDA6C19078C6A9D1B + +# We don't support CFB{1,8}-AESxxx.{En,De}crypt +# For all CFB128 encrypts and decrypts, the transformed sequence is +# AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec +# CFB128-AES128.Encrypt +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 3B3FD92EB72DAD20333449F8E83CFB4A +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 26751F67A3CBB140B1808CF187A4F4DF +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6 + +# CFB128-AES128.Decrypt +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 3B3FD92EB72DAD20333449F8E83CFB4A +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 26751F67A3CBB140B1808CF187A4F4DF +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6 + +# CFB128-AES192.Encrypt +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = CDC80D6FDDF18CAB34C25909C99A4174 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 67CE7F7F81173621961A2B70171D3D7A + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 67CE7F7F81173621961A2B70171D3D7A +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF + +# CFB128-AES192.Decrypt +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = CDC80D6FDDF18CAB34C25909C99A4174 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 67CE7F7F81173621961A2B70171D3D7A + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 67CE7F7F81173621961A2B70171D3D7A +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF + +# CFB128-AES256.Encrypt +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DC7E84BFDA79164B7ECD8486985D3860 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 39FFED143B28B1C832113C6331E5407B + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 39FFED143B28B1C832113C6331E5407B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = DF10132415E54B92A13ED0A8267AE2F9 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DF10132415E54B92A13ED0A8267AE2F9 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 75A385741AB9CEF82031623D55B1E471 + +# CFB128-AES256.Decrypt +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DC7E84BFDA79164B7ECD8486985D3860 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 39FFED143B28B1C832113C6331E5407B + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 39FFED143B28B1C832113C6331E5407B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = DF10132415E54B92A13ED0A8267AE2F9 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DF10132415E54B92A13ED0A8267AE2F9 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 75A385741AB9CEF82031623D55B1E471 + +# For all OFB encrypts and decrypts, the transformed sequence is +# AES-bits-CFB:key:IV/output':plaintext:ciphertext:encdec +# OFB-AES128.Encrypt +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 7789508D16918F03F53C52DAC54ED825 + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9740051E9C5FECF64344F7A82260EDCC + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 304C6528F659C77866A510D9C1D6AE5E + +# OFB-AES128.Decrypt +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 7789508D16918F03F53C52DAC54ED825 + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9740051E9C5FECF64344F7A82260EDCC + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 304C6528F659C77866A510D9C1D6AE5E + +# OFB-AES192.Encrypt +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = FCC28B8D4C63837C09E81700C1100401 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A + +# OFB-AES192.Decrypt +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = FCC28B8D4C63837C09E81700C1100401 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A + +# OFB-AES256.Encrypt +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0126141D67F37BE8538F5A8BE740E484 + +# OFB-AES256.Decrypt +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0126141D67F37BE8538F5A8BE740E484 + + +# AES Counter test vectors from RFC3686 +Cipher = aes-128-ctr +Key = AE6852F8121067CC4BF7A5765577F39E +IV = 00000030000000000000000000000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = E4095D4FB7A7B3792D6175A3261311B8 + +Cipher = aes-128-ctr +Key = 7E24067817FAE0D743D6CE1F32539163 +IV = 006CB6DBC0543B59DA48D90B00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = 5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28 + +Cipher = aes-128-ctr +Key = 7691BE035E5020A8AC6E618529F9A0DC +IV = 00E0017B27777F3F4A1786F000000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F + +Cipher = aes-192-ctr +Key = 16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515 +IV = 0000004836733C147D6D93CB00000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 4B55384FE259C9C84E7935A003CBE928 + +Cipher = aes-192-ctr +Key = 7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A +IV = 0096B03B020C6EADC2CB500D00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = 453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00 + +Cipher = aes-192-ctr +Key = 02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE +IV = 0007BDFD5CBD60278DCC091200000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = 96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935 + +Cipher = aes-256-ctr +Key = 776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104 +IV = 00000060DB5672C97AA8F0B200000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 145AD01DBF824EC7560863DC71E3E0C0 + +Cipher = aes-256-ctr +Key = F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884 +IV = 00FAAC24C1585EF15A43D87500000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C + +Cipher = aes-256-ctr +Key = FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D +IV = 001CC5B751A51D70A1C1114800000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8 + +# Self-generated vector to trigger false carry on big-endian platforms +Cipher = aes-128-ctr +Key = 7E24067817FAE0D743D6CE1F32539163 +IV = 00000000000000007FFFFFFFFFFFFFFF +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = A2D459477E6432BD74184B1B5370D2243CDC202BC43583B2A55D288CDBBD1E03 + +# DES ECB tests (from destest) + +Cipher = DES-ECB +Key = 0000000000000000 +Plaintext = 0000000000000000 +Ciphertext = 8CA64DE9C1B123A7 + +Cipher = DES-ECB +Key = FFFFFFFFFFFFFFFF +Plaintext = FFFFFFFFFFFFFFFF +Ciphertext = 7359B2163E4EDC58 + +Cipher = DES-ECB +Key = 3000000000000000 +Plaintext = 1000000000000001 +Ciphertext = 958E6E627A05557B + +Cipher = DES-ECB +Key = 1111111111111111 +Plaintext = 1111111111111111 +Ciphertext = F40379AB9E0EC533 + +Cipher = DES-ECB +Key = 0123456789ABCDEF +Plaintext = 1111111111111111 +Ciphertext = 17668DFC7292532D + +Cipher = DES-ECB +Key = 1111111111111111 +Plaintext = 0123456789ABCDEF +Ciphertext = 8A5AE1F81AB8F2DD + +Cipher = DES-ECB +Key = FEDCBA9876543210 +Plaintext = 0123456789ABCDEF +Ciphertext = ED39D950FA74BCC4 + +# DESX-CBC tests (from destest) +Cipher = DESX-CBC +Key = 0123456789abcdeff1e0d3c2b5a49786fedcba9876543210 +IV = fedcba9876543210 +Plaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000 +Ciphertext = 846B2914851E9A2954732F8AA0A611C115CDC2D7951B1053A63C5E03B21AA3C4 + +# DES EDE3 CBC tests (from destest) +Cipher = DES-EDE3-CBC +Key = 0123456789abcdeff1e0d3c2b5a49786fedcba9876543210 +IV = fedcba9876543210 +Plaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000 +Ciphertext = 3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675 + +# RC4 tests (from rc4test) +Cipher = RC4 +Key = 0123456789abcdef0123456789abcdef +Plaintext = 0123456789abcdef +Ciphertext = 75b7878099e0c596 + +Cipher = RC4 +Key = 0123456789abcdef0123456789abcdef +Plaintext = 0000000000000000 +Ciphertext = 7494c2e7104b0879 + +Cipher = RC4 +Key = 00000000000000000000000000000000 +Plaintext = 0000000000000000 +Ciphertext = de188941a3375d3a + +Cipher = RC4 +Key = ef012345ef012345ef012345ef012345 +Plaintext = 0000000000000000000000000000000000000000 +Ciphertext = d6a141a7ec3c38dfbd615a1162e1c7ba36b67858 + +Cipher = RC4 +Key = 0123456789abcdef0123456789abcdef +Plaintext = 123456789ABCDEF0123456789ABCDEF0123456789ABCDEF012345678 +Ciphertext = 66a0949f8af7d6891f7f832ba833c00c892ebe30143ce28740011ecf + +Cipher = RC4 +Key = ef012345ef012345ef012345ef012345 +Plaintext = 00000000000000000000 +Ciphertext = d6a141a7ec3c38dfbd61 + +# Camellia tests from RFC3713 +# For all ECB encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-ECB:key::plaintext:ciphertext:encdec +Cipher = CAMELLIA-128-ECB +Key = 0123456789abcdeffedcba9876543210 +Plaintext = 0123456789abcdeffedcba9876543210 +Ciphertext = 67673138549669730857065648eabe43 + +Cipher = CAMELLIA-192-ECB +Key = 0123456789abcdeffedcba98765432100011223344556677 +Plaintext = 0123456789abcdeffedcba9876543210 +Ciphertext = b4993401b3e996f84ee5cee7d79b09b9 + +Cipher = CAMELLIA-256-ECB +Key = 0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff +Plaintext = 0123456789abcdeffedcba9876543210 +Ciphertext = 9acc237dff16d76c20ef7c919e3a7509 + +# ECB-CAMELLIA128.Encrypt +Cipher = CAMELLIA-128-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 77CF412067AF8270613529149919546F + +Cipher = CAMELLIA-192-ECB +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = B22F3C36B72D31329EEE8ADDC2906C68 + +Cipher = CAMELLIA-256-ECB +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 2EDF1F3418D53B88841FC8985FB1ECF2 + + +# ECB-CAMELLIA128.Encrypt and ECB-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 432FC5DCD628115B7C388D770B270C96 + +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 0BE1F14023782A22E8384C5ABB7FAB2B + +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = A0A1ABCD1893AB6FE0FE5B65DF5F8636 + +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = E61925E0D5DFAA9BB29F815B3076E51A + + +# ECB-CAMELLIA192.Encrypt and ECB-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CCCC6C4E138B45848514D48D0D3439D3 + +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 5713C62C14B2EC0F8393B6AFD6F5785A + +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = B40ED2B60EB54D09D030CF511FEEF366 + +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 909DBD95799096748CB27357E73E1D26 + + +# ECB-CAMELLIA256.Encrypt and ECB-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = BEFD219B112FA00098919CD101C9CCFA + +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = C91D3A8F1AEA08A9386CF4B66C0169EA + +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = A623D711DC5F25A51BB8A80D56397D28 + +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 7960109FB6DC42947FCFE59EA3C5EB6B + + +# For all CBC encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec +# CBC-CAMELLIA128.Encrypt and CBC-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 1607CF494B36BBF00DAEB0B503C831AB + +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 1607CF494B36BBF00DAEB0B503C831AB +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = A2F2CF671629EF7840C5A5DFB5074887 + +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A2F2CF671629EF7840C5A5DFB5074887 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 0F06165008CF8B8B5A63586362543E54 + +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 36A84CDAFD5F9A85ADA0F0A993D6D577 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 74C64268CDB8B8FAF5B34E8AF3732980 + + +# CBC-CAMELLIA192.Encrypt and CBC-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 2A4830AB5AC4A1A2405955FD2195CF93 + +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 2A4830AB5AC4A1A2405955FD2195CF93 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 5D5A869BD14CE54264F892A6DD2EC3D5 + +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 5D5A869BD14CE54264F892A6DD2EC3D5 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 37D359C3349836D884E310ADDF68C449 + +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 37D359C3349836D884E310ADDF68C449 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 01FAAA930B4AB9916E9668E1428C6B08 + + +# CBC-CAMELLIA256.Encrypt and CBC-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = E6CFA35FC02B134A4D2C0B6737AC3EDA + +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E6CFA35FC02B134A4D2C0B6737AC3EDA +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 36CBEB73BD504B4070B1B7DE2B21EB50 + +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 36CBEB73BD504B4070B1B7DE2B21EB50 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = E31A6055297D96CA3330CDF1B1860A83 + +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E31A6055297D96CA3330CDF1B1860A83 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 5D563F6D1CCCF236051C0C5C1C58F28F + + +# We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt +# For all CFB128 encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec +# CFB128-CAMELLIA128.Encrypt +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 14F7646187817EB586599146B82BD719 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = A53D28BB82DF741103EA4F921A44880B + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A53D28BB82DF741103EA4F921A44880B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9C2157A664626D1DEF9EA420FDE69B96 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 9C2157A664626D1DEF9EA420FDE69B96 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 742A25F0542340C7BAEF24CA8482BB09 + + +# CFB128-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 14F7646187817EB586599146B82BD719 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = A53D28BB82DF741103EA4F921A44880B + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A53D28BB82DF741103EA4F921A44880B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9C2157A664626D1DEF9EA420FDE69B96 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 9C2157A664626D1DEF9EA420FDE69B96 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 742A25F0542340C7BAEF24CA8482BB09 + + +# CFB128-CAMELLIA192.Encrypt +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = C832BB9780677DAA82D9B6860DCD565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 86F8491627906D780C7A6D46EA331F98 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 86F8491627906D780C7A6D46EA331F98 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 69511CCE594CF710CB98BB63D7221F01 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 69511CCE594CF710CB98BB63D7221F01 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D5B5378A3ABED55803F25565D8907B84 + + +# CFB128-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = C832BB9780677DAA82D9B6860DCD565E +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 86F8491627906D780C7A6D46EA331F98 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 86F8491627906D780C7A6D46EA331F98 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 69511CCE594CF710CB98BB63D7221F01 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 69511CCE594CF710CB98BB63D7221F01 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D5B5378A3ABED55803F25565D8907B84 + + +# CFB128-CAMELLIA256.Encrypt +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = CF6107BB0CEA7D7FB1BD31F5E7B06C93 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 89BEDB4CCDD864EA11BA4CBE849B5E2B + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 89BEDB4CCDD864EA11BA4CBE849B5E2B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 555FC3F34BDD2D54C62D9E3BF338C1C4 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 555FC3F34BDD2D54C62D9E3BF338C1C4 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 5953ADCE14DB8C7F39F1BD39F359BFFA + + +# CFB128-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = CF6107BB0CEA7D7FB1BD31F5E7B06C93 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 89BEDB4CCDD864EA11BA4CBE849B5E2B + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 89BEDB4CCDD864EA11BA4CBE849B5E2B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 555FC3F34BDD2D54C62D9E3BF338C1C4 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 555FC3F34BDD2D54C62D9E3BF338C1C4 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 5953ADCE14DB8C7F39F1BD39F359BFFA + + +# For all OFB encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-OFB:key:IV/output':plaintext:ciphertext:encdec +# OFB-CAMELLIA128.Encrypt +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 25623DB569CA51E01482649977E28D84 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = C776634A60729DC657D12B9FCA801E98 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D776379BE0E50825E681DA1A4C980E8E + + +# OFB-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 25623DB569CA51E01482649977E28D84 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = C776634A60729DC657D12B9FCA801E98 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D776379BE0E50825E681DA1A4C980E8E + + +# OFB-CAMELLIA192.Encrypt +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 8ECEB7D0350D72C7F78562AEBDF99339 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = BDD62DBBB9700846C53B507F544696F0 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = E28014E046B802F385C4C2E13EAD4A72 + + +# OFB-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 8ECEB7D0350D72C7F78562AEBDF99339 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = BDD62DBBB9700846C53B507F544696F0 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = E28014E046B802F385C4C2E13EAD4A72 + + +# OFB-CAMELLIA256.Encrypt +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 127AD97E8E3994E4820027D7BA109368 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 6BFF6265A6A6B7A535BC65A80B17214E + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0A4A0404E26AA78A27CB271E8BF3CF20 + + +# OFB-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 127AD97E8E3994E4820027D7BA109368 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 6BFF6265A6A6B7A535BC65A80B17214E + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0A4A0404E26AA78A27CB271E8BF3CF20 + + +# Camellia test vectors from RFC5528 +Cipher = CAMELLIA-128-CTR +Key = AE6852F8121067CC4BF7A5765577F39E +IV = 00000030000000000000000000000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = D09DC29A8214619A20877C76DB1F0B3F + +Cipher = CAMELLIA-128-CTR +Key = 7E24067817FAE0D743D6CE1F32539163 +IV = 006CB6DBC0543B59DA48D90B00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = DBF3C78DC08396D4DA7C907765BBCB442B8E8E0F31F0DCA72C7417E35360E048 + +Cipher = CAMELLIA-128-CTR +Key = 7691BE035E5020A8AC6E618529F9A0DC +IV = 00E0017B27777F3F4A1786F000000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = B19D1FCDCB75EB882F849CE24D85CF739CE64B2B5C9D73F14F2D5D9DCE9889CDDF508696 + +Cipher = CAMELLIA-192-CTR +Key = 16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515 +IV = 0000004836733C147D6D93CB00000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 2379399E8A8D2B2B16702FC78B9E9696 + +Cipher = CAMELLIA-192-CTR +Key = 7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A +IV = 0096B03B020C6EADC2CB500D00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = 7DEF34F7A5D0E415674B7FFCAE67C75DD018B86FF23051E056392A99F35A4CED + +Cipher = CAMELLIA-192-CTR +Key = 02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE +IV = 0007BDFD5CBD60278DCC091200000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = 5710E556E1487A20B5AC0E73F19E4E7876F37FDC91B1EF4D4DADE8E666A64D0ED557AB57 + +Cipher = CAMELLIA-256-CTR +Key = 776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104 +IV = 00000060DB5672C97AA8F0B200000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 3401F9C8247EFFCEBD6994714C1BBB11 + +Cipher = CAMELLIA-256-CTR +Key = F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884 +IV = 00FAAC24C1585EF15A43D87500000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = D6C30392246F7808A83C2B22A8839E45E51CD48A1CDF406EBC9CC2D3AB834108 + +Cipher = CAMELLIA-256-CTR +Key = FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D +IV = 001CC5B751A51D70A1C1114800000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = A4DA23FCE6A5FFAA6D64AE9A0652A42CD161A34B65F9679F75C01F101F71276F15EF0D8D + +# SEED test vectors from RFC4269 +Cipher = SEED-ECB +Key = 00000000000000000000000000000000 +Operation = DECRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = 5EBAC6E0054E166819AFF1CC6D346CDB + +Cipher = SEED-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 00000000000000000000000000000000 +Ciphertext = C11F22F20140505084483597E4370F43 + +Cipher = SEED-ECB +Key = 4706480851E61BE85D74BFB3FD956185 +Operation = DECRYPT +Plaintext = 83A2F8A288641FB9A4E9A5CC2F131C7D +Ciphertext = EE54D13EBCAE706D226BC3142CD40D4A + +Cipher = SEED-ECB +Key = 28DBC3BC49FFD87DCFA509B11D422BE7 +Operation = DECRYPT +Plaintext = B41E6BE2EBA84A148E2EED84593C5EC7 +Ciphertext = 9B9B7BFCD1813CB95D0B3618F40F5122 + +Cipher = SEED-ECB +Key = 00000000000000000000000000000000 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = 5EBAC6E0054E166819AFF1CC6D346CDB + +Cipher = SEED-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 00000000000000000000000000000000 +Ciphertext = C11F22F20140505084483597E4370F43 + +Cipher = SEED-ECB +Key = 4706480851E61BE85D74BFB3FD956185 +Operation = ENCRYPT +Plaintext = 83A2F8A288641FB9A4E9A5CC2F131C7D +Ciphertext = EE54D13EBCAE706D226BC3142CD40D4A + +Cipher = SEED-ECB +Key = 28DBC3BC49FFD87DCFA509B11D422BE7 +Operation = ENCRYPT +Plaintext = B41E6BE2EBA84A148E2EED84593C5EC7 +Ciphertext = 9B9B7BFCD1813CB95D0B3618F40F5122 + + +# AES CCM 256 bit key +Cipher = aes-256-ccm +Key = 1bde3251d41a8b5ea013c195ae128b218b3e0306376357077ef1c1c78548b92e +IV = 5b8e40746f6b98e00f1d13ff41 +AAD = c17a32514eb6103f3249e076d4c871dc97e04b286699e54491dc18f6d734d4c0 +Tag = 2024931d73bca480c24a24ece6b6c2bf +Plaintext = 53bd72a97089e312422bf72e242377b3c6ee3e2075389b999c4ef7f28bd2b80a +Ciphertext = 9a5fcccdb4cf04e7293d2775cc76a488f042382d949b43b7d6bb2b9864786726 + +Cipher = aes-256-ccm +Key = 1bde3251d41a8b5ea013c195ae128b218b3e0306376357077ef1c1c78548b92e +IV = 5b8e40746f6b98e00f1d13ff41 +AAD = c17a32514eb6103f3249e076d4c871dc97e04b286699e54491dc18f6d734d4c0 +Tag = 2024931d73bca480c24a24ece6b6c2be +Plaintext = 53bd72a97089e312422bf72e242377b3c6ee3e2075389b999c4ef7f28bd2b80a +Ciphertext = 9a5fcccdb4cf04e7293d2775cc76a488f042382d949b43b7d6bb2b9864786726 +Operation = DECRYPT +Result = CIPHERUPDATE_ERROR + +# AES GCM test vectors from http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-spec.pdf +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 58e2fccefa7e3061367f1d57a4e7455a +Plaintext = +Ciphertext = + +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = ab6e47d42cec13bdf53a67b21257bddf +Plaintext = 00000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = +Tag = 4d5c2af327cd64a62cf35abd2ba6fab4 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 +Ciphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 5bc94fbc3221a5db94fae95ae7121a47 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbad +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 3612d2e79e3b0785561be14aaca2fccb +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 619cc5aefffe0bfa462af43c1699d050 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 619cc5aefffe0bfa462af43c1699d051 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5 +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +Cipher = aes-192-gcm +Key = 000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = cd33b28ac773f74ba00ed1f312572435 +Plaintext = +Ciphertext = + +Cipher = aes-192-gcm +Key = 000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 2ff58d80033927ab8ef4d4587514f0fb +Plaintext = 00000000000000000000000000000000 +Ciphertext = 98e7247c07f0fe411c267e4384b0f600 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = cafebabefacedbaddecaf888 +AAD = +Tag = 9924a7c8587336bfb118024db8674a14 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 +Ciphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = cafebabefacedbaddecaf888 +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 2519498e80f1478f37ba55bd6d27618c +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = cafebabefacedbad +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 65dcc57fcf623a24094fcca40d3533f8 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = dcf566ff291c25bbb8568fc3d376a6d9 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = dcf566ff291c25bbb8568fc3d376a6d8 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +Cipher = aes-256-gcm +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 530f8afbc74536b9a963b4f1c4cb738b +Plaintext = +Ciphertext = + +Cipher = aes-256-gcm +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = d0d1c8a799996bf0265b98b5d48ab919 +Plaintext = 00000000000000000000000000000000 +Ciphertext = cea7403d4d606b6e074ec5d3baf39d18 + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = +Tag = b094dac5d93471bdec1a502270e3cc6c +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 +Ciphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 76fc6ece0f4e1768cddf8853bb2d551b +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662 + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbad +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 3a337dbf46a792c45e454913fe2ea8f2 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = a44a8266ee1c8eb0c8b5d4cf5ae9f19a +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = a44a8266ee1c8eb0c8b5d4cf5ae9f19b +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +# local add-ons, primarily streaming ghash tests +# 128 bytes aad +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad +Tag = 5fea793a2d6f974d37e68e0cb8ff9492 +Plaintext = +Ciphertext = + +# 48 bytes plaintext +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 9dd0a376b08e40eb00c35f29f9ea61a4 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0 + +# 80 bytes plaintext +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 98885a3a22bd4742fe7b72172193b163 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d5270291 + +# 128 bytes plaintext +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = cac45f60e31efd3b5a43b98a22ce1aa1 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d527029195b84d1b96c690ff2f2de30bf2ec89e00253786e126504f0dab90c48a30321de3345e6b0461e7c9e6c6b7afedde83f40 + +# 192 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +AAD = +Tag = 566f8ef683078bfdeeffa869d751a017 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606 + +# 240 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +AAD = +Tag = fd0c7011ff07f0071324bdfb2d0f3a29 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606872ca10dee15b3249b1a1b958f23134c4bccb7d03200bce420a2f8eb66dcf3644d1423c1b5699003c13ecef4bf38a3b6 + +# 288 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +AAD = +Tag = 8b307f6b33286d0ab026a9ed3fe1e85f +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606872ca10dee15b3249b1a1b958f23134c4bccb7d03200bce420a2f8eb66dcf3644d1423c1b5699003c13ecef4bf38a3b60eedc34033bac1902783dc6d89e2e774188a439c7ebcc0672dbda4ddcfb2794613b0be41315ef778708a70ee7d75165c + +# 80 bytes plaintext, submitted by Intel +Cipher = aes-128-gcm +Key = 843ffcf5d2b72694d19ed01d01249412 +IV = dbcca32ebf9b804617c3aa9e +AAD = 00000000000000000000000000000000101112131415161718191a1b1c1d1e1f +Tag = 3b629ccfbc1119b7319e1dce2cd6fd6d +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f +Ciphertext = 6268c6fa2a80b2d137467f092f657ac04d89be2beaa623d61b5a868c8f03ff95d3dcee23ad2f1ab3a6c80eaf4b140eb05de3457f0fbc111a6b43d0763aa422a3013cf1dc37fe417d1fbfc449b75d4cc5 + +#AES OCB Test vectors +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 197B9C3C441D3C83EAFB2BEF633B9182 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 0001020304050607 +Tag = 16DC76A46D47E1EAD537209E8A96D14E +Plaintext = 0001020304050607 +Ciphertext = 92B657130A74B85A + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 0001020304050607 +Tag = 98B91552C8C009185044E30A6EB2FE21 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 971EFFCAE19AD4716F88E87B871FBEED +Plaintext = 0001020304050607 +Ciphertext = 92B657130A74B85A + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F +Tag = 776C9924D6723A1FC4524532AC3E5BEB +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F +Tag = 7DDB8E6CEA6814866212509619B19CC6 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 13CC8B747807121A4CBB3E4BD6B456AF +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F1011121314151617 +Tag = 5FA94FC3F38820F1DC3F3D1FD4E55E1C +Plaintext = 000102030405060708090A0B0C0D0E0F1011121314151617 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122FCFCEE7A2A8D4D48 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F1011121314151617 +Tag = 282026DA3068BC9FA118681D559F10F6 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 6EF2F52587FDA0ED97DC7EEDE241DF68 +Plaintext = 000102030405060708090A0B0C0D0E0F1011121314151617 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122FCFCEE7A2A8D4D48 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Tag = B2A040DD3BD5164372D76D7BB6824240 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Tag = E1E072633BADE51A60E85951D9C42A1B +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 4A3BAE824465CFDAF8C41FC50C7DF9D9 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 659C623211DEEA0DE30D2C381879F4C8 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB68C65778B058A635 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 7AEB7A69A1687DD082CA27B0D9A37096 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 060C8467F4ABAB5E8B3C2067A2E115DC +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB68C65778B058A635 + +#AES OCB Non standard test vectors - generated from reference implementation +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 1b6c44f34e3abb3cbf8976e7 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = 09a4fd29de949d9a9aa9924248422097ad4883b4713e6c214ff6567ada08a96766fc4e2ee3e3a5a1 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B0C0D0E +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 1ad62009901f40cba7cd7156f94a7324 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = 5e2fa7367ffbdb3938845cfd415fcc71ec79634eb31451609d27505f5e2978f43c44213d8fa441ee + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = C203F98CE28F7DAD3F31C021 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F3031 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C822D6 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 8346D7D47C5D893ED472F5AB +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F4041 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F714FF + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 5822A9A70FDF55D29D2984A6 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F5051 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB8294170634D + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 81772B6741ABB4ECA9D2DEB2 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F6061 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB829417001E54E15A7576C4DF32366E0F439C7050FAA + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 3E52A01D068DE85456DB03B7 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB829417001E54E15A7576C4DF32366E0F439C7051CB4824B8114E9A720CBC1CE0185B156B486 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 3E52A01D068DE85456DB03B6 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB829417001E54E15A7576C4DF32366E0F439C7051CB4824B8114E9A720CBC1CE0185B156B486 +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +# AES XTS test vectors from IEEE Std 1619-2007 +Cipher = aes-128-xts +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 00000000000000000000000000000000 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 917cf69ebd68b2ec9b9fe9a3eadda692cd43d2f59598ed858c02c2652fbf922e + +Cipher = aes-128-xts +Key = 1111111111111111111111111111111122222222222222222222222222222222 +IV = 33333333330000000000000000000000 +Plaintext = 4444444444444444444444444444444444444444444444444444444444444444 +Ciphertext = c454185e6a16936e39334038acef838bfb186fff7480adc4289382ecd6d394f0 + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f022222222222222222222222222222222 +IV = 33333333330000000000000000000000 +Plaintext = 4444444444444444444444444444444444444444444444444444444444444444 +Ciphertext = af85336b597afc1a900b2eb21ec949d292df4c047e0b21532186a5971a227a89 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f4341332e4ca60482a4ba1a03b3e65008fc5da76b70bf1690db4eae29c5f1badd03c5ccf2a55d705ddcd86d449511ceb7ec30bf12b1fa35b913f9f747a8afd1b130e94bff94effd01a91735ca1726acd0b197c4e5b03393697e126826fb6bbde8ecc1e08298516e2c9ed03ff3c1b7860f6de76d4cecd94c8119855ef5297ca67e9f3e7ff72b1e99785ca0a7e7720c5b36dc6d72cac9574c8cbbc2f801e23e56fd344b07f22154beba0f08ce8891e643ed995c94d9a69c9f1b5f499027a78572aeebd74d20cc39881c213ee770b1010e4bea718846977ae119f7a023ab58cca0ad752afe656bb3c17256a9f6e9bf19fdd5a38fc82bbe872c5539edb609ef4f79c203ebb140f2e583cb2ad15b4aa5b655016a8449277dbd477ef2c8d6c017db738b18deb4a427d1923ce3ff262735779a418f20a282df920147beabe421ee5319d0568 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 01000000000000000000000000000000 +Plaintext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f4341332e4ca60482a4ba1a03b3e65008fc5da76b70bf1690db4eae29c5f1badd03c5ccf2a55d705ddcd86d449511ceb7ec30bf12b1fa35b913f9f747a8afd1b130e94bff94effd01a91735ca1726acd0b197c4e5b03393697e126826fb6bbde8ecc1e08298516e2c9ed03ff3c1b7860f6de76d4cecd94c8119855ef5297ca67e9f3e7ff72b1e99785ca0a7e7720c5b36dc6d72cac9574c8cbbc2f801e23e56fd344b07f22154beba0f08ce8891e643ed995c94d9a69c9f1b5f499027a78572aeebd74d20cc39881c213ee770b1010e4bea718846977ae119f7a023ab58cca0ad752afe656bb3c17256a9f6e9bf19fdd5a38fc82bbe872c5539edb609ef4f79c203ebb140f2e583cb2ad15b4aa5b655016a8449277dbd477ef2c8d6c017db738b18deb4a427d1923ce3ff262735779a418f20a282df920147beabe421ee5319d0568 +Ciphertext = 264d3ca8512194fec312c8c9891f279fefdd608d0c027b60483a3fa811d65ee59d52d9e40ec5672d81532b38b6b089ce951f0f9c35590b8b978d175213f329bb1c2fd30f2f7f30492a61a532a79f51d36f5e31a7c9a12c286082ff7d2394d18f783e1a8e72c722caaaa52d8f065657d2631fd25bfd8e5baad6e527d763517501c68c5edc3cdd55435c532d7125c8614deed9adaa3acade5888b87bef641c4c994c8091b5bcd387f3963fb5bc37aa922fbfe3df4e5b915e6eb514717bdd2a74079a5073f5c4bfd46adf7d282e7a393a52579d11a028da4d9cd9c77124f9648ee383b1ac763930e7162a8d37f350b2f74b8472cf09902063c6b32e8c2d9290cefbd7346d1c779a0df50edcde4531da07b099c638e83a755944df2aef1aa31752fd323dcb710fb4bfbb9d22b925bc3577e1b8949e729a90bbafeacf7f7879e7b1147e28ba0bae940db795a61b15ecf4df8db07b824bb062802cc98a9545bb2aaeed77cb3fc6db15dcd7d80d7d5bc406c4970a3478ada8899b329198eb61c193fb6275aa8ca340344a75a862aebe92eee1ce032fd950b47d7704a3876923b4ad62844bf4a09c4dbe8b4397184b7471360c9564880aedddb9baa4af2e75394b08cd32ff479c57a07d3eab5d54de5f9738b8d27f27a9f0ab11799d7b7ffefb2704c95c6ad12c39f1e867a4b7b1d7818a4b753dfd2a89ccb45e001a03a867b187f225dd + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 02000000000000000000000000000000 +Plaintext = 264d3ca8512194fec312c8c9891f279fefdd608d0c027b60483a3fa811d65ee59d52d9e40ec5672d81532b38b6b089ce951f0f9c35590b8b978d175213f329bb1c2fd30f2f7f30492a61a532a79f51d36f5e31a7c9a12c286082ff7d2394d18f783e1a8e72c722caaaa52d8f065657d2631fd25bfd8e5baad6e527d763517501c68c5edc3cdd55435c532d7125c8614deed9adaa3acade5888b87bef641c4c994c8091b5bcd387f3963fb5bc37aa922fbfe3df4e5b915e6eb514717bdd2a74079a5073f5c4bfd46adf7d282e7a393a52579d11a028da4d9cd9c77124f9648ee383b1ac763930e7162a8d37f350b2f74b8472cf09902063c6b32e8c2d9290cefbd7346d1c779a0df50edcde4531da07b099c638e83a755944df2aef1aa31752fd323dcb710fb4bfbb9d22b925bc3577e1b8949e729a90bbafeacf7f7879e7b1147e28ba0bae940db795a61b15ecf4df8db07b824bb062802cc98a9545bb2aaeed77cb3fc6db15dcd7d80d7d5bc406c4970a3478ada8899b329198eb61c193fb6275aa8ca340344a75a862aebe92eee1ce032fd950b47d7704a3876923b4ad62844bf4a09c4dbe8b4397184b7471360c9564880aedddb9baa4af2e75394b08cd32ff479c57a07d3eab5d54de5f9738b8d27f27a9f0ab11799d7b7ffefb2704c95c6ad12c39f1e867a4b7b1d7818a4b753dfd2a89ccb45e001a03a867b187f225dd +Ciphertext = fa762a3680b76007928ed4a4f49a9456031b704782e65e16cecb54ed7d017b5e18abd67b338e81078f21edb7868d901ebe9c731a7c18b5e6dec1d6a72e078ac9a4262f860beefa14f4e821018272e411a951502b6e79066e84252c3346f3aa62344351a291d4bedc7a07618bdea2af63145cc7a4b8d4070691ae890cd65733e7946e9021a1dffc4c59f159425ee6d50ca9b135fa6162cea18a939838dc000fb386fad086acce5ac07cb2ece7fd580b00cfa5e98589631dc25e8e2a3daf2ffdec26531659912c9d8f7a15e5865ea8fb5816d6207052bd7128cd743c12c8118791a4736811935eb982a532349e31dd401e0b660a568cb1a4711f552f55ded59f1f15bf7196b3ca12a91e488ef59d64f3a02bf45239499ac6176ae321c4a211ec545365971c5d3f4f09d4eb139bfdf2073d33180b21002b65cc9865e76cb24cd92c874c24c18350399a936ab3637079295d76c417776b94efce3a0ef7206b15110519655c956cbd8b2489405ee2b09a6b6eebe0c53790a12a8998378b33a5b71159625f4ba49d2a2fdba59fbf0897bc7aabd8d707dc140a80f0f309f835d3da54ab584e501dfa0ee977fec543f74186a802b9a37adb3e8291eca04d66520d229e60401e7282bef486ae059aa70696e0e305d777140a7a883ecdcb69b9ff938e8a4231864c69ca2c2043bed007ff3e605e014bcf518138dc3a25c5e236171a2d01d6 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = fd000000000000000000000000000000 +Plaintext = 8e41b78c390b5af9d758bb214a67e9f6bf7727b09ac6124084c37611398fa45daad94868600ed391fb1acd4857a95b466e62ef9f4b377244d1c152e7b30d731aad30c716d214b707aed99eb5b5e580b3e887cf7497465651d4b60e6042051da3693c3b78c14489543be8b6ad0ba629565bba202313ba7b0d0c94a3252b676f46cc02ce0f8a7d34c0ed229129673c1f61aed579d08a9203a25aac3a77e9db60267996db38df637356d9dcd1632e369939f2a29d89345c66e05066f1a3677aef18dea4113faeb629e46721a66d0a7e785d3e29af2594eb67dfa982affe0aac058f6e15864269b135418261fc3afb089472cf68c45dd7f231c6249ba0255e1e033833fc4d00a3fe02132d7bc3873614b8aee34273581ea0325c81f0270affa13641d052d36f0757d484014354d02d6883ca15c24d8c3956b1bd027bcf41f151fd8023c5340e5606f37e90fdb87c86fb4fa634b3718a30bace06a66eaf8f63c4aa3b637826a87fe8cfa44282e92cb1615af3a28e53bc74c7cba1a0977be9065d0c1a5dec6c54ae38d37f37aa35283e048e5530a85c4e7a29d7b92ec0c3169cdf2a805c7604bce60049b9fb7b8eaac10f51ae23794ceba68bb58112e293b9b692ca721b37c662f8574ed4dba6f88e170881c82cddc1034a0ca7e284bf0962b6b26292d836fa9f73c1ac770eef0f2d3a1eaf61d3e03555fd424eedd67e18a18094f888 +Ciphertext = d55f684f81f4426e9fde92a5ff02df2ac896af63962888a97910c1379e20b0a3b1db613fb7fe2e07004329ea5c22bfd33e3dbe4cf58cc608c2c26c19a2e2fe22f98732c2b5cb844cc6c0702d91e1d50fc4382a7eba5635cd602432a2306ac4ce82f8d70c8d9bc15f918fe71e74c622d5cf71178bf6e0b9cc9f2b41dd8dbe441c41cd0c73a6dc47a348f6702f9d0e9b1b1431e948e299b9ec2272ab2c5f0c7be86affa5dec87a0bee81d3d50007edaa2bcfccb35605155ff36ed8edd4a40dcd4b243acd11b2b987bdbfaf91a7cac27e9c5aea525ee53de7b2d3332c8644402b823e94a7db26276d2d23aa07180f76b4fd29b9c0823099c9d62c519880aee7e9697617c1497d47bf3e571950311421b6b734d38b0db91eb85331b91ea9f61530f54512a5a52a4bad589eb69781d537f23297bb459bdad2948a29e1550bf4787e0be95bb173cf5fab17dab7a13a052a63453d97ccec1a321954886b7a1299faaeecae35c6eaaca753b041b5e5f093bf83397fd21dd6b3012066fcc058cc32c3b09d7562dee29509b5839392c9ff05f51f3166aaac4ac5f238038a3045e6f72e48ef0fe8bc675e82c318a268e43970271bf119b81bf6a982746554f84e72b9f00280a320a08142923c23c883423ff949827f29bbacdc1ccdb04938ce6098c95ba6b32528f4ef78eed778b2e122ddfd1cbdd11d1c0a6783e011fc536d63d053260637 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = fe000000000000000000000000000000 +Plaintext = d55f684f81f4426e9fde92a5ff02df2ac896af63962888a97910c1379e20b0a3b1db613fb7fe2e07004329ea5c22bfd33e3dbe4cf58cc608c2c26c19a2e2fe22f98732c2b5cb844cc6c0702d91e1d50fc4382a7eba5635cd602432a2306ac4ce82f8d70c8d9bc15f918fe71e74c622d5cf71178bf6e0b9cc9f2b41dd8dbe441c41cd0c73a6dc47a348f6702f9d0e9b1b1431e948e299b9ec2272ab2c5f0c7be86affa5dec87a0bee81d3d50007edaa2bcfccb35605155ff36ed8edd4a40dcd4b243acd11b2b987bdbfaf91a7cac27e9c5aea525ee53de7b2d3332c8644402b823e94a7db26276d2d23aa07180f76b4fd29b9c0823099c9d62c519880aee7e9697617c1497d47bf3e571950311421b6b734d38b0db91eb85331b91ea9f61530f54512a5a52a4bad589eb69781d537f23297bb459bdad2948a29e1550bf4787e0be95bb173cf5fab17dab7a13a052a63453d97ccec1a321954886b7a1299faaeecae35c6eaaca753b041b5e5f093bf83397fd21dd6b3012066fcc058cc32c3b09d7562dee29509b5839392c9ff05f51f3166aaac4ac5f238038a3045e6f72e48ef0fe8bc675e82c318a268e43970271bf119b81bf6a982746554f84e72b9f00280a320a08142923c23c883423ff949827f29bbacdc1ccdb04938ce6098c95ba6b32528f4ef78eed778b2e122ddfd1cbdd11d1c0a6783e011fc536d63d053260637 +Ciphertext = 72efc1ebfe1ee25975a6eb3aa8589dda2b261f1c85bdab442a9e5b2dd1d7c3957a16fc08e526d4b1223f1b1232a11af274c3d70dac57f83e0983c498f1a6f1aecb021c3e70085a1e527f1ce41ee5911a82020161529cd82773762daf5459de94a0a82adae7e1703c808543c29ed6fb32d9e004327c1355180c995a07741493a09c21ba01a387882da4f62534b87bb15d60d197201c0fd3bf30c1500a3ecfecdd66d8721f90bcc4c17ee925c61b0a03727a9c0d5f5ca462fbfa0af1c2513a9d9d4b5345bd27a5f6e653f751693e6b6a2b8ead57d511e00e58c45b7b8d005af79288f5c7c22fd4f1bf7a898b03a5634c6a1ae3f9fae5de4f296a2896b23e7ed43ed14fa5a2803f4d28f0d3ffcf24757677aebdb47bb388378708948a8d4126ed1839e0da29a537a8c198b3c66ab00712dd261674bf45a73d67f76914f830ca014b65596f27e4cf62de66125a5566df9975155628b400fbfb3a29040ed50faffdbb18aece7c5c44693260aab386c0a37b11b114f1c415aebb653be468179428d43a4d8bc3ec38813eca30a13cf1bb18d524f1992d44d8b1a42ea30b22e6c95b199d8d182f8840b09d059585c31ad691fa0619ff038aca2c39a943421157361717c49d322028a74648113bd8c9d7ec77cf3c89c1ec8718ceff8516d96b34c3c614f10699c9abc4ed0411506223bea16af35c883accdbe1104eef0cfdb54e12fb230a + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = ff000000000000000000000000000000 +Plaintext = 72efc1ebfe1ee25975a6eb3aa8589dda2b261f1c85bdab442a9e5b2dd1d7c3957a16fc08e526d4b1223f1b1232a11af274c3d70dac57f83e0983c498f1a6f1aecb021c3e70085a1e527f1ce41ee5911a82020161529cd82773762daf5459de94a0a82adae7e1703c808543c29ed6fb32d9e004327c1355180c995a07741493a09c21ba01a387882da4f62534b87bb15d60d197201c0fd3bf30c1500a3ecfecdd66d8721f90bcc4c17ee925c61b0a03727a9c0d5f5ca462fbfa0af1c2513a9d9d4b5345bd27a5f6e653f751693e6b6a2b8ead57d511e00e58c45b7b8d005af79288f5c7c22fd4f1bf7a898b03a5634c6a1ae3f9fae5de4f296a2896b23e7ed43ed14fa5a2803f4d28f0d3ffcf24757677aebdb47bb388378708948a8d4126ed1839e0da29a537a8c198b3c66ab00712dd261674bf45a73d67f76914f830ca014b65596f27e4cf62de66125a5566df9975155628b400fbfb3a29040ed50faffdbb18aece7c5c44693260aab386c0a37b11b114f1c415aebb653be468179428d43a4d8bc3ec38813eca30a13cf1bb18d524f1992d44d8b1a42ea30b22e6c95b199d8d182f8840b09d059585c31ad691fa0619ff038aca2c39a943421157361717c49d322028a74648113bd8c9d7ec77cf3c89c1ec8718ceff8516d96b34c3c614f10699c9abc4ed0411506223bea16af35c883accdbe1104eef0cfdb54e12fb230a +Ciphertext = 3260ae8dad1f4a32c5cafe3ab0eb95549d461a67ceb9e5aa2d3afb62dece0553193ba50c75be251e08d1d08f1088576c7efdfaaf3f459559571e12511753b07af073f35da06af0ce0bbf6b8f5ccc5cea500ec1b211bd51f63b606bf6528796ca12173ba39b8935ee44ccce646f90a45bf9ccc567f0ace13dc2d53ebeedc81f58b2e41179dddf0d5a5c42f5d8506c1a5d2f8f59f3ea873cbcd0eec19acbf325423bd3dcb8c2b1bf1d1eaed0eba7f0698e4314fbeb2f1566d1b9253008cbccf45a2b0d9c5c9c21474f4076e02be26050b99dee4fd68a4cf890e496e4fcae7b70f94ea5a9062da0daeba1993d2ccd1dd3c244b8428801495a58b216547e7e847c46d1d756377b6242d2e5fb83bf752b54e0df71e889f3a2bb0f4c10805bf3c590376e3c24e22ff57f7fa965577375325cea5d920db94b9c336b455f6e894c01866fe9fbb8c8d3f70a2957285f6dfb5dcd8cbf54782f8fe7766d4723819913ac773421e3a31095866bad22c86a6036b2518b2059b4229d18c8c2ccbdf906c6cc6e82464ee57bddb0bebcb1dc645325bfb3e665ef7251082c88ebb1cf203bd779fdd38675713c8daadd17e1cabee432b09787b6ddf3304e38b731b45df5df51b78fcfb3d32466028d0ba36555e7e11ab0ee0666061d1645d962444bc47a38188930a84b4d561395c73c087021927ca638b7afc8a8679ccb84c26555440ec7f10445cd + + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ff000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 1c3b3a102f770386e4836c99e370cf9bea00803f5e482357a4ae12d414a3e63b5d31e276f8fe4a8d66b317f9ac683f44680a86ac35adfc3345befecb4bb188fd5776926c49a3095eb108fd1098baec70aaa66999a72a82f27d848b21d4a741b0c5cd4d5fff9dac89aeba122961d03a757123e9870f8acf1000020887891429ca2a3e7a7d7df7b10355165c8b9a6d0a7de8b062c4500dc4cd120c0f7418dae3d0b5781c34803fa75421c790dfe1de1834f280d7667b327f6c8cd7557e12ac3a0f93ec05c52e0493ef31a12d3d9260f79a289d6a379bc70c50841473d1a8cc81ec583e9645e07b8d9670655ba5bbcfecc6dc3966380ad8fecb17b6ba02469a020a84e18e8f84252070c13e9f1f289be54fbc481457778f616015e1327a02b140f1505eb309326d68378f8374595c849d84f4c333ec4423885143cb47bd71c5edae9be69a2ffeceb1bec9de244fbe15992b11b77c040f12bd8f6a975a44a0f90c29a9abc3d4d893927284c58754cce294529f8614dcd2aba991925fedc4ae74ffac6e333b93eb4aff0479da9a410e4450e0dd7ae4c6e2910900575da401fc07059f645e8b7e9bfdef33943054ff84011493c27b3429eaedb4ed5376441a77ed43851ad77f16f541dfd269d50d6a5f14fb0aab1cbb4c1550be97f7ab4066193c4caa773dad38014bd2092fa755c824bb5e54c4f36ffda9fcea70b9c6e693e148c151 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffff0000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 77a31251618a15e6b92d1d66dffe7b50b50bad552305ba0217a610688eff7e11e1d0225438e093242d6db274fde801d4cae06f2092c728b2478559df58e837c2469ee4a4fa794e4bbc7f39bc026e3cb72c33b0888f25b4acf56a2a9804f1ce6d3d6e1dc6ca181d4b546179d55544aa7760c40d06741539c7e3cd9d2f6650b2013fd0eeb8c2b8e3d8d240ccae2d4c98320a7442e1c8d75a42d6e6cfa4c2eca1798d158c7aecdf82490f24bb9b38e108bcda12c3faf9a21141c3613b58367f922aaa26cd22f23d708dae699ad7cb40a8ad0b6e2784973dcb605684c08b8d6998c69aac049921871ebb65301a4619ca80ecb485a31d744223ce8ddc2394828d6a80470c092f5ba413c3378fa6054255c6f9df4495862bbb3287681f931b687c888abf844dfc8fc28331e579928cd12bd2390ae123cf03818d14dedde5c0c24c8ab018bfca75ca096f2d531f3d1619e785f1ada437cab92e980558b3dce1474afb75bfedbf8ff54cb2618e0244c9ac0d3c66fb51598cd2db11f9be39791abe447c63094f7c453b7ff87cb5bb36b7c79efb0872d17058b83b15ab0866ad8a58656c5a7e20dbdf308b2461d97c0ec0024a2715055249cf3b478ddd4740de654f75ca686e0d7345c69ed50cdc2a8b332b1f8824108ac937eb050585608ee734097fc09054fbff89eeaeea791f4a7ab1f9868294a4f9e27b42af8100cb9d59cef9645803 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffffff00000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = e387aaa58ba483afa7e8eb469778317ecf4cf573aa9d4eac23f2cdf914e4e200a8b490e42ee646802dc6ee2b471b278195d60918ececb44bf79966f83faba0499298ebc699c0c8634715a320bb4f075d622e74c8c932004f25b41e361025b5a87815391f6108fc4afa6a05d9303c6ba68a128a55705d415985832fdeaae6c8e19110e84d1b1f199a2692119edc96132658f09da7c623efcec712537a3d94c0bf5d7e352ec94ae5797fdb377dc1551150721adf15bd26a8efc2fcaad56881fa9e62462c28f30ae1ceaca93c345cf243b73f542e2074a705bd2643bb9f7cc79bb6e7091ea6e232df0f9ad0d6cf502327876d82207abf2115cdacf6d5a48f6c1879a65b115f0f8b3cb3c59d15dd8c769bc014795a1837f3901b5845eb491adfefe097b1fa30a12fc1f65ba22905031539971a10f2f36c321bb51331cdefb39e3964c7ef079994f5b69b2edd83a71ef549971ee93f44eac3938fcdd61d01fa71799da3a8091c4c48aa9ed263ff0749df95d44fef6a0bb578ec69456aa5408ae32c7af08ad7ba8921287e3bbee31b767be06a0e705c864a769137df28292283ea81a2480241b44d9921cdbec1bc28dc1fda114bd8e5217ac9d8ebafa720e9da4f9ace231cc949e5b96fe76ffc21063fddc83a6b8679c00d35e09576a875305bed5f36ed242c8900dd1fa965bc950dfce09b132263a1eef52dd6888c309f5a7d712826 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffffffff000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = bf53d2dade78e822a4d949a9bc6766b01b06a8ef70d26748c6a7fc36d80ae4c5520f7c4ab0ac8544424fa405162fef5a6b7f229498063618d39f0003cb5fb8d1c86b643497da1ff945c8d3bedeca4f479702a7a735f043ddb1d6aaade3c4a0ac7ca7f3fa5279bef56f82cd7a2f38672e824814e10700300a055e1630b8f1cb0e919f5e942010a416e2bf48cb46993d3cb6a51c19bacf864785a00bc2ecff15d350875b246ed53e68be6f55bd7e05cfc2b2ed6432198a6444b6d8c247fab941f569768b5c429366f1d3f00f0345b96123d56204c01c63b22ce78baf116e525ed90fdea39fa469494d3866c31e05f295ff21fea8d4e6e13d67e47ce722e9698a1c1048d68ebcde76b86fcf976eab8aa9790268b7068e017a8b9b749409514f1053027fd16c3786ea1bac5f15cb79711ee2abe82f5cf8b13ae73030ef5b9e4457e75d1304f988d62dd6fc4b94ed38ba831da4b7634971b6cd8ec325d9c61c00f1df73627ed3745a5e8489f3a95c69639c32cd6e1d537a85f75cc844726e8a72fc0077ad22000f1d5078f6b866318c668f1ad03d5a5fced5219f2eabbd0aa5c0f460d183f04404a0d6f469558e81fab24a167905ab4c7878502ad3e38fdbe62a41556cec37325759533ce8f25f367c87bb5578d667ae93f9e2fd99bcbc5f2fbba88cf6516139420fcff3b7361d86322c4bd84c82f335abb152c4a93411373aaa8220 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffffffffff0000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 64497e5a831e4a932c09be3e5393376daa599548b816031d224bbf50a818ed2350eae7e96087c8a0db51ad290bd00c1ac1620857635bf246c176ab463be30b808da548081ac847b158e1264be25bb0910bbc92647108089415d45fab1b3d2604e8a8eff1ae4020cfa39936b66827b23f371b92200be90251e6d73c5f86de5fd4a950781933d79a28272b782a2ec313efdfcc0628f43d744c2dc2ff3dcb66999b50c7ca895b0c64791eeaa5f29499fb1c026f84ce5b5c72ba1083cddb5ce45434631665c333b60b11593fb253c5179a2c8db813782a004856a1653011e93fb6d876c18366dd8683f53412c0c180f9c848592d593f8609ca736317d356e13e2bff3a9f59cd9aeb19cd482593d8c46128bb32423b37a9adfb482b99453fbe25a41bf6feb4aa0bef5ed24bf73c762978025482c13115e4015aac992e5613a3b5c2f685b84795cb6e9b2656d8c88157e52c42f978d8634c43d06fea928f2822e465aa6576e9bf419384506cc3ce3c54ac1a6f67dc66f3b30191e698380bc999b05abce19dc0c6dcc2dd001ec535ba18deb2df1a101023108318c75dc98611a09dc48a0acdec676fabdf222f07e026f059b672b56e5cbc8e1d21bbd867dd927212054681d70ea737134cdfce93b6f82ae22423274e58a0821cc5502e2d0ab4585e94de6975be5e0b4efce51cd3e70c25a1fbbbd609d273ad5b0d59631c531f6a0a57b9 + + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f10 +Ciphertext = 6c1625db4671522d3d7599601de7ca09ed + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f1011 +Ciphertext = d069444b7a7e0cab09e24447d24deb1fedbf + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112 +Ciphertext = e5df1351c0544ba1350b3363cd8ef4beedbf9d + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f10111213 +Ciphertext = 9d84c813f719aa2c7be3f66171c7c5c2edbf9dac + +Cipher = aes-128-xts +Key = e0e1e2e3e4e5e6e7e8e9eaebecedeeefc0c1c2c3c4c5c6c7c8c9cacbcccdcecf +IV = 21436587a90000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 38b45812ef43a05bd957e545907e223b954ab4aaf088303ad910eadf14b42be68b2461149d8c8ba85f992be970bc621f1b06573f63e867bf5875acafa04e42ccbd7bd3c2a0fb1fff791ec5ec36c66ae4ac1e806d81fbf709dbe29e471fad38549c8e66f5345d7c1eb94f405d1ec785cc6f6a68f6254dd8339f9d84057e01a17741990482999516b5611a38f41bb6478e6f173f320805dd71b1932fc333cb9ee39936beea9ad96fa10fb4112b901734ddad40bc1878995f8e11aee7d141a2f5d48b7a4e1e7f0b2c04830e69a4fd1378411c2f287edf48c6c4e5c247a19680f7fe41cefbd49b582106e3616cbbe4dfb2344b2ae9519391f3e0fb4922254b1d6d2d19c6d4d537b3a26f3bcc51588b32f3eca0829b6a5ac72578fb814fb43cf80d64a233e3f997a3f02683342f2b33d25b492536b93becb2f5e1a8b82f5b883342729e8ae09d16938841a21a97fb543eea3bbff59f13c1a18449e398701c1ad51648346cbc04c27bb2da3b93a1372ccae548fb53bee476f9e9c91773b1bb19828394d55d3e1a20ed69113a860b6829ffa847224604435070221b257e8dff783615d2cae4803a93aa4334ab482a0afac9c0aeda70b45a481df5dec5df8cc0f423c77a5fd46cd312021d4b438862419a791be03bb4d97c0e59578542531ba466a83baf92cefc151b5cc1611a167893819b63fb8a6b18e86de60290fa72b797b0ce59f3 + +# Exercise different lengths covering even ciphertext stealing cases +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f6061 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5B079C6307EA0914559C6D2FB6384F8AADF94 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce84 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f7071 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CEF4F253466EF4953ADC8FE2F5BC1FF57593FD + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad0265 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f8081 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE842973C68248EDDFE26FB9B096659C8A5D6BB7 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f9091 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD0265C4DD16E65A24575A709F174593F19FF85EA9 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD02655EA92DC4C4E41A8952C651D33174BE519215FA160C664D4B07D757A034AB3B35A10C + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f91 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD02655EA92DC4C4E41A8952C651D33174BE51A10C421110E6D81588EDE82103A252D82C6CBC24F9357BD1FB882AA4B2CC2E7FA750 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f434 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD02655EA92DC4C4E41A8952C651D33174BE51A10C421110E6D81588EDE82103A252D8A750E8768DEFFFED9122810AAEB99F910409B03D164E727C31290FD4E039500872AF + +# AES wrap tests from RFC3394 +Cipher = id-aes128-wrap +Key = 000102030405060708090A0B0C0D0E0F +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 1FA68B0A8112B447AEF34BD8FB5A7B829D3E862371D2CFE5 + +Cipher = id-aes192-wrap +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 96778B25AE6CA435F92B5B97C050AED2468AB8A17AD84E5D + +Cipher = id-aes256-wrap +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 64E8C3F9CE0F5BA263E9777905818A2A93C8191E7D6E8AE7 + +Cipher = id-aes192-wrap +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Plaintext = 00112233445566778899AABBCCDDEEFF0001020304050607 +Ciphertext = 031D33264E15D33268F24EC260743EDCE1C6C7DDEE725A936BA814915C6762D2 + +Cipher = id-aes256-wrap +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Plaintext = 00112233445566778899AABBCCDDEEFF0001020304050607 +Ciphertext = A8F9BC1612C68B3FF6E6F4FBE30E71E4769C8B80A32CB8958CD5D17D6B254DA1 + +Cipher = id-aes256-wrap +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Plaintext = 00112233445566778899AABBCCDDEEFF000102030405060708090A0B0C0D0E0F +Ciphertext = 28C9F404C4B810F4CBCCB35CFB87F8263F5786E2D80ED326CBC7F0E71A99F43BFB988B9B7A02DD21 + +# Same as previous example but with invalid unwrap key: should be rejected +# without returning any plaintext +Cipher = id-aes256-wrap +Operation = DECRYPT +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E00 +Plaintext = 00112233445566778899AABBCCDDEEFF000102030405060708090A0B0C0D0E0F +Ciphertext = 28C9F404C4B810F4CBCCB35CFB87F8263F5786E2D80ED326CBC7F0E71A99F43BFB988B9B7A02DD21 +Result = CIPHERUPDATE_ERROR + +# AES wrap tests from RFC5649 +Cipher = id-aes192-wrap-pad +Key = 5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8 +Plaintext = c37b7e6492584340bed12207808941155068f738 +Ciphertext = 138bdeaa9b8fa7fc61f97742e72248ee5ae6ae5360d1ae6a5f54f373fa543b6a + +Cipher = id-aes192-wrap-pad +Key = 5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8 +Plaintext = 466f7250617369 +Ciphertext = afbeb0f07dfbf5419200f2ccb50bb24f + +Cipher = chacha20 +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 00000000000000000000000000000000 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee6586 + +Cipher = chacha20 +Key = 0000000000000000000000000000000000000000000000000000000000000001 +IV = 00000000000000000000000000000000 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 4540f05a9f1fb296d7736e7b208e3c96eb4fe1834688d2604f450952ed432d41bbe2a0b6ea7566d2a5d1e7e20d42af2c53d792b1c43fea817e9ad275ae546963 + +Cipher = chacha20 +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 00000000000000000000000000000001 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = de9cba7bf3d69ef5e786dc63973f653a0b49e015adbff7134fcb7df137821031e85a050278a7084527214f73efc7fa5b5277062eb7a0433e445f41e31afab757 + +Cipher = chacha20 +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 00000000000000000100000000000000 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = ef3fdfd6c61578fbf5cf35bd3dd33b8009631634d21e42ac33960bd138e50d32111e4caf237ee53ca8ad6426194a88545ddc497a0b466e7d6bbdb0041b2f586b + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c9 + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c730 + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37 + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444a + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37C7C5E6A87478BF41EE85A518C0F4EFA9BDE828C5A71B8E46597B634AFD204D3C501334239C3414285ED72D3A9169EABBD4DC25D52BB7516D3BA712D75AD8C0AE + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37C7C5E6A87478BF41EE85A518C0F4EFA9BDE828C5A71B8E46597B634AFD204D3C501334239C3414285ED72D3A9169EABBD4DC25D52BB7516D3BA712D75AD8C0AE5D493C19E38A77939E7A058D713E9CCCCA58045F436B434B1C80D365472406E392951987DB6905C80D431DA18451135BE7E82BCAB358CB3971E61405B2FF1798 + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37C7C5E6A87478BF41EE85A518C0F4EFA9BDE828C5A71B8E46597B634AFD204D3C501334239C3414285ED72D3A9169EABBD4DC25D52BB7516D3BA712D75AD8C0AE5D493C19E38A77939E7A058D713E9CCCCA58045F436B434B1C80D365472406E392951987DB6905C80D431DA18451135BE7E82BCAB358CB3971E61405B2FF17980D6E7E67E861E28201C1EE30B441040FD06878D65042C95582A4318207BFC700BE0CE32889AEC2FFE5085E8967910D879FA0E8C0FF85FDC510B9FF2FBF87CFCB + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37C7C5E6A87478BF41EE85A518C0F4EFA9BDE828C5A71B8E46597B634AFD204D3C501334239C3414285ED72D3A9169EABBD4DC25D52BB7516D3BA712D75AD8C0AE5D493C19E38A77939E7A058D713E9CCCCA58045F436B434B1C80D365472406E392951987DB6905C80D431DA18451135BE7E82BCAB358CB3971E61405B2FF17980D6E7E67E861E28201C1EE30B441040FD06878D65042C95582A4318207BFC700BE0CE32889AEC2FFE5085E8967910D879FA0E8C0FF85FDC510B9FF2FBF87CFCB29577D68099E04FFA05F752A73D377C70D3A8BC2DA80E6E780EC057182C33AD1DE387252258A1E18E6FAD910327CE7F42FD1E1E0515F9586E2F2EFCB9F472B1D + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37C7C5E6A87478BF41EE85A518C0F4EFA9BDE828C5A71B8E46597B634AFD204D3C501334239C3414285ED72D3A9169EABBD4DC25D52BB7516D3BA712D75AD8C0AE5D493C19E38A77939E7A058D713E9CCCCA58045F436B434B1C80D365472406E392951987DB6905C80D431DA18451135BE7E82BCAB358CB3971E61405B2FF17980D6E7E67E861E28201C1EE30B441040FD06878D65042C95582A4318207BFC700BE0CE32889AEC2FFE5085E8967910D879FA0E8C0FF85FDC510B9FF2FBF87CFCB29577D68099E04FFA05F752A73D377C70D3A8BC2DA80E6E780EC057182C33AD1DE387252258A1E18E6FAD910327CE7F42FD1E1E0515F9586E2F2EFCB9F472B1DBDBAC354A4162151E9D92C79FB08BB4DDC56F19448C0175A46E2E6C491FEC71419AA43A349BEA768A92C75DE68FD9591E68067F3197094D3FB87ED81785EA075 + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37C7C5E6A87478BF41EE85A518C0F4EFA9BDE828C5A71B8E46597B634AFD204D3C501334239C3414285ED72D3A9169EABBD4DC25D52BB7516D3BA712D75AD8C0AE5D493C19E38A77939E7A058D713E9CCCCA58045F436B434B1C80D365472406E392951987DB6905C80D431DA18451135BE7E82BCAB358CB3971E61405B2FF17980D6E7E67E861E28201C1EE30B441040FD06878D65042C95582A4318207BFC700BE0CE32889AEC2FFE5085E8967910D879FA0E8C0FF85FDC510B9FF2FBF87CFCB29577D68099E04FFA05F752A73D377C70D3A8BC2DA80E6E780EC057182C33AD1DE387252258A1E18E6FAD910327CE7F42FD1E1E0515F9586E2F2EFCB9F472B1DBDBAC354A4162151E9D92C79FB08BB4DDC56F19448C0175A46E2E6C491FEC71419AA43A349BEA768A92C75DE68FD9591E68067F3197094D3FB87ED81785EA075E4B65E3E4C78F81DA9B751C5EFE024152301C48E63245B556C4C67AFF857E5EA15A908D83A1D9704F8E55E7352B20B694BF9970298E6B5AAD33EA2155D105D4E + +Cipher = chacha20 +Key = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +IV = 00000000000000000001020304050607 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a38008b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc385245fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2ccb27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c144226b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430ffd1dcfc27deed327b9f9630d2fa969fb6f0603cd19dd9a9519e673bcfcd9014125291a44669ef7285e74ed3729b677f801c3cdf058c50963168b496043716c7307cd9e0cdd137fccb0f05b47cdbb95c5f54831622c3652a32b2531fe326bcd6e2bbf56a194fa196fbd1a54952110f51c73433865f7664b836685e3664b3d8444aF89A242805E18C975F1146324996FDE17007CF3E6E8F4E764022533EDBFE07D4733E48BB372D75B0EF48EC983EB78532161CC529E5ABB89837DFCCA6261DBB37C7C5E6A87478BF41EE85A518C0F4EFA9BDE828C5A71B8E46597B634AFD204D3C501334239C3414285ED72D3A9169EABBD4DC25D52BB7516D3BA712D75AD8C0AE5D493C19E38A77939E7A058D713E9CCCCA58045F436B434B1C80D365472406E392951987DB6905C80D431DA18451135BE7E82BCAB358CB3971E61405B2FF17980D6E7E67E861E28201C1EE30B441040FD06878D65042C95582A4318207BFC700BE0CE32889AEC2FFE5085E8967910D879FA0E8C0FF85FDC510B9FF2FBF87CFCB29577D68099E04FFA05F752A73D377C70D3A8BC2DA80E6E780EC057182C33AD1DE387252258A1E18E6FAD910327CE7F42FD1E1E0515F9586E2F2EFCB9F472B1DBDBAC354A4162151E9D92C79FB08BB4DDC56F19448C0175A46E2E6C491FEC71419AA43A349BEA768A92C75DE68FD9591E68067F3197094D3FB87ED81785EA075E4B65E3E4C78F81DA9B751C5EFE024152301C48E63245B556C4C67AFF857E5EA15A908D83A1D9704F8E55E7352B20B694BF9970298E6B5AAD33EA2155D105D4E637D1E87C40A8E5F4E8C5A16A4B8F3DC27B31721D77A65FD1ED6F86BE25FB95DB29B1988493770A7C60E451FF97DD241A236851FC425691979FE30226559AD95 + +# RFC7539 +Cipher = chacha20-poly1305 +Key = 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f +IV = 070000004041424344454647 +AAD = 50515253c0c1c2c3c4c5c6c7 +Tag = 1ae10b594f09e26a7e902ecbd0600691 +Plaintext = 4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e +Ciphertext = d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b6116 + +Cipher = chacha20-poly1305 +Key = 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0 +IV = 000000000102030405060708 +AAD = f33388860000000000004e91 +Tag = eead9d67890cbb22392336fea1851f38 +Plaintext = 496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67726573732e2fe2809d +Ciphertext = 64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a1049e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29a6ad5cb4022b02709b + +Cipher = chacha20-poly1305 +Key = 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0 +IV = 000000000102030405060708 +AAD = f33388860000000000004e91 +Tag = eead9d67890cbb22392336fea1851f39 +Plaintext = 496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67726573732e2fe2809d +Ciphertext = 64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a1049e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29a6ad5cb4022b02709b +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + + +# self-generated vectors +Cipher = chacha20-poly1305 +Key = 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0 +IV = 000000000102030405060708 +AAD = f33388860000000000004e91 +Tag = d96119a40cd17f2527306866a3ef0413 +Plaintext = 496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d4472616674732061732072 +Ciphertext = 64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a + +Cipher = chacha20-poly1305 +Key = 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0 +IV = 000000000102030405060708 +AAD = f33388860000000000004e91 +Tag = 53aee3189d2b747032378a6186feb43f +Plaintext = 496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67 +Ciphertext = 64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a1049e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c299da65ba25e6a85842bf0440fd98a9a2266b061c4b3a13327c090f9a0789f58aad805275e4378a525f19232bfbfb749ede38480f405cf43ec2f1f8619ebcbc80a89e92a859c7911e674977ab17d4a7126a6b8a477358ff14a344d276ef6e504e10268ac3619fcf90c2d6c03fc2e3d1f290d9bf26c1fa1495dd8f97eec6229a55c2354e4524143551a5cc370a1c622c9390530cff21c3e1ed50c5e3daf97518ccce34156bdbd7eafab8bd417aef25c6c927301731bd319d247a1d5c3186ed10bfd9a7a24bac30e3e4503ed9204154d338b79ea276e7058e7f20f4d4fd1ac93d63f611af7b6d006c2a72add0eedc497b19cb30a198816664f0da00155f2e2d6ac61 + +Cipher = chacha20-poly1305 +Key = 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0 +IV = 000000000102030405060708 +AAD = f33388860000000000004e91 +Tag = e0723bce23528ce6ccb10ff9627038bf +Plaintext = 496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d +Ciphertext = 64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a1049e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c299da65ba25e6a85842bf0440fd98a9a2266b061c4b3a13327c090f9a0789f58aad805275e4378a525f19232bfbfb749ede38480f405cf43ec2f1f8619ebcbc80a89e92a859c7911e674977ab17d4a7126a6b8a477358ff14a344d276ef6e504e10268ac3619fcf90c2d6c03fc2e3d1f290d9bf26c1fa1495dd8f97eec6229a55c2354e4524143551a5cc370a1c622c9390530cff21c3e1ed50c5e3daf97518ccce34156bdbd7eafab8bd417aef25c6c927301731bd319d247a1d5c3186ed10bfd9a7a24bac30e3e4503ed9204154d338b79ea276e7058e7f20f4d4fd1ac93d63f611af7b6d006c2a72add0eedc497b19cb30a198816664f0da00155f2e2d6ac61045b296d614301e0ad4983308028850dd4feffe3a8163970306e4047f5a165cb4befbc129729cd2e286e837e9b606486d402acc3dec5bf8b92387f6e486f2140 diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpdigest.txt b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpdigest.txt new file mode 100644 index 0000000000..6579e69883 --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpdigest.txt @@ -0,0 +1,224 @@ +# +# Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# Tests start with one of these keywords +# Cipher Decrypt Derive Digest Encoding KDF MAC PBE +# PrivPubKeyPair Sign Verify VerifyRecover +# and continue until a blank line. Lines starting with a pound sign, +# like this prolog, are ignored. + +# BLAKE2 tests, using same inputs as MD5 +# There are no official BLAKE2 test vectors we can use since they all use a key +# Which is currently unsupported by OpenSSL. They were generated using the +# reference implementation. RFC7693 also mentions the 616263 / "abc" values. + +Digest = BLAKE2s256 +Input = +Output = 69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9 + +Digest = BLAKE2s256 +Input = 61 +Output = 4a0d129873403037c2cd9b9048203687f6233fb6738956e0349bd4320fec3e90 + +Digest = BLAKE2s256 +Input = 616263 +Output = 508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982 + +Digest = BLAKE2s256 +Input = 6d65737361676520646967657374 +Output = fa10ab775acf89b7d3c8a6e823d586f6b67bdbac4ce207fe145b7d3ac25cd28c + +Digest = BLAKE2s256 +Input = 6162636465666768696a6b6c6d6e6f707172737475767778797a +Output = bdf88eb1f86a0cdf0e840ba88fa118508369df186c7355b4b16cf79fa2710a12 + +Digest = BLAKE2s256 +Input = 4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839 +Output = c75439ea17e1de6fa4510c335dc3d3f343e6f9e1ce2773e25b4174f1df8b119b + +Digest = BLAKE2s256 +Input = 3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930 +Output = fdaedb290a0d5af9870864fec2e090200989dc9cd53a3c092129e8535e8b4f66 + +Digest = BLAKE2s256 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F +Output = 1FA877DE67259D19863A2A34BCC6962A2B25FCBF5CBECD7EDE8F1FA36688A796 + +Digest = BLAKE2s256 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F8081 +Output = C80ABEEBB669AD5DEEB5F5EC8EA6B7A05DDF7D31EC4C0A2EE20B0B98CAEC6746 + +Digest = BLAKE2b512 +Input = +Output = 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce + +Digest = BLAKE2b512 +Input = 61 +Output = 333fcb4ee1aa7c115355ec66ceac917c8bfd815bf7587d325aec1864edd24e34d5abe2c6b1b5ee3face62fed78dbef802f2a85cb91d455a8f5249d330853cb3c + +Digest = BLAKE2b512 +Input = 616263 +Output = ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923 + +Digest = BLAKE2b512 +Input = 6d65737361676520646967657374 +Output = 3c26ce487b1c0f062363afa3c675ebdbf5f4ef9bdc022cfbef91e3111cdc283840d8331fc30a8a0906cff4bcdbcd230c61aaec60fdfad457ed96b709a382359a + +Digest = BLAKE2b512 +Input = 6162636465666768696a6b6c6d6e6f707172737475767778797a +Output = c68ede143e416eb7b4aaae0d8e48e55dd529eafed10b1df1a61416953a2b0a5666c761e7d412e6709e31ffe221b7a7a73908cb95a4d120b8b090a87d1fbedb4c + +Digest = BLAKE2b512 +Input = 4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839 +Output = 99964802e5c25e703722905d3fb80046b6bca698ca9e2cc7e49b4fe1fa087c2edf0312dfbb275cf250a1e542fd5dc2edd313f9c491127c2e8c0c9b24168e2d50 + +Digest = BLAKE2b512 +Input = 3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930 +Output = 686f41ec5afff6e87e1f076f542aa466466ff5fbde162c48481ba48a748d842799f5b30f5b67fc684771b33b994206d05cc310f31914edd7b97e41860d77d282 + +Digest = BLAKE2b512 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F +Output = 2319E3789C47E2DAA5FE807F61BEC2A1A6537FA03F19FF32E87EECBFD64B7E0E8CCFF439AC333B040F19B0C4DDD11A61E24AC1FE0F10A039806C5DCC0DA3D115 + +Digest = BLAKE2b512 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F8081 +Output = DF0A9D0C212843A6A934E3902B2DD30D17FBA5F969D2030B12A546D8A6A45E80CF5635F071F0452E9C919275DA99BED51EB1173C1AF0518726B75B0EC3BAE2B5 + +# SHA(1) tests (from shatest.c) +Digest = SHA1 +Input = 616263 +Output = a9993e364706816aba3e25717850c26c9cd0d89d + +# MD5 tests +Digest = MD5 +Input = +Output = d41d8cd98f00b204e9800998ecf8427e + +Digest = MD5 +Input = 61 +Output = 0cc175b9c0f1b6a831c399e269772661 + +Digest = MD5 +Input = 616263 +Output = 900150983cd24fb0d6963f7d28e17f72 + +Digest = MD5 +Input = 6d65737361676520646967657374 +Output = f96b697d7cb7938d525a2f31aaf161d0 + +Digest = MD5 +Input = 6162636465666768696a6b6c6d6e6f707172737475767778797a +Output = c3fcd3d76192e4007dfb496cca67e13b + +Digest = MD5 +Input = 4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839 +Output = d174ab98d277d9f5a5611c2c9f419d9f + +Digest = MD5 +Input = 3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930 +Output = 57edf4a22be3c955ac49da2e2107b67a + +# MD4 tests +Digest = MD4 +Input = "" +Output = 31d6cfe0d16ae931b73c59d7e0c089c0 + +Digest = MD4 +Input = "a" +Output = bde52cb31de33e46245e05fbdbd6fb24 + +Digest = MD4 +Input = "abc" +Output = a448017aaf21d8525fc10ae87aa6729d + +Digest = MD4 +Input = "message digest" +Output = d9130a8164549fe818874806e1c7014b + +Digest = MD4 +Input = "abcdefghijklmnopqrstuvwxyz" +Output = d79e1c308aa5bbcdeea8ed63df412da9 + +Digest = MD4 +Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" +Output = 043f8582f241db351ce627e153e7f0e4 + +Digest = MD4 +Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890" +Output = e33b4ddc9c38f2199c3e7b164fcc0536 + +# RIPEMD160 tests +Digest = RIPEMD160 +Input = "" +Output = 9c1185a5c5e9fc54612808977ee8f548b2258d31 + +Digest = RIPEMD160 +Input = "a" +Output = 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe + +Digest = RIPEMD160 +Input = "abc" +Output = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc + +Digest = RIPEMD160 +Input = "message digest" +Output = 5d0689ef49d2fae572b881b123a85ffa21595f36 + +Digest = RIPEMD160 +Input = "abcdefghijklmnopqrstuvwxyz" +Output = f71c27109c692c1b56bbdceb5b9d2865b3708dbc + +Digest = RIPEMD160 +Input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" +Output = 12a053384a9c0c88e405a06c27dcf49ada62eb2b + +Digest = RIPEMD160 +Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" +Output = b0e20b6e3116640286ed3a87a5713079b21f5189 + +Digest = RIPEMD160 +Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890" +Output = 9b752e45573d4b39f4dbd3323cab82bf63326bfb + +# ISO/IEC 10118-3 test vector set +Digest = whirlpool +Input = "" +Output = 19FA61D75522A4669B44E39C1D2E1726C530232130D407F89AFEE0964997F7A73E83BE698B288FEBCF88E3E03C4F0757EA8964E59B63D93708B138CC42A66EB3 + +Digest = whirlpool +Input = "a" +Output = 8ACA2602792AEC6F11A67206531FB7D7F0DFF59413145E6973C45001D0087B42D11BC645413AEFF63A42391A39145A591A92200D560195E53B478584FDAE231A + +Digest = whirlpool +Input = "abc" +Output = 4E2448A4C6F486BB16B6562C73B4020BF3043E3A731BCE721AE1B303D97E6D4C7181EEBDB6C57E277D0E34957114CBD6C797FC9D95D8B582D225292076D4EEF5 + +Digest = whirlpool +Input = "message digest" +Output = 378C84A4126E2DC6E56DCC7458377AAC838D00032230F53CE1F5700C0FFB4D3B8421557659EF55C106B4B52AC5A4AAA692ED920052838F3362E86DBD37A8903E + +Digest = whirlpool +Input = "abcdefghijklmnopqrstuvwxyz" +Output = F1D754662636FFE92C82EBB9212A484A8D38631EAD4238F5442EE13B8054E41B08BF2A9251C30B6A0B8AAE86177AB4A6F68F673E7207865D5D9819A3DBA4EB3B + +Digest = whirlpool +Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" +Output = DC37E008CF9EE69BF11F00ED9ABA26901DD7C28CDEC066CC6AF42E40F82F3A1E08EBA26629129D8FB7CB57211B9281A65517CC879D7B962142C65F5A7AF01467 + +Digest = whirlpool +Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890" +Output = 466EF18BABB0154D25B9D38A6414F5C08784372BCCB204D6549C4AFADB6014294D5BD8DF2A6C44E538CD047B2681A51A2C60481E88C5A20B2C2A80CF3A9A083B + +Digest = whirlpool +Input = "abcdbcdecdefdefgefghfghighijhijk" +Output = 2A987EA40F917061F5D6F0A0E4644F488A7A5A52DEEE656207C562F988E95C6916BDC8031BC5BE1B7B947639FE050B56939BAAA0ADFF9AE6745B7B181C3BE3FD + +Digest = whirlpool +Input = "aaaaaaaaaa" +Count = 100000 +Output = 0C99005BEB57EFF50A7CF005560DDF5D29057FD86B20BFD62DECA0F1CCEA4AF51FC15490EDDC47AF32BB2B66C34FF9AD8C6008AD677F77126953B226E4ED8B01 diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpencod.txt b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpencod.txt new file mode 100644 index 0000000000..010a88f935 --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpencod.txt @@ -0,0 +1,192 @@ +# +# Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# Tests start with one of these keywords +# Cipher Decrypt Derive Digest Encoding KDF MAC PBE +# PrivPubKeyPair Sign Verify VerifyRecover +# and continue until a blank line. Lines starting with a pound sign, +# like this prolog, are ignored. + +# Base64 tests + +Encoding = canonical +Input = "" +Output = "" + +Encoding = canonical +Input = "h" +Output = "aA==\n" + +Encoding = canonical +Input = "hello" +Output = "aGVsbG8=\n" + +Encoding = canonical +Input = "hello world!" +Output = "aGVsbG8gd29ybGQh\n" + +Encoding = canonical +Input = 00010203040506070809a0b0c0d0e0f000 +Output = "AAECAwQFBgcICaCwwNDg8AA=\n" + +# Missing padding +Encoding = invalid +Output = "aGVsbG8" + +Encoding = invalid +Output = "aGVsbG8\n" + +# Tolerate missing newline +Encoding = valid +Input = "hello" +Output = "aGVsbG8=" + +# Don't tolerate extra trailing '=' +Encoding = invalid +Input = "hello" +Output = "aGVsbG8==\n" + +Encoding = invalid +Output = "aGVsbG8===\n" + +# Don't tolerate data after '=' +Encoding = invalid +Output = "aGV=sbG8=\n" + +# Newlines are ignored +Encoding = valid +Input = "hello" +Output = "aGV\nsbG8=\n" + +Encoding = canonical +Input = "hello" +Output = 614756736247383d0a + +# Invalid characters +Encoding = invalid +Output = 614756736247383d0a00 + +Encoding = invalid +Output = 61475600736247383d0a + +Encoding = invalid +Output = 61475601736247383d0a + +Encoding = invalid +Output = 61475680736247383d0a + +Encoding = invalid +Output = e14756736247383d0a + +Encoding = canonical +Input = "OpenSSLOpenSSL\n" +Output = "T3BlblNTTE9wZW5TU0wK\n" + +Encoding = valid +Input = "OpenSSLOpenSSL\n" +Output = "T3BlblNTTE9wZW5TU0wK" + +# Truncate 1-3 chars +Encoding = invalid +Output = "T3BlblNTTE9wZW5TU0w" + +Encoding = invalid +Output = "T3BlblNTTE9wZW5TU0" + +Encoding = invalid +Output = "T3BlblNTTE9wZW5TU" + +Encoding = invalid +Output = "T3BlblNTTE9wZW5TU0wK====" + +Encoding = invalid +Output = "T3BlblNTTE9wZW5TU0wK============================================\n" + +Encoding = invalid +Output = "YQ==YQ==YQ==\n" + +Encoding = invalid +Output = "A" + +Encoding = invalid +Output = "A\n" + +Encoding = invalid +Output = "A=" + +Encoding = invalid +Output = "A==\n" + +Encoding = invalid +Output = "A===\n" + +Encoding = invalid +Output = "A====\n" + +Encoding = valid +Input = "OpenSSLOpenSSL\n" +Output = "T3BlblNTTE9wZW5TU0wK\n\n" + +Encoding = valid +Input = "OpenSSLOpenSSL\n" +Output = "T3BlblNTTE\n9wZW5TU0wK" + +# CVE 2015-0292 +Encoding = invalid +Output = "ZW5jb2RlIG1lCg==================================================================\n" + +Encoding = canonical +Input = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eA==\n" + +Encoding = valid +Input = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eA\n==\n" + +Encoding = valid +Input = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eA=\n=\n" + +Encoding = invalid +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eA====\n" + +# Multiline output without padding +Encoding = canonical +Input = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4\neHh4eHh4eHh4eHh4\n" + +# Multiline output with padding +Encoding = canonical +Input = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4\neHh4eHh4eHh4eHh4eHh4eA==\n" + +# Multiline output with line break in the middle of a b64 block is accepted +Encoding = valid +Input = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh\n4eHh4eHh4eHh4eHh4eHh4eA==\n" + +# Long lines are accepted +Encoding = valid +Input = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eA==\n" + +# Multiline input with data after '='. +Encoding = invalid +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eA==\neHh4eHh4eHh4eHh4eHh4eHh4\n" + +Encoding = invalid +Output = "eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4\neA==eHh4eHh4eHh4eHh4eHh4\n" + +# B64_EOF ('-') terminates input and trailing bytes are ignored +Encoding = valid +Input = "OpenSSLOpenSSL\n" +Output = "T3BlblNTTE9wZW5TU0wK\n-abcd" + +Encoding = valid +Input = "OpenSSLOpenSSL\n" +Output = "T3BlblNTTE9wZW5TU0wK-abcd" diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf.txt b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf.txt new file mode 100644 index 0000000000..da4a824bc6 --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpkdf.txt @@ -0,0 +1,138 @@ +# +# Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# Tests start with one of these keywords +# Cipher Decrypt Derive Digest Encoding KDF MAC PBE +# PrivPubKeyPair Sign Verify VerifyRecover +# and continue until a blank line. Lines starting with a pound sign, +# like this prolog, are ignored. + +# TLS1 PRF tests, from NIST test vectors + +KDF=TLS1-PRF +Ctrl.md = md:MD5-SHA1 +Ctrl.Secret = hexsecret:bded7fa5c1699c010be23dd06ada3a48349f21e5f86263d512c0c5cc379f0e780ec55d9844b2f1db02a96453513568d0 +Ctrl.label = seed:master secret +Ctrl.client_random = hexseed:e5acaf549cd25c22d964c0d930fa4b5261d2507fad84c33715b7b9a864020693 +Ctrl.server_random = hexseed:135e4d557fdf3aa6406d82975d5c606a9734c9334b42136e96990fbd5358cdb2 +Output = 2f6962dfbc744c4b2138bb6b3d33054c5ecc14f24851d9896395a44ab3964efc2090c5bf51a0891209f46c1e1e998f62 + +KDF=TLS1-PRF +Ctrl.md = md:MD5-SHA1 +Ctrl.Secret = hexsecret:2f6962dfbc744c4b2138bb6b3d33054c5ecc14f24851d9896395a44ab3964efc2090c5bf51a0891209f46c1e1e998f62 +Ctrl.label = seed:key expansion +Ctrl.server_random = hexseed:67267e650eb32444119d222a368c191af3082888dc35afe8368e638c828874be +Ctrl.client_random = hexseed:d58a7b1cd4fedaa232159df652ce188f9d997e061b9bf48e83b62990440931f6 +Output = 3088825988e77fce68d19f756e18e43eb7fe672433504feaf99b3c503d9091b164f166db301d70c9fc0870b4a94563907bee1a61fb786cb717576890bcc51cb9ead97e01d0a2fea99c953377b195205ff07b369589178796edc963fd80fdbe518a2fc1c35c18ae8d + +KDF=TLS1-PRF +Ctrl.md = md:SHA256 +Ctrl.Secret = hexsecret:f8938ecc9edebc5030c0c6a441e213cd24e6f770a50dda07876f8d55da062bcadb386b411fd4fe4313a604fce6c17fbc +Ctrl.label = seed:master secret +Ctrl.client_random = hexseed:36c129d01a3200894b9179faac589d9835d58775f9b5ea3587cb8fd0364cae8c +Ctrl.server_random = hexseed:f6c9575ed7ddd73e1f7d16eca115415812a43c2b747daaaae043abfb50053fce +Output = 202c88c00f84a17a20027079604787461176455539e705be730890602c289a5001e34eeb3a043e5d52a65e66125188bf + +KDF=TLS1-PRF +Ctrl.md = md:SHA256 +Ctrl.Secret = hexsecret:202c88c00f84a17a20027079604787461176455539e705be730890602c289a5001e34eeb3a043e5d52a65e66125188bf +Ctrl.label = seed:key expansion +Ctrl.server_random = hexseed:ae6c806f8ad4d80784549dff28a4b58fd837681a51d928c3e30ee5ff14f39868 +Ctrl.client_random = hexseed:62e1fd91f23f558a605f28478c58cf72637b89784d959df7e946d3f07bd1b616 +Output = d06139889fffac1e3a71865f504aa5d0d2a2e89506c6f2279b670c3e1b74f531016a2530c51a3a0f7e1d6590d0f0566b2f387f8d11fd4f731cdd572d2eae927f6f2f81410b25e6960be68985add6c38445ad9f8c64bf8068bf9a6679485d966f1ad6f68b43495b10a683755ea2b858d70ccac7ec8b053c6bd41ca299d4e51928 + +# Missing digest. +KDF=TLS1-PRF +Ctrl.Secret = hexsecret:01 +Ctrl.Seed = hexseed:02 +Output = 03 +Result = KDF_DERIVE_ERROR + +# Missing secret. +KDF=TLS1-PRF +Ctrl.md = md:MD5-SHA1 +Ctrl.Seed = hexseed:02 +Output = 03 +Result = KDF_DERIVE_ERROR + +# HKDF tests, from RFC5869 test vectors + +KDF = HKDF +Ctrl.md = md:SHA256 +Ctrl.IKM = hexkey:0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b +Ctrl.salt = hexsalt:000102030405060708090a0b0c +Ctrl.info = hexinfo:f0f1f2f3f4f5f6f7f8f9 +Output = 3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865 + +KDF = HKDF +Ctrl.md = md:SHA256 +Ctrl.IKM = hexkey:000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f +Ctrl.salt = hexsalt:606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf +Ctrl.info = hexinfo:b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Output = b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5c1f3434f1d87 + +KDF = HKDF +Ctrl.md = md:SHA256 +Ctrl.IKM = hexkey:0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b +Ctrl.salt = salt: +Ctrl.info = info: +Output = 8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8 + +KDF = HKDF +Ctrl.md = md:SHA1 +Ctrl.IKM = hexkey:0b0b0b0b0b0b0b0b0b0b0b +Ctrl.salt = hexsalt:000102030405060708090a0b0c +Ctrl.info = hexinfo:f0f1f2f3f4f5f6f7f8f9 +Output = 085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f155fda2c22e422478d305f3f896 + +KDF = HKDF +Ctrl.md = md:SHA1 +Ctrl.IKM = hexkey:000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f +Ctrl.salt = hexsalt:606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf +Ctrl.info = hexinfo:b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Output = 0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e927336d0441f4c4300e2cff0d0900b52d3b4 + +KDF = HKDF +Ctrl.md = md:SHA1 +Ctrl.IKM = hexkey:0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b +Ctrl.salt = salt: +Ctrl.info = info: +Output = 0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0ea00033de03984d34918 + +KDF = HKDF +Ctrl.md = md:SHA1 +Ctrl.IKM = hexkey:0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c +Ctrl.salt = salt: +Ctrl.info = info: +Output = 2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48 + +KDF = HKDF +Ctrl.IKM = hexkey:0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c +Ctrl.salt = salt: +Ctrl.info = info: +Output = 00 +Result = KDF_DERIVE_ERROR + +KDF = HKDF +Ctrl.md = md:SHA1 +Ctrl.salt = salt: +Ctrl.info = info: +Output = 00 +Result = KDF_DERIVE_ERROR + +KDF = HKDF +Ctrl.md = md:SHA1 +Ctrl.IKM = hexkey:0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c +Ctrl.info = info: +Output = 2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48 + +KDF = HKDF +Ctrl.md = md:SHA1 +Ctrl.IKM = hexkey:0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c +Ctrl.salt = salt: +Output = 2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48 diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac.txt b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac.txt new file mode 100644 index 0000000000..dff9a1ffa8 --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp_data/evpmac.txt @@ -0,0 +1,150 @@ +# +# Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +# Tests start with one of these keywords +# Cipher Decrypt Derive Digest Encoding KDF MAC PBE +# PrivPubKeyPair Sign Verify VerifyRecover +# and continue until a blank line. Lines starting with a pound sign, +# like this prolog, are ignored. + +# HMAC tests from RFC2104 +MAC = HMAC +Algorithm = MD5 +Key = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b +Input = "Hi There" +Output = 9294727a3638bb1c13f48ef8158bfc9d + +MAC = HMAC +Algorithm = MD5 +Key = "Jefe" +Input = "what do ya want for nothing?" +Output = 750c783e6ab0b503eaa86e310a5db738 + +MAC = HMAC +Algorithm = MD5 +Key = AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +Input = DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD +Output = 56be34521d144c88dbb8c733f0e8b3f6 + +# HMAC tests from NIST test data + +MAC = HMAC +Algorithm = SHA1 +Input = "Sample message for keylen=blocklen" +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F +Output = 5FD596EE78D5553C8FF4E72D266DFD192366DA29 + +MAC = HMAC +Algorithm = SHA1 +Input = "Sample message for keylen 1; + +ok(run(test(["x509_dup_cert_test", srctop_file("test", "certs", "leaf.pem")]))); diff --git a/worker/deps/openssl/openssl/test/recipes/60-test_x509_time.t b/worker/deps/openssl/openssl/test/recipes/60-test_x509_time.t new file mode 100644 index 0000000000..e812cd0b26 --- /dev/null +++ b/worker/deps/openssl/openssl/test/recipes/60-test_x509_time.t @@ -0,0 +1,12 @@ +#! /usr/bin/env perl +# Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + + +use OpenSSL::Test::Simple; + +simple_test("test_x509_time", "x509_time_test"); diff --git a/worker/deps/openssl/openssl/test/recipes/80-test_ca.t b/worker/deps/openssl/openssl/test/recipes/80-test_ca.t index f40aba1d4d..28a090ea7d 100644 --- a/worker/deps/openssl/openssl/test/recipes/80-test_ca.t +++ b/worker/deps/openssl/openssl/test/recipes/80-test_ca.t @@ -56,3 +56,4 @@ sub yes { close PIPE; return 0; } + diff --git a/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t b/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t index 98d537e5f3..5c1b1d4545 100644 --- a/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t +++ b/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t @@ -1,6 +1,6 @@ #! /usr/bin/perl # -# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -12,11 +12,16 @@ use strict; use warnings; use OpenSSL::Test::Simple; -use OpenSSL::Test; +use OpenSSL::Test qw(:DEFAULT openssl_versions); use OpenSSL::Test::Utils qw(alldisabled available_protocols); setup("test_cipherlist"); +my ($build_version, $library_version) = openssl_versions(); +plan skip_all => + "This test recipe isn't supported when doing regression testing" + if $build_version != $library_version; + my $no_anytls = alldisabled(available_protocols("tls")); # If we have no protocols, then we also have no supported ciphers. diff --git a/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t b/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t index b4897c5808..65ba5fcf52 100644 --- a/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t +++ b/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t @@ -19,7 +19,7 @@ plan skip_all => "test_dane uses ec which is not supported by this OpenSSL build plan tests => 1; # The number of tests being performed -ok(run(test(["x509aux", +ok(run(test(["x509aux", srctop_file("test", "certs", "roots.pem"), srctop_file("test", "certs", "root+anyEKU.pem"), srctop_file("test", "certs", "root-anyEKU.pem"), diff --git a/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t b/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t index d152925733..8d3b3541fc 100644 --- a/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t +++ b/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -26,14 +26,14 @@ plan tests => scalar @fuzzers; foreach my $f (@fuzzers) { subtest "Fuzzing $f" => sub { - my @files = glob(srctop_file('fuzz', 'corpora', $f, '*')); - push @files, glob(srctop_file('fuzz', 'corpora', "$f-*", '*')); + my @dirs = glob(srctop_file('fuzz', 'corpora', $f)); + push @dirs, glob(srctop_file('fuzz', 'corpora', "$f-*")); - plan skip_all => "No corpora for $f-test" unless @files; + plan skip_all => "No corpora for $f-test" unless @dirs; - plan tests => scalar @files; + plan tests => scalar @dirs; - foreach (@files) { + foreach (@dirs) { ok(run(fuzz(["$f-test", $_]))); } } diff --git a/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t b/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t index 2bc86fdec5..78899f674a 100644 --- a/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t +++ b/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t @@ -1,13 +1,12 @@ #! /usr/bin/env perl -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html - -use OpenSSL::Test qw/:DEFAULT bldtop_dir/; +use OpenSSL::Test qw/:DEFAULT bldtop_dir bldtop_file/; use OpenSSL::Test::Utils; #Load configdata.pm @@ -20,14 +19,15 @@ use configdata; plan skip_all => "Test only supported in a shared build" if disabled("shared"); -plan tests => 3; +plan tests => 4; + +# When libssl and libcrypto are compiled on Linux with "-rpath", but not +# "--enable-new-dtags", the RPATH takes precedence over LD_LIBRARY_PATH, +# and we end up running with the wrong libraries. This is resolved by +# using paths to the shared objects, not just the names. -my $libcrypto_idx = $unified_info{rename}->{libcrypto} // "libcrypto"; -my $libssl_idx = $unified_info{rename}->{libssl} // "libssl"; -my $libcrypto = - $unified_info{sharednames}->{$libcrypto_idx}.$target{shared_extension_simple}; -my $libssl = - $unified_info{sharednames}->{$libssl_idx}.$target{shared_extension_simple}; +my $libcrypto = bldtop_file(shlib('libcrypto')); +my $libssl = bldtop_file(shlib('libssl')); ok(run(test(["shlibloadtest", "-crypto_first", $libcrypto, $libssl])), "running shlibloadtest -crypto_first"); @@ -35,3 +35,17 @@ ok(run(test(["shlibloadtest", "-ssl_first", $libcrypto, $libssl])), "running shlibloadtest -ssl_first"); ok(run(test(["shlibloadtest", "-just_crypto", $libcrypto, $libssl])), "running shlibloadtest -just_crypto"); +ok(run(test(["shlibloadtest", "-dso_ref", $libcrypto, $libssl])), + "running shlibloadtest -dso_ref"); + +sub shlib { + my $lib = shift; + $lib = $unified_info{rename}->{$lib} + if defined $unified_info{rename}->{$lib}; + $lib = $unified_info{sharednames}->{$lib} + . ($target{shlib_variant} || "") + . ($target{shared_extension} || ".so"); + $lib =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\) + |.$config{shlib_version_number}|x; + return $lib; +} diff --git a/worker/deps/openssl/openssl/test/recipes/tconversion.pl b/worker/deps/openssl/openssl/test/recipes/tconversion.pl index e19147b697..1cf68dc09b 100644 --- a/worker/deps/openssl/openssl/test/recipes/tconversion.pl +++ b/worker/deps/openssl/openssl/test/recipes/tconversion.pl @@ -23,7 +23,7 @@ sub tconversion { my $testtype = shift; my $t = shift; - my @conversionforms = + my @conversionforms = defined($conversionforms{$testtype}) ? @{$conversionforms{$testtype}} : @{$conversionforms{"*"}}; diff --git a/worker/deps/openssl/openssl/test/run_tests.pl b/worker/deps/openssl/openssl/test/run_tests.pl index 889d6dc117..77dffb332b 100644 --- a/worker/deps/openssl/openssl/test/run_tests.pl +++ b/worker/deps/openssl/openssl/test/run_tests.pl @@ -21,7 +21,7 @@ BEGIN use OpenSSL::Glob; use Module::Load::Conditional qw(can_load); -my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) +my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) ? 'TAP::Harness' : 'OpenSSL::TAP::Harness'; my $srctop = $ENV{SRCTOP} || $ENV{TOP}; diff --git a/worker/deps/openssl/openssl/test/secmemtest.c b/worker/deps/openssl/openssl/test/secmemtest.c index 9405f348ab..36906f7854 100644 --- a/worker/deps/openssl/openssl/test/secmemtest.c +++ b/worker/deps/openssl/openssl/test/secmemtest.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -18,6 +18,8 @@ int main(int argc, char **argv) { #if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX) char *p = NULL, *q = NULL, *r = NULL, *s = NULL; + int i; + const int size = 64; s = OPENSSL_secure_malloc(20); /* s = non-secure 20 */ @@ -128,6 +130,48 @@ int main(int argc, char **argv) return 1; } + if (!CRYPTO_secure_malloc_init(32768, 16)) { + perror_line(); + return 1; + } + + /* + * Verify that secure memory gets zeroed properly. + */ + if ((p = OPENSSL_secure_malloc(size)) == NULL) { + perror_line(); + return 1; + } + for (i = 0; i < size; i++) + if (p[i] != 0) { + perror_line(); + fprintf(stderr, "iteration %d\n", i); + return 1; + } + + for (i = 0; i < size; i++) + p[i] = (unsigned char)(i + ' ' + 1); + OPENSSL_secure_free(p); + + /* + * A deliberate use after free here to verify that the memory has been + * cleared properly. Since secure free doesn't return the memory to + * libc's memory pool, it technically isn't freed. However, the header + * bytes have to be skipped and these consist of two pointers in the + * current implementation. + */ + for (i = sizeof(void *) * 2; i < size; i++) + if (p[i] != 0) { + perror_line(); + fprintf(stderr, "iteration %d\n", i); + return 1; + } + + if (!CRYPTO_secure_malloc_done()) { + perror_line(); + return 1; + } + /*- * There was also a possible infinite loop when the number of * elements was 1<<31, as |int i| was set to that, which is a diff --git a/worker/deps/openssl/openssl/test/shlibloadtest.c b/worker/deps/openssl/openssl/test/shlibloadtest.c index 25df363f23..d584413ac9 100644 --- a/worker/deps/openssl/openssl/test/shlibloadtest.c +++ b/worker/deps/openssl/openssl/test/shlibloadtest.c @@ -40,6 +40,16 @@ static OpenSSL_version_num_t OpenSSL_version_num; #ifdef DSO_DLFCN +# define DSO_DSOBYADDR "DSO_dsobyaddr" +# define DSO_FREE "DSO_free" + +typedef void DSO; +typedef DSO * (*DSO_dsobyaddr_t)(void (*addr)(void), int flags); +typedef int (*DSO_free_t)(DSO *dso); + +static DSO_dsobyaddr_t DSO_dsobyaddr; +static DSO_free_t DSO_free; + # include typedef void * SHLIB; @@ -108,11 +118,13 @@ static int shlib_close(SHLIB lib) # define CRYPTO_FIRST_OPT "-crypto_first" # define SSL_FIRST_OPT "-ssl_first" # define JUST_CRYPTO_OPT "-just_crypto" +# define DSO_REFTEST_OPT "-dso_ref" enum test_types_en { CRYPTO_FIRST, SSL_FIRST, - JUST_CRYPTO + JUST_CRYPTO, + DSO_REFTEST }; int main(int argc, char **argv) @@ -123,7 +135,7 @@ int main(int argc, char **argv) void (*func) (void); SHLIB_SYM sym; } tls_method_sym, ssl_ctx_new_sym, ssl_ctx_free_sym, err_get_error_sym, - openssl_version_num_sym; + openssl_version_num_sym, dso_dsobyaddr_sym, dso_free_sym; enum test_types_en test_type; int i; @@ -138,6 +150,8 @@ int main(int argc, char **argv) test_type = SSL_FIRST; } else if (strcmp(argv[1], JUST_CRYPTO_OPT) == 0) { test_type = JUST_CRYPTO; + } else if (strcmp(argv[1], DSO_REFTEST_OPT) == 0) { + test_type = DSO_REFTEST; } else { printf("Unrecognised argument\n"); return 1; @@ -145,7 +159,8 @@ int main(int argc, char **argv) for (i = 0; i < 2; i++) { if ((i == 0 && (test_type == CRYPTO_FIRST - || test_type == JUST_CRYPTO)) + || test_type == JUST_CRYPTO + || test_type == DSO_REFTEST)) || (i == 1 && test_type == SSL_FIRST)) { if (!shlib_load(argv[2], &cryptolib)) { printf("Unable to load libcrypto\n"); @@ -161,7 +176,7 @@ int main(int argc, char **argv) } } - if (test_type != JUST_CRYPTO) { + if (test_type != JUST_CRYPTO && test_type != DSO_REFTEST) { if (!shlib_sym(ssllib, TLS_METHOD, &tls_method_sym.sym) || !shlib_sym(ssllib, SSL_CTX_NEW, &ssl_ctx_new_sym.sym) || !shlib_sym(ssllib, SSL_CTX_FREE, &ssl_ctx_free_sym.sym)) { @@ -215,6 +230,38 @@ int main(int argc, char **argv) return 1; } + if (test_type == DSO_REFTEST) { +# ifdef DSO_DLFCN + /* + * This is resembling the code used in ossl_init_base() and + * OPENSSL_atexit() to block unloading the library after dlclose(). + * We are not testing this on Windows, because it is done there in a + * completely different way. Especially as a call to DSO_dsobyaddr() + * will always return an error, because DSO_pathbyaddr() is not + * implemented there. + */ + if (!shlib_sym(cryptolib, DSO_DSOBYADDR, &dso_dsobyaddr_sym.sym) + || !shlib_sym(cryptolib, DSO_FREE, &dso_free_sym.sym)) { + printf("Unable to load crypto dso symbols\n"); + return 1; + } + + DSO_dsobyaddr = (DSO_dsobyaddr_t)dso_dsobyaddr_sym.func; + DSO_free = (DSO_free_t)dso_free_sym.func; + + { + DSO *hndl; + /* use known symbol from crypto module */ + if ((hndl = DSO_dsobyaddr((void (*)(void))ERR_get_error, 0)) != NULL) { + DSO_free(hndl); + } else { + printf("Unable to obtain DSO reference from crypto symbol\n"); + return 1; + } + } +# endif /* DSO_DLFCN */ + } + for (i = 0; i < 2; i++) { if ((i == 0 && test_type == CRYPTO_FIRST) || (i == 1 && test_type == SSL_FIRST)) { @@ -224,7 +271,8 @@ int main(int argc, char **argv) } } if ((i == 0 && (test_type == SSL_FIRST - || test_type == JUST_CRYPTO)) + || test_type == JUST_CRYPTO + || test_type == DSO_REFTEST)) || (i == 1 && test_type == CRYPTO_FIRST)) { if (!shlib_close(cryptolib)) { printf("Unable to close libcrypto\n"); diff --git a/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf b/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf index 65c7e5d151..5f4dd841b4 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf @@ -74,3 +74,5 @@ VerifyMode = Peer [test-2] ExpectedClientAlert = UnknownCA ExpectedResult = ClientFail + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf b/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf index cb737f8072..cb89dbc10a 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf @@ -9971,3 +9971,5 @@ VerifyMode = Peer [test-360] ExpectedProtocol = TLSv1.2 ExpectedResult = Success + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf b/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf index 65c9005ff8..8dca715e74 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf @@ -234,3 +234,5 @@ client = 8-verify-custom-fail-no-root-client-extra [8-verify-custom-fail-no-root-client-extra] VerifyCallback = RejectAll + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf index bf374039d1..0e91bed9f1 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf @@ -588,3 +588,5 @@ VerifyMode = Peer [test-19] ExpectedResult = ServerFail ExpectedServerAlert = UnknownCA + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in index bb7fddb8bc..8738aaa769 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in +++ b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in @@ -119,5 +119,5 @@ sub generate_tests() { } } } - + generate_tests(); diff --git a/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf b/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf index 4278cbf85b..e1fb3d9d89 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf @@ -199,3 +199,5 @@ ServerNameCallback = RejectMismatch [5-SNI-bad-sni-reject-mismatch-client-extra] ServerName = invalid + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf b/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf index 9ee9c71fcc..9620e015a1 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf @@ -730,3 +730,5 @@ ServerNameCallback = IgnoreMismatch [16-sni-session-ticket-client-extra] ServerName = server2 + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf b/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf index bd9a5db7a2..3304a3bbaa 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf @@ -1816,3 +1816,5 @@ VerifyMode = Peer ExpectedProtocol = DTLSv1.2 ExpectedResult = Success Method = DTLS + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf index 8b4b5360c0..9115ef458b 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf @@ -790,3 +790,5 @@ NPNProtocols = baz [19-npn-used-if-alpn-not-supported-resumption-client-extra] ALPNProtocols = foo NPNProtocols = bar,baz + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in index 7965992244..bcb632f051 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in +++ b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in @@ -237,7 +237,7 @@ our @tests = ( test => { "ExpectedALPNProtocol" => undef, "ExpectedNPNProtocol" => "bar", - "ExpectedServerName" => "server2", + "ExpectedServerName" => "server2", }, }, { diff --git a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf index bb11102636..e7e6cb9534 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf @@ -615,3 +615,5 @@ ALPNProtocols = foo [15-alpn-no-client-support-resumption-client-extra] ALPNProtocols = foo + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in index 41c9486fa5..37035f1d84 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in +++ b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in @@ -180,7 +180,7 @@ our @tests = ( name => "alpn-selected-sni-server-does-not-support-alpn", server => { extra => { - "ALPNProtocols" => "bar", + "ALPNProtocols" => "bar", "ServerNameCallback" => "IgnoreMismatch", }, }, diff --git a/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf b/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf index 4c79b0898e..b2deee4209 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf @@ -1332,3 +1332,5 @@ VerifyMode = Peer ExpectedProtocol = TLSv1.2 HandshakeMode = Resume ResumptionExpected = Yes + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf b/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf index df28ecb1e7..ceed959744 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf @@ -608,3 +608,5 @@ ExpectedProtocol = DTLSv1.2 HandshakeMode = Resume Method = DTLS ResumptionExpected = Yes + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf b/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf index 985292e900..2e6e9dea67 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf @@ -187,3 +187,5 @@ CTValidation = Strict [5-ct-strict-resumption-resume-client-extra] CTValidation = Strict + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf b/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf index 02feb2c778..4c1e9e2b33 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf @@ -393,3 +393,5 @@ VerifyMode = Peer [test-15] ApplicationData = 4096 MaxFragmentSize = 4096 + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf b/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf index 61b297053e..7f7ac4ba8d 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf @@ -783,3 +783,5 @@ VerifyMode = Peer [test-28] ExpectedResult = Success ExpectedTmpKeyType = X25519 + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf b/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf index 770f024d13..bf6c41cda2 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf @@ -58,3 +58,5 @@ server = 1-certstatus-bad-server-extra [1-certstatus-bad-server-extra] CertStatus = BadResponse + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf b/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf index eb55bbd71c..a561803a55 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf @@ -58,3 +58,5 @@ server = 1-certstatus-bad-server-extra [1-certstatus-bad-server-extra] CertStatus = BadResponse + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf b/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf index 45a9d5864b..48f569fad6 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf @@ -424,3 +424,5 @@ ExpectedResult = ClientFail HandshakeMode = RenegotiateClient Method = TLS ResumptionExpected = No + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf b/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf index d23a84a89b..3d8ebd74c4 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf @@ -272,3 +272,5 @@ client = 8-renegotiate-aead-to-aead-client-extra [8-renegotiate-aead-to-aead-client-extra] RenegotiateCiphers = AES256-GCM-SHA384 + + diff --git a/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf b/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf index 8626a06669..40480edbf8 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf @@ -152,3 +152,5 @@ VerifyMode = Peer [test-5] ExpectedResult = Success + + diff --git a/worker/deps/openssl/openssl/test/ssl_test.tmpl b/worker/deps/openssl/openssl/test/ssl_test.tmpl index 0517bff44f..9506837f84 100644 --- a/worker/deps/openssl/openssl/test/ssl_test.tmpl +++ b/worker/deps/openssl/openssl/test/ssl_test.tmpl @@ -92,35 +92,35 @@ client = {-$testname-}-client{- $OUT .= "\n[$testname-server-extra]\n"; foreach my $key (sort keys %{$server{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$server{"extra"}{$key}\n} - if defined $server{"extra"}{$key}; + if defined $server{"extra"}{$key}; } } if (%server2 && $server2{"extra"}) { $OUT .= "\n[$testname-server2-extra]\n"; foreach my $key (sort keys %{$server2{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$server2{"extra"}{$key}\n} - if defined $server2{"extra"}{$key}; + if defined $server2{"extra"}{$key}; } } if (%resume_server && $resume_server{"extra"}) { $OUT .= "\n[$testname-resume-server-extra]\n"; foreach my $key (sort keys %{$resume_server{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$resume_server{"extra"}{$key}\n} - if defined $resume_server{"extra"}{$key}; + if defined $resume_server{"extra"}{$key}; } } if ($client{"extra"}) { $OUT .= "\n[$testname-client-extra]\n"; foreach my $key (sort keys %{$client{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$client{"extra"}{$key}\n} - if defined $client{"extra"}{$key}; + if defined $client{"extra"}{$key}; } } if (%resume_client && $resume_client{"extra"}) { $OUT .= "\n[$testname-resume-client-extra]\n"; foreach my $key (sort keys %{$resume_client{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$resume_client{"extra"}{$key}\n} - if defined $resume_client{"extra"}{$key}; + if defined $resume_client{"extra"}{$key}; } } -} diff --git a/worker/deps/openssl/openssl/test/sslapitest.c b/worker/deps/openssl/openssl/test/sslapitest.c index 77e8f2e9ad..8badd284e3 100644 --- a/worker/deps/openssl/openssl/test/sslapitest.c +++ b/worker/deps/openssl/openssl/test/sslapitest.c @@ -1208,6 +1208,61 @@ static int test_custom_exts(int tst) return testresult; } +static int test_ssl_pending(int tst) +{ + SSL_CTX *cctx = NULL, *sctx = NULL; + SSL *clientssl = NULL, *serverssl = NULL; + int testresult = 0; + char msg[] = "A test message"; + char buf[5]; + size_t written; + + if (tst == 0) { + if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), + TLS1_VERSION, TLS_MAX_VERSION, + &sctx, &cctx, cert, privkey)) { + printf("Failed creating SSL_CTX pair\n"); + goto end; + } + } else { +#ifndef OPENSSL_NO_DTLS + if (!create_ssl_ctx_pair(DTLS_server_method(), DTLS_client_method(), + DTLS1_VERSION, DTLS_MAX_VERSION, + &sctx, &cctx, cert, privkey)) { + printf("Failed creating SSL_CTX pair\n"); + goto end; + } +#else + return 1; +#endif + } + + if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL) + || !create_ssl_connection(serverssl, clientssl)) { + printf("Failed creating connection\n"); + goto end; + } + + written = SSL_write(serverssl, msg, sizeof(msg)); + if (written != sizeof(msg) + || SSL_read(clientssl, buf, sizeof(buf)) != sizeof(buf) + || SSL_pending(clientssl) != (int)(written - sizeof(buf))) { + printf("Failed checking SSL_pending\n"); + goto end; + } + + testresult = 1; + + end: + SSL_free(serverssl); + SSL_free(clientssl); + SSL_CTX_free(sctx); + SSL_CTX_free(cctx); + + return testresult; +} + + int main(int argc, char *argv[]) { BIO *err = NULL; @@ -1244,6 +1299,7 @@ int main(int argc, char *argv[]) ADD_TEST(test_ssl_bio_change_wbio); ADD_ALL_TESTS(test_set_sigalgs, OSSL_NELEM(testsigalgs) * 2); ADD_ALL_TESTS(test_custom_exts, 2); + ADD_ALL_TESTS(test_ssl_pending, 2); testresult = run_tests(argv[0]); diff --git a/worker/deps/openssl/openssl/test/verify_extra_test.c b/worker/deps/openssl/openssl/test/verify_extra_test.c index cc05bc2ef1..fabc1dc59f 100644 --- a/worker/deps/openssl/openssl/test/verify_extra_test.c +++ b/worker/deps/openssl/openssl/test/verify_extra_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -137,6 +137,43 @@ static int test_alt_chains_cert_forgery(const char *roots_f, return ret; } +static int test_store_ctx(const char *bad_f) +{ + X509_STORE_CTX *sctx = NULL; + X509 *x = NULL; + BIO *bio = NULL; + int testresult = 0, ret; + + bio = BIO_new_file(bad_f, "r"); + if (bio == NULL) + goto err; + + x = PEM_read_bio_X509(bio, NULL, 0, NULL); + if (x == NULL) + goto err; + + sctx = X509_STORE_CTX_new(); + if (sctx == NULL) + goto err; + + if (!X509_STORE_CTX_init(sctx, NULL, x, NULL)) + goto err; + + /* Verifying a cert where we have no trusted certs should fail */ + ret = X509_verify_cert(sctx); + + if (ret == 0) { + /* This is the result we were expecting: Test passed */ + testresult = 1; + } + + err: + X509_STORE_CTX_free(sctx); + X509_free(x); + BIO_free(bio); + return testresult; +} + int main(int argc, char **argv) { CRYPTO_set_mem_debug(1); @@ -152,6 +189,11 @@ int main(int argc, char **argv) return 1; } + if (!test_store_ctx(argv[3])) { + fprintf(stderr, "Test X509_STORE_CTX failed\n"); + return 1; + } + #ifndef OPENSSL_NO_CRYPTO_MDEBUG if (CRYPTO_mem_leaks_fp(stderr) <= 0) return 1; diff --git a/worker/deps/openssl/openssl/test/versions.c b/worker/deps/openssl/openssl/test/versions.c new file mode 100644 index 0000000000..3ab05ec35d --- /dev/null +++ b/worker/deps/openssl/openssl/test/versions.c @@ -0,0 +1,20 @@ +/* + * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include + +/* A simple helper for the perl function OpenSSL::Test::openssl_versions */ +int main(void) +{ + printf("Build version: 0x%08lX\n", OPENSSL_VERSION_NUMBER); + printf("Library version: 0x%08lX\n", OpenSSL_version_num()); + return 0; +} diff --git a/worker/deps/openssl/openssl/test/x509_dup_cert_test.c b/worker/deps/openssl/openssl/test/x509_dup_cert_test.c new file mode 100644 index 0000000000..7f7adebbb0 --- /dev/null +++ b/worker/deps/openssl/openssl/test/x509_dup_cert_test.c @@ -0,0 +1,70 @@ +/* + * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* ==================================================================== + * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + */ + +#include +#include +#include + +static int test_509_dup_cert(const char *cert_f) +{ + int ret = 0; + X509_STORE_CTX *sctx = NULL; + X509_STORE *store = NULL; + X509_LOOKUP *lookup = NULL; + + store = X509_STORE_new(); + if (store == NULL) + goto err; + + lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file()); + if (lookup == NULL) + goto err; + + if (!X509_load_cert_file(lookup, cert_f, X509_FILETYPE_PEM)) + goto err; + if (!X509_load_cert_file(lookup, cert_f, X509_FILETYPE_PEM)) + goto err; + + ret = 1; + + err: + X509_STORE_CTX_free(sctx); + X509_STORE_free(store); + if (ret != 1) + ERR_print_errors_fp(stderr); + return ret; +} + +int main(int argc, char **argv) +{ + CRYPTO_set_mem_debug(1); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); + + if (argc != 2) { + fprintf(stderr, "usage: x509_dup_cert_test cert.pem\n"); + return 1; + } + + if (!test_509_dup_cert(argv[1])) { + fprintf(stderr, "Test X509 duplicate cert failed\n"); + return 1; + } + +#ifndef OPENSSL_NO_CRYPTO_MDEBUG + if (CRYPTO_mem_leaks_fp(stderr) <= 0) + return 1; +#endif + + printf("PASS\n"); + return 0; +} diff --git a/worker/deps/openssl/openssl/test/x509_time_test.c b/worker/deps/openssl/openssl/test/x509_time_test.c new file mode 100644 index 0000000000..32d65c8761 --- /dev/null +++ b/worker/deps/openssl/openssl/test/x509_time_test.c @@ -0,0 +1,212 @@ +/* + * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +/* Tests for X509 time functions */ + +#include +#include + +#include +#include +#include "testutil.h" +#include "e_os.h" + +typedef struct { + const char *data; + int type; + time_t cmp_time; + /* -1 if asn1_time <= cmp_time, 1 if asn1_time > cmp_time, 0 if error. */ + int expected; +} TESTDATA; + +static TESTDATA x509_cmp_tests[] = { + { + "20170217180154Z", V_ASN1_GENERALIZEDTIME, + /* The same in seconds since epoch. */ + 1487354514, -1, + }, + { + "20170217180154Z", V_ASN1_GENERALIZEDTIME, + /* One second more. */ + 1487354515, -1, + }, + { + "20170217180154Z", V_ASN1_GENERALIZEDTIME, + /* One second less. */ + 1487354513, 1, + }, + /* Same as UTC time. */ + { + "170217180154Z", V_ASN1_UTCTIME, + /* The same in seconds since epoch. */ + 1487354514, -1, + }, + { + "170217180154Z", V_ASN1_UTCTIME, + /* One second more. */ + 1487354515, -1, + }, + { + "170217180154Z", V_ASN1_UTCTIME, + /* One second less. */ + 1487354513, 1, + }, + /* UTCTime from the 20th century. */ + { + "990217180154Z", V_ASN1_UTCTIME, + /* The same in seconds since epoch. */ + 919274514, -1, + }, + { + "990217180154Z", V_ASN1_UTCTIME, + /* One second more. */ + 919274515, -1, + }, + { + "990217180154Z", V_ASN1_UTCTIME, + /* One second less. */ + 919274513, 1, + }, + /* Various invalid formats. */ + { + /* No trailing Z. */ + "20170217180154", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* No trailing Z, UTCTime. */ + "170217180154", V_ASN1_UTCTIME, 0, 0, + }, + { + /* No seconds. */ + "201702171801Z", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* No seconds, UTCTime. */ + "1702171801Z", V_ASN1_UTCTIME, 0, 0, + }, + { + /* Fractional seconds. */ + "20170217180154.001Z", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* Fractional seconds, UTCTime. */ + "170217180154.001Z", V_ASN1_UTCTIME, 0, 0, + }, + { + /* Timezone offset. */ + "20170217180154+0100", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* Timezone offset, UTCTime. */ + "170217180154+0100", V_ASN1_UTCTIME, 0, 0, + }, + { + /* Extra digits. */ + "2017021718015400Z", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* Extra digits, UTCTime. */ + "17021718015400Z", V_ASN1_UTCTIME, 0, 0, + }, + { + /* Non-digits. */ + "2017021718015aZ", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* Non-digits, UTCTime. */ + "17021718015aZ", V_ASN1_UTCTIME, 0, 0, + }, + { + /* Trailing garbage. */ + "20170217180154Zlongtrailinggarbage", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* Trailing garbage, UTCTime. */ + "170217180154Zlongtrailinggarbage", V_ASN1_UTCTIME, 0, 0, + }, + { + /* Swapped type. */ + "20170217180154Z", V_ASN1_UTCTIME, 0, 0, + }, + { + /* Swapped type. */ + "170217180154Z", V_ASN1_GENERALIZEDTIME, 0, 0, + }, + { + /* Bad type. */ + "20170217180154Z", V_ASN1_OCTET_STRING, 0, 0, + }, +}; + +static int test_x509_cmp_time(int idx) +{ + ASN1_TIME t; + int result; + + memset(&t, 0, sizeof(t)); + t.type = x509_cmp_tests[idx].type; + t.data = (unsigned char*)(x509_cmp_tests[idx].data); + t.length = strlen(x509_cmp_tests[idx].data); + + result = X509_cmp_time(&t, &x509_cmp_tests[idx].cmp_time); + if (result != x509_cmp_tests[idx].expected) { + fprintf(stderr, "test_x509_cmp_time(%d) failed: expected %d, got %d\n", + idx, x509_cmp_tests[idx].expected, result); + return 0; + } + return 1; +} + +static int test_x509_cmp_time_current() +{ + time_t now = time(NULL); + /* Pick a day earlier and later, relative to any system clock. */ + ASN1_TIME *asn1_before = NULL, *asn1_after = NULL; + int cmp_result, failed = 0; + + asn1_before = ASN1_TIME_adj(NULL, now, -1, 0); + asn1_after = ASN1_TIME_adj(NULL, now, 1, 0); + + cmp_result = X509_cmp_time(asn1_before, NULL); + if (cmp_result != -1) { + fprintf(stderr, "test_x509_cmp_time_current failed: expected -1, got %d\n", + cmp_result); + failed = 1; + } + + cmp_result = X509_cmp_time(asn1_after, NULL); + if (cmp_result != 1) { + fprintf(stderr, "test_x509_cmp_time_current failed: expected 1, got %d\n", + cmp_result); + failed = 1; + } + + ASN1_TIME_free(asn1_before); + ASN1_TIME_free(asn1_after); + + return failed == 0; +} + +int main(int argc, char **argv) +{ + int ret = 0; + unsigned int idx; + + if (!test_x509_cmp_time_current()) + ret = 1; + + for (idx=0 ; idx < OSSL_NELEM(x509_cmp_tests) ; ++idx) { + if (!test_x509_cmp_time(idx)) + ret = 1; + } + + if (ret == 0) + printf("PASS\n"); + return ret; +} diff --git a/worker/deps/openssl/openssl/util/copy.pl b/worker/deps/openssl/openssl/util/copy.pl index 01964f585e..fe1c908e68 100644 --- a/worker/deps/openssl/openssl/util/copy.pl +++ b/worker/deps/openssl/openssl/util/copy.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -18,6 +18,7 @@ my $stripcr = 0; my $arg; +my @excludes = (); foreach $arg (@ARGV) { if ($arg eq "-stripcr") @@ -25,11 +26,16 @@ $stripcr = 1; next; } + if ($arg =~ /^-exclude_re=(.*)$/) + { + push @excludes, $1; + next; + } $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... $arg = qq("$arg") if ($arg =~ /\s/); # compensate for bug in 5.10... - foreach (glob $arg) + foreach my $f (glob $arg) { - push @filelist, $_; + push @filelist, $f unless grep { $f =~ /$_/ } @excludes; } } diff --git a/worker/deps/openssl/openssl/util/dofile.pl b/worker/deps/openssl/openssl/util/dofile.pl index fc72989b0f..4533c135a3 100644 --- a/worker/deps/openssl/openssl/util/dofile.pl +++ b/worker/deps/openssl/openssl/util/dofile.pl @@ -40,7 +40,7 @@ package OpenSSL::Template; use File::Basename; use File::Spec::Functions; use lib "$FindBin::Bin/perl"; -use with_fallback qw(Text::Template); +use with_fallback "Text::Template 1.46"; #use parent qw/Text::Template/; use vars qw/@ISA/; @@ -99,9 +99,9 @@ package main; # This adds quotes (") around the given string, and escapes any $, @, \, # " and ' by prepending a \ to them. sub quotify1 { - my $s = my $orig = shift @_; + my $s = shift @_; $s =~ s/([\$\@\\"'])/\\$1/g; - $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s; + '"'.$s.'"'; } # quotify_l LIST diff --git a/worker/deps/openssl/openssl/util/echo.pl b/worker/deps/openssl/openssl/util/echo.pl new file mode 100644 index 0000000000..d90e52129b --- /dev/null +++ b/worker/deps/openssl/openssl/util/echo.pl @@ -0,0 +1,12 @@ +#! /usr/bin/perl + +use strict; +use warnings; +use Getopt::Std; + +our $opt_n = 0; + +getopts('n') or die "Invalid option: $!\n"; + +print join(' ', @ARGV); +print "\n" unless $opt_n; diff --git a/worker/deps/openssl/openssl/util/fipslink.pl b/worker/deps/openssl/openssl/util/fipslink.pl index 8248382c84..18a91532be 100644 --- a/worker/deps/openssl/openssl/util/fipslink.pl +++ b/worker/deps/openssl/openssl/util/fipslink.pl @@ -20,7 +20,7 @@ sub check_env my ($fips_cc,$fips_cc_args, $fips_link,$fips_target, $fips_libdir, $sha1_exe) = check_env("FIPS_CC", "FIPS_CC_ARGS", "FIPS_LINK", "FIPS_TARGET", - "FIPSLIB_D", "FIPS_SHA1_EXE"); + "FIPSLIB_D", "FIPS_SHA1_EXE"); @@ -109,5 +109,7 @@ sub check_hash $hashval =~ s/^.*=\s+//; die "Invalid hash syntax in file" if (length($hashfile) != 40); die "Invalid hash received for file" if (length($hashval) != 40); - die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile); + die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile); } + + diff --git a/worker/deps/openssl/openssl/util/incore b/worker/deps/openssl/openssl/util/incore index 8a88f81559..26fcf95033 100755 --- a/worker/deps/openssl/openssl/util/incore +++ b/worker/deps/openssl/openssl/util/incore @@ -65,7 +65,7 @@ # put aside e_machine in case one has to treat specific # platforms differently, see EM_ constants in elf.h for - # assortment... + # assortment... $self->{e_machine} = $elf_ehdr{e_machine}; ################################################# @@ -131,12 +131,12 @@ my $name; # (STT_OBJECT || STT_FUNC) if ($st_bind<3 && ($st_type==1 || $st_type==2) - && $st_secn <= $#sections # sane st_shndx + && $st_secn <= $#sections # sane st_shndx && @sections[$st_secn]->{sh_type} # not SHN_UNDEF && ($name=(split(chr(0),substr($strings,$elf_sym{st_name},128)))[0]) ) { # synthesize st_offset, ... - $elf_sym{st_offset} = $elf_sym{st_value} + $elf_sym{st_offset} = $elf_sym{st_value} - @sections[$st_secn]->{sh_addr} + @sections[$st_secn]->{sh_offset}; $elf_sym{st_name} = $name; diff --git a/worker/deps/openssl/openssl/util/libcrypto.num b/worker/deps/openssl/openssl/util/libcrypto.num index 8414d97ff1..2390fa0362 100644 --- a/worker/deps/openssl/openssl/util/libcrypto.num +++ b/worker/deps/openssl/openssl/util/libcrypto.num @@ -282,7 +282,7 @@ TS_REQ_free 282 1_1_0 EXIST::FUNCTION:TS PEM_read_DHparams 283 1_1_0 EXIST::FUNCTION:DH,STDIO RSA_private_decrypt 284 1_1_0 EXIST::FUNCTION:RSA X509V3_EXT_get_nid 285 1_1_0 EXIST::FUNCTION: -BIO_s_log 286 1_1_0 EXIST:!WIN32,!macintosh:FUNCTION: +BIO_s_log 286 1_1_0 EXIST::FUNCTION: EC_POINT_set_to_infinity 287 1_1_0 EXIST::FUNCTION:EC EVP_des_ede_ofb 288 1_1_0 EXIST::FUNCTION:DES ECDH_KDF_X9_62 289 1_1_0 EXIST::FUNCTION:EC @@ -4234,3 +4234,34 @@ CRYPTO_secure_clear_free 4315 1_1_0g EXIST::FUNCTION: EVP_PKEY_set1_engine 4347 1_1_0g EXIST::FUNCTION:ENGINE OCSP_resp_get0_signer 4374 1_1_0h EXIST::FUNCTION:OCSP X509_get0_authority_key_id 4448 1_1_0h EXIST::FUNCTION: +conf_ssl_name_find 4469 1_1_0i EXIST::FUNCTION: +conf_ssl_get_cmd 4470 1_1_0i EXIST::FUNCTION: +conf_ssl_get 4471 1_1_0i EXIST::FUNCTION: +X509_VERIFY_PARAM_get_hostflags 4472 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_get_by_fingerprint 4493 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_new 4494 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_init 4495 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_get_by_alias 4496 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_new_item 4497 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_shutdown 4498 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_new_item 4499 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_ctrl 4500 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_get_by_issuer_serial 4501 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_get_store 4502 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_ctrl 4503 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_get_by_alias 4504 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_get_by_subject 4505 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_free 4506 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_get_by_subject 4507 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_free 4508 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_shutdown 4509 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_set_method_data 4510 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_get_method_data 4511 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_get_by_fingerprint 4512 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_free 4513 1_1_0i EXIST::FUNCTION: +X509_OBJECT_set1_X509 4514 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_get_get_by_issuer_serial 4515 1_1_0i EXIST::FUNCTION: +X509_LOOKUP_meth_set_init 4516 1_1_0i EXIST::FUNCTION: +X509_OBJECT_set1_X509_CRL 4517 1_1_0i EXIST::FUNCTION: +OCSP_resp_get0_tbs_sigalg 4529 1_1_0j EXIST::FUNCTION:OCSP +OCSP_resp_get0_respdata 4530 1_1_0j EXIST::FUNCTION:OCSP diff --git a/worker/deps/openssl/openssl/util/local_shlib.com.in b/worker/deps/openssl/openssl/util/local_shlib.com.in index a381872537..e49aa15c77 100644 --- a/worker/deps/openssl/openssl/util/local_shlib.com.in +++ b/worker/deps/openssl/openssl/util/local_shlib.com.in @@ -16,7 +16,7 @@ $ $ NAMES := {- join(",", keys %names); -} {- join("\n", map { "\$ __$_ = \"".$names{$_}."\"" } keys %names); --} +-} $ I = 0 $ LOOP: $ E = F$ELEMENT(I,",",NAMES) diff --git a/worker/deps/openssl/openssl/util/mkdef.pl b/worker/deps/openssl/openssl/util/mkdef.pl index 66db26c3b9..3626dcdcb1 100755 --- a/worker/deps/openssl/openssl/util/mkdef.pl +++ b/worker/deps/openssl/openssl/util/mkdef.pl @@ -252,6 +252,7 @@ $crypto.=" include/internal/o_str.h"; $crypto.=" include/internal/err.h"; $crypto.=" include/internal/asn1t.h"; +$crypto.=" include/internal/sslconf.h"; $crypto.=" include/openssl/des.h" ; # unless $no_des; $crypto.=" include/openssl/idea.h" ; # unless $no_idea; $crypto.=" include/openssl/rc4.h" ; # unless $no_rc4; @@ -977,16 +978,6 @@ sub do_defs } } - # Prune the returned symbols - - delete $syms{"bn_dump1"}; - $platform{"BIO_s_log"} .= ",!WIN32,!macintosh"; - - $platform{"PEM_read_NS_CERT_SEQ"} = "VMS"; - $platform{"PEM_write_NS_CERT_SEQ"} = "VMS"; - $platform{"PEM_read_P8_PRIV_KEY_INFO"} = "VMS"; - $platform{"PEM_write_P8_PRIV_KEY_INFO"} = "VMS"; - # Info we know about push @ret, map { $_."\\".&info_string($_,"EXIST", @@ -1335,7 +1326,7 @@ sub print_def_file } elsif ($VMS) { print OUT ")\n"; (my $libvmaj, my $libvmin, my $libvedit) = - $currversion =~ /^(\d+)_(\d+)_(\d+)$/; + $currversion =~ /^(\d+)_(\d+)_(\d+)[a-z]{0,2}$/; # The reason to multiply the edit number with 100 is to make space # for the possibility that we want to encode the patch letters print OUT "GSMATCH=LEQUAL,",($libvmaj * 100 + $libvmin),",",($libvedit * 100),"\n"; diff --git a/worker/deps/openssl/openssl/util/mkrc.pl b/worker/deps/openssl/openssl/util/mkrc.pl index c177349c13..99912eb8b5 100755 --- a/worker/deps/openssl/openssl/util/mkrc.pl +++ b/worker/deps/openssl/openssl/util/mkrc.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -60,7 +60,7 @@ BEGIN BLOCK "040904b0" BEGIN // Required: - VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0" + VALUE "CompanyName", "The OpenSSL Project, https://www.openssl.org/\\0" VALUE "FileDescription", "$description\\0" VALUE "FileVersion", "$version\\0" VALUE "InternalName", "$basename\\0" diff --git a/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm b/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm index 5de7b58e8b..a77909c606 100644 --- a/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm +++ b/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm @@ -21,7 +21,8 @@ $VERSION = "0.8"; @EXPORT_OK = (@Test::More::EXPORT_OK, qw(bldtop_dir bldtop_file srctop_dir srctop_file data_file - pipe with cmdstr quotify)); + pipe with cmdstr quotify + openssl_versions)); =head1 NAME @@ -695,6 +696,32 @@ sub quotify { return map { $arg_formatter->($_) } @_; } +=over 4 + +=item B + +Returns a list of two numbers, the first representing the build version, +the second representing the library version. See opensslv.h for more +information on those numbers. + +=back + +=cut + +my @versions = (); +sub openssl_versions { + unless (@versions) { + my %lines = + map { s/\R$//; + /^(.*): (0x[[:xdigit:]]{8})$/; + die "Weird line: $_" unless defined $1; + $1 => hex($2) } + run(test(['versions']), capture => 1); + @versions = ( $lines{'Build version'}, $lines{'Library version'} ); + } + return @versions; +} + ###################################################################### # private functions. These are never exported. diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm index 10daba4b42..0821bdedd3 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm @@ -170,7 +170,7 @@ sub get_messages $startoffset = $recoffset; $recoffset += 4; $payload = ""; - + if ($recoffset <= $record->decrypt_len) { #Some payload data is present in this record if ($record->decrypt_len - $recoffset >= $messlen) { @@ -296,7 +296,7 @@ sub new $records, $startoffset, $message_frag_lens) = @_; - + my $self = { server => $server, data => $data, diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm index ad942d4251..786ba0c72b 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm @@ -178,7 +178,7 @@ sub new $decrypt_len, $data, $decrypt_data) = @_; - + my $self = { flight => $flight, content_type => $content_type, diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm index fd3fba5694..79a8be9a89 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm @@ -20,7 +20,7 @@ sub new $records, $startoffset, $message_frag_lens) = @_; - + my $self = $class->SUPER::new( $server, TLSProxy::Message::MT_SERVER_HELLO, @@ -66,7 +66,7 @@ sub parse my $extension_data; if ($extensions_len != 0) { $extension_data = substr($self->data, $ptr); - + if (length($extension_data) != $extensions_len) { die "Invalid extension length\n"; } diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm index c011d2707a..6e5b4cdcb4 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm @@ -20,7 +20,7 @@ sub new $records, $startoffset, $message_frag_lens) = @_; - + my $self = $class->SUPER::new( $server, TLSProxy::Message::MT_SERVER_KEY_EXCHANGE, diff --git a/worker/deps/openssl/openssl/util/perl/with_fallback.pm b/worker/deps/openssl/openssl/util/perl/with_fallback.pm index 2af1d5fbd5..242365033f 100644 --- a/worker/deps/openssl/openssl/util/perl/with_fallback.pm +++ b/worker/deps/openssl/openssl/util/perl/with_fallback.pm @@ -1,4 +1,4 @@ -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -8,15 +8,17 @@ package with_fallback; sub import { + shift; + use File::Basename; use File::Spec::Functions; foreach (@_) { - eval "require $_"; + eval "use $_"; if ($@) { unshift @INC, catdir(dirname(__FILE__), "..", "..", "external", "perl"); my $transfer = "transfer::$_"; - eval "require $transfer"; + eval "use $transfer"; shift @INC; warn $@ if $@; } diff --git a/worker/deps/openssl/openssl/util/process_docs.pl b/worker/deps/openssl/openssl/util/process_docs.pl index e084df78a5..f7daef0dd8 100755 --- a/worker/deps/openssl/openssl/util/process_docs.pl +++ b/worker/deps/openssl/openssl/util/process_docs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -101,7 +101,7 @@ my $suffix = { man => ".$podinfo{section}".($options{suffix} // ""), html => ".html" } -> {$options{type}}; my $generate = { man => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"", - html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=apps:crypto:ssl \"--infile=$podpath\" \"--title=$podname\"" + html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=apps:crypto:ssl \"--infile=$podpath\" \"--title=$podname\" --quiet" } -> {$options{type}}; my $output_dir = catdir($options{destdir}, "man$podinfo{section}"); my $output_file = $podname . $suffix; @@ -115,6 +115,32 @@ @output = `$generate`; map { s|href="http://man\.he\.net/(man\d/[^"]+)(?:\.html)?"|href="../$1.html|g; } @output if $options{type} eq "html"; + if ($options{type} eq "man") { + # Because some *roff parsers are more strict than others, + # multiple lines in the NAME section must be merged into + # one. + my $in_name = 0; + my $name_line = ""; + my @newoutput = (); + foreach (@output) { + if ($in_name) { + if (/^\.SH "/) { + $in_name = 0; + push @newoutput, $name_line."\n"; + } else { + chomp (my $x = $_); + $name_line .= " " if $name_line; + $name_line .= $x; + next; + } + } + if (/^\.SH +"NAME" *$/) { + $in_name = 1; + } + push @newoutput, $_; + } + @output = @newoutput; + } } print STDERR "DEBUG: Done processing\n" if $options{debug}; @@ -238,7 +264,7 @@ =head1 OPTIONS =head1 COPYRIGHT -Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013-2018 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/util/shlib_wrap.sh.in b/worker/deps/openssl/openssl/util/shlib_wrap.sh.in index 6c115ba725..d030d33ed6 100755 --- a/worker/deps/openssl/openssl/util/shlib_wrap.sh.in +++ b/worker/deps/openssl/openssl/util/shlib_wrap.sh.in @@ -1,5 +1,22 @@ #!/bin/sh +{- + use lib '.'; + use configdata; + sub shlib { + my $lib = shift; + return "" if $disabled{shared}; + $lib = $unified_info{rename}->{$lib} + if defined $unified_info{rename}->{$lib}; + $lib = $unified_info{sharednames}->{$lib} + . ($target{shlib_variant} || "") + . ($target{shared_extension} || ".so"); + $lib =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\) + |.$config{shlib_version_number}|x; + return $lib; + } + ""; # Make sure no left over string sneaks its way into the script +-} # To test this OpenSSL version's applications against another version's # shared libraries, simply set # @@ -25,15 +42,8 @@ fi THERE="`echo $0 | sed -e 's|[^/]*$||' 2>/dev/null`.." [ -d "${THERE}" ] || exec "$@" # should never happen... -# Alternative to this is to parse ${THERE}/Makefile... -LIBCRYPTOSO="${THERE}/libcrypto.so" -if [ -f "$LIBCRYPTOSO" ]; then - while [ -h "$LIBCRYPTOSO" ]; do - LIBCRYPTOSO="${THERE}/`ls -l "$LIBCRYPTOSO" | sed -e 's|.*\-> ||'`" - done - SOSUFFIX=`echo ${LIBCRYPTOSO} | sed -e 's|.*\.so||' 2>/dev/null` - LIBSSLSO="${THERE}/libssl.so${SOSUFFIX}" -fi +LIBCRYPTOSO="${THERE}/{- shlib('libcrypto') -}" +LIBSSLSO="${THERE}/{- shlib('libssl') -}" SYSNAME=`(uname -s) 2>/dev/null`; case "$SYSNAME" in diff --git a/worker/fuzzer/corpora/COPYRIGHT.txt b/worker/fuzzer/corpora/COPYRIGHT.txt new file mode 100644 index 0000000000..cd780976c5 --- /dev/null +++ b/worker/fuzzer/corpora/COPYRIGHT.txt @@ -0,0 +1,3 @@ +/* + * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. + */ diff --git a/worker/fuzzer/corpora/pseudotcp-corpus/785b96587d0eb44dd5d75b7a886f37e2ac504511 b/worker/fuzzer/corpora/pseudotcp-corpus/785b96587d0eb44dd5d75b7a886f37e2ac504511 new file mode 100644 index 0000000000000000000000000000000000000000..21f5cffa1239f1b5709a45f1e0cec04efa86662c GIT binary patch literal 24 gcmZQzU|?imU|?bB-hPCE;qzIpOUmM0my~`2061+1*#H0l literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/0.rtcp b/worker/fuzzer/corpora/rtcp-corpus/0.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..802eecf052f84ea5986b47bb97c2e378ae083203 GIT binary patch literal 72 zcmV-O0Jr~u&j1k;G*);70007uZm3*`{#ybC000Bu|1QR7jYBd)EK>*v000QCl_sm7 e*^*!AE~QfefqZQF*?jiU;YLJa02^K3ukGZAcpV`C literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/1.rtcp b/worker/fuzzer/corpora/rtcp-corpus/1.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..c062793b3c3afa50b0d09de749053080fae2bec4 GIT binary patch literal 24 fcmZoT&%i2V5>~;=z`)#{w<4zfUo_MG|9Zy&T+|67 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/10.rtcp b/worker/fuzzer/corpora/rtcp-corpus/10.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..fdc77802184cd5e64addc884027864d7c6d4b289 GIT binary patch literal 76 zcmZoW#ULbP5>~;;n8*O6D;b#*lNf*i$gW~!PE1OMu&Wtafb0~ocnu>fh@A>jQ_IK( JW~YJl003vq5FG#j literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/11.rtcp b/worker/fuzzer/corpora/rtcp-corpus/11.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..994f721dcaf776ee0733d55f7ddab88f7f64d8bb GIT binary patch literal 12 OcmZ3$z`(=+0UQ7arU0t| literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/12.rtcp b/worker/fuzzer/corpora/rtcp-corpus/12.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..557fe9c23a4affc002aae5b5844281490bdd0848 GIT binary patch literal 16 XcmZoV$G|LP5>}z?n%?=DuW3I3EZhbH literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/13.rtcp b/worker/fuzzer/corpora/rtcp-corpus/13.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..0f1b1809a78f7afd61d927d4bfe64050fb49f604 GIT binary patch literal 12 RcmZoU$G{|H5>~+g1OOF)0%-sM literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/14.rtcp b/worker/fuzzer/corpora/rtcp-corpus/14.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..df6bfed86cf09413612367b19ab2f9ad5b6b9e28 GIT binary patch literal 40 ncmZoV#lR_K5>~;;m6(&6oa&H~UtGcf1VFJ$MvkQXB&Y}g<46j? literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/15.rtcp b/worker/fuzzer/corpora/rtcp-corpus/15.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..3b31b3079d44d24a3641d65b3017a7adc5a9631c GIT binary patch literal 20 acmeA_$G{?F5>~+g1VOI8P7Lh7Cj$U8?*%ac literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/16.rtcp b/worker/fuzzer/corpora/rtcp-corpus/16.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..0496ddf910f7f657aea9f887c33adeda6f4cfebc GIT binary patch literal 16 VcmeA_$G|LP5>~+g1VOI8P5>g*1DgN< literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/17.rtcp b/worker/fuzzer/corpora/rtcp-corpus/17.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..755b7198babc2902cc6db89151173eff88078aa6 GIT binary patch literal 12 RcmZoZ%fKXL5>~+g1OOFj0%rgK literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/18.rtcp b/worker/fuzzer/corpora/rtcp-corpus/18.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..04fd1e34176e5d71508f9cf3ea1da111d3efc553 GIT binary patch literal 28 ccmZoU$G|3J5>~+g1j?@IoxBjbiw{Tx09Y{vIRF3v literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/19.rtcp b/worker/fuzzer/corpora/rtcp-corpus/19.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..8ae9812f106795160df584cdc9bda00b527cbee5 GIT binary patch literal 12 TcmZoV%)lflBrKw&qNV`=5!(VL literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/2.rtcp b/worker/fuzzer/corpora/rtcp-corpus/2.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..ba38a0a599bbbf4ee6d1c54e4255b64fbd8ec654 GIT binary patch literal 12 RcmZoU%fKXL5>~+g1OOFv0%!mL literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/20.rtcp b/worker/fuzzer/corpora/rtcp-corpus/20.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..debb7de9407cdc0bdd160b5fe9ae173da6fd8d16 GIT binary patch literal 8 PcmZoX&A=#R5>^2K3#tNQ literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/21.rtcp b/worker/fuzzer/corpora/rtcp-corpus/21.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..3fcbd405e22bf2a82654ca19c07a2e79b403b20c GIT binary patch literal 8 PcmZoT$-pRN5>^2K3zPz1 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/22.rtcp b/worker/fuzzer/corpora/rtcp-corpus/22.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..3defd8c253b874ccd022b1340b8312e8a45cb277 GIT binary patch literal 8 PcmZoT&%h{T5>^2K3%&wn literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/23.rtcp b/worker/fuzzer/corpora/rtcp-corpus/23.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..211ccbd5beb0b40616e58992ab2bee657f24b775 GIT binary patch literal 20 bcmZoX#lRwD5>~;)oS2l%$dr=Gz`y_iHi`sW literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/24.rtcp b/worker/fuzzer/corpora/rtcp-corpus/24.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..8ded9be7fda05f2f6b0af7927f19deb7edee32f3 GIT binary patch literal 8 PcmZoX%)lrpBrE~|3LXKF literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/25.rtcp b/worker/fuzzer/corpora/rtcp-corpus/25.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..b5c8146cef5eb61837615e00dabcb7f023af3725 GIT binary patch literal 20 bcmZoV#lRwD5>~;;n8?hOlFFd$n%)TjG)@HW literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/26.rtcp b/worker/fuzzer/corpora/rtcp-corpus/26.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..0fd4f255119d558fe6302039389e256bcc0fc3e8 GIT binary patch literal 12 TcmZoX#lR$F5>~;;z`y_i6*K~4 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/27.rtcp b/worker/fuzzer/corpora/rtcp-corpus/27.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..2c8bb63c9ceaaf47808cf545fba57e95cc2c2d57 GIT binary patch literal 8 PcmZoY%fKjP5>^2K3)li^ literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/28.rtcp b/worker/fuzzer/corpora/rtcp-corpus/28.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..6a20bc27d8268e5d42ea2682d4b4650901af8a48 GIT binary patch literal 12 TcmZoX$G{|H5>}z?n%)Tj7!Cuz literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/29.rtcp b/worker/fuzzer/corpora/rtcp-corpus/29.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..76fd214197974959001bde3246b0a0fa4dc22eb2 GIT binary patch literal 56 ccmZoV$-paQ5>}z?n%>EP1pvjnun02%0Ncq09smFU literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/3.rtcp b/worker/fuzzer/corpora/rtcp-corpus/3.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..72307e08bd5f26f4999c20ea80a62d6d8665177f GIT binary patch literal 12 TcmZoZ$G{|H5>}z?n%)Tj7$yV2 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/30.rtcp b/worker/fuzzer/corpora/rtcp-corpus/30.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..cfa38faa6785347df21fad385fb5254f13fdf890 GIT binary patch literal 28 jcmZoT!N4YD5>_E7BqE`tqNZVNVru5%>gFCA79IfrTw(@@ literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/31.rtcp b/worker/fuzzer/corpora/rtcp-corpus/31.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..8abf725057d4381b60b9245e385c7a3edc42c190 GIT binary patch literal 28 gcmZoZ%fKdN5>~+g1j?@Iom`2D|A2ItP-5bL0BfxXxc~qF literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/32.rtcp b/worker/fuzzer/corpora/rtcp-corpus/32.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..76518c88dd71bc2cae02bf4344cd50417ee7d028 GIT binary patch literal 8 PcmZoV&A=#R5>^2K3$g-Z literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/33.rtcp b/worker/fuzzer/corpora/rtcp-corpus/33.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..92964965a61d9c752368d9c1c11b867decbbbc8c GIT binary patch literal 32 lcmZoT&%iEZ5>~;&z`)d~+g1VOI8PAu%dCo8+AcLH%25O)Iriw_Ay literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/35.rtcp b/worker/fuzzer/corpora/rtcp-corpus/35.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..f86df024485c323c27cf97da5911ac16b3043fa4 GIT binary patch literal 16 XcmZoX#lS3N5>~;)l$gZGn8FMIBjp2= literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/36.rtcp b/worker/fuzzer/corpora/rtcp-corpus/36.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..d274d416a22817d2cafd504e78656b5c1ad85413 GIT binary patch literal 52 ZcmZoX!N4PA5>~;01t`0wcVZD{005Jg1Hu3R literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/37.rtcp b/worker/fuzzer/corpora/rtcp-corpus/37.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..b4f04f4069eb4d7508e392b9e7555d8a2415f269 GIT binary patch literal 12 OcmZ3$z`(=+0h|B_rvR(~ literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/38.rtcp b/worker/fuzzer/corpora/rtcp-corpus/38.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..8d65e0ff35abd16ed9847bc788f9f7cf15a6f7f4 GIT binary patch literal 20 WcmeA_$H2k>1wpR9P7Kw*Cj$T`Qv{I! literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/39.rtcp b/worker/fuzzer/corpora/rtcp-corpus/39.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..fb969f85f0b6719b7fdd9e4f85b4c9fd5e895e07 GIT binary patch literal 12 TcmZoV$G{|H5>}z?n%)Tj7#ah= literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/4.rtcp b/worker/fuzzer/corpora/rtcp-corpus/4.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..51701851226fdbc2f3eea7b61fb2d5c3e69cb0a6 GIT binary patch literal 20 WcmZoZ$H2k>1p*9*S`RxhFaQ80RRgjB literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/40.rtcp b/worker/fuzzer/corpora/rtcp-corpus/40.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..279047c6b2224f32bf4bf9a1082cfaef286c26c6 GIT binary patch literal 24 ScmZoZ$H2+}2aW%spdJ8Fs0vR2 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/41.rtcp b/worker/fuzzer/corpora/rtcp-corpus/41.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..09a8a589bdd87981a3f00e9748e45c0e9f87656f GIT binary patch literal 20 YcmZoU$G{?F5>~+g1j?@IoxDIA05LEF&;S4c literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/42.rtcp b/worker/fuzzer/corpora/rtcp-corpus/42.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..f727b190a7bc70acfaf77366af34c665a93e26de GIT binary patch literal 11 NcmZo*U|?c^000G>0D}Mk literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/43.rtcp b/worker/fuzzer/corpora/rtcp-corpus/43.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..9aab33a48a11ed9308c7e9b7a3374d4634157c7b GIT binary patch literal 36 scmZoT&%hyM5>~;=z`)j>w<4zfUo_MG|9Z#Ld!3COb%Ht8O;uYB0OcVKZ2$lO literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/44.rtcp b/worker/fuzzer/corpora/rtcp-corpus/44.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..2eba529c3ab3175d0ebfe2f19049793e8da84195 GIT binary patch literal 32 jcmeA_$G|RR5>~+g1VOI8PR#7TCo8+AcLH%25O)IrivI~h literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/45.rtcp b/worker/fuzzer/corpora/rtcp-corpus/45.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..50c0beabed8e8e5341eab827496e7b679cb689bf GIT binary patch literal 32 mcmZoV#lS9P5>~;)oS4MG%#@PKz`&sFn%>FCoRXRbWCH+qCkBZC literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/46.rtcp b/worker/fuzzer/corpora/rtcp-corpus/46.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..2de424a5d1f543f67be8113722be6e9c47305c11 GIT binary patch literal 32 jcmeA_$G|RR5>~+g1b(i*PR#7TCo8+AcLH%25O)IrimwSi literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/47.rtcp b/worker/fuzzer/corpora/rtcp-corpus/47.rtcp new file mode 100644 index 0000000000..71d530b41f --- /dev/null +++ b/worker/fuzzer/corpora/rtcp-corpus/47.rtcp @@ -0,0 +1 @@ +€ \ No newline at end of file diff --git a/worker/fuzzer/corpora/rtcp-corpus/48.rtcp b/worker/fuzzer/corpora/rtcp-corpus/48.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..665695029a0d6163cb3900c1f6adbe94d4495def GIT binary patch literal 16 XcmZoZ$G|LP5>}z?n%*hEz{mgqCv^kT literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/49.rtcp b/worker/fuzzer/corpora/rtcp-corpus/49.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..33b0f3d873804d479daeadbe75f3827cc95874bc GIT binary patch literal 24 dcmZoX#lR|L5>~;;m6(&6oa&H~UtGcf1OQkS25bNT literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/5.rtcp b/worker/fuzzer/corpora/rtcp-corpus/5.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..46bef3242ab73295379167e4a8b1d3f85c2fb9b6 GIT binary patch literal 20 bcmZoZ$G{?F5>}z?n%*hRaPW{b0|Ns9Kzs$G literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/50.rtcp b/worker/fuzzer/corpora/rtcp-corpus/50.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..5bec1253979b1d1d0c7560c699cb8db97c64b66a GIT binary patch literal 4 LcmZoT&A}z?n%*gqa`2Ed0|Ns9Lm&nO literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/52.rtcp b/worker/fuzzer/corpora/rtcp-corpus/52.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..55cc76cd81b9c692e8e6ade6967f8c9481cfb68c GIT binary patch literal 32 ncmZoX$-pjT5>}z?n%-$HC?u?;tfFdcVru5%>gFCA79Ifrh4u&g literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/53.rtcp b/worker/fuzzer/corpora/rtcp-corpus/53.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..ac11523c9418991c82e4406b7b8a4b119f14f3a7 GIT binary patch literal 4 LcmZoT#lQdn1Y!Y8 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/54.rtcp b/worker/fuzzer/corpora/rtcp-corpus/54.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..f3f0bb8fa1e14b3a2ac1441fbfced52e30fb8362 GIT binary patch literal 12 TcmZoY%fKXL5>}z?n%)Tj7&8OG literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/55.rtcp b/worker/fuzzer/corpora/rtcp-corpus/55.rtcp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/worker/fuzzer/corpora/rtcp-corpus/56.rtcp b/worker/fuzzer/corpora/rtcp-corpus/56.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..f0012f1efa8be39116d80d4edc58a31ec24131a4 GIT binary patch literal 8 PcmZoX$G|9L5>^2K3%>$o literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/57.rtcp b/worker/fuzzer/corpora/rtcp-corpus/57.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..61517f01d846d0b212dd865d6575ec4273cf1b78 GIT binary patch literal 20 ZcmZoZ%fKRJ5>~+g1j?@Iom`2D{{S=K1&aUx literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/58.rtcp b/worker/fuzzer/corpora/rtcp-corpus/58.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..3688310a051433680a98879e02743d0c63173fe9 GIT binary patch literal 20 ZcmZoU%fKRJ5>~+g1j?@Iom`2D{{S=e1&jay literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/59.rtcp b/worker/fuzzer/corpora/rtcp-corpus/59.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..e914f83b161a4eac17d836de30ff3f57735ac420 GIT binary patch literal 4 LcmZo*U|;|M0t5ho literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/6.rtcp b/worker/fuzzer/corpora/rtcp-corpus/6.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..dcad8f6b4023d1e5296906d06a41f4eb8373d3cf GIT binary patch literal 16 XcmZoY%fKvT5>{cPnA)!Fn%)TjDO?2s literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/60.rtcp b/worker/fuzzer/corpora/rtcp-corpus/60.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..8e999e783286de630a97e63ed4f90c79d02cdad5 GIT binary patch literal 28 gcmZoU%fKdN5>~+g1j?@Iom`2D|A2ItP-21x0BZ0D;s5{u literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/61.rtcp b/worker/fuzzer/corpora/rtcp-corpus/61.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..eb38d237aa7948ca3247eb16886325914863bd70 GIT binary patch literal 44 zcmZoT&%h;Q5>~;^z`)U+w<3n=m=TBCYT@~;H?1bc>jgLF{JdH7jbXwC*@v}m06^jp A+W-In literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/62.rtcp b/worker/fuzzer/corpora/rtcp-corpus/62.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..6df94b715f99d1d628780481c71974250b13dae9 GIT binary patch literal 4 LcmZ=@U|;|M0R#X+ literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/63.rtcp b/worker/fuzzer/corpora/rtcp-corpus/63.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..a3b2acb3a89931b6f553776a86ae05167b3f54b4 GIT binary patch literal 40 ucmZoT&%h~U5>~;=z`)#{w<4zfUo_MG|9Zzj{PbRDBS)QJj&)PjRs#SE6%BI$ literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/64.rtcp b/worker/fuzzer/corpora/rtcp-corpus/64.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..4d50c0f4ae0088fe12739f0f508e9ad541595db1 GIT binary patch literal 20 bcmZoT&%h#N5>~;&z`)dV5>~;I2m}la3;-ue1MC0* literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/66.rtcp b/worker/fuzzer/corpora/rtcp-corpus/66.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..f280f3ca09f22773fc60acbec2f266b94dcaf723 GIT binary patch literal 4 LcmZ3$z`y_i0)zme literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/7.rtcp b/worker/fuzzer/corpora/rtcp-corpus/7.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..f8f74e12c6567fcde426e56758c6c7dc96396d00 GIT binary patch literal 16 XcmZoX#lS3N5>~;;n8?VKlF9%8BOL>h literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/8.rtcp b/worker/fuzzer/corpora/rtcp-corpus/8.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..f0ceba83f4c1ee6584a77e74dcee2866f7c7663f GIT binary patch literal 4 LcmZoT%)kHu1Wf@% literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtcp-corpus/9.rtcp b/worker/fuzzer/corpora/rtcp-corpus/9.rtcp new file mode 100644 index 0000000000000000000000000000000000000000..7cc07893c31e4a89c22f21911d02e71ca601c883 GIT binary patch literal 16 XcmZoX#lS3N5>~;)oS2l%$e02EB@YAi literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtp-corpus/rtp-0 b/worker/fuzzer/corpora/rtp-corpus/rtp-0 new file mode 100644 index 0000000000000000000000000000000000000000..c93ce82ec053ddff3c36ac9dc65918982b729030 GIT binary patch literal 12 TcmZojVTed|7OD_339A4A7dZoi literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtp-corpus/rtp-1 b/worker/fuzzer/corpora/rtp-corpus/rtp-1 new file mode 100644 index 0000000000000000000000000000000000000000..84834aefeadcab8cd3c7ecd4a7b844ba7b20f4f6 GIT binary patch literal 20 bcmbP`!Vr<_EL0(65>~PA9s{EgL)bY0LRto9 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtp-corpus/rtp-2 b/worker/fuzzer/corpora/rtp-corpus/rtp-2 new file mode 100644 index 0000000000000000000000000000000000000000..3a5aedba9b50dca8cb9e0687cfa4bb2d77fa548e GIT binary patch literal 24 fcmbP`!Vr<_EL0(65>~PA9s`pQL)f_qw-^`zV95v3 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtp-corpus/rtp-3 b/worker/fuzzer/corpora/rtp-corpus/rtp-3 new file mode 100644 index 0000000000000000000000000000000000000000..300309ff37939c0863b04a64a8703722e067355d GIT binary patch literal 43 xcmdm#!Vr<_EL0(65>^336O5cgQup0sU=(5qJ6DicnUkNGQjnOEl9`vz0RTaU4-o(W literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtp-corpus/rtp-4 b/worker/fuzzer/corpora/rtp-corpus/rtp-4 new file mode 100644 index 0000000000000000000000000000000000000000..84834aefeadcab8cd3c7ecd4a7b844ba7b20f4f6 GIT binary patch literal 20 bcmbP`!Vr<_EL0(65>~PA9s{EgL)bY0LRto9 literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/rtp-corpus/rtp-5 b/worker/fuzzer/corpora/rtp-corpus/rtp-5 new file mode 100644 index 0000000000000000000000000000000000000000..7dd663200723a7a0f5ae26c976515321edc32a97 GIT binary patch literal 261774 zcmeI5U1%Ifw#R#7D>&iCJ5GY*`!-`j#v_dGNVa6f!)``eSii~g(-Kg8^)c2}2-#6S zE;nyi$%aLV1#aJUz)!Zo7h?9sZ4*dBz>&RAhCBrJCB*pSF%W|H;(#7Z(zmL6KB{|8 zb=PUv#N+s1K{Hk7oa(9movMFzkF2y`b(g2=6O*Ol%u;#q@=gD&EOWE7uXsvvMg5Xj z4=k17Rr@mk^J8xH`U&ry%Qv03*Gu9p=Qz&5zmC&vRYnes)L$H5oD(q@ z!nix12JZvn^~()eJ?(8hemCa~Ro(xdDosw*D|u1M^2Mu(;(4_R@#fSDg~DLLZx+#r zmSW-9$oPQ+^CP1NM(4&V`zw|2<>$_g4(}VQ-;pC-oEuvlUi^=R1C{alWBd2LI6Shy z`MLk4e(uHagPq`$tqx`W*&XtYwmtl?^nXYZ}WMmP{Mip+gwa^isrB@S_9$1;X|1y97 zhlm_uThNkorw>bHq}dv_d4-g+jV02{_P~(H2;S5Nc%>qW1b|lrM`{B?k!3?k#hM-f zVNGYGMu3+}BfV~$7lZ;rk%a)SPx`!0jj%oOaYd1eJQ4t*;7xh(0A zuwvr#QV3q)m4yJWPd06c^ny_EkoP7!l9Fr<+lj=bG%pX}#p4w&Bwimf8WW$yqBVk- z77ghDFA|H^Xqy*=BFi<0Ha+GJ+lj;uY0h3of)|e$gaSg5g#fP)Z%&fY5LOb4)@Yj- zgn~Ea!3(^y5a9LEE`M_ego1~>H__(#(ni`&Brc`3s7VKSkyy0Ga3N{k<_=7Jb5=4E zyueGli}BEq(YEIoghHFG1P7TKp3!z9u|x9sgBOn%gd#x?v@RZFG8#fbV$mAGON)kd z*yaVH(5gX#gG>$2XgiVEA$k14i^mH>k)Q`!7mqO+4WS^hXpP{dMMFAl^MX)l)gZw^ zriN#R@Vq*8%lPz5goNJ>bb@+u_=WOkQw-dU@*d4(sFbu>yp+XL&? zu8(BrA0$J!i7Y-ct%Wo@Y1R>4-FZO`9)&U8g27}P-tg&f3DHAi+VVhG(>$NbHb2{@}&q1))gL z1Feh4n2d%{kXW=v@Y13o9kzKvD70#j;2=}OGulohc1Rw7@Z#};P$cMq*2QB?Mnfn_ zELtOYY0;1l+q@tYS~W;;kg4GrZ6^{tB#%FM@pwTf67)dp;xQ(pyM@AEc9*B>6O*Ol z%u;#q@=a$Ysa)()S=p2HsSmA>PUZcd&cEEpA>O@@zAK#*BBvM6*gY9}{o~P4;W&}x zHh3lTiF?DzAGc;`W8(9mffsmncAi*`hlY%{J-;9nu^bsS$<*+SwiAgRlE)vsc)TDK zM#>Ni;xQ(pArvGQtr5JmXh?@`UJ#0y1{gKT)bNb96Nw#?#~-|SydV@t$`A|UF(#uS z6eJd{5xlf$NQZ4+eI^v8_DMtW+bE1G;AMoV9Ryx&6h@Uk6N=85k;o1UlNxxLQ0l~h zSBHg34MGvSt1xPskWGoPeQAh^p8`DQ2Co>9lqQ72NEu>5DNs$^5DF7Yofz=yurR4v zD*+DS0xtqe zf+?#|yw-J0C`A{NL<4vw;^}gNR~M2*gKb_}m7;5qwg(2u??Rkt0Ix(mT~6@oLXv2J zP=o|{uZc*_oDfzsPOT{LYLPH|x6KPe!IKE^09EZULII)3LV(wYoXR|-?TL>oRvv!{1#ilO7kFhM!0W?X!(_B=Va3Gfr4YQpD+>W$ zA9CsQj1USQ^4>)Aaz;kmP9!d+Nz7U!cxlm)j&LE7E}jt+AH1}x%tJ#)V}6lXv_{*! zAQal!o#4=>$J}8%k=P;4*~>`q;_-q|BHArxf zso@!IClWg(k3V?vctI!<^g!$4F(#uS6eJd{5xlf$NQZ4+5DKjtBsj>_@Qk(-i5-&1 zAG~9fc)Kpg%Rm#q-k9&UE^RYcrdv}V`nz;#`3{24D z){4%ud~s2sn^)N`Dxk-`kWT2anMVGSQMz>lJ%%1fGyvDf5gfmU2K4xsR9dsoO48%j z_f#!qGJa3Jqzpb4-&Z_Li@GoM*Z?3z$4m%*$*3gJ>G&!^6|8YAQ2Wp{b1K5@15j1&H)bFtvB{CQ<%<*8lg&iTIM-|?I6f_Zs93_V2msJ>q) zd`G)f>zQ2G+N~O=>djWMkaL{Qzhd*eBZo)Fj#Wp-$B!MD9~s>>Ha9jpx^Jw0M}#?x zb7PCci;D{fD&zAD`}e&#JhETyD(a3?a~cP$&h{I!e7onywTgSfsWu)j`OXVF4~oA4 z-x29?TeL34e%8H@f|#A#E;~1C)6=K&=Vzyj;a?QX*Du7+!b{#M_tl`|CGYdO<=pyP z^P+WY({1DiZf!Q)+`U5^<&WQ9FJ0Lve<|MH5g#pow$*APP84ze!!07B;f)+E)Yd|0 zEhwH0l%F^3z3PcXz9)V%6!}?XNjz3~B4X^~6n>K9ej;{^N~|3;i_K$tp1AEpC|;*) zCo>+D>J}_v%8_QvJi>ged=Y71$UBjCK0g?1CpC8j&fg@2e65tUQ;hp7CAV>XU}K~F z^6@`@Ba<>98qMaMh$E4M@z_J>u#(zm617{6Oa8QRlwBx&O z_ssVFV27PtS{j@wmqm_pZ%i(g^ZD+`eE!+ioQ_WJw8iu6({#UOk{9D%ZI3@lQ{DYJDdZz6*x{R4Dj`LMX|aW3^7kK&6S0?fK5V z^3mX4dF#O1T29jkb9~D0ovIyud390bU>N@;7%tD0s+w z6K$R^ZKUl);!;|Rnsk5{iA8G+7n0U(?!d%1XC))S3%s*6scqahR|7OfGyv}j0&ZC(%xtr{da$kgzRwiAgRlE=SC zyfzYM4a3Dd7c$!R1Pez`eiYAWdtg1vBqLi1p*%EXbT4_ye@fa{g(Sc;_L5g$v66$~ zp&_Gf^9mV}AH_4;9vFmz#~-}FOC?}?Jwhl#0=!o>BN^+q6A7W*qahR|7OfGyv}j0& zZC>{w6tTsFCJ2B42!H?xfB*=900@8p2!H?xfB*=900@8p2!H?xfB*=9KwlAf(kb-S zcrX|c=uZN{?`8Y$@76))Dcn|;q5C8!X009sH z0doTQ1-m&bM1sKm5g_jyc}ClJnc)fX#z02f9vHqZATeu=;H5=FI>3v>qBTM&vS_~+ zr@7-77S_k+-u(B)|NPU!TmNTPzAx+J-hA~>Z-)o-4B?q$(MJBlybMpQM`2nD<__Du z!ZS7hd~KxdfkE-Ls7Z%iUY7q62{~e(5%cT8@`6xg*%Wv=Bcn0#Ni13;cxlm)4%@sS z6cCCm1bBVOsmwFlp7?gJz<4-Pqj_k^XxqHPF_Ry~Guj>)63OEaUf`t?u)Q836sht~ z1gIIwSht->2n8<@;Kkzwp&)c1)x={=Mnfn_ELtOYY0;1l+q@tYsj5H(kf|{;4qkSb zr|J_|OV2n<<-yB0onpaX`SZ%k%2T_}o%4OizvDOC1@rQJ7Oj|)-$=V zwOch#)tjwiLHr`bQ_7LUqhrUaBje-84$O~??i!mL8y(#@R=*>EU$Qtiwm7`FxNx8{ zKEJSk-;2W|`<0%u>Nqv0aj@!azah)Fdv08-xF?)y zB=SA+lcC7ZB1_`2!V?i=7pL%(9QPBkV^m`8pjm7l)ARgQw^W>3o~+MIgwrwS6dlKC zCi8=ch2#uXPcCn-PwW;xUzBhVTPk;_ot3ZLTz*TT>to~u%UEu0dT-|L{UJ=aq_rhX zp?ICHoy>Sps#~yxDMy+u^9b{?@8^nSMLPSRZfe&cbx%lq&_sTi^7& ze@2g$ZJ9=ovAX(~RZ)f<@zNTEG_0=rzI?qZ*U#~2ACp$s0?TTsp5>HT!x9|RA&>0% zuG>AceLvV?CzqB6XUb)fqud*lOXYmNJ2Ibtwl$}tlRItkJo_}=uVq!=_o$6_{W(!< zAEa%Kj-qW=DxIVKeZv!W<)o<2!MsxiFT!!R+Cuge%uJuzAD-rx;(@1L)`Cmx%xI`fA_C}xASr#sLIzc?o+Sf{kH0S)``&6#3?M# z6emhkll7&t(PiIhaiqT~M>{`s_H1cW?C(xxPkE(z2c2`BbtmyI=@D{1{PUxR`O#nV zH8&u?Uy!#PLMm$BUS&OYS3_}#+B?c{QgKv7{rhJ76U82{jzkQn+O73=t-I3Hh?Avj zGtI9x+`H>5jqbp}B4tc|d7~+TF8a6S?NzfBw)&;kcS7O2a0oz!f?p_vlB_va>tqa6 znh4pR@7yaN4eph<4y>)^#ND&ACW_;nK0Vj1?7{ducc9Hg?rna*r5R|7*;V`%rEXf) zr6Qq!_f|()hA5+58<7~U$@aJS`1L3+1L1_=^&z8?ND_)~nHrwab|SGu^7w-nj~9d@K@YSp9%C{ZLP28D8o^78hIH8G1)CKV zLcx;=@B*(a1bBUTYnY6-y%AyJ^HK<2;FW~{uMfHOc}55Y4|#8*c{wAaZ6^|!(j;cB z5xlf$NJqGkNEgqDi4R^{Rpy}~qcOioELx*&UiTps+Gzm?2!H?xfB*=900@8p2!H?x zfB*=900@8p2!H?xfB*=900@AXueu{ruhKJ zVj*~5`pQ$g&Ykmp$G_t@+tFvNCAOXqy@%+a>idPlceG2jp2>x+-Kue_-fR^M;{SJ{ zKA`N#;nA^U)sgY>V+ZC(Mt6`=u|67d3xv|CJ#l?jKmGSw7{rg@V9@(#U z6?Mm{IgNu=XZsCVzTI=J=Vtp+ zp0)Q}o2c3*XE307G#Qx+EU1^JKfX*ME}Z zej;{|N~|3;i_K$tp1mH#sawJ4~SHdH;iyuCiLTlnPj1;asX zsob4*R=#p``7MR61IY=NvE179-pr{_1m6;-P`pmpPG&qP)h$@Ulq1cSd4%d?i)B6b zXW{c z>c&q2Z><2|4|dqerKQ1{a#=`X?hWxg>Bw`xTcLT)!@JWK&$Carj*#{Q@qE|A$itq` ziMRGaS_jK>j@Hx1u%{+5DPyV+*=r|PR65U-e+aU7W_A|YdjQ$Xw0wS42b%vunQ5Wp zLgWHKX{AX{XUb9s3T+w{4V^J9{V*~R88R5g8NKcZqLRk^wNm0cU01sww{zcdmk-w` z#Fq8S>#Kuu`I$i0?)| zmbcwPjcVRr>Klc&?LxcOseIP1o^01VuOjN-H`|{m_IPz9VmQ@qt+#94mC~lT2XHDU zOV?(aUu(E`*H;?dfq|v<<&DPufp^5a=--yNSItt`>X%yI35D;%ApjK$exVTVGMZzx zPA1zu*7khKZCoGN*eJhz{OC9G>z=IxYil`San?j}oYSZ0PCPbWb?!Ba2XD%6(eh#( z!T3906g3mMxB2~+W}qo%SMgVrx@lFHiiG}MyEkbVBCS@9*>V@@h2N@0aHKYD^9tuf z>c^%B*d7>ueU;8!jQ}r|MtU8*(iy1{5Q;2Yr%Etm9m2{32VM`B7lZ;rk%a)S4{wf> z(GUs}i`HnH7leX0<-rTQvJl|)(Jp^;2ZVx$yf@M2`O-$(P9*NRwWvu4c#&AN#&98N z-R2HVd~;SZ61>1myNmJAkkPj17lcBatpo>|8lKU1BC$jA_=6XZ7la}~540{GV=@{- zL1NJw!ApyVblBzvq0p*9f`d#A&uBZ5*dclRd&FxaVb(BQymKL=ZBMXp^yEkJjJ5~X zqf9cgl@Q89Lq_+Km;9%seN{*TJYz3;^%W~Q7#3SJ_>i^mH>!IKE^0d(AjR3HEXAOHd&00JNY0w7?Y0IvS+GsO{qjRdrR#iBa! zr+q4o^g4K@Gg2eKOQn%s4}~Z_E;YjTpQ<5|smLP%;1$7<+5oRqM3DdpMV4!}2trn4 z@Upu+RiC(8dd68Q4_?0M6bt^!pI25^p4xTpobNmS9lzNwn3w0n&_i^O>idPlceG2j zp2>x+-Kue_-fR^M;(yocDdouF(XnIIk@4|k2j)jcca6=BjgIactKX6TSKr0CvBlxV z#f1Zv@%e@Q`(7L#*{}4JRmZ70je}KZ`wdyX-E-qw#XaFv8;_TK=Y^dI1(zL>9=Ap7 zQtW5l`zVOnx$UxZvo<|_Dt~@#J&{+$LCj;f@ z4STP8B9ZTjpA1EQ7FiOH6`qI~yEuiP`N^QYNZWTPcCn-PwW;xUzBhVTPk;_ot3ZLTz*TT>p*gXWh}Qgy*G3B{tzZy z(%KTHP`pmpPG&qP)h$@Ulq1cSd4%~``6AN3kar^Oe10(2PHOH5oWDs3`C2Jyrx^EF zN^ax&z{W=T<>P<+MkZxIG@9l2!Fze*M7&ck+NaYG>i^E|OuwCCtdF;KXJNW>%9R4+ zt#5kXKcmOWwoIePSY7?gswhK_cxeqn8dg_*U%p*sj1k4dX*fn_yR&vMGFVF`}u zkVkfW*X^F!z8~zclS@m3Gv%_#QSOb&rE)&s9huKR+nUqS$(^=%o_(6`*Rrbbd(=j| z{+y__57M?qN6|JbmCn)rzTpYGa#B?1VBV>M7vZ>DZ6SLK=61EiyKNGcMrLQmJ8s*A=6_)#5b{)c>Ltf52E31LuLlxnEQN(Lep_`u>qKa3 z;uMx=iW8-&$@)^+=(6v$IMUygqn#f*d$zPG_IIbUr@YdX4{(ZCkiDHjeMz zbutDjO@wUEckY#s2KUNa2iDed;_lg56UA{(pPuVh_F(*-JJ4n#_cp)Z(hM}k>?;0> zQa7#YQjyTVd#j@?LzL03jYtgFgx{+1h}q^9P6*x@$Y|RG!>_MM%vvLOY0;1l@FKBj zjSz|~d#4tsxdXy#&Pqmt*MsE+p@2|iA;9ayo8x3Ogo4DPHQMF{q2Nt<@B*(a1bBV4 z%ir7qq2M9!O|*Hww2`(GiFYSIB-Bo?hPTu55CxdRj5oRy3OFYwatVmvftwC(u? zq0nY4!9k{mXSAJ2?2tVE;Kkzwp-9jJt&7K)jD}E9)IuxFO`7p^$4K|3GiOkjAX3aP9%hamk99U z@q$qBBm%s^D+>W$AKn@!qit_QnE1RDf){vYA;9ZHE`6R6Lcv4cn`mCn$Y|S%#HBQe zS!)C@EgI4hE+o>$Gh*U{msXW|Xvk>HFA|H^Xq(r42!(c9zySgv00JNY0w4eaAOHd& z00JNY0w4eaAOHd&00JNY0w4eaAkYT{o^%R*FbWI-1V8`;KmY_l00jDz0Irq#GcOnw z2!H?xfB*=900@8p2!H?xfB*=900@8p2!H?xfB*>e3jzEtp#98$4PK}-+D~Qc!bd%$@+?i-Hf!bev{>=WkK=P$5>Y(WJme9 z+`L_FHY`dkQ0uM&da?(+5VJ3Cn?Mo*j_iFhX+P# zZz=k(+L!sCpKwao*WGt7-?ZMT<;7dZvaG(z$)JaS_~7MlmQ`;RhsK5~FOM(IiI@vP z+?`MT_dfCZ<+iMDxw}u_%~%5^=YOX1lM|IFQ-i-U{*xiD57pFcHxt^Pi<$$AqekYEPjGihDjgOxi7h^gwIyX8p5+2E- zKaz!DBz~XPi)EFq>d}(5_l92%-Pph9vURgOJ-wMdKRcaUc*Wgx=9V+Hx93HlTRToQ z(|2p9>SXR6+b(=8l5=Id@MVxAOQvg&JQ-O8vk`?`c`a}RXX%y&r3Y5#?!V06{~k~h(V3}IEv%UM zycB{Lc%>o0>yu6!LcJgqJmlSp4y7br!*n8XDb33Rc=31z3yIfCD9HJauHp-6Mhp-oS6hv`IOhfL01MuHcQ7lZ;rk%j=T4{uJA(GXS=i`HnG7leX0 z<-rTQ(h%VF(Juew4hRJgd3U0d=Sv%DI+3`P)}kgI;6-B58iR$TbtiXV;wNV%Bf$&2 zw7VD&4H<2EenBX-*@|$Gso@z-ClWg(k3V?vctI#4^g!$4F(#uS6eJd{5xlf$NQY@& z5DKjtL^#OQ@QkJti5-&1AG~m|w(xbfc5dxXsrJQ%#s%c)q$)p{P($Dn3IyEdk zcjG;k^G;g@FCIDYda%486lqk1moqXN6Q9JQHG-EG4e2n=3qk>*NJD_vhn&hhqv?r{ zD^?zV2nBD-gBN(EA;9ayTf=0uX<^00=cN$5z$*;_ULSJl^NbJ*9`f!)^KwQ;n@%Jy zrAf?MBY0`ikd9y>kuIJQ6Cb>^s?0+}Mq_@FShPmdydV_X*&X4~rYE_>bRw}sCTA}r z!HdTWLJ^?{S{IKo84aNzv1pCprA0$JO!I2QKq2a-sGX%nNOU_` zNYOEgyqNfjFg1g~tBE2}1-uerY6h9+1))fD&CyIp`ikj9Vu$4A0=#&~yAz!}U)o61iNvL}7B%SrFA|H^ z7%U{MJGlcBKRGKI30~l(-Nkrl$Y|5^3qqmIR)m904bNygk=P-5{K1RI3qld02U-`8 zF&Pb^AhBqT;H5=FI!yC|P-xX4!a=5nXEdEi?2tVE;Kkzwp@`4}t&7K)jD}E zHHdJKso@z-ClWg(k3V?vctI#4^g!$4F(#uS6eJd{5xlf$NQY@&5DKjtL^#OQ@QkJt zi5-&1AG~W>x_FGqXb1&~MQa2vEgI5cniqsZs|FDcGBrG-=|p0O866(;jel2M=LgOPWwQQ$_UwAI)=^PirH$pimCR)R-)B5gmJ0osZ(6&G zcc-nDubfPFmz`HmqEY>~M&;3Yzgt`Ro9=AtoIg`|>#FGzs$H6aL-%3f*-`Yvf=The zYL`-I5)CS07u7Jg5NZXD?wvCxv2MDhw?EKHJp8gUvx3>vRHc>zsnXN3`Zd*+MwQZY z>*1bXc71G*)!rSWw8`9rPWmS3abrcNS-!Za(9NrK7ZuRsZb&EeIGINNl2N*K13iWw zhcp1!#~~b#LIZmIODb)$&x+FH#`jbWWlH=Wdr9ekD!#9Hm=<+U>Tv>q5S?T~@JmKT ziB8K`^sD%i6yNld%e+2Oy10wrOHva2{TZRhzogRQvp@g@KmY_l00ck)1V8`;KmY_l z00ck)1V8`;Kp=v^)0Q3Kg$o2gARv(F7bEyP!9G=hr&}J*bL8c~=vH!BOJXM*vnt#p;{?a*Tdn#l{+HLTAUkQ99&#n7%Ps?FAN`fd2nc0?JDY)Rko@}OV-{S zvV42!#~3o?D^U0T<{mg z^7RYxv+#<$>AdE5yySj9x16cHJuh0fcARRa@77M$$=o}(UHJH&TK>v*;Y;!MuJ~yA zv!`4ZaiWOxA8Zg24R`3IU0w^EWxu#GP=4N^`D2L6x-Tw2qBJ~y>IS(%v#rens+SyrN%%nza#)PVngRZkogKKif!J3dBE zu$1N2j{8>T-tU5hOIo{v6pGjB@QwWFH* zeCMwsLcUf?+$pyEi+QJdy>ENF@Q2gC|3)UIPc-V~xBh!!d%e9=H`-hA2lamAw5H#F zG1e!Wy0b7{+;pVCxV0VE{a5%{>6U5u7^|y)Srui#5-*KGNWU<7XP3Yd1%XXoX(l;dHxPNxwOrk=g9?jX52j z+;NNN`Df{V4XgToNNqIhFNj+6AWds{6iu^IX&vn!+pe%HCq;Gk=bb8eA&v*t7P6;c zZdO~on^bzE|)QwvxAna|~y3a?B1 z?D}M-bAwN?d;fghS$|@_WZkRgj^32_T3P?D-~;!BxQ~%{GQmBRe7|_N_NTx4-qyfxbn`nEdiaQ+!?YZp+)Nda-wV`Nnrb!Mkt> zK(_7Kb|A@`V>M1Dfl3o0d$X;3<&*xs^6tL1wT!rXw$?C-QLp z`z_5tW6X}?FDmtbc7b&6qi6 z%r6ct^ZzC^grZZ=<1M_Lk*?a+DOv_gW_vZlMb`I4F69g;PoM=GS6sw;+wq!F)#L7Dnpk^dx-E<-$6ud-$7mpW&g3y6j6OS<&4WS^h zXpP{dMMFAF^MX*sssa%}rY4cG|FW|@RhhV&f6iJe^k2Sd3!S&j&`ZmGnt@uP&H0f>aCnDei7m-<;3xk(Nm?N@$pk*^Ft#C zM(0LHMvjbD?#SPlEY6KC4lXV(j1|Y{7lx0#JUBG0^psW0DqGc~C2Q{uS-w4V<66;K zw@TF~^Pct6{-c7+zEF?bqIIe5r{;d-$L!y8*}7Stp5Dx!pPkNK^lkF>3-Pn?io5B& zCMuW2f1l4SXKHWHi`K0jr<&=zwNrI6_l|8BK7OZ`zp`EUQoOw@K3e|lDVIf@DB}DF z8$?9I9Xe^3*8*qRFRl!fpEu~f=88nVCw@{C`B`L%JXUZbV(j7+ev;#Us_huXwzl8Q z)sN}A-l~(&O)XDWW+sB^n6Yw}m1rjOgNTJ>4U{&P_f{qj3ZExRFo<2nyVKUnS579o z%kKCXIl)qvTRZMsnR~wr5-w@&3Q{Our^_2D4@!0OmoVjsv!xzkwyk^-YG24&p>{Ug z-`0+5?(?0$iU|2yDRHOR?l0z@>h-?u?ZO{U|Na}9ls?g@m*4vDh3)nBPTgp4#UIrB zjnkTb`^8wFZ0gR!baB&>0^`{$*8^0ZY6z1|bcrtDYxcugdjv zI@~8ot7CzsHI&YB%51{oAJZa_Y_-(e@0milK31(Bo7o0Ch0Y_>Bpn|;19 zr^AywZt*<-EZwhRRo@S(jb{A?QEMKgX$_B}X;vz&qy1ys6?WyMsLuYpQw1-?@u1p5 z_7u#`YKwQ%Br1mVVevS0cT*oqLwEe7rItwyam*Sd}-3nd!;GjJP^3In}9!EC0;r@=Jx+ zrG0jNveLQ1C)mAzzV56)F<-LoRdYvg%6qM>e^>BeSf0sEU4= zO8pKx<5)E-@-FEyaz6a?qm22{Tk|#3C%<2iw;Vz$%I;xhJ$6g3^es}x+ zH@*`J-i1Q|vTe_{14-5#t8p?3RGJ9cn{C}IpY-pQclWKWWyIaHwI+&XZEekUD!V`a z)*Wa)k%#NwZ)pY^V|EmOQK=`b>QWKWzjLdjECZC$tc^$v*JS!zeEfQpmw{kH@cNL^ zNF<3xYXmPX8qxt?Bo?jFG%pB6n!Qt-p5zYGiNp?>oV|<$FCH%l1%x6E0bU>8oFtdE>3Lf(AL?_ReHqvw=aVf1uO*+7f#G*9@3rXuv z?!d%P&Pqmt7kFuRF&-K++VuQ_P-wFi;UH7PGn!5$c1Rw7@Z#};P(HFA|H^Xqwl3 z2!(c9zySgv00JNY0w4eaAOHd&00JNY0w4eaAOHd&00JNY0w4eaAn6vKsxD{RcE(%|BOvfMd?~pO?P!%z<;~JkRp(c=dMp8EcWP7X$AxI;ix% zZGT6*RO^{c&^o9Zrz-VU&KCdPh5CT96URqJPnCwo$4`yT4~-lcof{n)IWk(gBmY^9 z#ktYN!NtXevEumr!tjxo2Zx5$uA**PWvhC$WbM5n%eRMaTq`>3R;l`A-m_lXFCWXf zFVy3+GxhmJs z>G*SKkLXxnX$>X+f!#@8)F*vM)e}Djys-j2&);DumzMfx3I!pFnK#Arq(jgBZiHqv z5ATj!JkLMdI6~YL#Iqd_BM*AMAl{k>X&fxeIa*gA!ycQ&sEnyTWUrZAQE5F-{vpWT znb}!n?*U{l)$;jK9ccCkWu^s=3!w`Dr4=VRttm?#D6nZ%G;p?Q>4%|#$dLXZF45~g zKPqa>Un`}3r|W3<;&$#?&hqifgxIoPePgv>ZeP=rg&A>mTym;Y3s)ZgN8C@~5%-a| zbob|c_~%C%^W*-efa%_uKJnei$MUvYs8QKHOnsx!v|VV{T9wb5)s1G&b&I0@eZBpO zVsEbwg$$d`R;^jh-?u?ZO{UpZrFC-Lt!IZ7m}#)|x1m zwY4?3{=|IAx>wB|y(zy%%ZhRM<8OUYR8QpL`uAI!fyS5}#a~qFNvpb4MD*|2y-C9W zX*Ft0m%C6e{8lZ5Ber3hS1=!9KQ=zV^uX}zt9a&W1bC@5;_KiQ&q$4cP^8&9Re~w& z5LO;I@OrSkAQTXaGz55kcypYLhER}Lv_{jsAQZeQ4_@Gvh5)aRcKIiFKqz>~yAz!} zU)o61iNrm(7B%SrFA|H^7%U{MJGlcBKRGKI30~l(-Nkrl$Y|5^3qqmIR)m904bNyg zk=P-5{K1RI3qld02U-`8F&Pb^AhBqT;H5=FI!yC|P-xX4!a=5nXEdEi?2tVEUE;MJ zF>4qu-no#`rYBf1dh(-qM$-f9QYIPMiU{SQA)~v=Oa8Bi^mH>!IKE^0eCIMV4^=4i$Di8nx5C8!X009sH z0T3`x09XI!nc|3#A_47Rv8WFGX`f0Xz7AgTjMND5Qfb8310jl!i;Xb-r)o%KEb>qQ zc!hApHoz+uQ78aHk>;8$gpk$fzw9heRVJ?HpR<+<{g-cAIon(L^UBJ~GY8I{^E}JD z!sP@8aC(;^5-q!dP*9eqs2?%Y#G1N>5p}tg=--TC(=ukmcJ$H?9?( zb*of;GVfV0?LR8G>FLev`Pu2*Mc*c0zYsqQueh7e zYoc;V{P+3Xa;En7ylCCpajKcVTRT-JbMM%8;p2B|`77InFU8xt;-lryo^n~li6YK_ zut7vL+@X_pc`b03{o=|%`FVrxYpzJ-d*UZWk)K7D$YTX3BE~LG;U_unr`nEDY-{_? zT>Y4?>#aKZ+|=@9Wo9Cnju|Uw76rA^21*;tdn*$Mh0hZu7{spP-Dzv(D<_lP zWp^A%POy~a){gsD=HBmugiBhxf)t9^>GDR(gHql6B}_TuY^g_>Z7W}d+844`sGZIB zx3#01`+VoGB0|1aO57>7`-^#}dcALZyYPq8zyC%irB5{K<+uKOVSBy3Q#aaM@dx#O zR4cD4W+Z3GMljY$F#^JTb|=|&TP-~ci73LrT&>hLF6d&=HyZ#o9&FuW}k1& z>G0%^TRhJ{OZRJ7)%Qbcqgj7J)S3rrTEnAgnw3iHX#d!DgN6QtyDV$eT$Sa`Q?qK_`2xbmbX{+V(<3y zjqiklci|9#Y}>Q#K$11bYMe|0l_o;=W?T2lC;fZn-F<6o8FBY)t%+h;TU&FT%I=T9 zbq88ctDmRO(5qx>Q8;@7(Gr%K&9GYa=`O-$3P9*NRwWvu4c#&AN#$X|7-N_x8 z_{mwxNbn+f8IpD4$Xt`@^kAK($t^c)M7-%lVuK+dN0`7X0uJGVP(Ucs5a9J8CLY%W zVdW7s%?m=ooATfVUTFyM`tUS?jD}F~kas7VObyRyI+3`P=J5wF9eo)Pow!SV{`6K@P;G!jW-(Hg-^i-vT77l}n{ zG|dY_k!I`FrYE_>bRyL&iZrLx)jr9wXd}T(i-vTV<^`chvqH$!@QkJt38CQe2QMBk z2nB>94FO&s-kc<(A*>`8toINAZ^Fmf>TBf3{{<#Omvx92prH7#TPi80Y?3BkuAH0FZME5dZ)H literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/1.stun b/worker/fuzzer/corpora/stun-corpus/1.stun new file mode 100644 index 0000000000000000000000000000000000000000..1f82c03ffaaad4af33488a91fba9e1870e8d2fc0 GIT binary patch literal 32 ocmZQ%WZ+R0TH>TBf3{{<#Omvx92prH6c{)d82@bTWqq&&0FvVhaR2}S literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/10.stun b/worker/fuzzer/corpora/stun-corpus/10.stun new file mode 100644 index 0000000000000000000000000000000000000000..a6b06b2be8f3136b8fc6ae0d28a3d21d20741f20 GIT binary patch literal 44 zcmV+{0Mq{g0RR{w5~M=osYc;^0K#Ha2mt^9AOI8q0?S(k6JA2&tybZ}FqxgI?E%9Z CcMn1U literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/11.stun b/worker/fuzzer/corpora/stun-corpus/11.stun new file mode 100644 index 0000000000000000000000000000000000000000..1f82c03ffaaad4af33488a91fba9e1870e8d2fc0 GIT binary patch literal 32 ocmZQ%WZ+R0TH>TBf3{{<#Omvx92prH6c{)d82@bTWqq&&0FvVhaR2}S literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/12.stun b/worker/fuzzer/corpora/stun-corpus/12.stun new file mode 100644 index 0000000000000000000000000000000000000000..cb91baa250fc85a41207c344dada1630744abc6c GIT binary patch literal 32 ncmZQzWZ+R0TH^G0rQ5?AhC@jq9E=PMYz!QUNy#axY3UgNjYSCw literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/13.stun b/worker/fuzzer/corpora/stun-corpus/13.stun new file mode 100644 index 0000000000000000000000000000000000000000..63298fce7d76fa7ad8da9c8c6c219c27e55e7670 GIT binary patch literal 28 jcmZQzWZ+N~TH^G0rQ5?AhC@jq9E=PMYz)kaNy%pbYj_9F literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/14.stun b/worker/fuzzer/corpora/stun-corpus/14.stun new file mode 100644 index 0000000000000000000000000000000000000000..31f9f732d498a97fd69a0a0152184ab597f89b9d GIT binary patch literal 40 vcmZP+WDrplTH>TBf3{{<#Omvx92prHI2i;O7+4rX^Abx-GV+Tut5Q<{+~o_o literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/15.stun b/worker/fuzzer/corpora/stun-corpus/15.stun new file mode 100644 index 0000000000000000000000000000000000000000..3d15a67193e58bf6a9e8e72fbc455a53b921556d GIT binary patch literal 32 ocmZQzWZ+R0TH^G0rQ5?AhC@jq9E=PMTnuasi~TBf3{{<#Omvx92prJ^cjRQN=gc>^z~CK5_1c3QuUJaa~T)_F*ptW literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/2.stun b/worker/fuzzer/corpora/stun-corpus/2.stun new file mode 100644 index 0000000000000000000000000000000000000000..50fe614adbade2725170230a6abcdcd2df0de80b GIT binary patch literal 44 zcmZQzWROr4TH>TBf3{{<#Omvx92prH7#Tzun07R(F#cj-U=d*0XAu4W-&2Oe01)R5 A{Qv*} literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/3.stun b/worker/fuzzer/corpora/stun-corpus/3.stun new file mode 100644 index 0000000000000000000000000000000000000000..50fe614adbade2725170230a6abcdcd2df0de80b GIT binary patch literal 44 zcmZQzWROr4TH>TBf3{{<#Omvx92prH7#Tzun07R(F#cj-U=d*0XAu4W-&2Oe01)R5 A{Qv*} literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/4.stun b/worker/fuzzer/corpora/stun-corpus/4.stun new file mode 100644 index 0000000000000000000000000000000000000000..a6b06b2be8f3136b8fc6ae0d28a3d21d20741f20 GIT binary patch literal 44 zcmV+{0Mq{g0RR{w5~M=osYc;^0K#Ha2mt^9AOI8q0?S(k6JA2&tybZ}FqxgI?E%9Z CcMn1U literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/5.stun b/worker/fuzzer/corpora/stun-corpus/5.stun new file mode 100644 index 0000000000000000000000000000000000000000..c0a79fa7abf1e8db609a06be9e4aa3b399a3c3e6 GIT binary patch literal 108 zcmV-y0F(a!0RUJb5~M=6=cfU@G}eathu^M%A^;FmR8>wObY*jNAY*K4Wo~o;Bme|% z00IAiDF6tQFZr=iCOb9&1^@|Vc64ewXf}3PARr(B2mlnC>Zc69*vnRU9`d!a)AC8d OwQ-_=C;$ZIdOOb{m?)kA literal 0 HcmV?d00001 diff --git a/worker/fuzzer/corpora/stun-corpus/6.stun b/worker/fuzzer/corpora/stun-corpus/6.stun new file mode 100644 index 0000000000000000000000000000000000000000..1f43a4787d587d4af22b5979453a9cbd57f4b5d7 GIT binary patch literal 80 zcmV-W0I&Z60RTK95~M=6=cfU@G}eathu^M%A^;0?Wpi{Oc4cF9Z*m|2AOHve0ij3X m5~f1{2mll-k@cDVo{+_*`EtfRCfC-r-EVLBrNqEpl3HA%P?nlpl3%32pu`}=z{uhLkP)PK g14Q-0WzGy73?kYSzs~$SZ^Gf862{J->Oc1Y0E&1YCIA2c literal 0 HcmV?d00001 diff --git a/worker/fuzzer/include/RTC/FuzzerRtpPacket.hpp b/worker/fuzzer/include/RTC/FuzzerRtpPacket.hpp new file mode 100644 index 0000000000..a96ae0c07a --- /dev/null +++ b/worker/fuzzer/include/RTC/FuzzerRtpPacket.hpp @@ -0,0 +1,17 @@ +#ifndef MS_FUZZER_RTC_RTP_PACKET_HPP +#define MS_FUZZER_RTC_RTP_PACKET_HPP + +#include "common.hpp" + +namespace Fuzzer +{ + namespace RTC + { + namespace RtpPacket + { + void Fuzz(const uint8_t* data, size_t len); + } + } +} + +#endif diff --git a/worker/fuzzer/include/RTC/FuzzerStunMessage.hpp b/worker/fuzzer/include/RTC/FuzzerStunMessage.hpp new file mode 100644 index 0000000000..864dcadaae --- /dev/null +++ b/worker/fuzzer/include/RTC/FuzzerStunMessage.hpp @@ -0,0 +1,17 @@ +#ifndef MS_FUZZER_RTC_STUN_MESSAGE_HPP +#define MS_FUZZER_RTC_STUN_MESSAGE_HPP + +#include "common.hpp" + +namespace Fuzzer +{ + namespace RTC + { + namespace StunMessage + { + void Fuzz(const uint8_t* data, size_t len); + } + } +} + +#endif diff --git a/worker/fuzzer/include/RTC/RTCP/FuzzerPacket.hpp b/worker/fuzzer/include/RTC/RTCP/FuzzerPacket.hpp new file mode 100644 index 0000000000..fce1bdd4fa --- /dev/null +++ b/worker/fuzzer/include/RTC/RTCP/FuzzerPacket.hpp @@ -0,0 +1,20 @@ +#ifndef MS_FUZZER_RTC_RTCP_PACKET_HPP +#define MS_FUZZER_RTC_RTCP_PACKET_HPP + +#include "common.hpp" + +namespace Fuzzer +{ + namespace RTC + { + namespace RTCP + { + namespace Packet + { + void Fuzz(const uint8_t* data, size_t len); + } + } + } +} + +#endif diff --git a/worker/fuzzer/new-corpus/.placeholder b/worker/fuzzer/new-corpus/.placeholder new file mode 100644 index 0000000000..e69de29bb2 diff --git a/worker/fuzzer/reports/.placeholder b/worker/fuzzer/reports/.placeholder new file mode 100644 index 0000000000..e69de29bb2 diff --git a/worker/fuzzer/src/RTC/FuzzerRtpPacket.cpp b/worker/fuzzer/src/RTC/FuzzerRtpPacket.cpp new file mode 100644 index 0000000000..4658643249 --- /dev/null +++ b/worker/fuzzer/src/RTC/FuzzerRtpPacket.cpp @@ -0,0 +1,68 @@ +#include "RTC/FuzzerRtpPacket.hpp" +#include "RTC/RtpPacket.hpp" +#include // std::memory() + +void Fuzzer::RTC::RtpPacket::Fuzz(const uint8_t* data, size_t len) +{ + if (!::RTC::RtpPacket::IsRtp(data, len)) + return; + + // We need to clone the given data into a separate buffer because setters + // below will try to write into packet memory. + uint8_t data2[len]; + + std::memcpy(data2, data, len); + + ::RTC::RtpPacket* packet = ::RTC::RtpPacket::Parse(data2, len); + + if (!packet) + return; + + packet->Dump(); + packet->GetData(); + packet->GetSize(); + packet->GetPayloadType(); + packet->SetPayloadType(100); + packet->HasMarker(); + packet->SetMarker(true); + packet->SetPayloadPaddingFlag(true); + packet->GetSequenceNumber(); + packet->SetSequenceNumber(12345); + packet->GetTimestamp(); + packet->SetTimestamp(8888); + packet->GetSsrc(); + packet->SetSsrc(666); + packet->HasExtensionHeader(); + packet->GetExtensionHeaderId(); + packet->GetExtensionHeaderLength(); + packet->GetExtensionHeaderValue(); + // TODO: packet->MangleExtensionHeaderIds(); + packet->HasOneByteExtensions(); + packet->HasTwoBytesExtensions(); + // TODO: packet->AddExtensionMapping(); + // TODO: packet->GetExtension(); + // TODO: packet->ReadAudioLevel(); + // TODO: packet->ReadAbsSendTime(); + // TODO: packet->ReadMid(); + // TODO: packet->ReadRid(); + packet->GetPayload(); + packet->GetPayloadLength(); + packet->GetPayloadPadding(); + packet->IsKeyFrame(); + + { + uint8_t buffer[len]; + auto* clonedPacket = packet->Clone(buffer); + + delete clonedPacket; + } + + // TODO: packet->RtxEncode(); // This cannot be tested this way. + // TODO: packet->RtxDecode(); // This cannot be tested this way. + // TODO: packet->SetPayloadDescriptorHandler(); + // TODO: packet->EncodePayload(); + // TODO: packet->EncodePayload(); + // TODO: packet->ShiftPayload(); + + delete packet; +} diff --git a/worker/fuzzer/src/RTC/FuzzerStunMessage.cpp b/worker/fuzzer/src/RTC/FuzzerStunMessage.cpp new file mode 100644 index 0000000000..3b19f22b9b --- /dev/null +++ b/worker/fuzzer/src/RTC/FuzzerStunMessage.cpp @@ -0,0 +1,45 @@ +#include "RTC/FuzzerStunMessage.hpp" +#include "RTC/StunMessage.hpp" + +void Fuzzer::RTC::StunMessage::Fuzz(const uint8_t* data, size_t len) +{ + if (!::RTC::StunMessage::IsStun(data, len)) + return; + + ::RTC::StunMessage* msg = ::RTC::StunMessage::Parse(data, len); + + if (!msg) + return; + + msg->Dump(); + msg->GetClass(); + msg->GetMethod(); + msg->GetData(); + msg->GetSize(); + msg->SetUsername("foo", 3); + msg->SetPriority(123); + msg->SetIceControlling(123); + msg->SetIceControlled(123); + msg->SetUseCandidate(); + // TODO: msg->SetXorMappedAddress(); + msg->SetErrorCode(666); + // TODO: msg->SetMessageIntegrity(); + msg->SetFingerprint(); + msg->GetUsername(); + msg->GetPriority(); + msg->GetIceControlling(); + msg->GetIceControlled(); + msg->HasUseCandidate(); + msg->GetErrorCode(); + msg->HasMessageIntegrity(); + msg->HasFingerprint(); + msg->CheckAuthentication("foo", "bar"); + // TODO: msg->CreateSuccessResponse(); // This cannot be easily tested. + // TODO: msg->CreateErrorResponse(); // This cannot be easily tested. + msg->Authenticate("lalala"); + // TODO: Cannot test Serialize() because we don't know the exact required + // buffer size (setters above may change the total size). + // TODO: msg->Serialize(); + + delete msg; +} diff --git a/worker/fuzzer/src/RTC/RTCP/FuzzerPacket.cpp b/worker/fuzzer/src/RTC/RTCP/FuzzerPacket.cpp new file mode 100644 index 0000000000..0922ba0ce6 --- /dev/null +++ b/worker/fuzzer/src/RTC/RTCP/FuzzerPacket.cpp @@ -0,0 +1,23 @@ +#include "RTC/RTCP/FuzzerPacket.hpp" +#include "RTC/RTCP/Packet.hpp" + +void Fuzzer::RTC::RTCP::Packet::Fuzz(const uint8_t* data, size_t len) +{ + if (!::RTC::RTCP::Packet::IsRtcp(data, len)) + return; + + ::RTC::RTCP::Packet* packet = ::RTC::RTCP::Packet::Parse(data, len); + + if (!packet) + return; + + // TODO: Add more checks here. + + while (packet != nullptr) + { + auto* previousPacket = packet; + + packet = packet->GetNext(); + delete previousPacket; + } +} diff --git a/worker/fuzzer/src/fuzzer.cpp b/worker/fuzzer/src/fuzzer.cpp new file mode 100644 index 0000000000..18fdd5ead3 --- /dev/null +++ b/worker/fuzzer/src/fuzzer.cpp @@ -0,0 +1,89 @@ +#define MS_CLASS "fuzzer" + +#include "DepLibUV.hpp" +#include "DepOpenSSL.hpp" +#include "LogLevel.hpp" +#include "Logger.hpp" +#include "Settings.hpp" +#include "Utils.hpp" +#include "RTC/FuzzerStunMessage.hpp" +#include "RTC/FuzzerRtpPacket.hpp" +#include "RTC/RTCP/FuzzerPacket.hpp" +#include +#include +#include // std::getenv() +#include + +bool fuzzStun = false; +bool fuzzRtp = false; +bool fuzzRtcp = false; + +int init() +{ + std::string loggerId = "fuzzer"; + LogLevel logLevel{ LogLevel::LOG_NONE }; + + // Get logLevel from ENV variable. + if (std::getenv("MS_FUZZ_LOG_LEVEL")) + { + if (std::string(std::getenv("MS_FUZZ_LOG_LEVEL")) == "debug") + logLevel = LogLevel::LOG_DEBUG; + else if (std::string(std::getenv("MS_FUZZ_LOG_LEVEL")) == "warn") + logLevel = LogLevel::LOG_WARN; + else if (std::string(std::getenv("MS_FUZZ_LOG_LEVEL")) == "error") + logLevel = LogLevel::LOG_ERROR; + } + + Settings::configuration.logLevel = logLevel; + Logger::Init(loggerId); + DepLibUV::ClassInit(); + DepOpenSSL::ClassInit(); + Utils::Crypto::ClassInit(); + + // Select what to fuzz. + if (std::getenv("MS_FUZZ_STUN") && std::string(std::getenv("MS_FUZZ_STUN")) == "1") + { + std::cout << "[fuzzer] STUN fuzzers enabled" << std::endl; + + fuzzStun = true; + } + if (std::getenv("MS_FUZZ_RTP") && std::string(std::getenv("MS_FUZZ_RTP")) == "1") + { + std::cout << "[fuzzer] RTP fuzzers enabled" << std::endl; + + fuzzRtp = true; + } + if (std::getenv("MS_FUZZ_RTCP") && std::string(std::getenv("MS_FUZZ_RTCP")) == "1") + { + std::cout << "[fuzzer] RTCP fuzzers enabled" << std::endl; + + fuzzRtcp = true; + } + if (!fuzzStun && !fuzzRtcp && !fuzzRtp) + { + std::cout << "[fuzzer] all fuzzers enabled" << std::endl; + + fuzzStun = true; + fuzzRtp = true; + fuzzRtcp = true; + } + + return 0; +} + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t len) +{ + // Trick to initialize our stuff just once. + static int unused = init(); + + if (fuzzStun) + Fuzzer::RTC::StunMessage::Fuzz(data, len); + + if (fuzzRtp) + Fuzzer::RTC::RtpPacket::Fuzz(data, len); + + if (fuzzRtcp) + Fuzzer::RTC::RTCP::Packet::Fuzz(data, len); + + return 0; +} diff --git a/worker/include/Channel/UnixStreamSocket.hpp b/worker/include/Channel/UnixStreamSocket.hpp index 27b45b748e..22b113f386 100644 --- a/worker/include/Channel/UnixStreamSocket.hpp +++ b/worker/include/Channel/UnixStreamSocket.hpp @@ -20,8 +20,6 @@ namespace Channel public: explicit UnixStreamSocket(int fd); - - private: ~UnixStreamSocket() override; public: @@ -42,7 +40,6 @@ namespace Channel Json::CharReader* jsonReader{ nullptr }; Json::StreamWriter* jsonWriter{ nullptr }; size_t msgStart{ 0 }; // Where the latest message starts. - bool closed{ false }; }; } // namespace Channel diff --git a/worker/include/LogLevel.hpp b/worker/include/LogLevel.hpp index 9ab6f90ad5..cfa7824330 100644 --- a/worker/include/LogLevel.hpp +++ b/worker/include/LogLevel.hpp @@ -5,9 +5,10 @@ enum class LogLevel : uint8_t { - LOG_DEBUG = 2, - LOG_WARN = 1, - LOG_ERROR = 0 + LOG_DEBUG = 3, + LOG_WARN = 2, + LOG_ERROR = 1, + LOG_NONE = 0 }; #endif diff --git a/worker/include/Logger.hpp b/worker/include/Logger.hpp index 1dfe693a63..2483e2b0ce 100644 --- a/worker/include/Logger.hpp +++ b/worker/include/Logger.hpp @@ -3,10 +3,13 @@ * * This include file defines logging macros for source files (.cpp). Each * source file including Logger.hpp MUST define its own MS_CLASS macro. Include - * files (.h) MUST NOT include Logger.hpp. + * files (.hpp) MUST NOT include Logger.hpp. * - * All the logging macros use the same format as printf(). The XXX_STD version + * All the logging macros use the same format as printf(). The XXX_STD() version * of a macro logs to stdoud/stderr instead of using the Channel instance. + * However some macros such as MS_ABORT() and MS_ASSERT() always log to stderr. + * + * If the macro MS_LOG_STD is defined, all the macros log to stdout/stderr. * * If the macro MS_LOG_FILE_LINE is defied, all the logging macros print more * verbose information, including current file and line. @@ -41,18 +44,16 @@ * MS_DEBUG_DEV(...) * MS_WARN_DEV(...) * - * Logs if the current source file defines the MS_LOG_DEV macro. + * Logs if the current source file defines the MS_LOG_DEV macro and the current + * debug level is satisfied. * Example: * MS_DEBUG_DEV("Producer closed [producerId:%" PRIu32 "]", producerId); * - * MS_DUMP(...) - * - * For Dump() methods. - * * MS_ERROR(...) * - * Logs an error. Must just be used for internal errors that should not - * happen. + * Logs an error if the current debug level is satisfied (or if the current + * source file defines the MS_LOG_DEV macro). Must just be used for internal + * errors that should not happen. * * MS_ABORT(...) * @@ -71,7 +72,7 @@ #include "Settings.hpp" #include "Channel/UnixStreamSocket.hpp" #include // std::snprintf(), std::fprintf(), stdout, stderr -#include // std::abort() +#include // std::abort(), std::getenv() #include #include @@ -138,7 +139,7 @@ class Logger #define MS_TRACE() \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG) \ { \ int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "D(trace) " _MS_LOG_STR, _MS_LOG_ARG); \ Logger::channel->SendLog(Logger::buffer, loggerWritten); \ @@ -149,7 +150,7 @@ class Logger #define MS_TRACE_STD() \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG) \ { \ std::fprintf(stdout, "(trace) " _MS_LOG_STR _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG); \ std::fflush(stdout); \ @@ -157,20 +158,20 @@ class Logger } \ while (false) #else - #define MS_TRACE() ; - #define MS_TRACE_STD() ; + #define MS_TRACE() {} + #define MS_TRACE_STD() {} #endif #define MS_HAS_DEBUG_TAG(tag) \ - (LogLevel::LOG_DEBUG == Settings::configuration.logLevel && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) + (Settings::configuration.logLevel == LogLevel::LOG_DEBUG && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) #define MS_HAS_WARN_TAG(tag) \ - (LogLevel::LOG_WARN <= Settings::configuration.logLevel && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) + (Settings::configuration.logLevel >= LogLevel::LOG_WARN && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) #define MS_DEBUG_TAG(tag, desc, ...) \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ { \ int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "D" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ Logger::channel->SendLog(Logger::buffer, loggerWritten); \ @@ -181,7 +182,7 @@ class Logger #define MS_DEBUG_TAG_STD(tag, desc, ...) \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ { \ std::fprintf(stdout, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ std::fflush(stdout); \ @@ -192,7 +193,7 @@ class Logger #define MS_WARN_TAG(tag, desc, ...) \ do \ { \ - if (LogLevel::LOG_WARN <= Settings::configuration.logLevel && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel >= LogLevel::LOG_WARN && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ { \ int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "W" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ Logger::channel->SendLog(Logger::buffer, loggerWritten); \ @@ -203,7 +204,7 @@ class Logger #define MS_WARN_TAG_STD(tag, desc, ...) \ do \ { \ - if (LogLevel::LOG_WARN <= Settings::configuration.logLevel && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel >= LogLevel::LOG_WARN && (_MS_TAG_ENABLED(tag) || _MS_LOG_DEV_ENABLED)) \ { \ std::fprintf(stderr, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ std::fflush(stderr); \ @@ -214,7 +215,7 @@ class Logger #define MS_DEBUG_2TAGS(tag1, tag2, desc, ...) \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ { \ int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "D" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ Logger::channel->SendLog(Logger::buffer, loggerWritten); \ @@ -225,7 +226,7 @@ class Logger #define MS_DEBUG_2TAGS_STD(tag1, tag2, desc, ...) \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ { \ std::fprintf(stdout, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ std::fflush(stdout); \ @@ -236,7 +237,7 @@ class Logger #define MS_WARN_2TAGS(tag1, tag2, desc, ...) \ do \ { \ - if (LogLevel::LOG_WARN <= Settings::configuration.logLevel && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel >= LogLevel::LOG_WARN && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ { \ int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "W" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ Logger::channel->SendLog(Logger::buffer, loggerWritten); \ @@ -247,7 +248,7 @@ class Logger #define MS_WARN_2TAGS_STD(tag1, tag2, desc, ...) \ do \ { \ - if (LogLevel::LOG_WARN <= Settings::configuration.logLevel && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ + if (Settings::configuration.logLevel >= LogLevel::LOG_WARN && (_MS_TAG_ENABLED_2(tag1, tag2) || _MS_LOG_DEV_ENABLED)) \ { \ std::fprintf(stderr, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ std::fflush(stderr); \ @@ -259,7 +260,7 @@ class Logger #define MS_DEBUG_DEV(desc, ...) \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG) \ { \ int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "D" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ Logger::channel->SendLog(Logger::buffer, loggerWritten); \ @@ -270,7 +271,7 @@ class Logger #define MS_DEBUG_DEV_STD(desc, ...) \ do \ { \ - if (LogLevel::LOG_DEBUG == Settings::configuration.logLevel) \ + if (Settings::configuration.logLevel == LogLevel::LOG_DEBUG) \ { \ std::fprintf(stdout, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ std::fflush(stdout); \ @@ -281,7 +282,7 @@ class Logger #define MS_WARN_DEV(desc, ...) \ do \ { \ - if (LogLevel::LOG_WARN <= Settings::configuration.logLevel) \ + if (Settings::configuration.logLevel >= LogLevel::LOG_WARN) \ { \ int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "W" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ Logger::channel->SendLog(Logger::buffer, loggerWritten); \ @@ -292,7 +293,7 @@ class Logger #define MS_WARN_DEV_STD(desc, ...) \ do \ { \ - if (LogLevel::LOG_WARN <= Settings::configuration.logLevel) \ + if (Settings::configuration.logLevel >= LogLevel::LOG_WARN) \ { \ std::fprintf(stderr, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ std::fflush(stderr); \ @@ -300,41 +301,31 @@ class Logger } \ while (false) #else - #define MS_DEBUG_DEV(desc, ...) ; - #define MS_DEBUG_DEV_STD(desc, ...) ; - #define MS_WARN_DEV(desc, ...) ; - #define MS_WARN_DEV_STD(desc, ...) ; + #define MS_DEBUG_DEV(desc, ...) {} + #define MS_DEBUG_DEV_STD(desc, ...) {} + #define MS_WARN_DEV(desc, ...) {} + #define MS_WARN_DEV_STD(desc, ...) {} #endif -#define MS_DUMP(desc, ...) \ - do \ - { \ - int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "D" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ - Logger::channel->SendLog(Logger::buffer, loggerWritten); \ - } \ - while (false) - -#define MS_DUMP_STD(desc, ...) \ - do \ - { \ - std::fprintf(stdout, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ - std::fflush(stdout); \ - } \ - while (false) - #define MS_ERROR(desc, ...) \ do \ { \ - int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "E" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ - Logger::channel->SendLog(Logger::buffer, loggerWritten); \ + if (Settings::configuration.logLevel >= LogLevel::LOG_ERROR || _MS_LOG_DEV_ENABLED) \ + { \ + int loggerWritten = std::snprintf(Logger::buffer, Logger::bufferSize, "E" _MS_LOG_STR_DESC desc, _MS_LOG_ARG, ##__VA_ARGS__); \ + Logger::channel->SendLog(Logger::buffer, loggerWritten); \ + } \ } \ while (false) #define MS_ERROR_STD(desc, ...) \ do \ { \ - std::fprintf(stderr, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ - std::fflush(stderr); \ + if (Settings::configuration.logLevel >= LogLevel::LOG_ERROR || _MS_LOG_DEV_ENABLED) \ + { \ + std::fprintf(stderr, _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \ + std::fflush(stderr); \ + } \ } \ while (false) @@ -368,8 +359,6 @@ class Logger #define MS_DEBUG_DEV MS_DEBUG_DEV_STD #undef MS_WARN_DEV #define MS_WARN_DEV MS_WARN_DEV_STD - #undef MS_DUMP - #define MS_DUMP MS_DUMP_STD #undef MS_ERROR #define MS_ERROR MS_ERROR_STD #endif diff --git a/worker/include/RTC/Consumer.hpp b/worker/include/RTC/Consumer.hpp index fbef3731eb..67028e5f5b 100644 --- a/worker/include/RTC/Consumer.hpp +++ b/worker/include/RTC/Consumer.hpp @@ -34,12 +34,9 @@ namespace RTC uint32_t consumerId, RTC::Media::Kind kind, uint32_t sourceProducerId); - - private: virtual ~Consumer(); public: - void Destroy(); Json::Value ToJson() const; Json::Value GetStats() const; void AddListener(RTC::ConsumerListener* listener); diff --git a/worker/include/RTC/DtlsTransport.hpp b/worker/include/RTC/DtlsTransport.hpp index 133694c944..6b3f063daa 100644 --- a/worker/include/RTC/DtlsTransport.hpp +++ b/worker/include/RTC/DtlsTransport.hpp @@ -81,17 +81,13 @@ namespace RTC std::string& remoteCert) = 0; // The DTLS connection has been closed as the result of an error (such as a // DTLS alert or a failure to validate the remote fingerprint). - // NOTE: The caller MUST NOT call Destroy() during this callback. virtual void OnDtlsFailed(const RTC::DtlsTransport* dtlsTransport) = 0; // The DTLS connection has been closed due to receipt of a close_notify alert. - // NOTE: The caller MUST NOT call Destroy() during this callback. virtual void OnDtlsClosed(const RTC::DtlsTransport* dtlsTransport) = 0; // Need to send DTLS data to the peer. - // NOTE: The caller MUST NOT call Destroy() during this callback. virtual void OnOutgoingDtlsData( const RTC::DtlsTransport* dtlsTransport, const uint8_t* data, size_t len) = 0; // DTLS application data received. - // NOTE: The caller MUST NOT call Destroy() during this callback. virtual void OnDtlsApplicationData( const RTC::DtlsTransport* dtlsTransport, const uint8_t* data, size_t len) = 0; }; @@ -122,12 +118,9 @@ namespace RTC public: explicit DtlsTransport(Listener* listener); - - private: ~DtlsTransport() override; public: - void Destroy(); void Dump() const; void Run(Role localRole); bool SetRemoteFingerprint(Fingerprint fingerprint); diff --git a/worker/include/RTC/IceServer.hpp b/worker/include/RTC/IceServer.hpp index aa55b6b739..3fb0398407 100644 --- a/worker/include/RTC/IceServer.hpp +++ b/worker/include/RTC/IceServer.hpp @@ -42,7 +42,6 @@ namespace RTC public: IceServer(Listener* listener, const std::string& usernameFragment, const std::string& password); - void Destroy(); void ProcessStunMessage(RTC::StunMessage* msg, RTC::TransportTuple* tuple); const std::string& GetUsernameFragment() const; const std::string& GetPassword() const; diff --git a/worker/include/RTC/Producer.hpp b/worker/include/RTC/Producer.hpp index 93965a2eb9..1b8ccd2316 100644 --- a/worker/include/RTC/Producer.hpp +++ b/worker/include/RTC/Producer.hpp @@ -57,13 +57,9 @@ namespace RTC RTC::RtpParameters& rtpParameters, struct RtpMapping& rtpMapping, bool paused); + ~Producer(); public: - // Must be public because Router needs to call it. - virtual ~Producer(); - - public: - void Destroy(); Json::Value ToJson() const; Json::Value GetStats() const; void AddListener(RTC::ProducerListener* listener); @@ -78,8 +74,6 @@ namespace RTC void ReceiveRtpPacket(RTC::RtpPacket* packet); void ReceiveRtcpSenderReport(RTC::RTCP::SenderReport* report); void GetRtcp(RTC::RTCP::CompoundPacket* packet, uint64_t now); - void ReceiveRtcpFeedback(RTC::RTCP::FeedbackPsPacket* packet) const; - void ReceiveRtcpFeedback(RTC::RTCP::FeedbackRtpPacket* packet) const; void RequestKeyFrame(bool force = false); const std::map& GetActiveProfiles() const; diff --git a/worker/include/RTC/RTCP/FeedbackPs.hpp b/worker/include/RTC/RTCP/FeedbackPs.hpp index 857545eef8..e1e07661a4 100644 --- a/worker/include/RTC/RTCP/FeedbackPs.hpp +++ b/worker/include/RTC/RTCP/FeedbackPs.hpp @@ -22,7 +22,7 @@ namespace RTC // Parsed Report. Points to an external data. explicit FeedbackPsItemsPacket(CommonHeader* commonHeader); explicit FeedbackPsItemsPacket(uint32_t senderSsrc, uint32_t mediaSsrc = 0); - ~FeedbackPsItemsPacket() override = default; + ~FeedbackPsItemsPacket(); void AddItem(Item* item); Iterator Begin(); @@ -52,6 +52,13 @@ namespace RTC { } + template + FeedbackPsItemsPacket::~FeedbackPsItemsPacket() + { + for (auto* item : this->items) + delete item; + } + template inline size_t FeedbackPsItemsPacket::GetSize() const { diff --git a/worker/include/RTC/RTCP/FeedbackRtp.hpp b/worker/include/RTC/RTCP/FeedbackRtp.hpp index 5ec8971a25..8f4d84977d 100644 --- a/worker/include/RTC/RTCP/FeedbackRtp.hpp +++ b/worker/include/RTC/RTCP/FeedbackRtp.hpp @@ -22,7 +22,7 @@ namespace RTC // Parsed Report. Points to an external data. explicit FeedbackRtpItemsPacket(CommonHeader* commonHeader); explicit FeedbackRtpItemsPacket(uint32_t senderSsrc, uint32_t mediaSsrc = 0); - ~FeedbackRtpItemsPacket() override = default; + ~FeedbackRtpItemsPacket(); void AddItem(Item* item); Iterator Begin(); @@ -52,6 +52,13 @@ namespace RTC { } + template + FeedbackRtpItemsPacket::~FeedbackRtpItemsPacket() + { + for (auto* item : this->items) + delete item; + } + template inline size_t FeedbackRtpItemsPacket::GetSize() const { diff --git a/worker/include/RTC/Router.hpp b/worker/include/RTC/Router.hpp index 0113493c7d..8ce527cacb 100644 --- a/worker/include/RTC/Router.hpp +++ b/worker/include/RTC/Router.hpp @@ -38,12 +38,9 @@ namespace RTC public: Router(Listener* listener, Channel::Notifier* notifier, uint32_t routerId); - - private: virtual ~Router(); public: - void Destroy(); Json::Value ToJson() const; void HandleRequest(Channel::Request* request); @@ -58,8 +55,6 @@ namespace RTC /* Pure virtual methods inherited from RTC::Transport::Listener. */ public: void OnTransportClosed(RTC::Transport* transport) override; - void OnTransportReceiveRtcpFeedback( - RTC::Transport* transport, RTC::Consumer* consumer, RTC::RTCP::FeedbackPsPacket* packet) override; /* Pure virtual methods inherited from RTC::ProducerListener. */ public: diff --git a/worker/include/RTC/SrtpSession.hpp b/worker/include/RTC/SrtpSession.hpp index 5e65825849..891b9323bb 100644 --- a/worker/include/RTC/SrtpSession.hpp +++ b/worker/include/RTC/SrtpSession.hpp @@ -31,12 +31,9 @@ namespace RTC public: SrtpSession(Type type, Profile profile, uint8_t* key, size_t keyLen); - - private: ~SrtpSession(); public: - void Destroy(); bool EncryptRtp(const uint8_t** data, size_t* len); bool DecryptSrtp(const uint8_t* data, size_t* len); bool EncryptRtcp(const uint8_t** data, size_t* len); diff --git a/worker/include/RTC/TcpConnection.hpp b/worker/include/RTC/TcpConnection.hpp index 6839150e64..bbdd2941f3 100644 --- a/worker/include/RTC/TcpConnection.hpp +++ b/worker/include/RTC/TcpConnection.hpp @@ -18,9 +18,6 @@ namespace RTC public: TcpConnection(Listener* listener, size_t bufferSize); - private: - ~TcpConnection() override = default; - public: void Send(const uint8_t* data, size_t len); size_t GetRecvBytes() const; diff --git a/worker/include/RTC/TcpServer.hpp b/worker/include/RTC/TcpServer.hpp index 0e81f95514..50b9927708 100644 --- a/worker/include/RTC/TcpServer.hpp +++ b/worker/include/RTC/TcpServer.hpp @@ -39,16 +39,13 @@ namespace RTC public: TcpServer(Listener* listener, RTC::TcpConnection::Listener* connListener, int addressFamily); - - private: - ~TcpServer() override = default; + ~TcpServer() override; /* Pure virtual methods inherited from ::TcpServer. */ public: void UserOnTcpConnectionAlloc(::TcpConnection** connection) override; void UserOnNewTcpConnection(::TcpConnection* connection) override; void UserOnTcpConnectionClosed(::TcpConnection* connection, bool isClosedByPeer) override; - void UserOnTcpServerClosed() override; private: // Passed by argument. diff --git a/worker/include/RTC/Transport.hpp b/worker/include/RTC/Transport.hpp index 6b261339ea..3386371773 100644 --- a/worker/include/RTC/Transport.hpp +++ b/worker/include/RTC/Transport.hpp @@ -37,8 +37,6 @@ namespace RTC { public: virtual void OnTransportClosed(RTC::Transport* transport) = 0; - virtual void OnTransportReceiveRtcpFeedback( - RTC::Transport* transport, RTC::Consumer* consumer, RTC::RTCP::FeedbackPsPacket* packet) = 0; }; public: @@ -69,12 +67,10 @@ namespace RTC public: Transport(Listener* listener, Channel::Notifier* notifier, uint32_t transportId); - - protected: virtual ~Transport(); public: - void Destroy(); + void Close(); virtual Json::Value ToJson() const = 0; virtual Json::Value GetStats() const = 0; void HandleProducer(RTC::Producer* producer); @@ -134,9 +130,10 @@ namespace RTC Channel::Notifier* notifier{ nullptr }; // Allocated by this. Timer* rtcpTimer{ nullptr }; - // Allocated (Mirroring). RTC::UdpSocket* mirrorSocket{ nullptr }; RTC::TransportTuple* mirrorTuple{ nullptr }; + // Others. + bool closed{ false }; // Others (Producers and Consumers). std::unordered_set producers; std::unordered_set consumers; diff --git a/worker/include/RTC/UdpSocket.hpp b/worker/include/RTC/UdpSocket.hpp index e47dc1a7f2..e37c0267d4 100644 --- a/worker/include/RTC/UdpSocket.hpp +++ b/worker/include/RTC/UdpSocket.hpp @@ -39,14 +39,11 @@ namespace RTC public: UdpSocket(Listener* listener, int addressFamily); UdpSocket(Listener* listener, const std::string& ip); - - private: - ~UdpSocket() override = default; + ~UdpSocket() override; /* Pure virtual methods inherited from ::UdpSocket. */ public: void UserOnUdpDatagramRecv(const uint8_t* data, size_t len, const struct sockaddr* addr) override; - void UserOnUdpSocketClosed() override; private: // Passed by argument. diff --git a/worker/include/RTC/WebRtcTransport.hpp b/worker/include/RTC/WebRtcTransport.hpp index 0762f73093..ca9994c0d7 100644 --- a/worker/include/RTC/WebRtcTransport.hpp +++ b/worker/include/RTC/WebRtcTransport.hpp @@ -42,9 +42,7 @@ namespace RTC Channel::Notifier* notifier, uint32_t transportId, Options& options); - - private: - ~WebRtcTransport(); + ~WebRtcTransport() override; public: Json::Value ToJson() const override; diff --git a/worker/include/Settings.hpp b/worker/include/Settings.hpp index d61c7a3b61..5db6783e2c 100644 --- a/worker/include/Settings.hpp +++ b/worker/include/Settings.hpp @@ -28,7 +28,7 @@ class Settings // Struct holding the configuration. struct Configuration { - LogLevel logLevel{ LogLevel::LOG_DEBUG }; + LogLevel logLevel{ LogLevel::LOG_ERROR }; struct LogTags logTags; std::string rtcIPv4; std::string rtcIPv6; diff --git a/worker/include/Utils.hpp b/worker/include/Utils.hpp index 3a754d9096..87e0411e2d 100644 --- a/worker/include/Utils.hpp +++ b/worker/include/Utils.hpp @@ -41,19 +41,29 @@ namespace Utils switch (addr1->sa_family) { case AF_INET: + { if (std::memcmp(&((struct sockaddr_in*)addr1)->sin_addr, &((struct sockaddr_in*)addr2)->sin_addr, 4) == 0) { return true; } + break; + } + case AF_INET6: + { if (std::memcmp(&((struct sockaddr_in6*)addr1)->sin6_addr, &((struct sockaddr_in6*)addr2)->sin6_addr, 16) == 0) { return true; } + break; + } + default: + { return false; + } } return false; diff --git a/worker/include/handles/SignalsHandler.hpp b/worker/include/handles/SignalsHandler.hpp index 8c48eef38f..7c9407b7d4 100644 --- a/worker/include/handles/SignalsHandler.hpp +++ b/worker/include/handles/SignalsHandler.hpp @@ -19,12 +19,10 @@ class SignalsHandler public: explicit SignalsHandler(Listener* listener); - -private: - ~SignalsHandler() = default; + ~SignalsHandler(); public: - void Destroy(); + void Close(); void AddSignal(int signum, const std::string& name); /* Callbacks fired by UV events. */ @@ -36,6 +34,8 @@ class SignalsHandler Listener* listener{ nullptr }; // Allocated by this. std::vector uvHandles; + // Others. + bool closed{ false }; }; #endif diff --git a/worker/include/handles/TcpConnection.hpp b/worker/include/handles/TcpConnection.hpp index fb0f8f975f..3c46ee769f 100644 --- a/worker/include/handles/TcpConnection.hpp +++ b/worker/include/handles/TcpConnection.hpp @@ -37,19 +37,17 @@ class TcpConnection explicit TcpConnection(size_t bufferSize); TcpConnection& operator=(const TcpConnection&) = delete; TcpConnection(const TcpConnection&) = delete; - -protected: virtual ~TcpConnection(); public: - void Destroy(); + void Close(); virtual void Dump() const; void Setup( Listener* listener, struct sockaddr_storage* localAddr, const std::string& localIP, uint16_t localPort); - bool IsClosing() const; + bool IsClosed() const; uv_tcp_t* GetUvHandle() const; void Start(); void Write(const uint8_t* data, size_t len); @@ -71,8 +69,6 @@ class TcpConnection void OnUvReadAlloc(size_t suggestedSize, uv_buf_t* buf); void OnUvRead(ssize_t nread, const uv_buf_t* buf); void OnUvWriteError(int error); - void OnUvShutdown(uv_shutdown_t* req, int status); - void OnUvClosed(); /* Pure virtual methods that must be implemented by the subclass. */ protected: @@ -85,7 +81,7 @@ class TcpConnection uv_tcp_t* uvHandle{ nullptr }; // Others. struct sockaddr_storage* localAddr{ nullptr }; - bool isClosing{ false }; + bool closed{ false }; bool isClosedByPeer{ false }; bool hasError{ false }; @@ -105,9 +101,9 @@ class TcpConnection /* Inline methods. */ -inline bool TcpConnection::IsClosing() const +inline bool TcpConnection::IsClosed() const { - return this->isClosing; + return this->closed; } inline uv_tcp_t* TcpConnection::GetUvHandle() const diff --git a/worker/include/handles/TcpServer.hpp b/worker/include/handles/TcpServer.hpp index 0016f6c933..0cbff97c18 100644 --- a/worker/include/handles/TcpServer.hpp +++ b/worker/include/handles/TcpServer.hpp @@ -15,14 +15,11 @@ class TcpServer : public TcpConnection::Listener * uvHandle must be an already initialized and binded uv_tcp_t pointer. */ TcpServer(uv_tcp_t* uvHandle, int backlog); - -protected: - ~TcpServer() override; + virtual ~TcpServer() override; public: - void Destroy(); + void Close(); virtual void Dump() const; - bool IsClosing() const; const struct sockaddr* GetLocalAddress() const; int GetLocalFamily() const; const std::string& GetLocalIP() const; @@ -37,12 +34,10 @@ class TcpServer : public TcpConnection::Listener virtual void UserOnTcpConnectionAlloc(TcpConnection** connection) = 0; virtual void UserOnNewTcpConnection(TcpConnection* connection) = 0; virtual void UserOnTcpConnectionClosed(TcpConnection* connection, bool isClosedByPeer) = 0; - virtual void UserOnTcpServerClosed() = 0; /* Callbacks fired by UV events. */ public: void OnUvConnection(int status); - void OnUvClosed(); /* Methods inherited from TcpConnection::Listener. */ public: @@ -53,7 +48,7 @@ class TcpServer : public TcpConnection::Listener uv_tcp_t* uvHandle{ nullptr }; // Others. std::unordered_set connections; - bool isClosing{ false }; + bool closed{ false }; protected: struct sockaddr_storage localAddr; @@ -63,11 +58,6 @@ class TcpServer : public TcpConnection::Listener /* Inline methods. */ -inline bool TcpServer::IsClosing() const -{ - return this->isClosing; -} - inline size_t TcpServer::GetNumConnections() const { return this->connections.size(); diff --git a/worker/include/handles/Timer.hpp b/worker/include/handles/Timer.hpp index 7793f55b7b..77dc273e93 100644 --- a/worker/include/handles/Timer.hpp +++ b/worker/include/handles/Timer.hpp @@ -20,12 +20,10 @@ class Timer explicit Timer(Listener* listener); Timer& operator=(const Timer&) = delete; Timer(const Timer&) = delete; - -private: - ~Timer() = default; + ~Timer(); public: - void Destroy(); + void Close(); void Start(uint64_t timeout, uint64_t repeat = 0); void Stop(); void Reset(); @@ -42,6 +40,7 @@ class Timer // Allocated by this. uv_timer_t* uvHandle{ nullptr }; // Others. + bool closed{ false }; uint64_t timeout{ 0 }; uint64_t repeat{ 0 }; }; diff --git a/worker/include/handles/UdpSocket.hpp b/worker/include/handles/UdpSocket.hpp index 76a9d69bb0..5bac8fb12f 100644 --- a/worker/include/handles/UdpSocket.hpp +++ b/worker/include/handles/UdpSocket.hpp @@ -24,12 +24,10 @@ class UdpSocket explicit UdpSocket(uv_udp_t* uvHandle); UdpSocket& operator=(const UdpSocket&) = delete; UdpSocket(const UdpSocket&) = delete; - -protected: virtual ~UdpSocket(); public: - void Destroy(); + void Close(); virtual void Dump() const; void Send(const uint8_t* data, size_t len, const struct sockaddr* addr); void Send(const std::string& data, const struct sockaddr* addr); @@ -50,18 +48,16 @@ class UdpSocket void OnUvRecvAlloc(size_t suggestedSize, uv_buf_t* buf); void OnUvRecv(ssize_t nread, const uv_buf_t* buf, const struct sockaddr* addr, unsigned int flags); void OnUvSendError(int error); - void OnUvClosed(); /* Pure virtual methods that must be implemented by the subclass. */ protected: virtual void UserOnUdpDatagramRecv(const uint8_t* data, size_t len, const struct sockaddr* addr) = 0; - virtual void UserOnUdpSocketClosed() = 0; private: // Allocated by this (may be passed by argument). uv_udp_t* uvHandle{ nullptr }; // Others. - bool isClosing{ false }; + bool closed{ false }; size_t recvBytes{ 0 }; size_t sentBytes{ 0 }; diff --git a/worker/include/handles/UnixStreamSocket.hpp b/worker/include/handles/UnixStreamSocket.hpp index 230018ee45..e00cdd3dbc 100644 --- a/worker/include/handles/UnixStreamSocket.hpp +++ b/worker/include/handles/UnixStreamSocket.hpp @@ -20,13 +20,11 @@ class UnixStreamSocket UnixStreamSocket(int fd, size_t bufferSize); UnixStreamSocket& operator=(const UnixStreamSocket&) = delete; UnixStreamSocket(const UnixStreamSocket&) = delete; - -protected: virtual ~UnixStreamSocket(); public: - void Destroy(); - bool IsClosing() const; + void Close(); + bool IsClosed() const; void Write(const uint8_t* data, size_t len); void Write(const std::string& data); @@ -35,8 +33,6 @@ class UnixStreamSocket void OnUvReadAlloc(size_t suggestedSize, uv_buf_t* buf); void OnUvRead(ssize_t nread, const uv_buf_t* buf); void OnUvWriteError(int error); - void OnUvShutdown(uv_shutdown_t* req, int status); - void OnUvClosed(); /* Pure virtual methods that must be implemented by the subclass. */ protected: @@ -47,7 +43,7 @@ class UnixStreamSocket // Allocated by this. uv_pipe_t* uvHandle{ nullptr }; // Others. - bool isClosing{ false }; + bool closed{ false }; bool isClosedByPeer{ false }; bool hasError{ false }; @@ -62,9 +58,9 @@ class UnixStreamSocket /* Inline methods. */ -inline bool UnixStreamSocket::IsClosing() const +inline bool UnixStreamSocket::IsClosed() const { - return this->isClosing; + return this->closed; } inline void UnixStreamSocket::Write(const std::string& data) diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index 8e0335b7fc..11915e4a4d 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -261,55 +261,83 @@ }, { 'target_name': 'mediasoup-worker-test', - 'defines': [ 'MS_TEST', 'MS_LOG_STD' ], + 'defines': [ 'MS_LOG_STD' ], 'sources': [ # C++ source files - 'test/tests.cpp', - 'test/RTC/TestRtpStreamSend.cpp', - 'test/RTC/TestNackGenerator.cpp', - 'test/RTC/TestRtpPacket.cpp', - 'test/RTC/TestRtpDataCounter.cpp', - 'test/RTC/TestRtpMonitor.cpp', - 'test/RTC/TestRtpStreamRecv.cpp', - 'test/RTC/TestSeqManager.cpp', - 'test/RTC/Codecs/TestVP8.cpp', - 'test/RTC/RTCP/TestFeedbackPsAfb.cpp', - 'test/RTC/RTCP/TestFeedbackPsFir.cpp', - 'test/RTC/RTCP/TestFeedbackPsLei.cpp', - 'test/RTC/RTCP/TestFeedbackPsPli.cpp', - 'test/RTC/RTCP/TestFeedbackPsRemb.cpp', - 'test/RTC/RTCP/TestFeedbackPsRpsi.cpp', - 'test/RTC/RTCP/TestFeedbackPsSli.cpp', - 'test/RTC/RTCP/TestFeedbackPsTst.cpp', - 'test/RTC/RTCP/TestFeedbackPsVbcm.cpp', - 'test/RTC/RTCP/TestFeedbackRtpEcn.cpp', - 'test/RTC/RTCP/TestFeedbackRtpNack.cpp', - 'test/RTC/RTCP/TestFeedbackRtpSrReq.cpp', - 'test/RTC/RTCP/TestFeedbackRtpTllei.cpp', - 'test/RTC/RTCP/TestFeedbackRtpTmmb.cpp', - 'test/RTC/RTCP/TestBye.cpp', - 'test/RTC/RTCP/TestReceiverReport.cpp', - 'test/RTC/RTCP/TestSdes.cpp', - 'test/RTC/RTCP/TestSenderReport.cpp', - 'test/RTC/RTCP/TestPacket.cpp', + 'test/src/tests.cpp', + 'test/src/RTC/TestRtpStreamSend.cpp', + 'test/src/RTC/TestNackGenerator.cpp', + 'test/src/RTC/TestRtpPacket.cpp', + 'test/src/RTC/TestRtpDataCounter.cpp', + 'test/src/RTC/TestRtpMonitor.cpp', + 'test/src/RTC/TestRtpStreamRecv.cpp', + 'test/src/RTC/TestSeqManager.cpp', + 'test/src/RTC/Codecs/TestVP8.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsAfb.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsFir.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsLei.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsPli.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsRemb.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsRpsi.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsSli.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsTst.cpp', + 'test/src/RTC/RTCP/TestFeedbackPsVbcm.cpp', + 'test/src/RTC/RTCP/TestFeedbackRtpEcn.cpp', + 'test/src/RTC/RTCP/TestFeedbackRtpNack.cpp', + 'test/src/RTC/RTCP/TestFeedbackRtpSrReq.cpp', + 'test/src/RTC/RTCP/TestFeedbackRtpTllei.cpp', + 'test/src/RTC/RTCP/TestFeedbackRtpTmmb.cpp', + 'test/src/RTC/RTCP/TestBye.cpp', + 'test/src/RTC/RTCP/TestReceiverReport.cpp', + 'test/src/RTC/RTCP/TestSdes.cpp', + 'test/src/RTC/RTCP/TestSenderReport.cpp', + 'test/src/RTC/RTCP/TestPacket.cpp', # C++ include files - 'include/catch.hpp', - 'include/helpers.hpp' + 'test/include/catch.hpp', + 'test/include/helpers.hpp' ], 'include_dirs': [ 'test/include' ], - 'xcode_settings': - { - 'OTHER_CPLUSPLUSFLAGS': [ - '--coverage' - ], - 'OTHER_LDFLAGS': [ - '--coverage' - ] - } + 'xcode_settings': + { + 'OTHER_CPLUSPLUSFLAGS': + [ + '--coverage' + ], + 'OTHER_LDFLAGS': [ + '--coverage' + ] + } + }, + { + 'target_name': 'mediasoup-worker-fuzzer', + 'defines': [ 'DEBUG', 'MS_LOG_STD' ], + 'sources': + [ + # C++ source files + 'fuzzer/src/fuzzer.cpp', + 'fuzzer/src/RTC/FuzzerStunMessage.cpp', + 'fuzzer/src/RTC/FuzzerRtpPacket.cpp', + 'fuzzer/src/RTC/RTCP/FuzzerPacket.cpp', + # C++ include files + 'fuzzer/include/RTC/FuzzerStunMessage.hpp', + 'fuzzer/include/RTC/FuzzerRtpPacket.hpp', + 'fuzzer/include/RTC/RTCP/FuzzerPacket.hpp' + ], + 'include_dirs': + [ + 'fuzzer/include' + ], + 'conditions': + [ + [ 'OS == "linux"', { + 'cflags': [ '-g', '-O0', '-fsanitize=address,fuzzer' ], + 'ldflags': [ '-fsanitize=address,fuzzer' ] + }] + ] } ] } diff --git a/worker/scripts/get-dep.sh b/worker/scripts/get-dep.sh index 9fc5970701..4d18828c9b 100755 --- a/worker/scripts/get-dep.sh +++ b/worker/scripts/get-dep.sh @@ -78,7 +78,7 @@ function get_netstring() function get_libuv() { GIT_REPO="https://github.com/libuv/libuv.git" - GIT_TAG="v1.24.0" + GIT_TAG="v1.24.1" DEST="deps/libuv" get_dep "${GIT_REPO}" "${GIT_TAG}" "${DEST}" @@ -121,10 +121,31 @@ function get_lcov() get_dep "${GIT_REPO}" "${GIT_TAG}" "${DEST}" } +function get_clang_fuzzer() +{ + NAME="clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04" + TAR_FILE="${NAME}.tar.xz" + TAR_URL="http://releases.llvm.org/7.0.0/${TAR_FILE}" + DEST="deps/clang-fuzzer" + + set -x + + rm -rf ${DEST} + mkdir ${DEST} + cd ${DEST} + mkdir bin lib + wget ${TAR_URL} + tar xfJ ${TAR_FILE} + rm -f ${TAR_FILE} + mv ${NAME}/bin/* bin/ + mv ${NAME}/lib/clang lib/ + rm -rf ${NAME} +} + case "${DEP}" in '-h') echo "Usage:" - echo " ./scripts/$(basename $0) [gyp|jsoncpp|netstring|libuv|openssl|libsrtp|catch|lcov]" + echo " ./scripts/$(basename $0) [gyp|jsoncpp|netstring|libuv|openssl|libsrtp|catch|lcov|clang-fuzzer]" echo ;; gyp) @@ -151,6 +172,9 @@ case "${DEP}" in lcov) get_lcov ;; + clang-fuzzer) + get_clang_fuzzer + ;; *) echo ">>> [ERROR] unknown dep '${DEP}'" >&2 exit 1 diff --git a/worker/src/Channel/UnixStreamSocket.cpp b/worker/src/Channel/UnixStreamSocket.cpp index 541967884f..1e62bd8982 100644 --- a/worker/src/Channel/UnixStreamSocket.cpp +++ b/worker/src/Channel/UnixStreamSocket.cpp @@ -73,7 +73,7 @@ namespace Channel void UnixStreamSocket::Send(Json::Value& msg) { - if (this->closed) + if (IsClosed()) return; // MS_TRACE_STD(); @@ -117,7 +117,7 @@ namespace Channel void UnixStreamSocket::SendLog(char* nsPayload, size_t nsPayloadLen) { - if (this->closed) + if (IsClosed()) return; // MS_TRACE_STD(); @@ -154,7 +154,7 @@ namespace Channel void UnixStreamSocket::SendBinary(const uint8_t* nsPayload, size_t nsPayloadLen) { - if (this->closed) + if (IsClosed()) return; size_t nsNumLen; @@ -194,7 +194,7 @@ namespace Channel // Be ready to parse more than a single message in a single TCP chunk. while (true) { - if (IsClosing()) + if (IsClosed()) return; size_t readLen = this->bufferDataLen - this->msgStart; @@ -329,12 +329,8 @@ namespace Channel { MS_TRACE_STD(); - this->closed = true; - + // Notify the listener. if (isClosedByPeer) - { - // Notify the listener. this->listener->OnChannelUnixStreamSocketRemotelyClosed(this); - } } } // namespace Channel diff --git a/worker/src/RTC/Codecs/H264.cpp b/worker/src/RTC/Codecs/H264.cpp index a9a92bd759..b4375d7b46 100644 --- a/worker/src/RTC/Codecs/H264.cpp +++ b/worker/src/RTC/Codecs/H264.cpp @@ -85,9 +85,9 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" isKeyFrame : %s", this->isKeyFrame ? "true" : "false"); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" isKeyFrame : %s", this->isKeyFrame ? "true" : "false"); + MS_DEBUG_DEV(""); } H264::PayloadDescriptorHandler::PayloadDescriptorHandler(H264::PayloadDescriptor* payloadDescriptor) diff --git a/worker/src/RTC/Codecs/VP8.cpp b/worker/src/RTC/Codecs/VP8.cpp index ca95497935..e417363719 100644 --- a/worker/src/RTC/Codecs/VP8.cpp +++ b/worker/src/RTC/Codecs/VP8.cpp @@ -146,29 +146,29 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" extended : %" PRIu8, this->extended); - MS_DUMP(" nonReference : %" PRIu8, this->nonReference); - MS_DUMP(" start : %" PRIu8, this->start); - MS_DUMP(" partitionIndex : %" PRIu8, this->partitionIndex); - MS_DUMP( + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" extended : %" PRIu8, this->extended); + MS_DEBUG_DEV(" nonReference : %" PRIu8, this->nonReference); + MS_DEBUG_DEV(" start : %" PRIu8, this->start); + MS_DEBUG_DEV(" partitionIndex : %" PRIu8, this->partitionIndex); + MS_DEBUG_DEV( " i|l|t|k : %" PRIu8 "|%" PRIu8 "|%" PRIu8 "|%" PRIu8, this->i, this->l, this->t, this->k); - MS_DUMP(" pictureId : %" PRIu16, this->pictureId); - MS_DUMP(" tl0PictureIndex : %" PRIu8, this->tl0PictureIndex); - MS_DUMP(" tlIndex : %" PRIu8, this->tlIndex); - MS_DUMP(" y : %" PRIu8, this->y); - MS_DUMP(" keyIndex : %" PRIu8, this->keyIndex); - MS_DUMP(" isKeyFrame : %s", this->isKeyFrame ? "true" : "false"); - MS_DUMP(" hasPictureId : %s", this->hasPictureId ? "true" : "false"); - MS_DUMP(" hasOneBytePictureId : %s", this->hasOneBytePictureId ? "true" : "false"); - MS_DUMP(" hasTwoBytesPictureId : %s", this->hasTwoBytesPictureId ? "true" : "false"); - MS_DUMP(" hasTl0PictureIndex : %s", this->hasTl0PictureIndex ? "true" : "false"); - MS_DUMP(" hasTlIndex : %s", this->hasTlIndex ? "true" : "false"); - MS_DUMP(""); + MS_DEBUG_DEV(" pictureId : %" PRIu16, this->pictureId); + MS_DEBUG_DEV(" tl0PictureIndex : %" PRIu8, this->tl0PictureIndex); + MS_DEBUG_DEV(" tlIndex : %" PRIu8, this->tlIndex); + MS_DEBUG_DEV(" y : %" PRIu8, this->y); + MS_DEBUG_DEV(" keyIndex : %" PRIu8, this->keyIndex); + MS_DEBUG_DEV(" isKeyFrame : %s", this->isKeyFrame ? "true" : "false"); + MS_DEBUG_DEV(" hasPictureId : %s", this->hasPictureId ? "true" : "false"); + MS_DEBUG_DEV(" hasOneBytePictureId : %s", this->hasOneBytePictureId ? "true" : "false"); + MS_DEBUG_DEV(" hasTwoBytesPictureId : %s", this->hasTwoBytesPictureId ? "true" : "false"); + MS_DEBUG_DEV(" hasTl0PictureIndex : %s", this->hasTl0PictureIndex ? "true" : "false"); + MS_DEBUG_DEV(" hasTlIndex : %s", this->hasTlIndex ? "true" : "false"); + MS_DEBUG_DEV(""); } VP8::PayloadDescriptorHandler::PayloadDescriptorHandler(VP8::PayloadDescriptor* payloadDescriptor) diff --git a/worker/src/RTC/Consumer.cpp b/worker/src/RTC/Consumer.cpp index 6b26f2f8ff..5a1a66f62c 100644 --- a/worker/src/RTC/Consumer.cpp +++ b/worker/src/RTC/Consumer.cpp @@ -39,11 +39,6 @@ namespace RTC delete this->rtpStream; delete this->rtpMonitor; - } - - void Consumer::Destroy() - { - MS_TRACE(); for (auto& listener : this->listeners) { @@ -51,8 +46,6 @@ namespace RTC } this->notifier->Emit(this->consumerId, "close"); - - delete this; } Json::Value Consumer::ToJson() const @@ -666,7 +659,6 @@ namespace RTC default: MS_ASSERT(false, "invalid messageType"); - break; } RequestKeyFrame(); diff --git a/worker/src/RTC/DtlsTransport.cpp b/worker/src/RTC/DtlsTransport.cpp index 72928e199c..32a9394851 100644 --- a/worker/src/RTC/DtlsTransport.cpp +++ b/worker/src/RTC/DtlsTransport.cpp @@ -579,19 +579,6 @@ namespace RTC { MS_TRACE(); - if (this->ssl != nullptr) - { - SSL_free(this->ssl); - this->ssl = nullptr; - this->sslBioFromNetwork = nullptr; - this->sslBioToNetwork = nullptr; - } - } - - void DtlsTransport::Destroy() - { - MS_TRACE(); - if (IsRunning()) { // Send close alert to the peer. @@ -599,25 +586,31 @@ namespace RTC SendPendingOutgoingDtlsData(); } - // Destroy the DTLS timer. - this->timer->Destroy(); + if (this->ssl != nullptr) + { + SSL_free(this->ssl); + this->ssl = nullptr; + this->sslBioFromNetwork = nullptr; + this->sslBioToNetwork = nullptr; + } - delete this; + // Close the DTLS timer. + delete this->timer; } void DtlsTransport::Dump() const { MS_TRACE(); - MS_DUMP(""); - MS_DUMP( + MS_DEBUG_DEV(""); + MS_DEBUG_DEV( " [role:%s, running:%s, handshake done:%s, connected:%s]", (this->localRole == Role::SERVER ? "server" : (this->localRole == Role::CLIENT ? "client" : "none")), IsRunning() ? "yes" : "no", this->handshakeDone ? "yes" : "no", this->state == DtlsState::CONNECTED ? "yes" : "no"); - MS_DUMP(""); + MS_DEBUG_DEV(""); } void DtlsTransport::Run(Role localRole) @@ -655,23 +648,31 @@ namespace RTC switch (this->localRole) { case Role::CLIENT: + { MS_DEBUG_TAG(dtls, "running [role:client]"); SSL_set_connect_state(this->ssl); SSL_do_handshake(this->ssl); SendPendingOutgoingDtlsData(); SetTimeout(); + break; + } case Role::SERVER: + { MS_DEBUG_TAG(dtls, "running [role:server]"); SSL_set_accept_state(this->ssl); SSL_do_handshake(this->ssl); + break; + } default: + { MS_ABORT("invalid local DTLS role"); + } } } @@ -1166,15 +1167,16 @@ namespace RTC srtpRemoteSalt = srtpLocalKey + SrtpMasterKeyLength; srtpLocalSalt = srtpRemoteSalt + SrtpMasterSaltLength; break; + case Role::CLIENT: srtpLocalKey = srtpMaterial; srtpRemoteKey = srtpLocalKey + SrtpMasterKeyLength; srtpLocalSalt = srtpRemoteKey + SrtpMasterKeyLength; srtpRemoteSalt = srtpLocalSalt + SrtpMasterSaltLength; break; + default: MS_ABORT("no DTLS role set"); - break; } // Create the SRTP local master key. diff --git a/worker/src/RTC/IceServer.cpp b/worker/src/RTC/IceServer.cpp index 824cb4cfde..d1b5a43f6a 100644 --- a/worker/src/RTC/IceServer.cpp +++ b/worker/src/RTC/IceServer.cpp @@ -27,13 +27,6 @@ namespace RTC this->password.c_str()); } - void IceServer::Destroy() - { - MS_TRACE(); - - delete this; - } - void IceServer::ProcessStunMessage(RTC::StunMessage* msg, RTC::TransportTuple* tuple) { MS_TRACE(); diff --git a/worker/src/RTC/NackGenerator.cpp b/worker/src/RTC/NackGenerator.cpp index 21be28c863..f9a19cc052 100644 --- a/worker/src/RTC/NackGenerator.cpp +++ b/worker/src/RTC/NackGenerator.cpp @@ -31,7 +31,7 @@ namespace RTC MS_TRACE(); // Close the timer. - this->timer->Destroy(); + delete this->timer; } // Returns true if this is a found nacked packet. False otherwise. diff --git a/worker/src/RTC/PlainRtpTransport.cpp b/worker/src/RTC/PlainRtpTransport.cpp index 7cc20f5dcf..fee6e408da 100644 --- a/worker/src/RTC/PlainRtpTransport.cpp +++ b/worker/src/RTC/PlainRtpTransport.cpp @@ -42,8 +42,8 @@ namespace RTC } catch (const MediaSoupError& error) { - // Destroy UdpSocket since ~PlainRtpTransport() will not be called. - this->udpSocket->Destroy(); + // Close UdpSocket since ~PlainRtpTransport() will not be called. + delete this->udpSocket; throw; } @@ -84,9 +84,7 @@ namespace RTC MS_TRACE(); delete this->tuple; - - if (this->udpSocket != nullptr) - this->udpSocket->Destroy(); + delete this->udpSocket; } Json::Value PlainRtpTransport::ToJson() const @@ -166,8 +164,6 @@ namespace RTC default: { MS_THROW_ERROR("invalid destination IP '%s'", ip.c_str()); - - break; } } diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 4d8dc79938..38f72a1718 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -57,21 +57,14 @@ namespace RTC delete rtpStream; } - } - void Producer::Destroy() - { - MS_TRACE(); + // Close the RTP key frame request block timer. + delete this->keyFrameRequestBlockTimer; for (auto& listener : this->listeners) { listener->OnProducerClosed(this); } - - // Close the RTP key frame request block timer. - this->keyFrameRequestBlockTimer->Destroy(); - - delete this; } Json::Value Producer::ToJson() const @@ -345,38 +338,6 @@ namespace RTC this->lastRtcpSentTime = now; } - void Producer::ReceiveRtcpFeedback(RTC::RTCP::FeedbackPsPacket* packet) const - { - MS_TRACE(); - - // Ensure that the RTCP packet fits into the RTCP buffer. - if (packet->GetSize() > RTC::RTCP::BufferSize) - { - MS_WARN_TAG(rtcp, "cannot send RTCP packet, size too big (%zu bytes)", packet->GetSize()); - - return; - } - - packet->Serialize(RTC::RTCP::Buffer); - this->transport->SendRtcpPacket(packet); - } - - void Producer::ReceiveRtcpFeedback(RTC::RTCP::FeedbackRtpPacket* packet) const - { - MS_TRACE(); - - // Ensure that the RTCP packet fits into the RTCP buffer. - if (packet->GetSize() > RTC::RTCP::BufferSize) - { - MS_WARN_TAG(rtcp, "cannot send RTCP packet, size too big (%zu bytes)", packet->GetSize()); - - return; - } - - packet->Serialize(RTC::RTCP::Buffer); - this->transport->SendRtcpPacket(packet); - } - void Producer::RequestKeyFrame(bool force) { MS_TRACE(); diff --git a/worker/src/RTC/RTCP/Bye.cpp b/worker/src/RTC/RTCP/Bye.cpp index 7956367676..dee347d5b8 100644 --- a/worker/src/RTC/RTCP/Bye.cpp +++ b/worker/src/RTC/RTCP/Bye.cpp @@ -90,14 +90,14 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); for (auto ssrc : this->ssrcs) { - MS_DUMP(" ssrc : %" PRIu32, ssrc); + MS_DEBUG_DEV(" ssrc : %" PRIu32, ssrc); } if (!this->reason.empty()) - MS_DUMP(" reason : %s", this->reason.c_str()); - MS_DUMP(""); + MS_DEBUG_DEV(" reason : %s", this->reason.c_str()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/CompoundPacket.cpp b/worker/src/RTC/RTCP/CompoundPacket.cpp index 7bef037e32..6e247a4bc2 100644 --- a/worker/src/RTC/RTCP/CompoundPacket.cpp +++ b/worker/src/RTC/RTCP/CompoundPacket.cpp @@ -85,7 +85,7 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); if (HasSenderReport()) { @@ -100,7 +100,7 @@ namespace RTC if (this->sdesPacket.GetCount() != 0u) this->sdesPacket.Dump(); - MS_DUMP(""); + MS_DEBUG_DEV(""); } void CompoundPacket::AddSenderReport(SenderReport* report) diff --git a/worker/src/RTC/RTCP/Feedback.cpp b/worker/src/RTC/RTCP/Feedback.cpp index aa365fd0fb..c5d064d828 100644 --- a/worker/src/RTC/RTCP/Feedback.cpp +++ b/worker/src/RTC/RTCP/Feedback.cpp @@ -86,9 +86,9 @@ namespace RTC { MS_TRACE(); - MS_DUMP(" sender ssrc : %" PRIu32, GetSenderSsrc()); - MS_DUMP(" media ssrc : %" PRIu32, GetMediaSsrc()); - MS_DUMP(" size : %zu", this->GetSize()); + MS_DEBUG_DEV(" sender ssrc : %" PRIu32, GetSenderSsrc()); + MS_DEBUG_DEV(" media ssrc : %" PRIu32, GetMediaSsrc()); + MS_DEBUG_DEV(" size : %zu", this->GetSize()); } /* Specialization for Ps class. */ @@ -167,10 +167,8 @@ namespace RTC break; case FeedbackPs::MessageType::AFB: - { packet = FeedbackPsAfbPacket::Parse(data, len); break; - } case FeedbackPs::MessageType::EXT: break; diff --git a/worker/src/RTC/RTCP/FeedbackPs.cpp b/worker/src/RTC/RTCP/FeedbackPs.cpp index 73345cf153..b503e8fee6 100644 --- a/worker/src/RTC/RTCP/FeedbackPs.cpp +++ b/worker/src/RTC/RTCP/FeedbackPs.cpp @@ -82,13 +82,13 @@ namespace RTC { MS_TRACE(); - MS_DUMP("<%s>", FeedbackPsPacket::MessageType2String(Item::messageType).c_str()); + MS_DEBUG_DEV("<%s>", FeedbackPsPacket::MessageType2String(Item::messageType).c_str()); FeedbackPsPacket::Dump(); for (auto item : this->items) { item->Dump(); } - MS_DUMP("", FeedbackPsPacket::MessageType2String(Item::messageType).c_str()); + MS_DEBUG_DEV("", FeedbackPsPacket::MessageType2String(Item::messageType).c_str()); } // explicit instantiation to have all FeedbackRtpPacket definitions in this file. diff --git a/worker/src/RTC/RTCP/FeedbackPsAfb.cpp b/worker/src/RTC/RTCP/FeedbackPsAfb.cpp index b10b6c86c9..fc5d26c154 100644 --- a/worker/src/RTC/RTCP/FeedbackPsAfb.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsAfb.cpp @@ -29,7 +29,10 @@ namespace RTC std::unique_ptr packet; constexpr size_t Offset = sizeof(CommonHeader) + sizeof(FeedbackPacket::Header); - if (Utils::Byte::Get4Bytes(data, Offset) == FeedbackPsRembPacket::uniqueIdentifier) + + if ( + sizeof(CommonHeader) + sizeof(FeedbackPacket::Header) + 4 <= len && + Utils::Byte::Get4Bytes(data, Offset) == FeedbackPsRembPacket::uniqueIdentifier) { packet.reset(FeedbackPsRembPacket::Parse(data, len)); } @@ -58,9 +61,9 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); FeedbackPsPacket::Dump(); - MS_DUMP(""); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackPsFir.cpp b/worker/src/RTC/RTCP/FeedbackPsFir.cpp index 4589669cf1..dc7fbac2ab 100644 --- a/worker/src/RTC/RTCP/FeedbackPsFir.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsFir.cpp @@ -41,10 +41,10 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, this->GetSsrc()); - MS_DUMP(" sequence number : %" PRIu8, this->GetSequenceNumber()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, this->GetSsrc()); + MS_DEBUG_DEV(" sequence number : %" PRIu8, this->GetSequenceNumber()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackPsLei.cpp b/worker/src/RTC/RTCP/FeedbackPsLei.cpp index 6f3ad4c4cb..3da2f0ecf8 100644 --- a/worker/src/RTC/RTCP/FeedbackPsLei.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsLei.cpp @@ -33,9 +33,9 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, this->GetSsrc()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, this->GetSsrc()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackPsPli.cpp b/worker/src/RTC/RTCP/FeedbackPsPli.cpp index b6299dab3b..be46769485 100644 --- a/worker/src/RTC/RTCP/FeedbackPsPli.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsPli.cpp @@ -32,9 +32,9 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); FeedbackPsPacket::Dump(); - MS_DUMP(""); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackPsRemb.cpp b/worker/src/RTC/RTCP/FeedbackPsRemb.cpp index 39d0a903bb..cc0d74a656 100644 --- a/worker/src/RTC/RTCP/FeedbackPsRemb.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsRemb.cpp @@ -20,7 +20,10 @@ namespace RTC { MS_TRACE(); - if (sizeof(CommonHeader) + sizeof(FeedbackPacket::Header) > len) + // Check that there is space for the REMB unique identifier and basic fields. + // NOTE: Feedback.cpp already checked that there is space for CommonHeader and + // Feedback Header. + if (sizeof(CommonHeader) + sizeof(FeedbackPacket::Header) + 8 > len) { MS_WARN_TAG(rtcp, "not enough space for Feedback packet, discarded"); @@ -40,43 +43,47 @@ namespace RTC FeedbackPsRembPacket::FeedbackPsRembPacket(CommonHeader* commonHeader) : FeedbackPsAfbPacket(commonHeader, FeedbackPsAfbPacket::Application::REMB) { - auto* data = reinterpret_cast(commonHeader + 1); + size_t len = static_cast(ntohs(commonHeader->length) + 1) * 4; + // Make data point to the 4 bytes that must containt the "REMB" identifier. + auto* data = reinterpret_cast(commonHeader) + sizeof(CommonHeader) + + sizeof(FeedbackPacket::Header); + size_t numSsrcs = data[4]; - if (Utils::Byte::Get4Bytes(data, 8) != uniqueIdentifier) + // Ensure there is space for the the announced number of SSRC feedbacks. + if (len != sizeof(CommonHeader) + sizeof(FeedbackPacket::Header) + 8 + (numSsrcs * sizeof(uint32_t))) { - MS_WARN_TAG(rtcp, "invalid unique indentifier in REMB packet"); + MS_WARN_TAG( + rtcp, "invalid payload size (%zu bytes) for the given number of ssrcs (%zu)", len, numSsrcs); this->isCorrect = false; return; } - size_t numSsrcs = data[12]; - uint8_t exponent = data[13] >> 2; - uint64_t mantissa = - (static_cast(data[13] & 0x03) << 16) | Utils::Byte::Get2Bytes(data, 14); - - this->bitrate = (mantissa << exponent); - if ((this->bitrate >> exponent) != mantissa) + // Verify the "REMB" unique identifier. + if (Utils::Byte::Get4Bytes(data, 0) != FeedbackPsRembPacket::uniqueIdentifier) { - MS_WARN_TAG(rtcp, "invalid REMB bitrate value : %" PRIu64 " *2^%u", mantissa, exponent); + MS_WARN_TAG(rtcp, "invalid unique indentifier in REMB packet"); this->isCorrect = false; return; } - // Check length. - size_t len = static_cast(ntohs(commonHeader->length) + 1) * 4; + // size_t numSsrcs = data[12]; + uint8_t exponent = data[5] >> 2; + uint64_t mantissa = + (static_cast(data[5] & 0x03) << 16) | Utils::Byte::Get2Bytes(data, 6); - if (len != sizeof(CommonHeader) + sizeof(FeedbackPacket::Header) + sizeof(Header) + (numSsrcs * sizeof(uint32_t))) + this->bitrate = (mantissa << exponent); + if ((this->bitrate >> exponent) != mantissa) { - MS_WARN_TAG( - rtcp, "invalid payload size (%zu bytes) for the given number of ssrcs (%zu)", len, numSsrcs); + MS_WARN_TAG(rtcp, "invalid REMB bitrate value: %" PRIu64 " *2^%u", mantissa, exponent); this->isCorrect = false; return; } - size_t index{ 16 }; + // Make index point to the first SSRC feedback item. + size_t index{ 8 }; this->ssrcs.reserve(numSsrcs); for (size_t n{ 0 }; n < numSsrcs; ++n) @@ -100,8 +107,8 @@ namespace RTC ++exponent; } - Utils::Byte::Set4Bytes(buffer, offset, uniqueIdentifier); - offset += sizeof(uniqueIdentifier); + Utils::Byte::Set4Bytes(buffer, offset, FeedbackPsRembPacket::uniqueIdentifier); + offset += sizeof(FeedbackPsRembPacket::uniqueIdentifier); buffer[offset] = this->ssrcs.size(); offset += 1; @@ -125,14 +132,14 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); FeedbackPsPacket::Dump(); - MS_DUMP(" bitrate (bps): %" PRIu64, this->bitrate); + MS_DEBUG_DEV(" bitrate (bps): %" PRIu64, this->bitrate); for (auto ssrc : this->ssrcs) { - MS_DUMP(" ssrc: %" PRIu32, ssrc); + MS_DEBUG_DEV(" ssrc: %" PRIu32, ssrc); } - MS_DUMP(""); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackPsRpsi.cpp b/worker/src/RTC/RTCP/FeedbackPsRpsi.cpp index b0e80658bd..8d9ab5c44f 100644 --- a/worker/src/RTC/RTCP/FeedbackPsRpsi.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsRpsi.cpp @@ -76,11 +76,11 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" padding bits : %" PRIu8, this->header->paddingBits); - MS_DUMP(" payload type : %" PRIu8, this->GetPayloadType()); - MS_DUMP(" length : %zu", this->GetLength()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" padding bits : %" PRIu8, this->header->paddingBits); + MS_DEBUG_DEV(" payload type : %" PRIu8, this->GetPayloadType()); + MS_DEBUG_DEV(" length : %zu", this->GetLength()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackPsSli.cpp b/worker/src/RTC/RTCP/FeedbackPsSli.cpp index 1a141a0b63..23e9e17b6c 100644 --- a/worker/src/RTC/RTCP/FeedbackPsSli.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsSli.cpp @@ -39,11 +39,11 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" first : %" PRIu16, this->first); - MS_DUMP(" number : %" PRIu16, this->number); - MS_DUMP(" picture id : %" PRIu8, this->pictureId); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" first : %" PRIu16, this->first); + MS_DEBUG_DEV(" number : %" PRIu16, this->number); + MS_DEBUG_DEV(" picture id : %" PRIu8, this->pictureId); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackPsTst.cpp b/worker/src/RTC/RTCP/FeedbackPsTst.cpp index fc7eed1676..c82219a695 100644 --- a/worker/src/RTC/RTCP/FeedbackPsTst.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsTst.cpp @@ -40,11 +40,11 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, this->GetSsrc()); - MS_DUMP(" sequence number : %" PRIu32, this->GetSequenceNumber()); - MS_DUMP(" index : %" PRIu32, this->GetIndex()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, this->GetSsrc()); + MS_DEBUG_DEV(" sequence number : %" PRIu32, this->GetSequenceNumber()); + MS_DEBUG_DEV(" index : %" PRIu32, this->GetIndex()); + MS_DEBUG_DEV(""); } /* Specialization for Tstr class. */ diff --git a/worker/src/RTC/RTCP/FeedbackPsVbcm.cpp b/worker/src/RTC/RTCP/FeedbackPsVbcm.cpp index 482848152c..73b0880487 100644 --- a/worker/src/RTC/RTCP/FeedbackPsVbcm.cpp +++ b/worker/src/RTC/RTCP/FeedbackPsVbcm.cpp @@ -50,12 +50,12 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, this->GetSsrc()); - MS_DUMP(" sequence number : %" PRIu8, this->GetSequenceNumber()); - MS_DUMP(" payload type : %" PRIu8, this->GetPayloadType()); - MS_DUMP(" length : %" PRIu16, this->GetLength()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, this->GetSsrc()); + MS_DEBUG_DEV(" sequence number : %" PRIu8, this->GetSequenceNumber()); + MS_DEBUG_DEV(" payload type : %" PRIu8, this->GetPayloadType()); + MS_DEBUG_DEV(" length : %" PRIu16, this->GetLength()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackRtp.cpp b/worker/src/RTC/RTCP/FeedbackRtp.cpp index 88da3dc666..8453dc36dc 100644 --- a/worker/src/RTC/RTCP/FeedbackRtp.cpp +++ b/worker/src/RTC/RTCP/FeedbackRtp.cpp @@ -73,13 +73,13 @@ namespace RTC { MS_TRACE(); - MS_DUMP("<%s>", FeedbackRtpPacket::MessageType2String(Item::messageType).c_str()); + MS_DEBUG_DEV("<%s>", FeedbackRtpPacket::MessageType2String(Item::messageType).c_str()); FeedbackRtpPacket::Dump(); for (auto item : this->items) { item->Dump(); } - MS_DUMP("", FeedbackRtpPacket::MessageType2String(Item::messageType).c_str()); + MS_DEBUG_DEV("", FeedbackRtpPacket::MessageType2String(Item::messageType).c_str()); } // Explicit instantiation to have all FeedbackRtpPacket definitions in this file. diff --git a/worker/src/RTC/RTCP/FeedbackRtpEcn.cpp b/worker/src/RTC/RTCP/FeedbackRtpEcn.cpp index 176794d4c7..8dfff06663 100644 --- a/worker/src/RTC/RTCP/FeedbackRtpEcn.cpp +++ b/worker/src/RTC/RTCP/FeedbackRtpEcn.cpp @@ -23,15 +23,15 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" sequence number : %" PRIu32, this->GetSequenceNumber()); - MS_DUMP(" ect0 counter : %" PRIu32, this->GetEct0Counter()); - MS_DUMP(" ect1 counter : %" PRIu32, this->GetEct1Counter()); - MS_DUMP(" ecn ce counter : %" PRIu16, this->GetEcnCeCounter()); - MS_DUMP(" not ect counter : %" PRIu16, this->GetNotEctCounter()); - MS_DUMP(" lost packets : %" PRIu16, this->GetLostPackets()); - MS_DUMP(" duplicated packets : %" PRIu16, this->GetDuplicatedPackets()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" sequence number : %" PRIu32, this->GetSequenceNumber()); + MS_DEBUG_DEV(" ect0 counter : %" PRIu32, this->GetEct0Counter()); + MS_DEBUG_DEV(" ect1 counter : %" PRIu32, this->GetEct1Counter()); + MS_DEBUG_DEV(" ecn ce counter : %" PRIu16, this->GetEcnCeCounter()); + MS_DEBUG_DEV(" not ect counter : %" PRIu16, this->GetNotEctCounter()); + MS_DEBUG_DEV(" lost packets : %" PRIu16, this->GetLostPackets()); + MS_DEBUG_DEV(" duplicated packets : %" PRIu16, this->GetDuplicatedPackets()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackRtpNack.cpp b/worker/src/RTC/RTCP/FeedbackRtpNack.cpp index 6847d4d5d7..4a8c8e1f6d 100644 --- a/worker/src/RTC/RTCP/FeedbackRtpNack.cpp +++ b/worker/src/RTC/RTCP/FeedbackRtpNack.cpp @@ -36,10 +36,10 @@ namespace RTC std::bitset<16> nackBitset(this->GetLostPacketBitmask()); - MS_DUMP(""); - MS_DUMP(" pid : %" PRIu16, this->GetPacketId()); - MS_DUMP(" bpl : %s", nackBitset.to_string().c_str()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" pid : %" PRIu16, this->GetPacketId()); + MS_DEBUG_DEV(" bpl : %s", nackBitset.to_string().c_str()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackRtpSrReq.cpp b/worker/src/RTC/RTCP/FeedbackRtpSrReq.cpp index c148fe3b1c..de33e16e27 100644 --- a/worker/src/RTC/RTCP/FeedbackRtpSrReq.cpp +++ b/worker/src/RTC/RTCP/FeedbackRtpSrReq.cpp @@ -30,9 +30,9 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); FeedbackRtpPacket::Dump(); - MS_DUMP(""); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackRtpTllei.cpp b/worker/src/RTC/RTCP/FeedbackRtpTllei.cpp index 6fc370a25f..c137f62362 100644 --- a/worker/src/RTC/RTCP/FeedbackRtpTllei.cpp +++ b/worker/src/RTC/RTCP/FeedbackRtpTllei.cpp @@ -33,10 +33,10 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" pid: %" PRIu16, this->GetPacketId()); - MS_DUMP(" bpl: %" PRIu16, this->GetLostPacketBitmask()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" pid: %" PRIu16, this->GetPacketId()); + MS_DEBUG_DEV(" bpl: %" PRIu16, this->GetLostPacketBitmask()); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/FeedbackRtpTmmb.cpp b/worker/src/RTC/RTCP/FeedbackRtpTmmb.cpp index db90dbd5b6..a8b342633a 100644 --- a/worker/src/RTC/RTCP/FeedbackRtpTmmb.cpp +++ b/worker/src/RTC/RTCP/FeedbackRtpTmmb.cpp @@ -68,11 +68,11 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, this->GetSsrc()); - MS_DUMP(" bitrate : %" PRIu64, this->GetBitrate()); - MS_DUMP(" overhead : %" PRIu16, this->GetOverhead()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, this->GetSsrc()); + MS_DEBUG_DEV(" bitrate : %" PRIu64, this->GetBitrate()); + MS_DEBUG_DEV(" overhead : %" PRIu16, this->GetOverhead()); + MS_DEBUG_DEV(""); } /* Specialization for Tmmbr class. */ diff --git a/worker/src/RTC/RTCP/ReceiverReport.cpp b/worker/src/RTC/RTCP/ReceiverReport.cpp index 2c84a87247..1ff4d3c886 100644 --- a/worker/src/RTC/RTCP/ReceiverReport.cpp +++ b/worker/src/RTC/RTCP/ReceiverReport.cpp @@ -1,5 +1,5 @@ #define MS_CLASS "RTC::RTCP::ReceiverReport" -#define MS_LOG_DEV +// #define MS_LOG_DEV #include "RTC/RTCP/ReceiverReport.hpp" #include "Logger.hpp" @@ -36,15 +36,15 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, this->GetSsrc()); - MS_DUMP(" fraction lost : %" PRIu32, this->GetFractionLost()); - MS_DUMP(" total lost : %" PRIu32, this->GetTotalLost()); - MS_DUMP(" last seq : %" PRIu32, this->GetLastSeq()); - MS_DUMP(" jitter : %" PRIu32, this->GetJitter()); - MS_DUMP(" lsr : %" PRIu32, this->GetLastSenderReport()); - MS_DUMP(" dlsr : %" PRIu32, this->GetDelaySinceLastSenderReport()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, this->GetSsrc()); + MS_DEBUG_DEV(" fraction lost : %" PRIu32, this->GetFractionLost()); + MS_DEBUG_DEV(" total lost : %" PRIu32, this->GetTotalLost()); + MS_DEBUG_DEV(" last seq : %" PRIu32, this->GetLastSeq()); + MS_DEBUG_DEV(" jitter : %" PRIu32, this->GetJitter()); + MS_DEBUG_DEV(" lsr : %" PRIu32, this->GetLastSenderReport()); + MS_DEBUG_DEV(" dlsr : %" PRIu32, this->GetDelaySinceLastSenderReport()); + MS_DEBUG_DEV(""); } size_t ReceiverReport::Serialize(uint8_t* buffer) @@ -71,6 +71,15 @@ namespace RTC // Get the header. auto* header = const_cast(reinterpret_cast(data)); + + // Ensure there is space for the common header and the SSRC of packet sender. + if (sizeof(CommonHeader) + sizeof(uint32_t) > len) + { + MS_WARN_TAG(rtcp, "not enough space for receiver report packet, packet discarded"); + + return nullptr; + } + std::unique_ptr packet(new ReceiverReportPacket()); packet->SetSsrc( @@ -124,13 +133,13 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc: %" PRIu32, static_cast(ntohl(this->ssrc))); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc: %" PRIu32, static_cast(ntohl(this->ssrc))); for (auto report : this->reports) { report->Dump(); } - MS_DUMP(""); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/Sdes.cpp b/worker/src/RTC/RTCP/Sdes.cpp index 275e9a97ea..8004635d9f 100644 --- a/worker/src/RTC/RTCP/Sdes.cpp +++ b/worker/src/RTC/RTCP/Sdes.cpp @@ -1,5 +1,5 @@ #define MS_CLASS "RTC::RTCP::Sdes" -#define MS_LOG_DEV +// #define MS_LOG_DEV #include "RTC/RTCP/Sdes.hpp" #include "Logger.hpp" @@ -37,7 +37,7 @@ namespace RTC auto* header = const_cast(reinterpret_cast(data)); // data size must be >= header + length value. - if (sizeof(uint8_t) * 2 + header->length > len) + if (sizeof(Header) > len || sizeof(uint8_t) * 2 + header->length > len) { MS_WARN_TAG(rtcp, "not enough space for SDES item, discarded"); @@ -85,11 +85,11 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" type : %s", SdesItem::Type2String(this->GetType()).c_str()); - MS_DUMP(" length : %" PRIu8, this->header->length); - MS_DUMP(" value : %.*s", this->header->length, this->header->value); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" type : %s", SdesItem::Type2String(this->GetType()).c_str()); + MS_DEBUG_DEV(" length : %" PRIu8, this->header->length); + MS_DEBUG_DEV(" value : %.*s", this->header->length, this->header->value); + MS_DEBUG_DEV(""); } size_t SdesItem::Serialize(uint8_t* buffer) @@ -167,13 +167,13 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, static_cast(ntohl(this->ssrc))); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, static_cast(ntohl(this->ssrc))); for (auto item : this->items) { item->Dump(); } - MS_DUMP(""); + MS_DEBUG_DEV(""); } /* Class methods. */ @@ -226,12 +226,12 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); for (auto chunk : this->chunks) { chunk->Dump(); } - MS_DUMP(""); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RTCP/SenderReport.cpp b/worker/src/RTC/RTCP/SenderReport.cpp index 497d514bc5..d001621fcb 100644 --- a/worker/src/RTC/RTCP/SenderReport.cpp +++ b/worker/src/RTC/RTCP/SenderReport.cpp @@ -1,5 +1,5 @@ #define MS_CLASS "RTC::RTCP::SenderReport" -#define MS_LOG_DEV +// #define MS_LOG_DEV #include "RTC/RTCP/SenderReport.hpp" #include "Logger.hpp" @@ -35,14 +35,14 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" ssrc : %" PRIu32, this->GetSsrc()); - MS_DUMP(" ntp sec : %" PRIu32, this->GetNtpSec()); - MS_DUMP(" ntp frac : %" PRIu32, this->GetNtpFrac()); - MS_DUMP(" rtp ts : %" PRIu32, this->GetRtpTs()); - MS_DUMP(" packet count : %" PRIu32, this->GetPacketCount()); - MS_DUMP(" octet count : %" PRIu32, this->GetOctetCount()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" ssrc : %" PRIu32, this->GetSsrc()); + MS_DEBUG_DEV(" ntp sec : %" PRIu32, this->GetNtpSec()); + MS_DEBUG_DEV(" ntp frac : %" PRIu32, this->GetNtpFrac()); + MS_DEBUG_DEV(" rtp ts : %" PRIu32, this->GetRtpTs()); + MS_DEBUG_DEV(" packet count : %" PRIu32, this->GetPacketCount()); + MS_DEBUG_DEV(" octet count : %" PRIu32, this->GetOctetCount()); + MS_DEBUG_DEV(""); } size_t SenderReport::Serialize(uint8_t* buffer) @@ -97,12 +97,12 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); for (auto report : this->reports) { report->Dump(); } - MS_DUMP(""); + MS_DEBUG_DEV(""); } } // namespace RTCP } // namespace RTC diff --git a/worker/src/RTC/RemoteBitrateEstimator/AimdRateControl.cpp b/worker/src/RTC/RemoteBitrateEstimator/AimdRateControl.cpp index ddcfe1fa8e..589958e4e6 100644 --- a/worker/src/RTC/RemoteBitrateEstimator/AimdRateControl.cpp +++ b/worker/src/RTC/RemoteBitrateEstimator/AimdRateControl.cpp @@ -140,9 +140,12 @@ namespace RTC switch (this->rateControlState) { case RC_HOLD: + { break; + } case RC_INCREASE: + { if (this->avgMaxBitrateKbps >= 0 && incomingBitrateKbps > this->avgMaxBitrateKbps + 3 * stdMaxBitRate) { ChangeRegion(RC_MAX_UNKNOWN); @@ -163,9 +166,12 @@ namespace RTC } this->timeLastBitrateChange = nowMs; + break; + } case RC_DECREASE: + { this->bitrateIsInitialized = true; // Set bit rate to something slightly lower than max to get rid // of any self-induced delay. @@ -195,10 +201,14 @@ namespace RTC // Stay on hold until the pipes are cleared. ChangeState(RC_HOLD); this->timeLastBitrateChange = nowMs; + break; + } default: + { MS_ASSERT(false, "invalid this->rateControlState value"); + } } return ClampBitrate(newBitrateBps, incomingBitrateBps); @@ -280,23 +290,37 @@ namespace RTC switch (this->currentInput.bwState) { case BW_NORMAL: + { if (this->rateControlState == RC_HOLD) { this->timeLastBitrateChange = nowMs; ChangeState(RC_INCREASE); } + break; + } + case BW_OVERUSING: + { if (this->rateControlState != RC_DECREASE) { ChangeState(RC_DECREASE); } + break; + } + case BW_UNDERUSING: + { ChangeState(RC_HOLD); + break; + } + default: + { MS_ASSERT(false, "invalid RateControlInput::bwState value"); + } } } } // namespace RTC diff --git a/worker/src/RTC/Router.cpp b/worker/src/RTC/Router.cpp index 239e005d10..c7f185f776 100644 --- a/worker/src/RTC/Router.cpp +++ b/worker/src/RTC/Router.cpp @@ -31,11 +31,6 @@ namespace RTC } Router::~Router() - { - MS_TRACE(); - } - - void Router::Destroy() { MS_TRACE(); @@ -45,7 +40,7 @@ namespace RTC auto* producer = it->second; it = this->producers.erase(it); - producer->Destroy(); + delete producer; } // Close all the Consumers. @@ -54,27 +49,25 @@ namespace RTC auto* consumer = it->second; it = this->consumers.erase(it); - consumer->Destroy(); + delete consumer; } // Close all the Transports. // NOTE: It is critical to close Transports after Producers/Consumers - // because their Destroy() method fires an event in the Transport. + // because their destructor fires an event in the Transport. for (auto it = this->transports.begin(); it != this->transports.end();) { auto* transport = it->second; it = this->transports.erase(it); - transport->Destroy(); + delete transport; } // Close the audio level timer. - this->audioLevelsTimer->Destroy(); + delete this->audioLevelsTimer; // Notify the listener. this->listener->OnRouterClosed(this); - - delete this; } Json::Value Router::ToJson() const @@ -601,7 +594,7 @@ namespace RTC return; } - transport->Destroy(); + delete transport; MS_DEBUG_DEV("Transport closed [transportId:%" PRIu32 "]", transport->transportId); @@ -999,7 +992,7 @@ namespace RTC return; } - producer->Destroy(); + delete producer; MS_DEBUG_DEV("Producer closed [producerId:%" PRIu32 "]", producer->producerId); @@ -1171,7 +1164,7 @@ namespace RTC return; } - consumer->Destroy(); + delete consumer; request->Accept(); @@ -1604,20 +1597,6 @@ namespace RTC this->transports.erase(transport->transportId); } - void Router::OnTransportReceiveRtcpFeedback( - RTC::Transport* /*transport*/, RTC::Consumer* consumer, RTC::RTCP::FeedbackPsPacket* packet) - { - MS_TRACE(); - - MS_ASSERT( - this->mapConsumerProducer.find(consumer) != this->mapConsumerProducer.end(), - "Consumer not present in mapConsumerProducer"); - - auto* producer = this->mapConsumerProducer[consumer]; - - producer->ReceiveRtcpFeedback(packet); - } - void Router::OnProducerClosed(RTC::Producer* producer) { MS_TRACE(); @@ -1625,6 +1604,7 @@ namespace RTC this->producers.erase(producer->producerId); // Remove the Producer from the map. + // NOTE: It may not exist if it failed before being inserted into the maps. if (this->mapProducerConsumers.find(producer) != this->mapProducerConsumers.end()) { // Iterate the map and close all the Consumers associated to it. @@ -1635,7 +1615,7 @@ namespace RTC auto* consumer = *it; it = consumers.erase(it); - consumer->Destroy(); + delete consumer; } // Finally delete the Producer entry in the map. @@ -1674,8 +1654,7 @@ namespace RTC for (auto* consumer : consumers) { - if (consumer->IsEnabled()) - consumer->SourceResume(); + consumer->SourceResume(); } } diff --git a/worker/src/RTC/RtpMonitor.cpp b/worker/src/RTC/RtpMonitor.cpp index 00ad3e5338..55eb6655b8 100644 --- a/worker/src/RTC/RtpMonitor.cpp +++ b/worker/src/RTC/RtpMonitor.cpp @@ -139,12 +139,12 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" score : %" PRIi8, GetScore()); - MS_DUMP(" totalSourceLoss : %" PRIi32, this->totalSourceLoss); - MS_DUMP(" totalReportedLoss : %" PRIi32, this->totalReportedLoss); - MS_DUMP(" repairedPackets size : %zu", this->repairedPackets.size()); - MS_DUMP(""); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" score : %" PRIi8, GetScore()); + MS_DEBUG_DEV(" totalSourceLoss : %" PRIi32, this->totalSourceLoss); + MS_DEBUG_DEV(" totalReportedLoss : %" PRIi32, this->totalReportedLoss); + MS_DEBUG_DEV(" repairedPackets size : %zu", this->repairedPackets.size()); + MS_DEBUG_DEV(""); } void RtpMonitor::AddScore(uint8_t score) diff --git a/worker/src/RTC/RtpPacket.cpp b/worker/src/RTC/RtpPacket.cpp index dc7b3bcdc9..2a6987f5f1 100644 --- a/worker/src/RTC/RtpPacket.cpp +++ b/worker/src/RTC/RtpPacket.cpp @@ -207,21 +207,21 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); - MS_DUMP(" padding : %s", this->header->padding ? "true" : "false"); - MS_DUMP(" extension header : %s", HasExtensionHeader() ? "true" : "false"); + MS_DEBUG_DEV(""); + MS_DEBUG_DEV(" padding : %s", this->header->padding ? "true" : "false"); + MS_DEBUG_DEV(" extension header : %s", HasExtensionHeader() ? "true" : "false"); if (HasExtensionHeader()) { - MS_DUMP(" id : %" PRIu16, GetExtensionHeaderId()); - MS_DUMP(" length : %zu bytes", GetExtensionHeaderLength()); + MS_DEBUG_DEV(" id : %" PRIu16, GetExtensionHeaderId()); + MS_DEBUG_DEV(" length : %zu bytes", GetExtensionHeaderLength()); } if (HasOneByteExtensions()) { - MS_DUMP(" RFC5285 ext style : One-Byte Header"); + MS_DEBUG_DEV(" RFC5285 ext style : One-Byte Header"); } if (HasTwoBytesExtensions()) { - MS_DUMP(" RFC5285 ext style : Two-Bytes Header"); + MS_DEBUG_DEV(" RFC5285 ext style : Two-Bytes Header"); } if (HasOneByteExtensions() || HasTwoBytesExtensions()) { @@ -239,25 +239,28 @@ namespace RTC extIds.push_back(std::to_string(pair.first)); } - std::copy( - extIds.begin(), extIds.end() - 1, std::ostream_iterator(extIdsStream, ",")); - extIdsStream << extIds.back(); + if (!extIds.empty()) + { + std::copy( + extIds.begin(), extIds.end() - 1, std::ostream_iterator(extIdsStream, ",")); + extIdsStream << extIds.back(); - MS_DUMP(" RFC5285 ext ids : %s", extIdsStream.str().c_str()); + MS_DEBUG_DEV(" RFC5285 ext ids : %s", extIdsStream.str().c_str()); + } } - MS_DUMP(" csrc count : %" PRIu8, this->header->csrcCount); - MS_DUMP(" marker : %s", HasMarker() ? "true" : "false"); - MS_DUMP(" payload type : %" PRIu8, GetPayloadType()); - MS_DUMP(" sequence number : %" PRIu16, GetSequenceNumber()); - MS_DUMP(" timestamp : %" PRIu32, GetTimestamp()); - MS_DUMP(" ssrc : %" PRIu32, GetSsrc()); - MS_DUMP(" payload size : %zu bytes", GetPayloadLength()); + MS_DEBUG_DEV(" csrc count : %" PRIu8, this->header->csrcCount); + MS_DEBUG_DEV(" marker : %s", HasMarker() ? "true" : "false"); + MS_DEBUG_DEV(" payload type : %" PRIu8, GetPayloadType()); + MS_DEBUG_DEV(" sequence number : %" PRIu16, GetSequenceNumber()); + MS_DEBUG_DEV(" timestamp : %" PRIu32, GetTimestamp()); + MS_DEBUG_DEV(" ssrc : %" PRIu32, GetSsrc()); + MS_DEBUG_DEV(" payload size : %zu bytes", GetPayloadLength()); if (this->header->padding != 0u) { - MS_DUMP(" padding size : %" PRIu8 " bytes", this->payloadPadding); + MS_DEBUG_DEV(" padding size : %" PRIu8 " bytes", this->payloadPadding); } - MS_DUMP(" packet size : %zu bytes", GetSize()); - MS_DUMP(""); + MS_DEBUG_DEV(" packet size : %zu bytes", GetSize()); + MS_DEBUG_DEV(""); } void RtpPacket::MangleExtensionHeaderIds(const std::map& idMapping) @@ -540,8 +543,9 @@ namespace RTC break; } - // Store the One-Byte extension element in a map. - this->oneByteExtensions[id] = reinterpret_cast(ptr); + // Store the One-Byte extension element in a map. Ignore if 0. + if (id != 0u) + this->oneByteExtensions[id] = reinterpret_cast(ptr); ptr += 1 + len; @@ -573,8 +577,9 @@ namespace RTC break; } - // Store the Two-Bytes extension element in a map. - this->twoBytesExtensions[id] = reinterpret_cast(ptr); + // Store the Two-Bytes extension element in a map. Ignore if 0. + if (id != 0u) + this->twoBytesExtensions[id] = reinterpret_cast(ptr); ptr += len; diff --git a/worker/src/RTC/RtpStream.cpp b/worker/src/RTC/RtpStream.cpp index d7215fc554..854c423110 100644 --- a/worker/src/RTC/RtpStream.cpp +++ b/worker/src/RTC/RtpStream.cpp @@ -32,7 +32,7 @@ namespace RTC MS_TRACE(); // Close the status check timer. - this->statusCheckTimer->Destroy(); + delete this->statusCheckTimer; } Json::Value RtpStream::ToJson() @@ -260,8 +260,6 @@ namespace RTC MS_TRACE(); if (timer == this->statusCheckTimer) - { CheckStatus(); - } } } // namespace RTC diff --git a/worker/src/RTC/SrtpSession.cpp b/worker/src/RTC/SrtpSession.cpp index b6621c5d02..62daa2fed8 100644 --- a/worker/src/RTC/SrtpSession.cpp +++ b/worker/src/RTC/SrtpSession.cpp @@ -115,13 +115,6 @@ namespace RTC } } - void SrtpSession::Destroy() - { - MS_TRACE(); - - delete this; - } - bool SrtpSession::EncryptRtp(const uint8_t** data, size_t* len) { MS_TRACE(); diff --git a/worker/src/RTC/StunMessage.cpp b/worker/src/RTC/StunMessage.cpp index f14b695aea..c0687faa22 100644 --- a/worker/src/RTC/StunMessage.cpp +++ b/worker/src/RTC/StunMessage.cpp @@ -126,7 +126,7 @@ namespace RTC { MS_WARN_TAG( ice, - "attribute after MESSAGE_INTEGRITY other than FINGERPRINT is not allowed, " + "attribute after MESSAGE-INTEGRITY other than FINGERPRINT is not allowed, " "message discarded"); delete msg; @@ -144,39 +144,99 @@ namespace RTC break; } + case Attribute::PRIORITY: { + // Ensure attribute length is 4 bytes. + if (attrLength != 4) + { + MS_WARN_TAG(ice, "attribute PRIORITY must be 4 bytes length, message discarded"); + + delete msg; + return nullptr; + } + msg->SetPriority(Utils::Byte::Get4Bytes(attrValuePos, 0)); break; } + case Attribute::ICE_CONTROLLING: { + // Ensure attribute length is 8 bytes. + if (attrLength != 8) + { + MS_WARN_TAG(ice, "attribute ICE-CONTROLLING must be 8 bytes length, message discarded"); + + delete msg; + return nullptr; + } + msg->SetIceControlling(Utils::Byte::Get8Bytes(attrValuePos, 0)); break; } + case Attribute::ICE_CONTROLLED: { + // Ensure attribute length is 8 bytes. + if (attrLength != 8) + { + MS_WARN_TAG(ice, "attribute ICE-CONTROLLED must be 8 bytes length, message discarded"); + + delete msg; + return nullptr; + } + msg->SetIceControlled(Utils::Byte::Get8Bytes(attrValuePos, 0)); break; } + case Attribute::USE_CANDIDATE: { + // Ensure attribute length is 0 bytes. + if (attrLength != 0) + { + MS_WARN_TAG(ice, "attribute USE-CANDIDATE must be 0 bytes length, message discarded"); + + delete msg; + return nullptr; + } + msg->SetUseCandidate(); break; } + case Attribute::MESSAGE_INTEGRITY: { + // Ensure attribute length is 20 bytes. + if (attrLength != 20) + { + MS_WARN_TAG(ice, "attribute MESSAGE-INTEGRITY must be 20 bytes length, message discarded"); + + delete msg; + return nullptr; + } + hasMessageIntegrity = true; msg->SetMessageIntegrity(attrValuePos); break; } + case Attribute::FINGERPRINT: { + // Ensure attribute length is 4 bytes. + if (attrLength != 4) + { + MS_WARN_TAG(ice, "attribute FINGERPRINT must be 4 bytes length, message discarded"); + + delete msg; + return nullptr; + } + hasFingerprint = true; fingerprintAttrPos = pos; fingerprint = Utils::Byte::Get4Bytes(attrValuePos, 0); @@ -184,8 +244,18 @@ namespace RTC break; } + case Attribute::ERROR_CODE: { + // Ensure attribute length >= 4bytes. + if (attrLength < 4) + { + MS_WARN_TAG(ice, "attribute ERROR-CODE must be >= 4bytes length, message discarded"); + + delete msg; + return nullptr; + } + uint8_t errorClass = Utils::Byte::Get1Byte(attrValuePos, 2); uint8_t errorNumber = Utils::Byte::Get1Byte(attrValuePos, 3); auto errorCode = static_cast(errorClass * 100 + errorNumber); @@ -194,6 +264,7 @@ namespace RTC break; } + default:; } @@ -253,7 +324,7 @@ namespace RTC { MS_TRACE(); - MS_DUMP(""); + MS_DEBUG_DEV(""); std::string klass; switch (this->klass) @@ -273,14 +344,15 @@ namespace RTC } if (this->method == Method::BINDING) { - MS_DUMP(" Binding %s", klass.c_str()); + MS_DEBUG_DEV(" Binding %s", klass.c_str()); } else { // This prints the unknown method number. Example: TURN Allocate => 0x003. - MS_DUMP(" %s with unknown method %#.3x", klass.c_str(), static_cast(this->method)); + MS_DEBUG_DEV( + " %s with unknown method %#.3x", klass.c_str(), static_cast(this->method)); } - MS_DUMP(" size: %zu bytes", this->size); + MS_DEBUG_DEV(" size: %zu bytes", this->size); static char transactionId[25]; @@ -289,19 +361,19 @@ namespace RTC // NOTE: n must be 3 because snprintf adds a \0 after printed chars. std::snprintf(transactionId + (i * 2), 3, "%.2x", this->transactionId[i]); } - MS_DUMP(" transactionId: %s", transactionId); + MS_DEBUG_DEV(" transactionId: %s", transactionId); if (this->errorCode != 0u) - MS_DUMP(" errorCode: %" PRIu16, this->errorCode); + MS_DEBUG_DEV(" errorCode: %" PRIu16, this->errorCode); if (!this->username.empty()) - MS_DUMP(" username: %s", this->username.c_str()); + MS_DEBUG_DEV(" username: %s", this->username.c_str()); if (this->priority != 0u) - MS_DUMP(" priority: %" PRIu32, this->priority); + MS_DEBUG_DEV(" priority: %" PRIu32, this->priority); if (this->iceControlling != 0u) - MS_DUMP(" iceControlling: %" PRIu64, this->iceControlling); + MS_DEBUG_DEV(" iceControlling: %" PRIu64, this->iceControlling); if (this->iceControlled != 0u) - MS_DUMP(" iceControlled: %" PRIu64, this->iceControlled); + MS_DEBUG_DEV(" iceControlled: %" PRIu64, this->iceControlled); if (this->hasUseCandidate) - MS_DUMP(" useCandidate"); + MS_DEBUG_DEV(" useCandidate"); if (this->xorMappedAddress != nullptr) { int family; @@ -310,7 +382,7 @@ namespace RTC Utils::IP::GetAddressInfo(this->xorMappedAddress, &family, ip, &port); - MS_DUMP(" xorMappedAddress: %s : %" PRIu16, ip.c_str(), port); + MS_DEBUG_DEV(" xorMappedAddress: %s : %" PRIu16, ip.c_str(), port); } if (this->messageIntegrity != nullptr) { @@ -321,12 +393,12 @@ namespace RTC std::snprintf(messageIntegrity + (i * 2), 3, "%.2x", this->messageIntegrity[i]); } - MS_DUMP(" messageIntegrity: %s", messageIntegrity); + MS_DEBUG_DEV(" messageIntegrity: %s", messageIntegrity); } if (this->hasFingerprint) - MS_DUMP(" fingerprint"); + MS_DEBUG_DEV(" has fingerprint"); - MS_DUMP(""); + MS_DEBUG_DEV(""); } StunMessage::Authentication StunMessage::CheckAuthentication( @@ -340,7 +412,7 @@ namespace RTC case Class::INDICATION: { // Both USERNAME and MESSAGE-INTEGRITY must be present. - if ((this->messageIntegrity == nullptr) || this->username.empty()) + if (this->messageIntegrity == nullptr || this->username.empty()) return Authentication::BAD_REQUEST; // Check that USERNAME attribute begins with our local username plus ":". @@ -478,6 +550,7 @@ namespace RTC break; } + case AF_INET6: { xorMappedAddressPaddedLen = 20; @@ -485,6 +558,7 @@ namespace RTC break; } + default: { MS_ERROR("invalid inet family in XOR-MAPPED-ADDRESS attribute"); @@ -610,6 +684,7 @@ namespace RTC break; } + case AF_INET6: { // Set first byte to 0. diff --git a/worker/src/RTC/TcpConnection.cpp b/worker/src/RTC/TcpConnection.cpp index a7bdd60b6b..41cbc808d1 100644 --- a/worker/src/RTC/TcpConnection.cpp +++ b/worker/src/RTC/TcpConnection.cpp @@ -47,9 +47,9 @@ namespace RTC while (true) { // We may receive multiple packets in the same TCP chunk. If one of them is - // a DTLS Close Alert this would be closed (Destroy() called) so we cannot call + // a DTLS Close Alert this would be closed (Close() called) so we cannot call // our listeners anymore. - if (IsClosing()) + if (IsClosed()) return; size_t dataLen = this->bufferDataLen - this->frameStart; @@ -125,7 +125,7 @@ namespace RTC "connection"); // Close the socket. - Destroy(); + Close(); } } // The buffer is not full. @@ -151,7 +151,6 @@ namespace RTC uint8_t frameLen[2]; Utils::Byte::Set2Bytes(frameLen, 0, len); - Write(frameLen, 2, data, len); } } // namespace RTC diff --git a/worker/src/RTC/TcpServer.cpp b/worker/src/RTC/TcpServer.cpp index b7625b47de..0af891f6b9 100644 --- a/worker/src/RTC/TcpServer.cpp +++ b/worker/src/RTC/TcpServer.cpp @@ -97,22 +97,29 @@ namespace RTC switch (addressFamily) { case AF_INET: + { availablePorts = &RTC::TcpServer::availableIPv4Ports; bindAddr = RTC::TcpServer::sockaddrStorageIPv4; listenIp = Settings::configuration.rtcIPv4.c_str(); + break; + } case AF_INET6: + { availablePorts = &RTC::TcpServer::availableIPv6Ports; bindAddr = RTC::TcpServer::sockaddrStorageIPv6; listenIp = Settings::configuration.rtcIPv6.c_str(); // Don't also bind into IPv4 when listening in IPv6. flags |= UV_TCP_IPV6ONLY; + break; + } default: + { MS_THROW_ERROR("invalid address family given"); - break; + } } // Choose a random first port to start from. @@ -155,6 +162,7 @@ namespace RTC case AF_INET: (reinterpret_cast(&bindAddr))->sin_port = htons(iteratingPort); break; + case AF_INET6: (reinterpret_cast(&bindAddr))->sin6_port = htons(iteratingPort); break; @@ -221,6 +229,17 @@ namespace RTC MS_TRACE(); } + TcpServer::~TcpServer() + { + MS_TRACE(); + + // Mark the port as available again. + if (this->localAddr.ss_family == AF_INET) + RTC::TcpServer::availableIPv4Ports[this->localPort] = true; + else if (this->localAddr.ss_family == AF_INET6) + RTC::TcpServer::availableIPv6Ports[this->localPort] = true; + } + void TcpServer::UserOnTcpConnectionAlloc(::TcpConnection** connection) { MS_TRACE(); @@ -235,31 +254,14 @@ namespace RTC // Allow just MaxTcpConnectionsPerServer. if (GetNumConnections() > MaxTcpConnectionsPerServer) - connection->Destroy(); + delete connection; } void TcpServer::UserOnTcpConnectionClosed(::TcpConnection* connection, bool isClosedByPeer) { MS_TRACE(); - // Notify the listener. - // NOTE: Don't do it if closing (since at this point the listener is already freed). - // At the end, this is just called if the connection was remotely closed. - if (!IsClosing()) - { - this->listener->OnRtcTcpConnectionClosed( - this, dynamic_cast(connection), isClosedByPeer); - } - } - - void TcpServer::UserOnTcpServerClosed() - { - MS_TRACE(); - - // Mark the port as available again. - if (this->localAddr.ss_family == AF_INET) - RTC::TcpServer::availableIPv4Ports[this->localPort] = true; - else if (this->localAddr.ss_family == AF_INET6) - RTC::TcpServer::availableIPv6Ports[this->localPort] = true; + this->listener->OnRtcTcpConnectionClosed( + this, dynamic_cast(connection), isClosedByPeer); } } // namespace RTC diff --git a/worker/src/RTC/Transport.cpp b/worker/src/RTC/Transport.cpp index 5225adf931..c96e640556 100644 --- a/worker/src/RTC/Transport.cpp +++ b/worker/src/RTC/Transport.cpp @@ -30,13 +30,26 @@ namespace RTC { MS_TRACE(); + if (!this->closed) + Close(); + } + + void Transport::Close() + { + MS_TRACE(); + + if (this->closed) + return; + + this->closed = true; + // Close all the handled Producers. for (auto it = this->producers.begin(); it != this->producers.end();) { auto* producer = *it; it = this->producers.erase(it); - producer->Destroy(); + delete producer; } // Disable all the handled Consumers. @@ -48,22 +61,22 @@ namespace RTC consumer->RemoveListener(this); } - // Destroy the RTCP timer. - if (this->rtcpTimer != nullptr) - this->rtcpTimer->Destroy(); - } + // Close the RTCP timer. + delete this->rtcpTimer; - void Transport::Destroy() - { - MS_TRACE(); + // Delete mirror tuple. + if (this->mirrorTuple != nullptr) + delete this->mirrorTuple; - // Notify. - this->notifier->Emit(this->transportId, "close"); + // Delete mirror socket. + if (this->mirrorSocket != nullptr) + delete this->mirrorSocket; // Notify the listener. this->listener->OnTransportClosed(this); - delete this; + // Notify. + this->notifier->Emit(this->transportId, "close"); } void Transport::StartMirroring(MirroringOptions& options) @@ -120,8 +133,6 @@ namespace RTC default: { MS_THROW_ERROR("invalid destination IP '%s'", options.remoteIP.c_str()); - - break; } } @@ -134,9 +145,7 @@ namespace RTC void Transport::StopMirroring() { delete this->mirrorTuple; - - if (this->mirrorSocket != nullptr) - this->mirrorSocket->Destroy(); + delete this->mirrorSocket; this->mirrorTuple = nullptr; this->mirrorSocket = nullptr; @@ -272,21 +281,14 @@ namespace RTC auto* remb = dynamic_cast(afb); this->recvRemb = std::make_tuple(remb->GetBitrate(), remb->GetSsrcs()); + break; } - } - - // [[fallthrough]]; (C++17) - case RTCP::FeedbackPs::MessageType::SLI: - case RTCP::FeedbackPs::MessageType::RPSI: - { - auto* consumer = GetConsumer(feedback->GetMediaSsrc()); - - if (consumer == nullptr) + else { MS_WARN_TAG( rtcp, - "no Consumer found for received %s Feedback packet " + "ignoring unsupported %s Feedback PS AFB packet " "[sender ssrc:%" PRIu32 ", media ssrc:%" PRIu32 "]", RTCP::FeedbackPsPacket::MessageType2String(feedback->GetMessageType()).c_str(), feedback->GetMediaSsrc(), @@ -294,10 +296,6 @@ namespace RTC break; } - - listener->OnTransportReceiveRtcpFeedback(this, consumer, feedback); - - break; } default: @@ -309,8 +307,6 @@ namespace RTC RTCP::FeedbackPsPacket::MessageType2String(feedback->GetMessageType()).c_str(), feedback->GetMediaSsrc(), feedback->GetMediaSsrc()); - - break; } } @@ -354,8 +350,6 @@ namespace RTC RTCP::FeedbackRtpPacket::MessageType2String(feedback->GetMessageType()).c_str(), feedback->GetMediaSsrc(), feedback->GetMediaSsrc()); - - break; } } @@ -367,7 +361,7 @@ namespace RTC auto* sr = dynamic_cast(packet); auto it = sr->Begin(); - // Even if Sender Report packet can only contain one report.. + // Even if Sender Report packet can only contains one report... for (; it != sr->End(); ++it) { auto& report = (*it); @@ -408,8 +402,6 @@ namespace RTC continue; } - - // TODO: Should we do something with the SDES packet? } break; diff --git a/worker/src/RTC/TransportTuple.cpp b/worker/src/RTC/TransportTuple.cpp index eec172542f..2f1e258b1c 100644 --- a/worker/src/RTC/TransportTuple.cpp +++ b/worker/src/RTC/TransportTuple.cpp @@ -56,27 +56,27 @@ namespace RTC Utils::IP::GetAddressInfo(GetRemoteAddress(), &remoteFamily, remoteIp, &remotePort); - MS_DUMP(""); - MS_DUMP( + MS_DEBUG_DEV(""); + MS_DEBUG_DEV( " [UDP, local:%s :%" PRIu16 ", remote:%s :%" PRIu16 "]", this->udpSocket->GetLocalIP().c_str(), this->udpSocket->GetLocalPort(), remoteIp.c_str(), remotePort); - MS_DUMP(""); + MS_DEBUG_DEV(""); break; } case Protocol::TCP: { - MS_DUMP(""); - MS_DUMP( + MS_DEBUG_DEV(""); + MS_DEBUG_DEV( " [TCP, local:%s :%" PRIu16 ", remote:%s :%" PRIu16 "]", this->tcpConnection->GetLocalIP().c_str(), this->tcpConnection->GetLocalPort(), this->tcpConnection->GetPeerIP().c_str(), this->tcpConnection->GetPeerPort()); - MS_DUMP(""); + MS_DEBUG_DEV(""); break; } } diff --git a/worker/src/RTC/UdpSocket.cpp b/worker/src/RTC/UdpSocket.cpp index 43f0583e79..6c0b527088 100644 --- a/worker/src/RTC/UdpSocket.cpp +++ b/worker/src/RTC/UdpSocket.cpp @@ -11,7 +11,7 @@ /* Static methods for UV callbacks. */ -static inline void onErrorClose(uv_handle_t* handle) +static inline void onClose(uv_handle_t* handle) { delete handle; } @@ -96,22 +96,29 @@ namespace RTC switch (addressFamily) { case AF_INET: + { availablePorts = &RTC::UdpSocket::availableIPv4Ports; bindAddr = RTC::UdpSocket::sockaddrStorageIPv4; listenIp = Settings::configuration.rtcIPv4.c_str(); + break; + } case AF_INET6: + { availablePorts = &RTC::UdpSocket::availableIPv6Ports; bindAddr = RTC::UdpSocket::sockaddrStorageIPv6; listenIp = Settings::configuration.rtcIPv6.c_str(); // Don't also bind into IPv4 when listening in IPv6. flags |= UV_UDP_IPV6ONLY; + break; + } default: + { MS_THROW_ERROR("invalid address family given"); - break; + } } // Choose a random port to start from. @@ -154,6 +161,7 @@ namespace RTC case AF_INET: (reinterpret_cast(&bindAddr))->sin_port = htons(iteratingPort); break; + case AF_INET6: (reinterpret_cast(&bindAddr))->sin6_port = htons(iteratingPort); break; @@ -180,7 +188,7 @@ namespace RTC iteratingPort, uv_strerror(err)); - uv_close(reinterpret_cast(uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(uvHandle), static_cast(onClose)); // If bind() fails due to "too many open files" stop here. if (err == UV_EMFILE) @@ -227,6 +235,17 @@ namespace RTC MS_TRACE(); } + UdpSocket::~UdpSocket() + { + MS_TRACE(); + + // Mark the port as available again. + if (this->localAddr.ss_family == AF_INET) + RTC::UdpSocket::availableIPv4Ports[this->localPort] = true; + else if (this->localAddr.ss_family == AF_INET6) + RTC::UdpSocket::availableIPv6Ports[this->localPort] = true; + } + void UdpSocket::UserOnUdpDatagramRecv(const uint8_t* data, size_t len, const struct sockaddr* addr) { MS_TRACE(); @@ -241,15 +260,4 @@ namespace RTC // Notify the reader. this->listener->OnPacketRecv(this, data, len, addr); } - - void UdpSocket::UserOnUdpSocketClosed() - { - MS_TRACE(); - - // Mark the port as available again. - if (this->localAddr.ss_family == AF_INET) - RTC::UdpSocket::availableIPv4Ports[this->localPort] = true; - else if (this->localAddr.ss_family == AF_INET6) - RTC::UdpSocket::availableIPv6Ports[this->localPort] = true; - } } // namespace RTC diff --git a/worker/src/RTC/WebRtcTransport.cpp b/worker/src/RTC/WebRtcTransport.cpp index d6f518afd3..d3960e52b6 100644 --- a/worker/src/RTC/WebRtcTransport.cpp +++ b/worker/src/RTC/WebRtcTransport.cpp @@ -163,22 +163,16 @@ namespace RTC // Ensure there is at least one IP:port binding. if (this->udpSockets.empty() && this->tcpServers.empty()) { - // NOTE: We must manually delete above allocated objects. We cannot call `delete this` - // here since it would call the parent ~Transport destructor, and it would be called - // again after throwing the exception here. - // - // See: https://github.com/versatica/mediasoup/issues/222 - - this->iceServer->Destroy(); + delete this->iceServer; for (auto* socket : this->udpSockets) { - socket->Destroy(); + delete socket; } for (auto* server : this->tcpServers) { - server->Destroy(); + delete server; } MS_THROW_ERROR("could not open any IP:port"); @@ -198,31 +192,29 @@ namespace RTC { MS_TRACE(); - if (this->srtpRecvSession != nullptr) - this->srtpRecvSession->Destroy(); - - if (this->srtpSendSession != nullptr) - this->srtpSendSession->Destroy(); - - if (this->dtlsTransport != nullptr) - this->dtlsTransport->Destroy(); + // It's important deleting DTLS transport first since it will generate a + // DTLS alert to be sent. + delete this->dtlsTransport; - if (this->iceServer != nullptr) - this->iceServer->Destroy(); + delete this->iceServer; for (auto* socket : this->udpSockets) { - socket->Destroy(); + delete socket; } this->udpSockets.clear(); for (auto* server : this->tcpServers) { - server->Destroy(); + delete server; } this->tcpServers.clear(); - this->selectedTuple = nullptr; + if (this->srtpRecvSession != nullptr) + delete this->srtpRecvSession; + + if (this->srtpSendSession != nullptr) + delete this->srtpSendSession; } Json::Value WebRtcTransport::ToJson() const @@ -1128,12 +1120,12 @@ namespace RTC // Close it if it was already set and update it. if (this->srtpSendSession != nullptr) { - this->srtpSendSession->Destroy(); + delete this->srtpSendSession; this->srtpSendSession = nullptr; } if (this->srtpRecvSession != nullptr) { - this->srtpRecvSession->Destroy(); + delete this->srtpRecvSession; this->srtpRecvSession = nullptr; } @@ -1156,7 +1148,7 @@ namespace RTC { MS_ERROR("error creating SRTP receiving session: %s", error.what()); - this->srtpSendSession->Destroy(); + delete this->srtpSendSession; this->srtpSendSession = nullptr; } @@ -1191,7 +1183,7 @@ namespace RTC this->notifier->Emit(this->transportId, "dtlsstatechange", eventData); // This is a fatal error so close the transport. - Destroy(); + Close(); } void WebRtcTransport::OnDtlsClosed(const RTC::DtlsTransport* /*dtlsTransport*/) @@ -1210,7 +1202,7 @@ namespace RTC this->notifier->Emit(this->transportId, "dtlsstatechange", eventData); // This is a fatal error so close the transport. - Destroy(); + Close(); } void WebRtcTransport::OnOutgoingDtlsData( diff --git a/worker/src/Settings.cpp b/worker/src/Settings.cpp index 220032d5c5..841955ac46 100644 --- a/worker/src/Settings.cpp +++ b/worker/src/Settings.cpp @@ -27,13 +27,15 @@ std::map Settings::string2LogLevel = { { "debug", LogLevel::LOG_DEBUG }, { "warn", LogLevel::LOG_WARN }, - { "error", LogLevel::LOG_ERROR } + { "error", LogLevel::LOG_ERROR }, + { "none", LogLevel::LOG_NONE } }; std::map Settings::logLevel2String = { { LogLevel::LOG_DEBUG, "debug" }, { LogLevel::LOG_WARN, "warn" }, - { LogLevel::LOG_ERROR, "error" } + { LogLevel::LOG_ERROR, "error" }, + { LogLevel::LOG_NONE, "none" } }; // clang-format on @@ -82,69 +84,105 @@ void Settings::SetConfiguration(int argc, char* argv[]) switch (c) { case 'l': + { stringValue = std::string(optarg); SetLogLevel(stringValue); + break; + } case 't': + { stringValue = std::string(optarg); logTags.push_back(stringValue); + break; + } case '4': + { stringValue = std::string(optarg); SetRtcIPv4(stringValue); + break; + } case '6': + { stringValue = std::string(optarg); SetRtcIPv6(stringValue); + break; + } case '5': + { stringValue = std::string(optarg); Settings::configuration.rtcAnnouncedIPv4 = stringValue; Settings::configuration.hasAnnouncedIPv4 = true; + break; + } case '7': + { stringValue = std::string(optarg); Settings::configuration.rtcAnnouncedIPv6 = stringValue; Settings::configuration.hasAnnouncedIPv6 = true; + break; + } case 'm': + { Settings::configuration.rtcMinPort = std::stoi(optarg); + break; + } case 'M': + { Settings::configuration.rtcMaxPort = std::stoi(optarg); + break; + } case 'c': + { stringValue = std::string(optarg); Settings::configuration.dtlsCertificateFile = stringValue; + break; + } case 'p': + { stringValue = std::string(optarg); Settings::configuration.dtlsPrivateKeyFile = stringValue; + break; + } // Invalid option. case '?': + { if (isprint(optopt) != 0) MS_THROW_ERROR("invalid option '-%c'", (char)optopt); else MS_THROW_ERROR("unknown long option given as argument"); + } // Valid option, but it requires and argument that is not given. case ':': + { MS_THROW_ERROR("option '%c' requires an argument", (char)optopt); + } // This should never happen. default: + { MS_THROW_ERROR("'default' should never happen"); + } } } @@ -354,6 +392,7 @@ void Settings::SetDefaultRtcIP(int requestedFamily) switch (family) { case AF_INET: + { // Ignore if already got an IPv4. if (!ipv4.empty()) continue; @@ -363,9 +402,12 @@ void Settings::SetDefaultRtcIP(int requestedFamily) continue; ipv4 = ip; + break; + } case AF_INET6: + { // Ignore if already got an IPv6. if (!ipv6.empty()) continue; @@ -375,7 +417,9 @@ void Settings::SetDefaultRtcIP(int requestedFamily) continue; ipv6 = ip; + break; + } } } @@ -425,15 +469,25 @@ void Settings::SetRtcIPv4(const std::string& ip) switch (Utils::IP::GetFamily(ip)) { case AF_INET: + { if (ip == "0.0.0.0") MS_THROW_ERROR("rtcIPv4 cannot be '0.0.0.0'"); + Settings::configuration.rtcIPv4 = ip; Settings::configuration.hasIPv4 = true; + break; + } + case AF_INET6: + { MS_THROW_ERROR("invalid IPv6 '%s' for rtcIPv4", ip.c_str()); + } + default: + { MS_THROW_ERROR("invalid value '%s' for rtcIPv4", ip.c_str()); + } } int bindErrno; @@ -460,15 +514,25 @@ void Settings::SetRtcIPv6(const std::string& ip) switch (Utils::IP::GetFamily(ip)) { case AF_INET6: + { if (ip == "::") MS_THROW_ERROR("rtcIPv6 cannot be '::'"); + Settings::configuration.rtcIPv6 = ip; Settings::configuration.hasIPv6 = true; + break; + } + case AF_INET: + { MS_THROW_ERROR("invalid IPv4 '%s' for rtcIPv6", ip.c_str()); + } + default: + { MS_THROW_ERROR("invalid value '%s' for rtcIPv6", ip.c_str()); + } } int bindErrno; @@ -604,7 +668,9 @@ bool isBindableIp(const std::string& ip, int family, int* bindErrno) switch (family) { case AF_INET: + { err = uv_ip4_addr(ip.c_str(), 0, reinterpret_cast(&bindAddr)); + if (err != 0) MS_ABORT("uv_ipv4_addr() failed: %s", uv_strerror(err)); @@ -614,10 +680,14 @@ bool isBindableIp(const std::string& ip, int family, int* bindErrno) err = bind( bindSocket, reinterpret_cast(&bindAddr), sizeof(struct sockaddr_in)); + break; + } case AF_INET6: + { uv_ip6_addr(ip.c_str(), 0, reinterpret_cast(&bindAddr)); + if (err != 0) MS_ABORT("uv_ipv6_addr() failed: %s", uv_strerror(err)); bindSocket = socket(AF_INET6, SOCK_DGRAM, 0); @@ -626,10 +696,14 @@ bool isBindableIp(const std::string& ip, int family, int* bindErrno) err = bind( bindSocket, reinterpret_cast(&bindAddr), sizeof(struct sockaddr_in6)); + break; + } default: + { MS_ABORT("unknown family"); + } } if (err == 0) diff --git a/worker/src/Utils/IP.cpp b/worker/src/Utils/IP.cpp index 921248859c..374820d193 100644 --- a/worker/src/Utils/IP.cpp +++ b/worker/src/Utils/IP.cpp @@ -4035,7 +4035,9 @@ case 86: } default: + { MS_ABORT("unknown network family: %d", (int)addr->sa_family); + } } *family = addr->sa_family; diff --git a/worker/src/Utils/IP.rl b/worker/src/Utils/IP.rl index e58e470be0..e82c5ff650 100644 --- a/worker/src/Utils/IP.rl +++ b/worker/src/Utils/IP.rl @@ -105,7 +105,9 @@ namespace Utils } default: + { MS_ABORT("unknown network family: %d", (int)addr->sa_family); + } } *family = addr->sa_family; diff --git a/worker/src/Worker.cpp b/worker/src/Worker.cpp index 55192029f4..9261a2ad10 100644 --- a/worker/src/Worker.cpp +++ b/worker/src/Worker.cpp @@ -39,6 +39,9 @@ Worker::Worker(Channel::UnixStreamSocket* channel) : channel(channel) Worker::~Worker() { MS_TRACE(); + + if (!this->closed) + Close(); } void Worker::Close() @@ -46,17 +49,12 @@ void Worker::Close() MS_TRACE(); if (this->closed) - { - MS_ERROR("already closed"); - return; - } this->closed = true; // Close the SignalsHandler. - if (this->signalsHandler != nullptr) - this->signalsHandler->Destroy(); + delete this->signalsHandler; // Close all the Routers. // NOTE: Upon Router closure the onRouterClosed() method is called, which @@ -67,15 +65,14 @@ void Worker::Close() RTC::Router* router = it->second; it = this->routers.erase(it); - router->Destroy(); + delete router; } // Delete the Notifier. delete this->notifier; // Close the Channel socket. - if (this->channel != nullptr) - this->channel->Destroy(); + delete this->channel; } RTC::Router* Worker::GetRouterFromRequest(Channel::Request* request, uint32_t* routerId) @@ -111,17 +108,27 @@ void Worker::OnSignal(SignalsHandler* /*signalsHandler*/, int signum) switch (signum) { case SIGINT: + { MS_DEBUG_DEV("signal INT received, exiting"); + Close(); + break; + } case SIGTERM: + { MS_DEBUG_DEV("signal TERM received, exiting"); + Close(); + break; + } default: + { MS_WARN_DEV("received a signal (with signum %d) for which there is no handling code", signum); + } } } @@ -231,7 +238,8 @@ void Worker::OnChannelRequest(Channel::UnixStreamSocket* /*channel*/, Channel::R return; } - router->Destroy(); + delete router; + request->Accept(); break; @@ -312,8 +320,6 @@ void Worker::OnChannelUnixStreamSocketRemotelyClosed(Channel::UnixStreamSocket* // abruptly died (SIGKILL?) so we must die. MS_ERROR_STD("Channel remotely closed, killing myself"); - this->channel = nullptr; - Close(); } diff --git a/worker/src/handles/SignalsHandler.cpp b/worker/src/handles/SignalsHandler.cpp index caf9c5d4d2..a4fedff8ef 100644 --- a/worker/src/handles/SignalsHandler.cpp +++ b/worker/src/handles/SignalsHandler.cpp @@ -25,10 +25,36 @@ SignalsHandler::SignalsHandler(Listener* listener) : listener(listener) MS_TRACE(); } +SignalsHandler::~SignalsHandler() +{ + MS_TRACE(); + + if (!this->closed) + Close(); +} + +void SignalsHandler::Close() +{ + MS_TRACE(); + + if (this->closed) + return; + + this->closed = true; + + for (auto uvHandle : uvHandles) + { + uv_close(reinterpret_cast(uvHandle), static_cast(onClose)); + } +} + void SignalsHandler::AddSignal(int signum, const std::string& name) { MS_TRACE(); + if (this->closed) + MS_THROW_ERROR("closed"); + int err; auto uvHandle = new uv_signal_t; @@ -50,19 +76,6 @@ void SignalsHandler::AddSignal(int signum, const std::string& name) this->uvHandles.push_back(uvHandle); } -void SignalsHandler::Destroy() -{ - MS_TRACE(); - - for (auto uvHandle : uvHandles) - { - uv_close(reinterpret_cast(uvHandle), static_cast(onClose)); - } - - // And delete this. - delete this; -} - inline void SignalsHandler::OnUvSignal(int signum) { MS_TRACE(); diff --git a/worker/src/handles/TcpConnection.cpp b/worker/src/handles/TcpConnection.cpp index 3f329de4c7..731ba8688c 100644 --- a/worker/src/handles/TcpConnection.cpp +++ b/worker/src/handles/TcpConnection.cpp @@ -34,14 +34,19 @@ inline static void onWrite(uv_write_t* req, int status) connection->OnUvWriteError(status); } -inline static void onShutdown(uv_shutdown_t* req, int status) +inline static void onClose(uv_handle_t* handle) { - static_cast(req->data)->OnUvShutdown(req, status); + delete handle; } -inline static void onClose(uv_handle_t* handle) +inline static void onShutdown(uv_shutdown_t* req, int status) { - static_cast(handle->data)->OnUvClosed(); + auto* handle = req->handle; + + delete req; + + // Now do close the handle. + uv_close(reinterpret_cast(handle), static_cast(onClose)); } /* Instance methods. */ @@ -60,46 +65,22 @@ TcpConnection::~TcpConnection() { MS_TRACE(); - delete this->uvHandle; - delete[] this->buffer; -} - -void TcpConnection::Setup( - Listener* listener, struct sockaddr_storage* localAddr, const std::string& localIP, uint16_t localPort) -{ - MS_TRACE(); - - int err; - - // Set the UV handle. - err = uv_tcp_init(DepLibUV::GetLoop(), this->uvHandle); - if (err != 0) - { - delete this->uvHandle; - this->uvHandle = nullptr; - - MS_THROW_ERROR("uv_tcp_init() failed: %s", uv_strerror(err)); - } + if (!this->closed) + Close(); - // Set the listener. - this->listener = listener; - - // Set the local address. - this->localAddr = localAddr; - this->localIP = localIP; - this->localPort = localPort; + delete[] this->buffer; } -void TcpConnection::Destroy() +void TcpConnection::Close() { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; int err; - this->isClosing = true; + this->closed = true; // Don't read more. err = uv_read_stop(reinterpret_cast(this->uvHandle)); @@ -123,26 +104,55 @@ void TcpConnection::Destroy() { uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); } + + // Notify the listener. + this->listener->OnTcpConnectionClosed(this, this->isClosedByPeer); } void TcpConnection::Dump() const { - MS_DUMP(""); - MS_DUMP( + MS_DEBUG_DEV(""); + MS_DEBUG_DEV( " [TCP, local:%s :%" PRIu16 ", remote:%s :%" PRIu16 ", status:%s]", this->localIP.c_str(), static_cast(this->localPort), this->peerIP.c_str(), static_cast(this->peerPort), - (!this->isClosing) ? "open" : "closed"); - MS_DUMP(""); + (!this->closed) ? "open" : "closed"); + MS_DEBUG_DEV(""); +} + +void TcpConnection::Setup( + Listener* listener, struct sockaddr_storage* localAddr, const std::string& localIP, uint16_t localPort) +{ + MS_TRACE(); + + // Set the listener. + this->listener = listener; + + // Set the local address. + this->localAddr = localAddr; + this->localIP = localIP; + this->localPort = localPort; + + int err; + + // Set the UV handle. + err = uv_tcp_init(DepLibUV::GetLoop(), this->uvHandle); + if (err != 0) + { + delete this->uvHandle; + this->uvHandle = nullptr; + + MS_THROW_ERROR("uv_tcp_init() failed: %s", uv_strerror(err)); + } } void TcpConnection::Start() { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; int err; @@ -163,7 +173,7 @@ void TcpConnection::Write(const uint8_t* data, size_t len) { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; if (len == 0) @@ -195,7 +205,7 @@ void TcpConnection::Write(const uint8_t* data, size_t len) { MS_WARN_DEV("uv_try_write() failed, closing the connection: %s", uv_strerror(written)); - Destroy(); + Close(); return; } @@ -228,7 +238,7 @@ void TcpConnection::Write(const uint8_t* data1, size_t len1, const uint8_t* data { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; if (len1 == 0 && len2 == 0) @@ -262,7 +272,8 @@ void TcpConnection::Write(const uint8_t* data1, size_t len1, const uint8_t* data { MS_WARN_DEV("uv_try_write() failed, closing the connection: %s", uv_strerror(written)); - Destroy(); + Close(); + return; } @@ -331,6 +342,9 @@ inline void TcpConnection::OnUvReadAlloc(size_t /*suggestedSize*/, uv_buf_t* buf { MS_TRACE(); + if (this->closed) + return; + // If this is the first call to onUvReadAlloc() then allocate the receiving buffer now. if (this->buffer == nullptr) this->buffer = new uint8_t[this->bufferSize]; @@ -354,7 +368,7 @@ inline void TcpConnection::OnUvRead(ssize_t nread, const uv_buf_t* /*buf*/) { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; if (nread == 0) @@ -377,7 +391,7 @@ inline void TcpConnection::OnUvRead(ssize_t nread, const uv_buf_t* /*buf*/) this->isClosedByPeer = true; // Close server side of the connection. - Destroy(); + Close(); } // Some error. else @@ -387,7 +401,7 @@ inline void TcpConnection::OnUvRead(ssize_t nread, const uv_buf_t* /*buf*/) this->hasError = true; // Close server side of the connection. - Destroy(); + Close(); } } @@ -395,7 +409,7 @@ inline void TcpConnection::OnUvWriteError(int error) { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; if (error != UV_EPIPE && error != UV_ENOTCONN) @@ -403,31 +417,5 @@ inline void TcpConnection::OnUvWriteError(int error) MS_WARN_DEV("write error, closing the connection: %s", uv_strerror(error)); - Destroy(); -} - -inline void TcpConnection::OnUvShutdown(uv_shutdown_t* req, int status) -{ - MS_TRACE(); - - delete req; - - if (status != 0) - { - MS_WARN_DEV("shutdown error: %s", uv_strerror(status)); - } - - // Now do close the handle. - uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); -} - -inline void TcpConnection::OnUvClosed() -{ - MS_TRACE(); - - // Notify the listener. - this->listener->OnTcpConnectionClosed(this, this->isClosedByPeer); - - // And delete this. - delete this; + Close(); } diff --git a/worker/src/handles/TcpServer.cpp b/worker/src/handles/TcpServer.cpp index c942bacc71..dea55a5a45 100644 --- a/worker/src/handles/TcpServer.cpp +++ b/worker/src/handles/TcpServer.cpp @@ -15,11 +15,6 @@ inline static void onConnection(uv_stream_t* handle, int status) } inline static void onClose(uv_handle_t* handle) -{ - static_cast(handle->data)->OnUvClosed(); -} - -inline static void onErrorClose(uv_handle_t* handle) { delete handle; } @@ -50,31 +45,44 @@ TcpServer::TcpServer(const std::string& ip, uint16_t port, int backlog) switch (Utils::IP::GetFamily(ip)) { case AF_INET: + { err = uv_ip4_addr( ip.c_str(), static_cast(port), reinterpret_cast(&bindAddr)); + if (err != 0) MS_ABORT("uv_ipv4_addr() failed: %s", uv_strerror(err)); + break; + } case AF_INET6: + { err = uv_ip6_addr( ip.c_str(), static_cast(port), reinterpret_cast(&bindAddr)); + if (err != 0) MS_ABORT("uv_ipv6_addr() failed: %s", uv_strerror(err)); + // Don't also bind into IPv4 when listening in IPv6. flags |= UV_TCP_IPV6ONLY; + break; + } default: - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + { + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); + MS_THROW_ERROR("invalid binding IP '%s'", ip.c_str()); + break; + } } err = uv_tcp_bind(this->uvHandle, reinterpret_cast(&bindAddr), flags); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("uv_tcp_bind() failed: %s", uv_strerror(err)); } @@ -84,14 +92,14 @@ TcpServer::TcpServer(const std::string& ip, uint16_t port, int backlog) static_cast(onConnection)); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("uv_listen() failed: %s", uv_strerror(err)); } // Set local address. if (!SetLocalAddress()) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("error setting local IP and port"); } } @@ -110,14 +118,14 @@ TcpServer::TcpServer(uv_tcp_t* uvHandle, int backlog) : uvHandle(uvHandle) static_cast(onConnection)); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("uv_listen() failed: %s", uv_strerror(err)); } // Set local address. if (!SetLocalAddress()) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("error setting local IP and port"); } } @@ -126,45 +134,42 @@ TcpServer::~TcpServer() { MS_TRACE(); - delete this->uvHandle; + if (!this->closed) + Close(); } -void TcpServer::Destroy() +void TcpServer::Close() { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; - this->isClosing = true; + this->closed = true; - // If there are no connections then close now. - if (this->connections.empty()) - { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); - } - // Otherwise close all the connections (but not the TCP server). - else + MS_DEBUG_DEV("closing %zu active connections", this->connections.size()); + + for (auto it = this->connections.begin(); it != this->connections.end();) { - MS_DEBUG_DEV("closing %zu active connections", this->connections.size()); + auto* connection = *it; - for (auto connection : this->connections) - { - connection->Destroy(); - } + it = this->connections.erase(it); + delete connection; } + + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); } void TcpServer::Dump() const { - MS_DUMP(""); - MS_DUMP( + MS_DEBUG_DEV(""); + MS_DEBUG_DEV( " [TCP, local:%s :%" PRIu16 ", status:%s, connections:%zu]", this->localIP.c_str(), static_cast(this->localPort), - (!this->isClosing) ? "open" : "closed", + (!this->closed) ? "open" : "closed", this->connections.size()); - MS_DUMP(""); + MS_DEBUG_DEV(""); } bool TcpServer::SetLocalAddress() @@ -197,7 +202,7 @@ inline void TcpServer::OnUvConnection(int status) { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; int err; @@ -240,59 +245,31 @@ inline void TcpServer::OnUvConnection(int status) try { connection->Start(); + + // Notify the subclass. + UserOnNewTcpConnection(connection); } catch (const MediaSoupError& error) { MS_ERROR("cannot run the TCP connection, closing the connection: %s", error.what()); - connection->Destroy(); - - // NOTE: Don't return here so the user won't be notified about a TCP connection - // closure for which there was not a previous creation event. + delete connection; } - - // Notify the subclass. - UserOnNewTcpConnection(connection); } -inline void TcpServer::OnUvClosed() +void TcpServer::OnTcpConnectionClosed(TcpConnection* connection, bool isClosedByPeer) { MS_TRACE(); - // Motify the subclass. - UserOnTcpServerClosed(); - - // And delete this. - delete this; -} - -inline void TcpServer::OnTcpConnectionClosed(TcpConnection* connection, bool isClosedByPeer) -{ - MS_TRACE(); - - // NOTE: - // Worst scenario is that in which this is the latest connection, - // which is remotely closed (no TcpServer.Destroy() was called) and the user - // call TcpServer.Destroy() on UserOnTcpConnectionClosed() callback, so Destroy() - // is called with zero connections and calls uv_close(), but then - // onTcpConnectionClosed() continues and finds that isClosing is true and - // there are zero connections, so calls uv_close() again and get a crash. - // - // SOLUTION: - // Check isClosing value *before* onTcpConnectionClosed() callback. - - bool wasClosing = this->isClosing; - MS_DEBUG_DEV("TCP connection closed"); // Remove the TcpConnection from the set. - this->connections.erase(connection); + size_t numErased = this->connections.erase(connection); + + // If the closed connection was not present in the set, do nothing else. + if (numErased == 0) + return; // Notify the subclass. UserOnTcpConnectionClosed(connection, isClosedByPeer); - - // Check if the server was closing connections, and if this is the last - // connection then close the server now. - if (wasClosing && this->connections.empty()) - uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); } diff --git a/worker/src/handles/Timer.cpp b/worker/src/handles/Timer.cpp index 5352fb7b25..12a0066845 100644 --- a/worker/src/handles/Timer.cpp +++ b/worker/src/handles/Timer.cpp @@ -39,20 +39,33 @@ Timer::Timer(Listener* listener) : listener(listener) } } -void Timer::Destroy() +Timer::~Timer() { MS_TRACE(); - uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); + if (!this->closed) + Close(); +} + +void Timer::Close() +{ + MS_TRACE(); + + if (this->closed) + return; - // Delete this. - delete this; + this->closed = true; + + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); } void Timer::Start(uint64_t timeout, uint64_t repeat) { MS_TRACE(); + if (this->closed) + MS_THROW_ERROR("closed"); + this->timeout = timeout; this->repeat = repeat; @@ -70,6 +83,9 @@ void Timer::Stop() { MS_TRACE(); + if (this->closed) + MS_THROW_ERROR("closed"); + int err; err = uv_timer_stop(this->uvHandle); @@ -81,6 +97,9 @@ void Timer::Reset() { MS_TRACE(); + if (this->closed) + MS_THROW_ERROR("closed"); + int err; if (uv_is_active(reinterpret_cast(this->uvHandle)) == 0) @@ -98,6 +117,9 @@ void Timer::Restart() { MS_TRACE(); + if (this->closed) + MS_THROW_ERROR("closed"); + int err; if (uv_is_active(reinterpret_cast(this->uvHandle)) != 0) diff --git a/worker/src/handles/UdpSocket.cpp b/worker/src/handles/UdpSocket.cpp index 9fc3094e87..ff9cb222b7 100644 --- a/worker/src/handles/UdpSocket.cpp +++ b/worker/src/handles/UdpSocket.cpp @@ -39,11 +39,6 @@ inline static void onSend(uv_udp_send_t* req, int status) } inline static void onClose(uv_handle_t* handle) -{ - static_cast(handle->data)->OnUvClosed(); -} - -inline static void onErrorClose(uv_handle_t* handle) { delete handle; } @@ -74,31 +69,44 @@ UdpSocket::UdpSocket(const std::string& ip, uint16_t port) switch (Utils::IP::GetFamily(ip)) { case AF_INET: + { err = uv_ip4_addr( ip.c_str(), static_cast(port), reinterpret_cast(&bindAddr)); + if (err != 0) MS_ABORT("uv_ipv4_addr() failed: %s", uv_strerror(err)); + break; + } case AF_INET6: + { err = uv_ip6_addr( ip.c_str(), static_cast(port), reinterpret_cast(&bindAddr)); + if (err != 0) MS_ABORT("uv_ipv6_addr() failed: %s", uv_strerror(err)); + // Don't also bind into IPv4 when listening in IPv6. flags |= UV_UDP_IPV6ONLY; + break; + } default: - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + { + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); + MS_THROW_ERROR("invalid binding IP '%s'", ip.c_str()); + break; + } } err = uv_udp_bind(this->uvHandle, reinterpret_cast(&bindAddr), flags); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("uv_udp_bind() failed: %s", uv_strerror(err)); } @@ -106,14 +114,14 @@ UdpSocket::UdpSocket(const std::string& ip, uint16_t port) this->uvHandle, static_cast(onAlloc), static_cast(onRecv)); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("uv_udp_recv_start() failed: %s", uv_strerror(err)); } // Set local address. if (!SetLocalAddress()) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("error setting local IP and port"); } } @@ -130,14 +138,14 @@ UdpSocket::UdpSocket(uv_udp_t* uvHandle) : uvHandle(uvHandle) this->uvHandle, static_cast(onAlloc), static_cast(onRecv)); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("uv_udp_recv_start() failed: %s", uv_strerror(err)); } // Set local address. if (!SetLocalAddress()) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR("error setting local IP and port"); } } @@ -146,19 +154,20 @@ UdpSocket::~UdpSocket() { MS_TRACE(); - delete this->uvHandle; + if (!this->closed) + Close(); } -void UdpSocket::Destroy() +void UdpSocket::Close() { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; int err; - this->isClosing = true; + this->closed = true; // Don't read more. err = uv_udp_recv_stop(this->uvHandle); @@ -170,20 +179,20 @@ void UdpSocket::Destroy() void UdpSocket::Dump() const { - MS_DUMP(""); - MS_DUMP( + MS_DEBUG_DEV(""); + MS_DEBUG_DEV( " [UDP, local:%s :%" PRIu16 ", status:%s]", this->localIP.c_str(), static_cast(this->localPort), - (!this->isClosing) ? "open" : "closed"); - MS_DUMP(""); + (!this->closed) ? "open" : "closed"); + MS_DEBUG_DEV(""); } void UdpSocket::Send(const uint8_t* data, size_t len, const struct sockaddr* addr) { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; if (len == 0) @@ -258,7 +267,7 @@ void UdpSocket::Send(const uint8_t* data, size_t len, const std::string& ip, uin { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; int err; @@ -271,23 +280,33 @@ void UdpSocket::Send(const uint8_t* data, size_t len, const std::string& ip, uin switch (Utils::IP::GetFamily(ip)) { case AF_INET: + { err = uv_ip4_addr( ip.c_str(), static_cast(port), reinterpret_cast(&addr)); + if (err != 0) MS_ABORT("uv_ipv4_addr() failed: %s", uv_strerror(err)); + break; + } case AF_INET6: + { err = uv_ip6_addr( ip.c_str(), static_cast(port), reinterpret_cast(&addr)); + if (err != 0) MS_ABORT("uv_ipv6_addr() failed: %s", uv_strerror(err)); + break; + } default: + { MS_ERROR("invalid destination IP '%s'", ip.c_str()); return; + } } Send(data, len, reinterpret_cast(&addr)); @@ -334,7 +353,7 @@ inline void UdpSocket::OnUvRecv( { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; // NOTE: libuv calls twice to alloc & recv when a datagram is received, the @@ -370,19 +389,8 @@ inline void UdpSocket::OnUvSendError(int /*error*/) { MS_TRACE(); - if (this->isClosing) + if (this->closed) return; MS_DEBUG_DEV("send error: %s", uv_strerror(error)); } - -inline void UdpSocket::OnUvClosed() -{ - MS_TRACE(); - - // Notify the subclass. - UserOnUdpSocketClosed(); - - // And delete this. - delete this; -} diff --git a/worker/src/handles/UnixStreamSocket.cpp b/worker/src/handles/UnixStreamSocket.cpp index 7365e06ff7..8af51cf439 100644 --- a/worker/src/handles/UnixStreamSocket.cpp +++ b/worker/src/handles/UnixStreamSocket.cpp @@ -38,19 +38,19 @@ inline static void onWrite(uv_write_t* req, int status) socket->OnUvWriteError(status); } -inline static void onShutdown(uv_shutdown_t* req, int status) -{ - static_cast(req->data)->OnUvShutdown(req, status); -} - inline static void onClose(uv_handle_t* handle) { - static_cast(handle->data)->OnUvClosed(); + delete handle; } -inline static void onErrorClose(uv_handle_t* handle) +inline static void onShutdown(uv_shutdown_t* req, int status) { - delete handle; + auto* handle = req->handle; + + delete req; + + // Now do close the handle. + uv_close(reinterpret_cast(handle), static_cast(onClose)); } /* Instance methods. */ @@ -76,7 +76,7 @@ UnixStreamSocket::UnixStreamSocket(int fd, size_t bufferSize) : bufferSize(buffe err = uv_pipe_open(this->uvHandle, fd); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR_STD("uv_pipe_open() failed: %s", uv_strerror(err)); } @@ -88,7 +88,7 @@ UnixStreamSocket::UnixStreamSocket(int fd, size_t bufferSize) : bufferSize(buffe static_cast(onRead)); if (err != 0) { - uv_close(reinterpret_cast(this->uvHandle), static_cast(onErrorClose)); + uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); MS_THROW_ERROR_STD("uv_read_start() failed: %s", uv_strerror(err)); } @@ -100,20 +100,22 @@ UnixStreamSocket::~UnixStreamSocket() { MS_TRACE_STD(); - delete this->uvHandle; + if (!this->closed) + Close(); + delete[] this->buffer; } -void UnixStreamSocket::Destroy() +void UnixStreamSocket::Close() { MS_TRACE_STD(); - if (this->isClosing) + if (this->closed) return; int err; - this->isClosing = true; + this->closed = true; // Don't read more. err = uv_read_stop(reinterpret_cast(this->uvHandle)); @@ -140,7 +142,7 @@ void UnixStreamSocket::Destroy() void UnixStreamSocket::Write(const uint8_t* data, size_t len) { - if (this->isClosing) + if (this->closed) return; if (len == 0) @@ -172,7 +174,10 @@ void UnixStreamSocket::Write(const uint8_t* data, size_t len) { MS_ERROR_STD("uv_try_write() failed, closing the socket: %s", uv_strerror(written)); - Destroy(); + Close(); + + // Notify the subclass. + UserOnUnixStreamSocketClosed(this->isClosedByPeer); return; } @@ -202,6 +207,9 @@ inline void UnixStreamSocket::OnUvReadAlloc(size_t /*suggestedSize*/, uv_buf_t* { MS_TRACE_STD(); + if (this->closed) + return; + // If this is the first call to onUvReadAlloc() then allocate the receiving buffer now. if (this->buffer == nullptr) this->buffer = new uint8_t[this->bufferSize]; @@ -225,6 +233,9 @@ inline void UnixStreamSocket::OnUvRead(ssize_t nread, const uv_buf_t* /*buf*/) { MS_TRACE_STD(); + if (this->closed) + return; + if (nread == 0) return; @@ -243,7 +254,10 @@ inline void UnixStreamSocket::OnUvRead(ssize_t nread, const uv_buf_t* /*buf*/) this->isClosedByPeer = true; // Close local side of the pipe. - Destroy(); + Close(); + + // Notify the subclass. + UserOnUnixStreamSocketClosed(this->isClosedByPeer); } // Some error. else @@ -253,7 +267,10 @@ inline void UnixStreamSocket::OnUvRead(ssize_t nread, const uv_buf_t* /*buf*/) this->hasError = true; // Close the socket. - Destroy(); + Close(); + + // Notify the subclass. + UserOnUnixStreamSocketClosed(this->isClosedByPeer); } } @@ -261,7 +278,7 @@ inline void UnixStreamSocket::OnUvWriteError(int error) { MS_TRACE_STD(); - if (this->isClosing) + if (this->closed) return; if (error != UV_EPIPE && error != UV_ENOTCONN) @@ -269,31 +286,8 @@ inline void UnixStreamSocket::OnUvWriteError(int error) MS_ERROR_STD("write error, closing the pipe: %s", uv_strerror(error)); - Destroy(); -} - -inline void UnixStreamSocket::OnUvShutdown(uv_shutdown_t* req, int status) -{ - MS_TRACE_STD(); - - delete req; - - if (status != 0) - { - MS_ERROR_STD("shutdown error: %s", uv_strerror(status)); - } - - // Now do close the handle. - uv_close(reinterpret_cast(this->uvHandle), static_cast(onClose)); -} - -inline void UnixStreamSocket::OnUvClosed() -{ - MS_TRACE_STD(); + Close(); // Notify the subclass. UserOnUnixStreamSocketClosed(this->isClosedByPeer); - - // And delete this. - delete this; } diff --git a/worker/src/main.cpp b/worker/src/main.cpp index 67a392448f..970fd07843 100644 --- a/worker/src/main.cpp +++ b/worker/src/main.cpp @@ -92,6 +92,7 @@ int main(int argc, char* argv[]) // Worker ended. destroy(); + exitSuccess(); } catch (const MediaSoupError& error) diff --git a/worker/test/include/helpers.hpp b/worker/test/include/helpers.hpp index ff0d437a88..4413931fa1 100644 --- a/worker/test/include/helpers.hpp +++ b/worker/test/include/helpers.hpp @@ -1,5 +1,5 @@ #ifndef MS_TEST_HELPERS_HPP -#define MS_TEST_HELPERS_HPP +#define MS_TEST_HELPERS_HPP #include "common.hpp" #include diff --git a/worker/test/RTC/Codecs/TestVP8.cpp b/worker/test/src/RTC/Codecs/TestVP8.cpp similarity index 100% rename from worker/test/RTC/Codecs/TestVP8.cpp rename to worker/test/src/RTC/Codecs/TestVP8.cpp diff --git a/worker/test/RTC/RTCP/TestBye.cpp b/worker/test/src/RTC/RTCP/TestBye.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestBye.cpp rename to worker/test/src/RTC/RTCP/TestBye.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsAfb.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsAfb.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsAfb.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsAfb.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsFir.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsFir.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsFir.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsFir.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsLei.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsLei.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsLei.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsLei.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsPli.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsPli.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsPli.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsPli.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsRemb.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsRemb.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsRemb.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsRemb.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsRpsi.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsRpsi.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsRpsi.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsRpsi.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsSli.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsSli.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsSli.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsSli.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsTst.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsTst.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsTst.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsTst.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackPsVbcm.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsVbcm.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackPsVbcm.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackPsVbcm.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackRtpEcn.cpp b/worker/test/src/RTC/RTCP/TestFeedbackRtpEcn.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackRtpEcn.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackRtpEcn.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackRtpNack.cpp b/worker/test/src/RTC/RTCP/TestFeedbackRtpNack.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackRtpNack.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackRtpNack.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackRtpSrReq.cpp b/worker/test/src/RTC/RTCP/TestFeedbackRtpSrReq.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackRtpSrReq.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackRtpSrReq.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackRtpTllei.cpp b/worker/test/src/RTC/RTCP/TestFeedbackRtpTllei.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackRtpTllei.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackRtpTllei.cpp diff --git a/worker/test/RTC/RTCP/TestFeedbackRtpTmmb.cpp b/worker/test/src/RTC/RTCP/TestFeedbackRtpTmmb.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestFeedbackRtpTmmb.cpp rename to worker/test/src/RTC/RTCP/TestFeedbackRtpTmmb.cpp diff --git a/worker/test/RTC/RTCP/TestPacket.cpp b/worker/test/src/RTC/RTCP/TestPacket.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestPacket.cpp rename to worker/test/src/RTC/RTCP/TestPacket.cpp diff --git a/worker/test/RTC/RTCP/TestReceiverReport.cpp b/worker/test/src/RTC/RTCP/TestReceiverReport.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestReceiverReport.cpp rename to worker/test/src/RTC/RTCP/TestReceiverReport.cpp diff --git a/worker/test/RTC/RTCP/TestSdes.cpp b/worker/test/src/RTC/RTCP/TestSdes.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestSdes.cpp rename to worker/test/src/RTC/RTCP/TestSdes.cpp diff --git a/worker/test/RTC/RTCP/TestSenderReport.cpp b/worker/test/src/RTC/RTCP/TestSenderReport.cpp similarity index 100% rename from worker/test/RTC/RTCP/TestSenderReport.cpp rename to worker/test/src/RTC/RTCP/TestSenderReport.cpp diff --git a/worker/test/RTC/TestNackGenerator.cpp b/worker/test/src/RTC/TestNackGenerator.cpp similarity index 100% rename from worker/test/RTC/TestNackGenerator.cpp rename to worker/test/src/RTC/TestNackGenerator.cpp diff --git a/worker/test/RTC/TestRtpDataCounter.cpp b/worker/test/src/RTC/TestRtpDataCounter.cpp similarity index 100% rename from worker/test/RTC/TestRtpDataCounter.cpp rename to worker/test/src/RTC/TestRtpDataCounter.cpp diff --git a/worker/test/RTC/TestRtpMonitor.cpp b/worker/test/src/RTC/TestRtpMonitor.cpp similarity index 100% rename from worker/test/RTC/TestRtpMonitor.cpp rename to worker/test/src/RTC/TestRtpMonitor.cpp diff --git a/worker/test/RTC/TestRtpPacket.cpp b/worker/test/src/RTC/TestRtpPacket.cpp similarity index 100% rename from worker/test/RTC/TestRtpPacket.cpp rename to worker/test/src/RTC/TestRtpPacket.cpp diff --git a/worker/test/RTC/TestRtpStreamRecv.cpp b/worker/test/src/RTC/TestRtpStreamRecv.cpp similarity index 100% rename from worker/test/RTC/TestRtpStreamRecv.cpp rename to worker/test/src/RTC/TestRtpStreamRecv.cpp diff --git a/worker/test/RTC/TestRtpStreamSend.cpp b/worker/test/src/RTC/TestRtpStreamSend.cpp similarity index 100% rename from worker/test/RTC/TestRtpStreamSend.cpp rename to worker/test/src/RTC/TestRtpStreamSend.cpp diff --git a/worker/test/RTC/TestSeqManager.cpp b/worker/test/src/RTC/TestSeqManager.cpp similarity index 100% rename from worker/test/RTC/TestSeqManager.cpp rename to worker/test/src/RTC/TestSeqManager.cpp diff --git a/worker/test/tests.cpp b/worker/test/src/tests.cpp similarity index 88% rename from worker/test/tests.cpp rename to worker/test/src/tests.cpp index 29d1bcf8f3..4eb4077820 100644 --- a/worker/test/tests.cpp +++ b/worker/test/src/tests.cpp @@ -6,7 +6,7 @@ #include "Logger.hpp" #include "Settings.hpp" #include "Utils.hpp" -#include "include/catch.hpp" +#include "catch.hpp" #include static void init(); @@ -14,7 +14,7 @@ static void destroy(); int main(int argc, char* argv[]) { - Settings::configuration.logLevel = LogLevel::LOG_DEBUG; + Settings::configuration.logLevel = LogLevel::LOG_NONE; std::string loggerId = "tests"; From e505251e50fb91d204a73eabccb58524a902897e Mon Sep 17 00:00:00 2001 From: artushin Date: Mon, 7 Jan 2019 10:41:07 -0600 Subject: [PATCH 14/82] package name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef250dadd3..e29d323172 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "mediasoup", + "name": "@livelyvideo/mediasoup", "version": "2.6.2-lv1", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", From 40a2ad723a2ea8ecab1270d393768c5995e83e8a Mon Sep 17 00:00:00 2001 From: artushin Date: Mon, 7 Jan 2019 12:09:29 -0600 Subject: [PATCH 15/82] worker deps --- worker/deps/openssl/config/README.md | 26 +- .../config/archs/BSD-x86_64/asm/configdata.pm | 880 +- .../BSD-x86_64/asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/aes/aesni-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/bn/rsaz-avx2.s | 2 +- .../BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s | 2 +- .../BSD-x86_64/asm/crypto/bn/x86_64-mont.s | 81 +- .../BSD-x86_64/asm/crypto/bn/x86_64-mont5.s | 19 +- .../archs/BSD-x86_64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../BSD-x86_64/asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s | 2 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/sha/sha256-x86_64.s | 2 +- .../BSD-x86_64/asm/crypto/sha/sha512-x86_64.s | 2 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../archs/BSD-x86_64/asm/crypto/x86_64cpuid.s | 2 +- .../BSD-x86_64/asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/BSD-x86_64/asm/openssl.gypi | 3 - .../archs/BSD-x86_64/no-asm/configdata.pm | 880 +- .../archs/BSD-x86_64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/BSD-x86_64/no-asm/openssl.gypi | 3 - .../config/archs/VC-WIN32/asm/configdata.pm | 568 +- .../archs/VC-WIN32/asm/crypto/bf/bf-586.asm | 70 +- .../archs/VC-WIN32/asm/crypto/bn/bn-586.asm | 30 +- .../archs/VC-WIN32/asm/crypto/bn/x86-mont.asm | 16 +- .../archs/VC-WIN32/asm/crypto/buildinf.h | 2 +- .../VC-WIN32/asm/crypto/des/crypt586.asm | 46 +- .../archs/VC-WIN32/asm/crypto/des/des-586.asm | 86 +- .../asm/crypto/ec/ecp_nistz256-x86.asm | 2 +- .../asm/crypto/include/internal/dso_conf.h | 2 +- .../archs/VC-WIN32/asm/crypto/md5/md5-586.asm | 8 +- .../VC-WIN32/asm/crypto/ripemd/rmd-586.asm | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/VC-WIN32/asm/openssl.gypi | 3 - .../archs/VC-WIN32/no-asm/configdata.pm | 570 +- .../archs/VC-WIN32/no-asm/crypto/buildinf.h | 2 +- .../no-asm/crypto/include/internal/dso_conf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../config/archs/VC-WIN32/no-asm/openssl.gypi | 3 - .../config/archs/VC-WIN64A/asm/configdata.pm | 568 +- .../VC-WIN64A/asm/crypto/bn/x86_64-mont.asm | 79 +- .../VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm | 17 +- .../archs/VC-WIN64A/asm/crypto/buildinf.h | 2 +- .../asm/crypto/include/internal/dso_conf.h | 2 +- .../VC-WIN64A/asm/crypto/x86_64cpuid.asm | 1 - .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/VC-WIN64A/asm/openssl.gypi | 3 - .../archs/VC-WIN64A/no-asm/configdata.pm | 568 +- .../archs/VC-WIN64A/no-asm/crypto/buildinf.h | 2 +- .../no-asm/crypto/include/internal/dso_conf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/VC-WIN64A/no-asm/openssl.gypi | 3 - .../config/archs/aix-gcc/asm/configdata.pm | 894 +- .../archs/aix-gcc/asm/crypto/aes/aes-ppc.s | 20 +- .../archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s | 64 +- .../archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s | 35 +- .../archs/aix-gcc/asm/crypto/bn/bn-ppc.s | 22 +- .../archs/aix-gcc/asm/crypto/bn/ppc-mont.s | 15 +- .../archs/aix-gcc/asm/crypto/bn/ppc64-mont.s | 23 +- .../archs/aix-gcc/asm/crypto/buildinf.h | 2 +- .../aix-gcc/asm/crypto/chacha/chacha-ppc.s | 14 +- .../aix-gcc/asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/aix-gcc/asm/crypto/ppccpuid.s | 27 +- .../archs/aix-gcc/asm/crypto/sha/sha1-ppc.s | 4 +- .../archs/aix-gcc/asm/crypto/sha/sha256-ppc.s | 6 +- .../aix-gcc/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../archs/aix-gcc/asm/crypto/sha/sha512-ppc.s | 6 +- .../aix-gcc/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../aix-gcc/asm/include/openssl/opensslconf.h | 18 +- .../config/archs/aix-gcc/asm/openssl.gypi | 3 - .../config/archs/aix-gcc/no-asm/configdata.pm | 562 +- .../archs/aix-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../config/archs/aix-gcc/no-asm/openssl.gypi | 3 - .../config/archs/aix64-gcc/asm/configdata.pm | 880 +- .../archs/aix64-gcc/asm/crypto/aes/aes-ppc.s | 20 +- .../aix64-gcc/asm/crypto/aes/aesp8-ppc.s | 64 +- .../aix64-gcc/asm/crypto/aes/vpaes-ppc.s | 35 +- .../archs/aix64-gcc/asm/crypto/bn/bn-ppc.s | 22 +- .../archs/aix64-gcc/asm/crypto/bn/ppc-mont.s | 13 +- .../aix64-gcc/asm/crypto/bn/ppc64-mont.s | 18 +- .../archs/aix64-gcc/asm/crypto/buildinf.h | 2 +- .../aix64-gcc/asm/crypto/chacha/chacha-ppc.s | 14 +- .../aix64-gcc/asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/aix64-gcc/asm/crypto/ppccpuid.s | 27 +- .../archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s | 4 +- .../aix64-gcc/asm/crypto/sha/sha256-ppc.s | 6 +- .../aix64-gcc/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../aix64-gcc/asm/crypto/sha/sha512-ppc.s | 6 +- .../aix64-gcc/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/aix64-gcc/asm/openssl.gypi | 3 - .../archs/aix64-gcc/no-asm/configdata.pm | 562 +- .../archs/aix64-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/aix64-gcc/no-asm/openssl.gypi | 3 - .../archs/darwin-i386-cc/asm/configdata.pm | 562 +- .../darwin-i386-cc/asm/crypto/bf/bf-586.s | 78 +- .../darwin-i386-cc/asm/crypto/bn/bn-586.s | 242 +- .../darwin-i386-cc/asm/crypto/bn/co-586.s | 432 +- .../darwin-i386-cc/asm/crypto/bn/x86-mont.s | 16 +- .../darwin-i386-cc/asm/crypto/buildinf.h | 2 +- .../darwin-i386-cc/asm/crypto/des/crypt586.s | 36 +- .../darwin-i386-cc/asm/crypto/des/des-586.s | 104 +- .../asm/crypto/ec/ecp_nistz256-x86.s | 2 +- .../darwin-i386-cc/asm/crypto/md5/md5-586.s | 136 +- .../asm/crypto/ripemd/rmd-586.s | 320 +- .../darwin-i386-cc/asm/crypto/sha/sha1-586.s | 160 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/darwin-i386-cc/asm/openssl.gypi | 3 - .../archs/darwin-i386-cc/no-asm/configdata.pm | 880 +- .../darwin-i386-cc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/darwin-i386-cc/no-asm/openssl.gypi | 3 - .../darwin64-x86_64-cc/asm/configdata.pm | 562 +- .../asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 3 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 3 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 3 +- .../asm/crypto/aes/aesni-x86_64.s | 2 +- .../asm/crypto/aes/bsaes-x86_64.s | 3 +- .../asm/crypto/aes/vpaes-x86_64.s | 3 +- .../asm/crypto/bn/rsaz-avx2.s | 2 +- .../asm/crypto/bn/rsaz-x86_64.s | 2 +- .../asm/crypto/bn/x86_64-gf2m.s | 2 +- .../asm/crypto/bn/x86_64-mont.s | 81 +- .../asm/crypto/bn/x86_64-mont5.s | 19 +- .../darwin64-x86_64-cc/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 3 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 5 +- .../asm/crypto/md5/md5-x86_64.s | 3 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 3 +- .../asm/crypto/rc4/rc4-x86_64.s | 3 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha256-x86_64.s | 3 +- .../asm/crypto/sha/sha512-x86_64.s | 3 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../asm/crypto/x86_64cpuid.s | 3 +- .../asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/darwin64-x86_64-cc/asm/openssl.gypi | 3 - .../darwin64-x86_64-cc/no-asm/configdata.pm | 880 +- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../darwin64-x86_64-cc/no-asm/openssl.gypi | 3 - .../archs/linux-aarch64/asm/configdata.pm | 880 +- .../archs/linux-aarch64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-armv8.S | 18 +- .../asm/crypto/modes/ghashv8-armx.S | 2 - .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-aarch64/asm/openssl.gypi | 3 - .../archs/linux-aarch64/no-asm/configdata.pm | 562 +- .../linux-aarch64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-aarch64/no-asm/openssl.gypi | 3 - .../archs/linux-armv4/asm/configdata.pm | 880 +- .../archs/linux-armv4/asm/crypto/armv4cpuid.S | 2 +- .../linux-armv4/asm/crypto/bn/armv4-mont.S | 15 +- .../archs/linux-armv4/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-armv4.S | 10 +- .../asm/crypto/modes/ghash-armv4.S | 7 +- .../asm/crypto/modes/ghashv8-armx.S | 2 - .../asm/crypto/poly1305/poly1305-armv4.S | 3 +- .../linux-armv4/asm/crypto/sha/sha256-armv4.S | 4 +- .../linux-armv4/asm/crypto/sha/sha512-armv4.S | 8 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-armv4/asm/openssl.gypi | 3 - .../archs/linux-armv4/no-asm/configdata.pm | 880 +- .../linux-armv4/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-armv4/no-asm/openssl.gypi | 3 - .../config/archs/linux-elf/asm/configdata.pm | 880 +- .../archs/linux-elf/asm/crypto/bn/x86-mont.s | 16 +- .../archs/linux-elf/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-x86.s | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-elf/asm/openssl.gypi | 3 - .../archs/linux-elf/no-asm/configdata.pm | 562 +- .../archs/linux-elf/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-elf/no-asm/openssl.gypi | 3 - .../config/archs/linux-ppc/asm/configdata.pm | 880 +- .../archs/linux-ppc/asm/crypto/aes/aes-ppc.s | 20 +- .../linux-ppc/asm/crypto/aes/aesp8-ppc.s | 64 +- .../linux-ppc/asm/crypto/aes/vpaes-ppc.s | 34 +- .../archs/linux-ppc/asm/crypto/bn/bn-ppc.s | 22 +- .../archs/linux-ppc/asm/crypto/bn/ppc-mont.s | 15 +- .../linux-ppc/asm/crypto/bn/ppc64-mont.s | 23 +- .../archs/linux-ppc/asm/crypto/buildinf.h | 2 +- .../linux-ppc/asm/crypto/chacha/chacha-ppc.s | 14 +- .../linux-ppc/asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/linux-ppc/asm/crypto/ppccpuid.s | 26 +- .../archs/linux-ppc/asm/crypto/sha/sha1-ppc.s | 4 +- .../linux-ppc/asm/crypto/sha/sha256-ppc.s | 6 +- .../linux-ppc/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../linux-ppc/asm/crypto/sha/sha512-ppc.s | 6 +- .../linux-ppc/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-ppc/asm/openssl.gypi | 3 - .../archs/linux-ppc/no-asm/configdata.pm | 562 +- .../archs/linux-ppc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc/no-asm/openssl.gypi | 3 - .../archs/linux-ppc64/asm/configdata.pm | 562 +- .../linux-ppc64/asm/crypto/aes/aes-ppc.s | 20 +- .../linux-ppc64/asm/crypto/aes/aesp8-ppc.s | 64 +- .../linux-ppc64/asm/crypto/aes/vpaes-ppc.s | 34 +- .../archs/linux-ppc64/asm/crypto/bn/bn-ppc.s | 22 +- .../linux-ppc64/asm/crypto/bn/ppc-mont.s | 13 +- .../linux-ppc64/asm/crypto/bn/ppc64-mont.s | 18 +- .../archs/linux-ppc64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/chacha/chacha-ppc.s | 14 +- .../asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/linux-ppc64/asm/crypto/ppccpuid.s | 26 +- .../linux-ppc64/asm/crypto/sha/sha1-ppc.s | 4 +- .../linux-ppc64/asm/crypto/sha/sha256-ppc.s | 6 +- .../linux-ppc64/asm/crypto/sha/sha256p8-ppc.s | 4 +- .../linux-ppc64/asm/crypto/sha/sha512-ppc.s | 6 +- .../linux-ppc64/asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-ppc64/asm/openssl.gypi | 3 - .../archs/linux-ppc64/no-asm/configdata.pm | 880 +- .../linux-ppc64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc64/no-asm/openssl.gypi | 3 - .../archs/linux-ppc64le/asm/configdata.pm | 880 +- .../linux-ppc64le/asm/crypto/aes/aes-ppc.s | 20 +- .../linux-ppc64le/asm/crypto/aes/aesp8-ppc.s | 58 +- .../linux-ppc64le/asm/crypto/aes/vpaes-ppc.s | 34 +- .../linux-ppc64le/asm/crypto/bn/bn-ppc.s | 22 +- .../linux-ppc64le/asm/crypto/bn/ppc-mont.s | 13 +- .../linux-ppc64le/asm/crypto/bn/ppc64-mont.s | 18 +- .../archs/linux-ppc64le/asm/crypto/buildinf.h | 2 +- .../asm/crypto/chacha/chacha-ppc.s | 14 +- .../asm/crypto/modes/ghashp8-ppc.s | 8 +- .../asm/crypto/poly1305/poly1305-ppc.s | 6 +- .../asm/crypto/poly1305/poly1305-ppcfp.s | 8 +- .../archs/linux-ppc64le/asm/crypto/ppccpuid.s | 26 +- .../linux-ppc64le/asm/crypto/sha/sha1-ppc.s | 4 +- .../linux-ppc64le/asm/crypto/sha/sha256-ppc.s | 6 +- .../asm/crypto/sha/sha256p8-ppc.s | 4 +- .../linux-ppc64le/asm/crypto/sha/sha512-ppc.s | 6 +- .../asm/crypto/sha/sha512p8-ppc.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc64le/asm/openssl.gypi | 3 - .../archs/linux-ppc64le/no-asm/configdata.pm | 880 +- .../linux-ppc64le/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-ppc64le/no-asm/openssl.gypi | 3 - .../config/archs/linux-x32/asm/configdata.pm | 880 +- .../linux-x32/asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../linux-x32/asm/crypto/aes/aesni-x86_64.s | 2 +- .../linux-x32/asm/crypto/aes/bsaes-x86_64.s | 2 +- .../linux-x32/asm/crypto/aes/vpaes-x86_64.s | 2 +- .../archs/linux-x32/asm/crypto/bn/rsaz-avx2.s | 2 +- .../linux-x32/asm/crypto/bn/rsaz-x86_64.s | 2 +- .../linux-x32/asm/crypto/bn/x86_64-gf2m.s | 2 +- .../linux-x32/asm/crypto/bn/x86_64-mont.s | 81 +- .../linux-x32/asm/crypto/bn/x86_64-mont5.s | 19 +- .../archs/linux-x32/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../linux-x32/asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../linux-x32/asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../linux-x32/asm/crypto/rc4/rc4-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha256-x86_64.s | 2 +- .../linux-x32/asm/crypto/sha/sha512-x86_64.s | 2 +- .../linux-x32/asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../archs/linux-x32/asm/crypto/x86_64cpuid.s | 2 +- .../linux-x32/asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../config/archs/linux-x32/asm/openssl.gypi | 3 - .../archs/linux-x32/no-asm/configdata.pm | 880 +- .../archs/linux-x32/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-x32/no-asm/openssl.gypi | 3 - .../archs/linux-x86_64/asm/configdata.pm | 562 +- .../linux-x86_64/asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../asm/crypto/aes/aesni-x86_64.s | 2 +- .../asm/crypto/aes/bsaes-x86_64.s | 2 +- .../asm/crypto/aes/vpaes-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/bn/rsaz-avx2.s | 2 +- .../linux-x86_64/asm/crypto/bn/rsaz-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/bn/x86_64-gf2m.s | 2 +- .../linux-x86_64/asm/crypto/bn/x86_64-mont.s | 81 +- .../linux-x86_64/asm/crypto/bn/x86_64-mont5.s | 19 +- .../archs/linux-x86_64/asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../linux-x86_64/asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/rc4/rc4-x86_64.s | 2 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha256-x86_64.s | 2 +- .../asm/crypto/sha/sha512-x86_64.s | 2 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../linux-x86_64/asm/crypto/x86_64cpuid.s | 2 +- .../asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-x86_64/asm/openssl.gypi | 3 - .../archs/linux-x86_64/no-asm/configdata.pm | 880 +- .../linux-x86_64/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux-x86_64/no-asm/openssl.gypi | 3 - .../archs/linux32-s390x/asm/configdata.pm | 880 +- .../linux32-s390x/asm/crypto/aes/aes-s390x.S | 16 +- .../linux32-s390x/asm/crypto/bn/s390x-mont.S | 14 +- .../archs/linux32-s390x/asm/crypto/buildinf.h | 2 +- .../asm/crypto/modes/ghash-s390x.S | 2 +- .../asm/crypto/sha/sha256-s390x.S | 2 +- .../asm/crypto/sha/sha512-s390x.S | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux32-s390x/asm/openssl.gypi | 3 - .../archs/linux32-s390x/no-asm/configdata.pm | 562 +- .../linux32-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux32-s390x/no-asm/openssl.gypi | 3 - .../archs/linux64-s390x/asm/configdata.pm | 562 +- .../linux64-s390x/asm/crypto/aes/aes-s390x.S | 16 +- .../linux64-s390x/asm/crypto/bn/s390x-gf2m.s | 2 +- .../linux64-s390x/asm/crypto/bn/s390x-mont.S | 40 +- .../archs/linux64-s390x/asm/crypto/buildinf.h | 2 +- .../asm/crypto/modes/ghash-s390x.S | 2 +- .../asm/crypto/sha/sha256-s390x.S | 2 +- .../asm/crypto/sha/sha512-s390x.S | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/linux64-s390x/asm/openssl.gypi | 3 - .../archs/linux64-s390x/no-asm/configdata.pm | 880 +- .../linux64-s390x/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/linux64-s390x/no-asm/openssl.gypi | 3 - .../archs/solaris-x86-gcc/asm/configdata.pm | 880 +- .../solaris-x86-gcc/asm/crypto/bn/x86-mont.s | 16 +- .../solaris-x86-gcc/asm/crypto/buildinf.h | 2 +- .../asm/crypto/ec/ecp_nistz256-x86.s | 2 +- .../asm/include/openssl/opensslconf.h | 18 +- .../archs/solaris-x86-gcc/asm/openssl.gypi | 3 - .../solaris-x86-gcc/no-asm/configdata.pm | 880 +- .../solaris-x86-gcc/no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../archs/solaris-x86-gcc/no-asm/openssl.gypi | 3 - .../solaris64-x86_64-gcc/asm/configdata.pm | 880 +- .../asm/crypto/aes/aes-x86_64.s | 2 +- .../asm/crypto/aes/aesni-mb-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha1-x86_64.s | 2 +- .../asm/crypto/aes/aesni-sha256-x86_64.s | 2 +- .../asm/crypto/aes/aesni-x86_64.s | 2 +- .../asm/crypto/aes/bsaes-x86_64.s | 2 +- .../asm/crypto/aes/vpaes-x86_64.s | 2 +- .../asm/crypto/bn/rsaz-avx2.s | 2 +- .../asm/crypto/bn/rsaz-x86_64.s | 2 +- .../asm/crypto/bn/x86_64-gf2m.s | 2 +- .../asm/crypto/bn/x86_64-mont.s | 81 +- .../asm/crypto/bn/x86_64-mont5.s | 19 +- .../asm/crypto/buildinf.h | 2 +- .../asm/crypto/camellia/cmll-x86_64.s | 2 +- .../asm/crypto/chacha/chacha-x86_64.s | 2 +- .../asm/crypto/ec/ecp_nistz256-x86_64.s | 4 +- .../asm/crypto/md5/md5-x86_64.s | 2 +- .../asm/crypto/modes/aesni-gcm-x86_64.s | 2 +- .../asm/crypto/modes/ghash-x86_64.s | 2 +- .../asm/crypto/poly1305/poly1305-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-md5-x86_64.s | 2 +- .../asm/crypto/rc4/rc4-x86_64.s | 2 +- .../asm/crypto/sha/sha1-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha1-x86_64.s | 2 +- .../asm/crypto/sha/sha256-mb-x86_64.s | 2 +- .../asm/crypto/sha/sha256-x86_64.s | 2 +- .../asm/crypto/sha/sha512-x86_64.s | 2 +- .../asm/crypto/whrlpool/wp-x86_64.s | 2 +- .../asm/crypto/x86_64cpuid.s | 2 +- .../asm/engines/e_padlock-x86_64.s | 4 +- .../asm/include/openssl/opensslconf.h | 18 +- .../solaris64-x86_64-gcc/asm/openssl.gypi | 3 - .../solaris64-x86_64-gcc/no-asm/configdata.pm | 880 +- .../no-asm/crypto/buildinf.h | 2 +- .../no-asm/include/openssl/opensslconf.h | 18 +- .../solaris64-x86_64-gcc/no-asm/openssl.gypi | 3 - worker/deps/openssl/openssl.gyp | 3 + worker/deps/openssl/openssl/.travis.yml | 12 +- worker/deps/openssl/openssl/CHANGES | 122 +- worker/deps/openssl/openssl/CONTRIBUTING | 67 +- .../Configurations/00-base-templates.conf | 8 +- .../openssl/Configurations/10-main.conf | 53 +- .../openssl/Configurations/90-team.conf | 112 + .../Configurations/INTERNALS.Configure | 1 - .../openssl/openssl/Configurations/README | 6 +- .../openssl/Configurations/README.design | 8 +- .../openssl/Configurations/descrip.mms.tmpl | 53 +- .../openssl/Configurations/unix-Makefile.tmpl | 33 +- .../openssl/Configurations/windows-checker.pm | 2 +- .../Configurations/windows-makefile.tmpl | 107 +- worker/deps/openssl/openssl/Configure | 64 +- worker/deps/openssl/openssl/INSTALL | 11 +- worker/deps/openssl/openssl/NEWS | 10 - worker/deps/openssl/openssl/NOTES.DJGPP | 4 +- worker/deps/openssl/openssl/NOTES.VMS | 2 +- worker/deps/openssl/openssl/README | 4 +- worker/deps/openssl/openssl/README.ECC | 55 +- .../openssl/openssl/VMS/openssl_ivp.com.in | 2 +- worker/deps/openssl/openssl/apps/apps.c | 19 +- worker/deps/openssl/openssl/apps/asn1pars.c | 22 +- worker/deps/openssl/openssl/apps/ca.c | 29 +- worker/deps/openssl/openssl/apps/cms.c | 2 +- .../deps/openssl/openssl/apps/ct_log_list.cnf | 1 - worker/deps/openssl/openssl/apps/dh1024.pem | 2 +- worker/deps/openssl/openssl/apps/dh2048.pem | 4 +- worker/deps/openssl/openssl/apps/dh4096.pem | 4 +- worker/deps/openssl/openssl/apps/dhparam.c | 11 +- worker/deps/openssl/openssl/apps/dsaparam.c | 29 +- worker/deps/openssl/openssl/apps/ocsp.c | 3 +- worker/deps/openssl/openssl/apps/pkey.c | 48 +- worker/deps/openssl/openssl/apps/rehash.c | 20 +- worker/deps/openssl/openssl/apps/req.c | 5 +- worker/deps/openssl/openssl/apps/s_client.c | 10 +- worker/deps/openssl/openssl/apps/s_server.c | 25 +- worker/deps/openssl/openssl/apps/smime.c | 2 +- worker/deps/openssl/openssl/apps/speed.c | 233 +- worker/deps/openssl/openssl/apps/verify.c | 3 +- worker/deps/openssl/openssl/appveyor.yml | 2 +- worker/deps/openssl/openssl/config | 5 +- .../openssl/crypto/aes/asm/vpaes-armv8.pl | 8 +- worker/deps/openssl/openssl/crypto/arm_arch.h | 4 +- worker/deps/openssl/openssl/crypto/armcap.c | 3 +- .../deps/openssl/openssl/crypto/armv4cpuid.pl | 4 +- .../openssl/openssl/crypto/asn1/a_object.c | 23 +- .../openssl/openssl/crypto/asn1/a_strex.c | 77 +- .../openssl/openssl/crypto/asn1/ameth_lib.c | 12 - .../openssl/openssl/crypto/asn1/asn1_err.c | 2 - .../openssl/openssl/crypto/asn1/asn_mime.c | 8 +- .../openssl/openssl/crypto/asn1/p5_scrypt.c | 4 +- .../openssl/openssl/crypto/asn1/tasn_enc.c | 4 +- .../openssl/openssl/crypto/asn1/tasn_utl.c | 4 +- .../openssl/openssl/crypto/asn1/x_int64.c | 1 - .../openssl/crypto/async/arch/async_null.c | 1 - .../openssl/crypto/async/arch/async_posix.h | 3 +- .../deps/openssl/openssl/crypto/async/async.c | 76 +- .../openssl/openssl/crypto/async/async_locl.h | 1 - .../deps/openssl/openssl/crypto/bio/b_addr.c | 11 +- .../deps/openssl/openssl/crypto/bio/b_print.c | 6 +- .../deps/openssl/openssl/crypto/bio/b_sock.c | 6 +- .../deps/openssl/openssl/crypto/bio/bio_lcl.h | 1 - .../openssl/openssl/crypto/bio/bio_meth.c | 17 +- .../deps/openssl/openssl/crypto/bio/bss_log.c | 9 +- .../deps/openssl/openssl/crypto/bio/bss_mem.c | 4 +- .../openssl/crypto/bn/asm/alpha-mont.pl | 11 +- .../openssl/crypto/bn/asm/armv4-mont.pl | 17 +- .../openssl/crypto/bn/asm/ia64-mont.pl | 20 +- .../openssl/crypto/bn/asm/mips-mont.pl | 14 +- .../openssl/crypto/bn/asm/parisc-mont.pl | 30 +- .../openssl/openssl/crypto/bn/asm/ppc-mont.pl | 15 +- .../openssl/crypto/bn/asm/ppc64-mont.pl | 43 +- .../openssl/crypto/bn/asm/rsaz-avx2.pl | 4 +- .../openssl/crypto/bn/asm/s390x-mont.pl | 16 +- .../openssl/crypto/bn/asm/sparct4-mont.pl | 26 +- .../openssl/crypto/bn/asm/sparcv9-mont.pl | 15 +- .../openssl/openssl/crypto/bn/asm/via-mont.pl | 15 +- .../openssl/crypto/bn/asm/vis3-mont.pl | 18 +- .../openssl/openssl/crypto/bn/asm/x86-mont.pl | 24 +- .../openssl/crypto/bn/asm/x86_64-gcc.c | 8 +- .../openssl/crypto/bn/asm/x86_64-mont.pl | 85 +- .../openssl/crypto/bn/asm/x86_64-mont5.pl | 21 +- .../deps/openssl/openssl/crypto/bn/bn_blind.c | 90 +- .../deps/openssl/openssl/crypto/bn/bn_div.c | 3 +- .../deps/openssl/openssl/crypto/bn/bn_exp.c | 69 +- .../deps/openssl/openssl/crypto/bn/bn_gcd.c | 11 +- .../deps/openssl/openssl/crypto/bn/bn_gf2m.c | 34 +- .../openssl/openssl/crypto/bn/bn_intern.c | 12 +- .../deps/openssl/openssl/crypto/bn/bn_lcl.h | 23 +- .../deps/openssl/openssl/crypto/bn/bn_lib.c | 107 +- .../deps/openssl/openssl/crypto/bn/bn_mod.c | 134 +- .../deps/openssl/openssl/crypto/bn/bn_mont.c | 92 +- .../deps/openssl/openssl/crypto/bn/bn_mul.c | 14 +- .../deps/openssl/openssl/crypto/bn/bn_prime.h | 512 +- .../deps/openssl/openssl/crypto/bn/bn_sqr.c | 22 +- .../deps/openssl/openssl/crypto/bn/bn_x931p.c | 6 +- worker/deps/openssl/openssl/crypto/build.info | 3 +- .../openssl/crypto/cast/asm/cast-586.pl | 2 +- .../openssl/crypto/chacha/asm/chacha-armv4.pl | 4 +- .../openssl/crypto/chacha/asm/chacha-armv8.pl | 4 +- .../openssl/crypto/chacha/asm/chacha-ppc.pl | 4 +- .../openssl/crypto/chacha/asm/chacha-x86.pl | 4 +- .../deps/openssl/openssl/crypto/cms/cms_env.c | 3 +- .../openssl/openssl/crypto/cms/cms_smime.c | 3 +- .../openssl/openssl/crypto/conf/build.info | 2 +- .../openssl/openssl/crypto/conf/conf_api.c | 13 +- .../openssl/openssl/crypto/conf/conf_err.c | 9 +- .../openssl/openssl/crypto/conf/conf_mall.c | 4 +- .../openssl/openssl/crypto/conf/conf_mod.c | 5 +- worker/deps/openssl/openssl/crypto/cryptlib.c | 112 +- .../deps/openssl/openssl/crypto/ct/ct_log.c | 4 +- .../deps/openssl/openssl/crypto/dh/dh_key.c | 2 +- .../deps/openssl/openssl/crypto/dh/dh_lib.c | 12 +- .../deps/openssl/openssl/crypto/dh/dh_meth.c | 4 +- worker/deps/openssl/openssl/crypto/dllmain.c | 1 - .../deps/openssl/openssl/crypto/dsa/dsa_err.c | 3 +- .../deps/openssl/openssl/crypto/dsa/dsa_gen.c | 15 +- .../deps/openssl/openssl/crypto/dsa/dsa_lib.c | 12 +- .../openssl/openssl/crypto/dsa/dsa_meth.c | 4 +- .../openssl/openssl/crypto/dsa/dsa_ossl.c | 129 +- .../openssl/openssl/crypto/dsa/dsa_pmeth.c | 28 +- .../openssl/openssl/crypto/dso/dso_dlfcn.c | 83 +- .../crypto/ec/asm/ecp_nistz256-armv4.pl | 12 +- .../crypto/ec/asm/ecp_nistz256-armv8.pl | 20 +- .../crypto/ec/asm/ecp_nistz256-avx2.pl | 4 +- .../crypto/ec/asm/ecp_nistz256-sparcv9.pl | 12 +- .../openssl/crypto/ec/asm/ecp_nistz256-x86.pl | 6 +- .../crypto/ec/asm/ecp_nistz256-x86_64.pl | 4 +- .../deps/openssl/openssl/crypto/ec/ec2_smpl.c | 6 +- .../deps/openssl/openssl/crypto/ec/ec_ameth.c | 13 +- .../deps/openssl/openssl/crypto/ec/ec_curve.c | 6 +- .../deps/openssl/openssl/crypto/ec/ec_err.c | 4 +- .../deps/openssl/openssl/crypto/ec/ec_key.c | 4 +- .../deps/openssl/openssl/crypto/ec/ec_kmeth.c | 4 +- .../deps/openssl/openssl/crypto/ec/ec_lcl.h | 23 +- .../deps/openssl/openssl/crypto/ec/ec_lib.c | 69 +- .../deps/openssl/openssl/crypto/ec/ec_mult.c | 263 +- .../deps/openssl/openssl/crypto/ec/ec_oct.c | 10 +- .../openssl/openssl/crypto/ec/ecdsa_ossl.c | 132 +- .../deps/openssl/openssl/crypto/ec/ecp_mont.c | 5 +- .../deps/openssl/openssl/crypto/ec/ecp_nist.c | 5 +- .../openssl/openssl/crypto/ec/ecp_nistp224.c | 5 +- .../openssl/openssl/crypto/ec/ecp_nistp521.c | 5 +- .../openssl/openssl/crypto/ec/ecp_nistz256.c | 37 +- .../deps/openssl/openssl/crypto/ec/ecp_smpl.c | 59 +- .../openssl/openssl/crypto/engine/eng_lib.c | 11 +- .../openssl/openssl/crypto/engine/eng_list.c | 4 +- .../openssl/crypto/engine/eng_openssl.c | 1 - .../openssl/openssl/crypto/engine/tb_asnmth.c | 5 +- worker/deps/openssl/openssl/crypto/err/err.c | 61 +- .../openssl/openssl/crypto/evp/cmeth_lib.c | 1 - .../deps/openssl/openssl/crypto/evp/evp_err.c | 3 - .../deps/openssl/openssl/crypto/evp/p_seal.c | 21 +- .../openssl/openssl/crypto/evp/pmeth_lib.c | 46 +- .../deps/openssl/openssl/crypto/evp/scrypt.c | 25 +- worker/deps/openssl/openssl/crypto/ex_data.c | 5 +- .../crypto/include/internal/asn1_int.h | 4 +- .../openssl/crypto/include/internal/async.h | 4 +- .../openssl/crypto/include/internal/bn_int.h | 25 +- .../crypto/include/internal/cryptlib.h | 6 +- .../crypto/include/internal/cryptlib_int.h | 4 +- .../openssl/crypto/include/internal/err_int.h | 4 +- .../crypto/include/internal/x509_int.h | 3 +- worker/deps/openssl/openssl/crypto/init.c | 141 +- worker/deps/openssl/openssl/crypto/kdf/hkdf.c | 10 +- .../deps/openssl/openssl/crypto/lhash/lhash.c | 27 +- .../openssl/openssl/crypto/lhash/lhash_lcl.h | 2 +- worker/deps/openssl/openssl/crypto/mem_sec.c | 16 +- .../openssl/crypto/modes/asm/ghash-armv4.pl | 9 +- .../openssl/crypto/modes/asm/ghashv8-armx.pl | 4 +- .../openssl/openssl/crypto/modes/modes_lcl.h | 17 +- .../openssl/openssl/crypto/modes/ocb128.c | 123 +- worker/deps/openssl/openssl/crypto/o_fopen.c | 20 +- worker/deps/openssl/openssl/crypto/o_time.c | 6 +- .../openssl/openssl/crypto/objects/o_names.c | 37 +- .../openssl/crypto/objects/objects.txt | 1 - .../openssl/openssl/crypto/ocsp/ocsp_cl.c | 12 +- .../deps/openssl/openssl/crypto/pem/pem_lib.c | 55 +- .../deps/openssl/openssl/crypto/pem/pem_pk8.c | 4 +- .../openssl/openssl/crypto/pem/pem_pkey.c | 4 +- .../deps/openssl/openssl/crypto/pem/pvkfmt.c | 13 +- .../openssl/openssl/crypto/perlasm/readme | 3 +- .../openssl/openssl/crypto/pkcs12/p12_asn.c | 4 +- .../openssl/openssl/crypto/pkcs12/p12_init.c | 5 +- .../openssl/openssl/crypto/pkcs12/p12_mutl.c | 34 +- .../openssl/openssl/crypto/pkcs7/pk7_lib.c | 3 +- .../crypto/poly1305/asm/poly1305-armv4.pl | 5 +- .../crypto/poly1305/asm/poly1305-mips.pl | 1 - .../crypto/poly1305/asm/poly1305-x86.pl | 4 +- .../openssl/openssl/crypto/rand/md_rand.c | 12 +- .../openssl/openssl/crypto/rand/randfile.c | 11 +- .../openssl/crypto/rc4/asm/rc4-c64xplus.pl | 2 +- .../deps/openssl/openssl/crypto/rsa/rsa_gen.c | 2 - .../deps/openssl/openssl/crypto/rsa/rsa_lib.c | 6 +- .../openssl/openssl/crypto/rsa/rsa_meth.c | 9 +- .../openssl/openssl/crypto/rsa/rsa_oaep.c | 73 +- .../openssl/openssl/crypto/rsa/rsa_ossl.c | 174 +- .../deps/openssl/openssl/crypto/rsa/rsa_pk1.c | 41 +- .../deps/openssl/openssl/crypto/rsa/rsa_pss.c | 4 +- .../deps/openssl/openssl/crypto/rsa/rsa_ssl.c | 10 +- .../openssl/crypto/sha/asm/sha1-586.pl | 4 +- .../openssl/crypto/sha/asm/sha256-586.pl | 4 +- .../openssl/crypto/sha/asm/sha256-armv4.pl | 4 +- .../openssl/crypto/sha/asm/sha512-armv4.pl | 6 +- .../deps/openssl/openssl/crypto/threads_win.c | 23 +- .../deps/openssl/openssl/crypto/ts/ts_lib.c | 5 +- .../openssl/openssl/crypto/ts/ts_rsp_sign.c | 7 +- .../openssl/openssl/crypto/ts/ts_rsp_verify.c | 2 +- .../openssl/openssl/crypto/ui/ui_openssl.c | 27 +- .../openssl/openssl/crypto/x509/build.info | 2 +- .../deps/openssl/openssl/crypto/x509/by_dir.c | 7 +- .../openssl/openssl/crypto/x509/by_file.c | 4 +- .../openssl/openssl/crypto/x509/x509_cmp.c | 4 +- .../openssl/openssl/crypto/x509/x509_err.c | 3 +- .../openssl/openssl/crypto/x509/x509_lcl.h | 6 +- .../openssl/openssl/crypto/x509/x509_lu.c | 124 +- .../openssl/openssl/crypto/x509/x509_vfy.c | 192 +- .../openssl/openssl/crypto/x509/x509_vpm.c | 7 +- .../openssl/openssl/crypto/x509/x509name.c | 10 +- .../deps/openssl/openssl/crypto/x509/x_name.c | 4 +- .../openssl/openssl/crypto/x509v3/v3_enum.c | 2 +- .../openssl/openssl/crypto/x509v3/v3_ncons.c | 137 +- .../openssl/openssl/crypto/x509v3/v3_purp.c | 34 +- .../openssl/openssl/crypto/x509v3/v3_skey.c | 2 +- .../openssl/openssl/crypto/x509v3/v3_tlsf.c | 9 +- .../openssl/openssl/demos/bio/descrip.mms | 2 +- .../deps/openssl/openssl/demos/certs/README | 5 +- .../openssl/openssl/demos/certs/apps/apps.cnf | 2 - .../openssl/demos/certs/apps/mkxcerts.sh | 2 +- .../openssl/openssl/demos/certs/mkcerts.sh | 3 +- .../deps/openssl/openssl/demos/evp/Makefile | 2 +- .../deps/openssl/openssl/demos/evp/aesgcm.c | 2 +- worker/deps/openssl/openssl/doc/apps/ca.pod | 6 +- worker/deps/openssl/openssl/doc/apps/cms.pod | 18 +- .../deps/openssl/openssl/doc/apps/config.pod | 4 +- worker/deps/openssl/openssl/doc/apps/crl.pod | 4 +- .../deps/openssl/openssl/doc/apps/genpkey.pod | 157 +- .../deps/openssl/openssl/doc/apps/rehash.pod | 8 +- worker/deps/openssl/openssl/doc/apps/req.pod | 9 +- .../openssl/openssl/doc/apps/s_client.pod | 10 +- .../doc/crypto/ASN1_INTEGER_get_int64.pod | 6 +- .../openssl/doc/crypto/BIO_meth_new.pod | 18 +- .../openssl/openssl/doc/crypto/BN_add.pod | 6 +- .../openssl/openssl/doc/crypto/BN_bn2bin.pod | 6 +- .../openssl/doc/crypto/BN_generate_prime.pod | 14 +- .../openssl/doc/crypto/CMS_encrypt.pod | 7 +- .../doc/crypto/CMS_get0_SignerInfos.pod | 4 +- .../doc/crypto/CMS_get1_ReceiptRequest.pod | 4 +- .../openssl/doc/crypto/DH_meth_new.pod | 4 +- .../openssl/doc/crypto/DSA_meth_new.pod | 4 +- .../openssl/openssl/doc/crypto/DSA_sign.pod | 15 +- .../openssl/doc/crypto/ECDSA_SIG_new.pod | 4 +- .../openssl/doc/crypto/EVP_DigestInit.pod | 53 +- .../openssl/doc/crypto/EVP_DigestSignInit.pod | 57 +- .../doc/crypto/EVP_DigestVerifyInit.pod | 11 +- .../doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod | 4 +- .../crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod | 4 +- .../doc/crypto/EVP_PKEY_asn1_get_count.pod | 2 +- .../openssl/doc/crypto/OBJ_nid2obj.pod | 4 +- .../doc/crypto/OCSP_resp_find_status.pod | 44 +- .../doc/crypto/OPENSSL_VERSION_NUMBER.pod | 12 +- .../doc/crypto/OPENSSL_init_crypto.pod | 10 +- .../openssl/doc/crypto/OPENSSL_malloc.pod | 6 +- .../doc/crypto/PEM_read_bio_PrivateKey.pod | 15 +- .../openssl/doc/crypto/RSA_meth_new.pod | 8 +- .../openssl/doc/crypto/SMIME_read_PKCS7.pod | 4 +- .../openssl/openssl/doc/crypto/UI_STRING.pod | 1 - .../doc/crypto/X509_LOOKUP_hash_dir.pod | 3 +- .../crypto/X509_VERIFY_PARAM_set_flags.pod | 33 +- .../openssl/doc/crypto/X509_check_host.pod | 9 +- .../deps/openssl/openssl/doc/crypto/bio.pod | 1 - .../deps/openssl/openssl/doc/fingerprints.txt | 5 +- .../openssl/openssl/doc/openssl-c-indent.el | 1 - .../openssl/openssl/doc/ssl/SSL_CONF_cmd.pod | 4 + .../doc/ssl/SSL_CTX_set_ctlog_list_file.pod | 2 +- .../doc/ssl/SSL_CTX_use_certificate.pod | 9 +- .../openssl/doc/ssl/SSL_get_ciphers.pod | 36 +- .../openssl/doc/ssl/SSL_get_session.pod | 7 +- .../openssl/doc/ssl/SSL_get_version.pod | 8 +- .../openssl/openssl/doc/ssl/SSL_set1_host.pod | 4 +- worker/deps/openssl/openssl/doc/ssl/ssl.pod | 8 +- .../openssl/engines/asm/e_padlock-x86.pl | 6 +- .../openssl/engines/asm/e_padlock-x86_64.pl | 2 +- worker/deps/openssl/openssl/engines/e_capi.c | 30 +- .../external/perl/Text-Template-1.46/INSTALL | 2 +- .../external/perl/Text-Template-1.46/README | 61 +- .../Text-Template-1.46/lib/Text/Template.pm | 146 +- .../lib/Text/Template/Preprocess.pm | 9 +- .../perl/Text-Template-1.46/t/00-version.t | 1 - .../perl/Text-Template-1.46/t/01-basic.t | 14 +- .../perl/Text-Template-1.46/t/02-hash.t | 9 +- .../perl/Text-Template-1.46/t/03-out.t | 3 +- .../perl/Text-Template-1.46/t/04-safe.t | 5 +- .../perl/Text-Template-1.46/t/05-safe2.t | 5 +- .../perl/Text-Template-1.46/t/06-ofh.t | 1 - .../perl/Text-Template-1.46/t/07-safe3.t | 1 - .../perl/Text-Template-1.46/t/08-exported.t | 9 +- .../perl/Text-Template-1.46/t/09-error.t | 5 +- .../perl/Text-Template-1.46/t/10-delimiters.t | 9 +- .../perl/Text-Template-1.46/t/11-prepend.t | 14 +- .../perl/Text-Template-1.46/t/12-preprocess.t | 6 +- .../perl/Text-Template-1.46/t/13-taint.t | 5 +- .../perl/Text-Template-1.46/t/14-broken.t | 3 +- .../external/perl/transfer/Text/Template.pm | 5 +- .../deps/openssl/openssl/fuzz/test-corpus.c | 87 +- .../openssl/include/internal/numbers.h | 1 - .../openssl/openssl/include/openssl/asn1.h | 2 - .../openssl/openssl/include/openssl/bio.h | 16 +- .../deps/openssl/openssl/include/openssl/bn.h | 89 +- .../openssl/openssl/include/openssl/conf.h | 7 +- .../openssl/openssl/include/openssl/crypto.h | 6 +- .../deps/openssl/openssl/include/openssl/dh.h | 4 +- .../openssl/openssl/include/openssl/dsa.h | 13 +- .../deps/openssl/openssl/include/openssl/ec.h | 3 +- .../openssl/openssl/include/openssl/evp.h | 31 +- .../openssl/openssl/include/openssl/lhash.h | 4 +- .../openssl/openssl/include/openssl/ocsp.h | 7 +- .../openssl/include/openssl/opensslconf.h.in | 18 +- .../openssl/include/openssl/opensslv.h | 11 +- .../openssl/openssl/include/openssl/pem.h | 5 +- .../openssl/openssl/include/openssl/rsa.h | 8 +- .../openssl/openssl/include/openssl/ssl.h | 6 +- .../openssl/openssl/include/openssl/ssl3.h | 12 +- .../openssl/include/openssl/symhacks.h | 17 +- .../openssl/openssl/include/openssl/tls1.h | 10 +- .../openssl/openssl/include/openssl/x509.h | 5 +- .../openssl/include/openssl/x509_vfy.h | 78 +- worker/deps/openssl/openssl/ms/uplink-x86.pl | 4 +- .../openssl/openssl/ssl/record/rec_layer_d1.c | 64 +- .../openssl/openssl/ssl/record/rec_layer_s3.c | 2 +- .../openssl/openssl/ssl/record/ssl3_record.c | 14 +- worker/deps/openssl/openssl/ssl/s3_enc.c | 10 +- worker/deps/openssl/openssl/ssl/ssl_ciph.c | 5 +- worker/deps/openssl/openssl/ssl/ssl_conf.c | 5 +- worker/deps/openssl/openssl/ssl/ssl_init.c | 13 +- worker/deps/openssl/openssl/ssl/ssl_lib.c | 41 +- worker/deps/openssl/openssl/ssl/ssl_locl.h | 9 +- worker/deps/openssl/openssl/ssl/ssl_mcnf.c | 142 +- worker/deps/openssl/openssl/ssl/ssl_sess.c | 8 +- worker/deps/openssl/openssl/ssl/ssl_txt.c | 16 +- worker/deps/openssl/openssl/ssl/statem/README | 1 - .../deps/openssl/openssl/ssl/statem/statem.c | 4 +- .../openssl/openssl/ssl/statem/statem_clnt.c | 17 +- .../openssl/openssl/ssl/statem/statem_dtls.c | 3 +- .../openssl/openssl/ssl/statem/statem_lib.c | 25 - .../openssl/openssl/ssl/statem/statem_srvr.c | 45 +- worker/deps/openssl/openssl/ssl/t1_lib.c | 50 +- worker/deps/openssl/openssl/ssl/t1_trce.c | 17 +- worker/deps/openssl/openssl/test/README | 18 +- .../deps/openssl/openssl/test/bioprinttest.c | 2 - worker/deps/openssl/openssl/test/build.info | 24 +- .../openssl/openssl/test/certs/alt1-cert.pem | 39 +- .../openssl/openssl/test/certs/alt1-key.pem | 52 +- .../openssl/test/certs/badalt6-cert.pem | 35 +- .../openssl/test/certs/badalt6-key.pem | 52 +- .../openssl/test/certs/badalt7-cert.pem | 33 +- .../openssl/test/certs/badalt7-key.pem | 52 +- .../deps/openssl/openssl/test/certs/setup.sh | 25 +- .../openssl/openssl/test/ct/log_list.conf | 1 - worker/deps/openssl/openssl/test/ct_test.c | 6 +- worker/deps/openssl/openssl/test/danetest.in | 2 +- .../openssl/openssl/test/evp_extra_test.c | 48 +- worker/deps/openssl/openssl/test/evp_test.c | 11 +- worker/deps/openssl/openssl/test/evptests.txt | 19244 ++++++++++++++++ worker/deps/openssl/openssl/test/r160test.c | 1 - .../cert-trailingwhitespace.pem | 52 +- .../dsa-trailingwhitespace.pem | 36 +- .../openssl/test/recipes/15-test_genrsa.t | 39 +- .../openssl/test/recipes/25-test_verify.t | 10 +- .../openssl/test/recipes/30-test_evp.t | 17 +- .../openssl/openssl/test/recipes/80-test_ca.t | 1 - .../openssl/test/recipes/80-test_cipherlist.t | 9 +- .../openssl/test/recipes/80-test_x509aux.t | 2 +- .../openssl/test/recipes/90-test_fuzz.t | 12 +- .../openssl/test/recipes/90-test_shlibload.t | 34 +- .../openssl/test/recipes/tconversion.pl | 2 +- worker/deps/openssl/openssl/test/run_tests.pl | 2 +- worker/deps/openssl/openssl/test/secmemtest.c | 46 +- .../deps/openssl/openssl/test/shlibloadtest.c | 58 +- .../openssl/test/ssl-tests/01-simple.conf | 2 - .../test/ssl-tests/02-protocol-version.conf | 2 - .../test/ssl-tests/03-custom_verify.conf | 2 - .../test/ssl-tests/04-client_auth.conf | 2 - .../test/ssl-tests/04-client_auth.conf.in | 2 +- .../openssl/test/ssl-tests/05-sni.conf | 2 - .../openssl/test/ssl-tests/06-sni-ticket.conf | 2 - .../ssl-tests/07-dtls-protocol-version.conf | 2 - .../openssl/test/ssl-tests/08-npn.conf | 2 - .../openssl/test/ssl-tests/08-npn.conf.in | 2 +- .../openssl/test/ssl-tests/09-alpn.conf | 2 - .../openssl/test/ssl-tests/09-alpn.conf.in | 2 +- .../openssl/test/ssl-tests/10-resumption.conf | 2 - .../test/ssl-tests/11-dtls_resumption.conf | 2 - .../openssl/openssl/test/ssl-tests/12-ct.conf | 2 - .../test/ssl-tests/13-fragmentation.conf | 2 - .../openssl/test/ssl-tests/14-curves.conf | 2 - .../openssl/test/ssl-tests/15-certstatus.conf | 2 - .../test/ssl-tests/16-dtls-certstatus.conf | 2 - .../test/ssl-tests/17-renegotiate.conf | 2 - .../test/ssl-tests/18-dtls-renegotiate.conf | 2 - .../test/ssl-tests/19-mac-then-encrypt.conf | 2 - .../deps/openssl/openssl/test/ssl_test.tmpl | 10 +- worker/deps/openssl/openssl/test/sslapitest.c | 56 - .../openssl/openssl/test/verify_extra_test.c | 44 +- worker/deps/openssl/openssl/util/copy.pl | 12 +- worker/deps/openssl/openssl/util/dofile.pl | 6 +- worker/deps/openssl/openssl/util/fipslink.pl | 6 +- worker/deps/openssl/openssl/util/incore | 6 +- .../deps/openssl/openssl/util/libcrypto.num | 33 +- .../openssl/openssl/util/local_shlib.com.in | 2 +- worker/deps/openssl/openssl/util/mkdef.pl | 13 +- worker/deps/openssl/openssl/util/mkrc.pl | 4 +- .../openssl/openssl/util/perl/OpenSSL/Test.pm | 29 +- .../openssl/util/perl/TLSProxy/Message.pm | 4 +- .../openssl/util/perl/TLSProxy/Record.pm | 2 +- .../openssl/util/perl/TLSProxy/ServerHello.pm | 4 +- .../util/perl/TLSProxy/ServerKeyExchange.pm | 2 +- .../openssl/util/perl/with_fallback.pm | 8 +- .../deps/openssl/openssl/util/process_docs.pl | 32 +- .../openssl/openssl/util/shlib_wrap.sh.in | 28 +- 850 files changed, 45403 insertions(+), 16653 deletions(-) create mode 100644 worker/deps/openssl/openssl/Configurations/90-team.conf create mode 100644 worker/deps/openssl/openssl/test/evptests.txt diff --git a/worker/deps/openssl/config/README.md b/worker/deps/openssl/config/README.md index 45ca72b797..1453622844 100644 --- a/worker/deps/openssl/config/README.md +++ b/worker/deps/openssl/config/README.md @@ -59,7 +59,7 @@ Currently, one floating patch is needed to build S390 asm files. Cherry pick it from the previous commit. ```sh -$ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd +$ git cherry-pick 094465362758ebf967b33c84d5c96230b46a34b3 ``` ### 3. Execute `make` in `deps/openssl/config` directory @@ -70,6 +70,16 @@ Just type `make` then it generates all platform dependent files into $ cd deps/openssl/config; make ``` +The commit message can be +``` + commit 8cb1de45c60f2d520551166610115531db673518 + Author: Shigeki Ohtsu + Date: Thu Mar 29 16:46:11 2018 +0900 + + deps: update archs files for OpenSSL-1.1.0 + + `cd deps/openssl/config; make` updates all archs dependant files. +``` ### 4. Check diffs Check diffs if updates are right. Even if no updates in openssl @@ -86,18 +96,14 @@ used for `nmake` command. The `make` command in the step 2 above uses created. When source files or build options are updated in Windows, it needs to change these two Makefiles by hand. If you are not sure, please ask @shigeki for details. - ### 5. Commit and make test Update all architecture dependent files. Do not forget to git add or remove -files if they are changed before commit: +files if they are changed before commit. ```sh -$ git add deps/openssl/config/archs -$ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h -$ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h -$ git add deps/openssl/openssl/include/openssl/opensslconf.h -$ git add deps/openssl/openssl/.gitignore -$ git commit +$ cd deps/openssl/openssl/config +$ git add archs +$ git commit archs ``` The commit message can be @@ -107,8 +113,6 @@ The commit message can be Date: Thu Mar 29 16:46:11 2018 +0900 deps: update archs files for OpenSSL-1.1.0 - - `cd deps/openssl/config; make` updates all archs dependant files. ``` Finally, build Node and run tests. diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index 742741d586..7ebb1a0112 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "BSD-x86_64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1076,10 +1076,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1246,22 +1242,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -4008,12 +3992,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5155,12 +5133,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6358,12 +6330,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7363,10 +7329,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7472,10 +7434,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7543,8 +7501,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7565,23 +7523,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7737,7 +7682,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7762,7 +7706,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7779,10 +7722,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7849,268 +7789,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8874,10 +9255,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9622,10 +9999,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10362,10 +10735,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10903,7 +11272,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11090,7 +11458,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11275,7 +11642,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12281,15 +12647,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12490,14 +12847,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12647,14 +12996,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12663,23 +13004,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s index 488ae6d781..aa7a1ea1cf 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s index 3dcd55d3f5..d493797832 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s index ca193ddb9e..c7c53e8771 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s index 427a1c7d12..70eed05b00 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s index e18f87c4e6..cd8b00f259 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s index c76c5a8afb..0fd201167f 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s index d193298940..bf7c2b0b6f 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s index ee619092c9..a2cccde636 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s index 795cebe1d7..b6797a6849 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s index a0b78a0565..f4e5337565 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s index 3a78cd8440..d19d4662b4 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax + leaq (%rsp),%rsi movq %r9,%r15 - + jmp .Lsub .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsp,%r14,8),%rax + movq 8(%rsi,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx - movq %r9,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq (%rsi,%r14,8),%rax + movq %r14,(%rsp,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi - leaq -4(%r9),%r15 movq 0(%rsp),%rax + pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r15 + shrq $2,%r9 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,7 +585,9 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - + leaq -1(%r9),%r15 + jmp .Lsub4x +.align 16 .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -612,35 +614,34 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - pxor %xmm0,%xmm0 -.byte 102,72,15,110,224 - pcmpeqd %xmm5,%xmm5 - pshufd $0,%xmm4,%xmm4 - movq %r9,%r15 - pxor %xmm4,%xmm5 - shrq $2,%r15 - xorl %eax,%eax - + xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx + leaq -1(%r9),%r15 + orq %rcx,%rsi + + movdqu (%rsi),%xmm1 + movdqa %xmm0,(%rsp) + movdqu %xmm1,(%rdi) jmp .Lcopy4x .align 16 .Lcopy4x: - movdqa (%rsp,%rax,1),%xmm1 - movdqu (%rdi,%rax,1),%xmm2 - pand %xmm4,%xmm1 - pand %xmm5,%xmm2 - movdqa 16(%rsp,%rax,1),%xmm3 - movdqa %xmm0,(%rsp,%rax,1) - por %xmm2,%xmm1 - movdqu 16(%rdi,%rax,1),%xmm2 - movdqu %xmm1,(%rdi,%rax,1) - pand %xmm4,%xmm3 - pand %xmm5,%xmm2 - movdqa %xmm0,16(%rsp,%rax,1) - por %xmm2,%xmm3 - movdqu %xmm3,16(%rdi,%rax,1) - leaq 32(%rax),%rax + movdqu 16(%rsi,%r14,1),%xmm2 + movdqu 32(%rsi,%r14,1),%xmm1 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) + movdqa %xmm0,32(%rsp,%r14,1) + movdqu %xmm1,32(%rdi,%r14,1) + leaq 32(%r14),%r14 decq %r15 jnz .Lcopy4x + + shlq $2,%r9 + movdqu 16(%rsi,%r14,1),%xmm2 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s index 0dd53512f9..a2fccf088e 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,19 +393,18 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx + movq (%rsi,%r14,8),%rax movq %r14,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index 260e0eaac9..42960ff459 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Tue Nov 20 09:37:29 2018" +#define DATE "built on: Tue Apr 3 00:38:12 2018" diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s index 1dead91b17..1117381f31 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s index a9fed05fd7..044b8f031e 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s index 62a7ac611f..ce86d5d969 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s index 0defe666bb..0aa90515d6 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s index 21e49925f1..d1a1c895a3 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s index 0116ef1c94..10f5987415 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s index 8b2e361ea1..5662696481 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s index aab3c6db13..9c7110f4ef 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s index 781b48b9eb..bdd0da3bd1 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s index d266d776ec..d2857f3288 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s index dbeebed9a0..195a148bb9 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s index f2896b4d6e..bd72a459ab 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s index 8264a7dbdf..23b932e1de 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s index 6f8488a38a..a1021c17a9 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s index a4d55b6afc..f83130ea68 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s index 7e1f5e2740..5a109c6fd9 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s index 38c02c188e..3e5ab736fd 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h index 7dd2101053..9df0f86ed6 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index 2a14dbf50a..5c26facf11 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -215,7 +215,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -574,7 +572,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index ca660392e1..0815b65b4c 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "BSD-x86_64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1075,10 +1075,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1245,22 +1241,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3947,12 +3931,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5082,12 +5060,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6237,12 +6209,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7230,10 +7196,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7339,10 +7301,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7410,8 +7368,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7432,23 +7390,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7604,7 +7549,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7629,7 +7573,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7646,10 +7589,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7716,268 +7656,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8701,10 +9082,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9441,10 +9818,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10149,10 +10522,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10672,7 +11041,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10857,7 +11225,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11034,7 +11401,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12038,15 +12404,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12247,14 +12604,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12404,14 +12753,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12420,23 +12761,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index f42029725c..9bcf65021a 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Tue Nov 20 09:37:38 2018" +#define DATE "built on: Tue Apr 3 00:38:16 2018" diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h index 7b122bd86e..e20916814d 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi index 5605b604a4..f54f6ed68e 100644 --- a/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 4b40a5a831..77adc3e250 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "", + makedepprog => "/usr/bin/makedepend", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN32", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des-586.s crypt586.s", des_obj => "des-586.o crypt586.o", dso_cflags => "/Zi /Fddso", - dso_extension => ".dll", + dso_extension => "", dso_scheme => "WIN32", ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86.s", ec_obj => "ecp_nistz256.o ecp_nistz256-x86.o", @@ -133,8 +133,8 @@ our %target = ( sha1_obj => "sha1-586.o sha256-586.o sha512-586.o", shared_cflag => "", shared_defines => [ ], - shared_extension => ".dll", - shared_extension_simple => ".dll", + shared_extension => "", + shared_extension_simple => "", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -263,7 +263,6 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", - "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1101,10 +1100,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1271,22 +1266,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3991,12 +3974,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5144,12 +5121,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6335,12 +6306,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7340,10 +7305,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7449,10 +7410,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7542,23 +7499,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7714,7 +7658,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7739,7 +7682,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7756,10 +7698,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7782,10 +7721,448 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], "libcrypto" => [ "crypto/dllmain.o", ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8784,10 +9161,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9536,10 +9909,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10268,10 +10637,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10801,7 +11166,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10988,7 +11352,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11171,7 +11534,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12177,15 +12539,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12386,14 +12739,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12543,14 +12888,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12559,23 +12896,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm index 78d5e7375e..1da1e643bb 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm @@ -10,7 +10,7 @@ global _BF_encrypt align 16 _BF_encrypt: L$_BF_encrypt_begin: - ; + ; push ebp push ebx mov ebx,DWORD [12+esp] @@ -24,7 +24,7 @@ L$_BF_encrypt_begin: mov ebx,DWORD [ebp] xor ecx,ecx xor edi,ebx - ; + ; ; Round 0 mov edx,DWORD [4+ebp] mov ebx,edi @@ -44,7 +44,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 1 mov edx,DWORD [8+ebp] mov ebx,esi @@ -64,7 +64,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 2 mov edx,DWORD [12+ebp] mov ebx,edi @@ -84,7 +84,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 3 mov edx,DWORD [16+ebp] mov ebx,esi @@ -104,7 +104,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 4 mov edx,DWORD [20+ebp] mov ebx,edi @@ -124,7 +124,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 5 mov edx,DWORD [24+ebp] mov ebx,esi @@ -144,7 +144,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 6 mov edx,DWORD [28+ebp] mov ebx,edi @@ -164,7 +164,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 7 mov edx,DWORD [32+ebp] mov ebx,esi @@ -184,7 +184,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 8 mov edx,DWORD [36+ebp] mov ebx,edi @@ -204,7 +204,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 9 mov edx,DWORD [40+ebp] mov ebx,esi @@ -224,7 +224,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 10 mov edx,DWORD [44+ebp] mov ebx,edi @@ -244,7 +244,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 11 mov edx,DWORD [48+ebp] mov ebx,esi @@ -264,7 +264,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 12 mov edx,DWORD [52+ebp] mov ebx,edi @@ -284,7 +284,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 13 mov edx,DWORD [56+ebp] mov ebx,esi @@ -304,7 +304,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 14 mov edx,DWORD [60+ebp] mov ebx,edi @@ -324,7 +324,7 @@ L$_BF_encrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 15 mov edx,DWORD [64+ebp] mov ebx,esi @@ -358,7 +358,7 @@ global _BF_decrypt align 16 _BF_decrypt: L$_BF_decrypt_begin: - ; + ; push ebp push ebx mov ebx,DWORD [12+esp] @@ -372,7 +372,7 @@ L$_BF_decrypt_begin: mov ebx,DWORD [68+ebp] xor ecx,ecx xor edi,ebx - ; + ; ; Round 16 mov edx,DWORD [64+ebp] mov ebx,edi @@ -392,7 +392,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 15 mov edx,DWORD [60+ebp] mov ebx,esi @@ -412,7 +412,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 14 mov edx,DWORD [56+ebp] mov ebx,edi @@ -432,7 +432,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 13 mov edx,DWORD [52+ebp] mov ebx,esi @@ -452,7 +452,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 12 mov edx,DWORD [48+ebp] mov ebx,edi @@ -472,7 +472,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 11 mov edx,DWORD [44+ebp] mov ebx,esi @@ -492,7 +492,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 10 mov edx,DWORD [40+ebp] mov ebx,edi @@ -512,7 +512,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 9 mov edx,DWORD [36+ebp] mov ebx,esi @@ -532,7 +532,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 8 mov edx,DWORD [32+ebp] mov ebx,edi @@ -552,7 +552,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 7 mov edx,DWORD [28+ebp] mov ebx,esi @@ -572,7 +572,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 6 mov edx,DWORD [24+ebp] mov ebx,edi @@ -592,7 +592,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 5 mov edx,DWORD [20+ebp] mov ebx,esi @@ -612,7 +612,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 4 mov edx,DWORD [16+ebp] mov ebx,edi @@ -632,7 +632,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 3 mov edx,DWORD [12+ebp] mov ebx,esi @@ -652,7 +652,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor edi,ebx - ; + ; ; Round 2 mov edx,DWORD [8+ebp] mov ebx,edi @@ -672,7 +672,7 @@ L$_BF_decrypt_begin: add ebx,edx xor eax,eax xor esi,ebx - ; + ; ; Round 1 mov edx,DWORD [4+ebp] mov ebx,esi @@ -706,7 +706,7 @@ global _BF_cbc_encrypt align 16 _BF_cbc_encrypt: L$_BF_cbc_encrypt_begin: - ; + ; push ebp push ebx push esi diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm index 82002b353b..8534042b05 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm @@ -108,7 +108,7 @@ L$000maw_non_sse2: push ebx push esi push edi - ; + ; xor esi,esi mov edi,DWORD [20+esp] mov ecx,DWORD [28+esp] @@ -191,7 +191,7 @@ L$006maw_loop: adc edx,0 mov DWORD [28+edi],eax mov esi,edx - ; + ; sub ecx,8 lea ebx,[32+ebx] lea edi,[32+edi] @@ -317,7 +317,7 @@ L$009mw_non_sse2: push ebx push esi push edi - ; + ; xor esi,esi mov edi,DWORD [20+esp] mov ebx,DWORD [24+esp] @@ -382,7 +382,7 @@ L$012mw_loop: adc edx,0 mov DWORD [28+edi],eax mov esi,edx - ; + ; add ebx,32 add edi,32 sub ebp,8 @@ -489,7 +489,7 @@ L$015sqr_non_sse2: push ebx push esi push edi - ; + ; mov esi,DWORD [20+esp] mov edi,DWORD [24+esp] mov ebx,DWORD [28+esp] @@ -536,7 +536,7 @@ L$018sw_loop: mul eax mov DWORD [56+esi],eax mov DWORD [60+esi],edx - ; + ; add edi,32 add esi,64 sub ebx,8 @@ -615,7 +615,7 @@ L$_bn_add_words_begin: push ebx push esi push edi - ; + ; mov ebx,DWORD [20+esp] mov esi,DWORD [24+esp] mov edi,DWORD [28+esp] @@ -696,7 +696,7 @@ L$021aw_loop: add ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add esi,32 add edi,32 add ebx,32 @@ -795,7 +795,7 @@ L$_bn_sub_words_begin: push ebx push esi push edi - ; + ; mov ebx,DWORD [20+esp] mov esi,DWORD [24+esp] mov edi,DWORD [28+esp] @@ -876,7 +876,7 @@ L$024aw_loop: sub ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add esi,32 add edi,32 add ebx,32 @@ -975,7 +975,7 @@ L$_bn_sub_part_words_begin: push ebx push esi push edi - ; + ; mov ebx,DWORD [20+esp] mov esi,DWORD [24+esp] mov edi,DWORD [28+esp] @@ -1056,7 +1056,7 @@ L$027aw_loop: sub ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add esi,32 add edi,32 add ebx,32 @@ -1248,7 +1248,7 @@ L$032pw_neg_loop: sub ecx,edx adc eax,0 mov DWORD [28+ebx],ecx - ; + ; add edi,32 add ebx,32 sub ebp,8 @@ -1379,7 +1379,7 @@ L$034pw_pos_loop: sub ecx,eax mov DWORD [28+ebx],ecx jnc NEAR L$042pw_nc7 - ; + ; add esi,32 add ebx,32 sub ebp,8 @@ -1462,7 +1462,7 @@ L$041pw_nc6: mov ecx,DWORD [28+esi] mov DWORD [28+ebx],ecx L$042pw_nc7: - ; + ; add esi,32 add ebx,32 sub ebp,8 diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm index 090630c3a0..bf237b633a 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm @@ -448,18 +448,16 @@ L$016sub: lea edx,[1+edx] jge NEAR L$016sub sbb eax,0 - mov edx,-1 - xor edx,eax - jmp NEAR L$017copy + and esi,eax + not eax + mov ebp,edi + and ebp,eax + or esi,ebp align 16 L$017copy: - mov esi,DWORD [32+ebx*4+esp] - mov ebp,DWORD [ebx*4+edi] + mov eax,DWORD [ebx*4+esi] + mov DWORD [ebx*4+edi],eax mov DWORD [32+ebx*4+esp],ecx - and esi,eax - and ebp,edx - or ebp,esi - mov DWORD [ebx*4+edi],ebp dec ebx jge NEAR L$017copy mov esp,DWORD [24+esp] diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h index 9a504b1683..29159b7a18 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Nov 20 09:39:18 2018" +#define DATE "built on: Tue Apr 3 00:38:59 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm index 2af8af39d6..912b2b9e90 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/crypt586.asm @@ -15,7 +15,7 @@ L$_fcrypt_body_begin: push ebx push esi push edi - ; + ; ; Load the 2 words xor edi,edi xor esi,esi @@ -24,7 +24,7 @@ L$_fcrypt_body_begin: mov ebp,DWORD [28+esp] push DWORD 25 L$000start: - ; + ; ; Round 0 mov eax,DWORD [36+esp] mov edx,esi @@ -74,7 +74,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 1 mov eax,DWORD [36+esp] mov edx,edi @@ -124,7 +124,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 2 mov eax,DWORD [36+esp] mov edx,esi @@ -174,7 +174,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 3 mov eax,DWORD [36+esp] mov edx,edi @@ -224,7 +224,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 4 mov eax,DWORD [36+esp] mov edx,esi @@ -274,7 +274,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 5 mov eax,DWORD [36+esp] mov edx,edi @@ -324,7 +324,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 6 mov eax,DWORD [36+esp] mov edx,esi @@ -374,7 +374,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 7 mov eax,DWORD [36+esp] mov edx,edi @@ -424,7 +424,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 8 mov eax,DWORD [36+esp] mov edx,esi @@ -474,7 +474,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 9 mov eax,DWORD [36+esp] mov edx,edi @@ -524,7 +524,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 10 mov eax,DWORD [36+esp] mov edx,esi @@ -574,7 +574,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 11 mov eax,DWORD [36+esp] mov edx,edi @@ -624,7 +624,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 12 mov eax,DWORD [36+esp] mov edx,esi @@ -674,7 +674,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 13 mov eax,DWORD [36+esp] mov edx,edi @@ -724,7 +724,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor esi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 14 mov eax,DWORD [36+esp] mov edx,esi @@ -774,7 +774,7 @@ L$000start: mov ebx,DWORD [0x500+edx*1+ebp] xor edi,ebx mov ebp,DWORD [32+esp] - ; + ; ; Round 15 mov eax,DWORD [36+esp] mov edx,edi @@ -831,7 +831,7 @@ L$000start: mov esi,eax mov DWORD [esp],ebx jnz NEAR L$000start - ; + ; ; FP mov edx,DWORD [28+esp] ror edi,1 @@ -840,35 +840,35 @@ L$000start: and esi,0xaaaaaaaa xor eax,esi xor edi,esi - ; + ; rol eax,23 mov esi,eax xor eax,edi and eax,0x03fc03fc xor esi,eax xor edi,eax - ; + ; rol esi,10 mov eax,esi xor esi,edi and esi,0x33333333 xor eax,esi xor edi,esi - ; + ; rol edi,18 mov esi,edi xor edi,eax and edi,0xfff0000f xor esi,edi xor eax,edi - ; + ; rol esi,12 mov edi,esi xor esi,eax and esi,0xf0f0f0f0 xor edi,esi xor eax,esi - ; + ; ror eax,4 mov DWORD [edx],eax mov DWORD [4+edx],edi diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm index 3d6ee2a5e4..d4a46e1606 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/des/des-586.asm @@ -951,7 +951,7 @@ _DES_encrypt1: L$_DES_encrypt1_begin: push esi push edi - ; + ; ; Load the 2 words mov esi,DWORD [12+esp] xor ecx,ecx @@ -960,7 +960,7 @@ L$_DES_encrypt1_begin: mov eax,DWORD [esi] mov ebx,DWORD [28+esp] mov edi,DWORD [4+esi] - ; + ; ; IP rol eax,4 mov esi,eax @@ -968,35 +968,35 @@ L$_DES_encrypt1_begin: and eax,0xf0f0f0f0 xor esi,eax xor edi,eax - ; + ; rol edi,20 mov eax,edi xor edi,esi and edi,0xfff0000f xor eax,edi xor esi,edi - ; + ; rol eax,14 mov edi,eax xor eax,esi and eax,0x33333333 xor edi,eax xor esi,eax - ; + ; rol esi,22 mov eax,esi xor esi,edi and esi,0x03fc03fc xor eax,esi xor edi,esi - ; + ; rol eax,9 mov esi,eax xor eax,edi and eax,0xaaaaaaaa xor esi,eax xor edi,eax - ; + ; rol edi,1 call L$000pic_point L$000pic_point: @@ -1010,7 +1010,7 @@ L$000pic_point: L$001decrypt: call __x86_DES_decrypt L$002done: - ; + ; ; FP mov edx,DWORD [20+esp] ror esi,1 @@ -1019,35 +1019,35 @@ L$002done: and edi,0xaaaaaaaa xor eax,edi xor esi,edi - ; + ; rol eax,23 mov edi,eax xor eax,esi and eax,0x03fc03fc xor edi,eax xor esi,eax - ; + ; rol edi,10 mov eax,edi xor edi,esi and edi,0x33333333 xor eax,edi xor esi,edi - ; + ; rol esi,18 mov edi,esi xor esi,eax and esi,0xfff0000f xor edi,esi xor eax,esi - ; + ; rol edi,12 mov esi,edi xor edi,eax and edi,0xf0f0f0f0 xor esi,edi xor eax,edi - ; + ; ror eax,4 mov DWORD [edx],eax mov DWORD [4+edx],esi @@ -1062,7 +1062,7 @@ _DES_encrypt2: L$_DES_encrypt2_begin: push esi push edi - ; + ; ; Load the 2 words mov eax,DWORD [12+esp] xor ecx,ecx @@ -1085,7 +1085,7 @@ L$003pic_point: L$004decrypt: call __x86_DES_decrypt L$005done: - ; + ; ; Fixup ror edi,3 mov eax,DWORD [20+esp] @@ -1106,12 +1106,12 @@ L$_DES_encrypt3_begin: push ebp push esi push edi - ; + ; ; Load the data words mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] sub esp,12 - ; + ; ; IP rol edi,4 mov edx,edi @@ -1119,35 +1119,35 @@ L$_DES_encrypt3_begin: and edi,0xf0f0f0f0 xor edx,edi xor esi,edi - ; + ; rol esi,20 mov edi,esi xor esi,edx and esi,0xfff0000f xor edi,esi xor edx,esi - ; + ; rol edi,14 mov esi,edi xor edi,edx and edi,0x33333333 xor esi,edi xor edx,edi - ; + ; rol edx,22 mov edi,edx xor edx,esi and edx,0x03fc03fc xor edi,edx xor esi,edx - ; + ; rol edi,9 mov edx,edi xor edi,esi and edi,0xaaaaaaaa xor edx,edi xor esi,edi - ; + ; ror edx,3 ror esi,2 mov DWORD [4+ebx],esi @@ -1170,7 +1170,7 @@ L$_DES_encrypt3_begin: add esp,12 mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] - ; + ; ; FP rol esi,2 rol edi,3 @@ -1179,35 +1179,35 @@ L$_DES_encrypt3_begin: and edi,0xaaaaaaaa xor eax,edi xor esi,edi - ; + ; rol eax,23 mov edi,eax xor eax,esi and eax,0x03fc03fc xor edi,eax xor esi,eax - ; + ; rol edi,10 mov eax,edi xor edi,esi and edi,0x33333333 xor eax,edi xor esi,edi - ; + ; rol esi,18 mov edi,esi xor esi,eax and esi,0xfff0000f xor edi,esi xor eax,esi - ; + ; rol edi,12 mov esi,edi xor edi,eax and edi,0xf0f0f0f0 xor esi,edi xor eax,edi - ; + ; ror eax,4 mov DWORD [ebx],eax mov DWORD [4+ebx],esi @@ -1225,12 +1225,12 @@ L$_DES_decrypt3_begin: push ebp push esi push edi - ; + ; ; Load the data words mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] sub esp,12 - ; + ; ; IP rol edi,4 mov edx,edi @@ -1238,35 +1238,35 @@ L$_DES_decrypt3_begin: and edi,0xf0f0f0f0 xor edx,edi xor esi,edi - ; + ; rol esi,20 mov edi,esi xor esi,edx and esi,0xfff0000f xor edi,esi xor edx,esi - ; + ; rol edi,14 mov esi,edi xor edi,edx and edi,0x33333333 xor esi,edi xor edx,edi - ; + ; rol edx,22 mov edi,edx xor edx,esi and edx,0x03fc03fc xor edi,edx xor esi,edx - ; + ; rol edi,9 mov edx,edi xor edi,esi and edi,0xaaaaaaaa xor edx,edi xor esi,edi - ; + ; ror edx,3 ror esi,2 mov DWORD [4+ebx],esi @@ -1289,7 +1289,7 @@ L$_DES_decrypt3_begin: add esp,12 mov edi,DWORD [ebx] mov esi,DWORD [4+ebx] - ; + ; ; FP rol esi,2 rol edi,3 @@ -1298,35 +1298,35 @@ L$_DES_decrypt3_begin: and edi,0xaaaaaaaa xor eax,edi xor esi,edi - ; + ; rol eax,23 mov edi,eax xor eax,esi and eax,0x03fc03fc xor edi,eax xor esi,eax - ; + ; rol edi,10 mov eax,edi xor edi,esi and edi,0x33333333 xor eax,edi xor esi,edi - ; + ; rol esi,18 mov edi,esi xor esi,eax and esi,0xfff0000f xor edi,esi xor eax,esi - ; + ; rol edi,12 mov esi,edi xor edi,eax and edi,0xf0f0f0f0 xor esi,edi xor eax,edi - ; + ; ror eax,4 mov DWORD [ebx],eax mov DWORD [4+ebx],esi @@ -1339,7 +1339,7 @@ global _DES_ncbc_encrypt align 16 _DES_ncbc_encrypt: L$_DES_ncbc_encrypt_begin: - ; + ; push ebp push ebx push esi @@ -1517,7 +1517,7 @@ global _DES_ede3_cbc_encrypt align 16 _DES_ede3_cbc_encrypt: L$_DES_ede3_cbc_encrypt_begin: - ; + ; push ebp push ebx push esi diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm index 7383523877..8203213818 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm @@ -3829,7 +3829,7 @@ L$_ecp_nistz256_scatter_w7_begin: mov edi,DWORD [20+esp] mov esi,DWORD [24+esp] mov ebp,DWORD [28+esp] - lea edi,[ebp*1+edi] + lea edi,[ebp*1+edi-1] mov ebp,16 L$007scatter_w7_loop: mov eax,DWORD [esi] diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h index 289768d956..f555fb4bdf 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION ".dll" +# define DSO_EXTENSION "" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm index 90663d022d..efa6b5f894 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm @@ -26,7 +26,7 @@ L$_md5_block_asm_data_order_begin: mov ecx,DWORD [8+edi] mov edx,DWORD [12+edi] L$000start: - ; + ; ; R0 section mov edi,ecx mov ebp,DWORD [esi] @@ -190,7 +190,7 @@ L$000start: rol ebx,22 mov edi,ecx add ebx,ecx - ; + ; ; R1 section ; R1 16 xor edi,ebx @@ -352,7 +352,7 @@ L$000start: mov edi,ecx rol ebx,20 add ebx,ecx - ; + ; ; R2 section ; R2 32 xor edi,edx @@ -498,7 +498,7 @@ L$000start: mov edi,-1 rol ebx,23 add ebx,ecx - ; + ; ; R3 section ; R3 48 xor edi,edx diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm index a5ab683672..0a05888845 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/crypto/ripemd/rmd-586.asm @@ -21,7 +21,7 @@ L$_ripemd160_block_asm_data_order_begin: push ebx sub esp,108 L$000start: - ; + ; mov ebx,DWORD [eax] mov ebp,DWORD [4+eax] mov DWORD [esp],ebx diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h index 19c35390f1..630bb30623 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index f114c22fd3..10fa852b2a 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -211,7 +211,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -395,7 +394,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -569,7 +567,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index 1b4354c204..a7afa26f51 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "", + makedepprog => "/usr/bin/makedepend", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN32", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", dso_cflags => "/Zi /Fddso", - dso_extension => ".dll", + dso_extension => "", dso_scheme => "WIN32", ec_asm_src => "", ec_obj => "", @@ -131,8 +131,8 @@ our %target = ( rmd160_obj => "", shared_cflag => "", shared_defines => [ ], - shared_extension => ".dll", - shared_extension_simple => ".dll", + shared_extension => "", + shared_extension_simple => "", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -262,7 +262,6 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", - "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1100,10 +1099,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1270,22 +1265,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3978,12 +3961,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5119,12 +5096,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6274,12 +6245,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7267,10 +7232,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7376,10 +7337,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7447,8 +7404,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7469,23 +7426,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7641,7 +7585,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7666,7 +7609,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7683,10 +7625,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7709,10 +7648,448 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], "libcrypto" => [ "crypto/dllmain.o", ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8703,10 +9080,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9447,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10155,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10678,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10863,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11040,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12044,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12253,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12410,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12426,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h index 4ff1ec2ebe..c58c6e6c40 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Nov 20 09:39:22 2018" +#define DATE "built on: Tue Apr 3 00:39:00 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h index 289768d956..f555fb4bdf 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION ".dll" +# define DSO_EXTENSION "" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h index eaf7b68125..1f09ee0d7f 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h @@ -108,18 +108,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index 7e920c437a..09aef657a4 100644 --- a/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index e06b3546c0..95949bf7a4 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "", + makedepprog => "/usr/bin/makedepend", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN64A", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", dso_cflags => "/Zi /Fddso", - dso_extension => ".dll", + dso_extension => "", dso_scheme => "WIN32", ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86_64.s", ec_obj => "ecp_nistz256.o ecp_nistz256-x86_64.o", @@ -134,8 +134,8 @@ our %target = ( sha1_obj => "sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o", shared_cflag => "", shared_defines => [ ], - shared_extension => ".dll", - shared_extension_simple => ".dll", + shared_extension => "", + shared_extension_simple => "", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -264,7 +264,6 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", - "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1102,10 +1101,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1272,22 +1267,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -4040,12 +4023,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5193,12 +5170,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6396,12 +6367,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7401,10 +7366,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7510,10 +7471,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7603,23 +7560,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7775,7 +7719,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7800,7 +7743,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7817,10 +7759,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7843,10 +7782,448 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], "libcrypto" => [ "crypto/dllmain.o", ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8877,10 +9254,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9629,10 +10002,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10369,10 +10738,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10910,7 +11275,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11097,7 +11461,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11282,7 +11645,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12288,15 +12650,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12497,14 +12850,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12654,14 +12999,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12670,23 +13007,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm index 26908c313b..f58343ff2b 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm @@ -214,30 +214,30 @@ $L$inner_enter: xor r14,r14 mov rax,QWORD[rsp] + lea rsi,[rsp] mov r15,r9 - + jmp NEAR $L$sub ALIGN 16 $L$sub: sbb rax,QWORD[r14*8+rcx] mov QWORD[r14*8+rdi],rax - mov rax,QWORD[8+r14*8+rsp] + mov rax,QWORD[8+r14*8+rsi] lea r14,[1+r14] dec r15 jnz NEAR $L$sub sbb rax,0 - mov rbx,-1 - xor rbx,rax xor r14,r14 + and rsi,rax + not rax + mov rcx,rdi + and rcx,rax mov r15,r9 - + or rsi,rcx +ALIGN 16 $L$copy: - mov rcx,QWORD[r14*8+rdi] - mov rdx,QWORD[r14*8+rsp] - and rcx,rbx - and rdx,rax - mov QWORD[r14*8+rsp],r9 - or rdx,rcx - mov QWORD[r14*8+rdi],rdx + mov rax,QWORD[r14*8+rsi] + mov QWORD[r14*8+rsp],r14 + mov QWORD[r14*8+rdi],rax lea r14,[1+r14] sub r15,1 jnz NEAR $L$copy @@ -605,10 +605,10 @@ $L$inner4x: cmp r14,r9 jb NEAR $L$outer4x mov rdi,QWORD[16+r9*8+rsp] - lea r15,[((-4))+r9] mov rax,QWORD[rsp] + pxor xmm0,xmm0 mov rdx,QWORD[8+rsp] - shr r15,2 + shr r9,2 lea rsi,[rsp] xor r14,r14 @@ -616,7 +616,9 @@ $L$inner4x: mov rbx,QWORD[16+rsi] mov rbp,QWORD[24+rsi] sbb rdx,QWORD[8+rcx] - + lea r15,[((-1))+r9] + jmp NEAR $L$sub4x +ALIGN 16 $L$sub4x: mov QWORD[r14*8+rdi],rax mov QWORD[8+r14*8+rdi],rdx @@ -643,35 +645,34 @@ $L$sub4x: sbb rax,0 mov QWORD[24+r14*8+rdi],rbp - pxor xmm0,xmm0 -DB 102,72,15,110,224 - pcmpeqd xmm5,xmm5 - pshufd xmm4,xmm4,0 - mov r15,r9 - pxor xmm5,xmm4 - shr r15,2 - xor eax,eax - + xor r14,r14 + and rsi,rax + not rax + mov rcx,rdi + and rcx,rax + lea r15,[((-1))+r9] + or rsi,rcx + + movdqu xmm1,XMMWORD[rsi] + movdqa XMMWORD[rsp],xmm0 + movdqu XMMWORD[rdi],xmm1 jmp NEAR $L$copy4x ALIGN 16 $L$copy4x: - movdqa xmm1,XMMWORD[rax*1+rsp] - movdqu xmm2,XMMWORD[rax*1+rdi] - pand xmm1,xmm4 - pand xmm2,xmm5 - movdqa xmm3,XMMWORD[16+rax*1+rsp] - movdqa XMMWORD[rax*1+rsp],xmm0 - por xmm1,xmm2 - movdqu xmm2,XMMWORD[16+rax*1+rdi] - movdqu XMMWORD[rax*1+rdi],xmm1 - pand xmm3,xmm4 - pand xmm2,xmm5 - movdqa XMMWORD[16+rax*1+rsp],xmm0 - por xmm3,xmm2 - movdqu XMMWORD[16+rax*1+rdi],xmm3 - lea rax,[32+rax] + movdqu xmm2,XMMWORD[16+r14*1+rsi] + movdqu xmm1,XMMWORD[32+r14*1+rsi] + movdqa XMMWORD[16+r14*1+rsp],xmm0 + movdqu XMMWORD[16+r14*1+rdi],xmm2 + movdqa XMMWORD[32+r14*1+rsp],xmm0 + movdqu XMMWORD[32+r14*1+rdi],xmm1 + lea r14,[32+r14] dec r15 jnz NEAR $L$copy4x + + shl r9,2 + movdqu xmm2,XMMWORD[16+r14*1+rsi] + movdqa XMMWORD[16+r14*1+rsp],xmm0 + movdqu XMMWORD[16+r14*1+rdi],xmm2 mov rsi,QWORD[8+r9*8+rsp] mov rax,1 mov r15,QWORD[((-48))+rsi] diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm index de93630c8f..e0fb22b79e 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm @@ -410,19 +410,18 @@ $L$sub: sbb rax,QWORD[r14*8+rcx] jnz NEAR $L$sub sbb rax,0 - mov rbx,-1 - xor rbx,rax xor r14,r14 + and rsi,rax + not rax + mov rcx,rdi + and rcx,rax mov r15,r9 - + or rsi,rcx +ALIGN 16 $L$copy: - mov rcx,QWORD[r14*8+rdi] - mov rdx,QWORD[r14*8+rsp] - and rcx,rbx - and rdx,rax + mov rax,QWORD[r14*8+rsi] mov QWORD[r14*8+rsp],r14 - or rdx,rcx - mov QWORD[r14*8+rdi],rdx + mov QWORD[r14*8+rdi],rax lea r14,[1+r14] sub r15,1 jnz NEAR $L$copy diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h index c0b70ab335..bae537d401 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Nov 20 09:39:06 2018" +#define DATE "built on: Tue Apr 3 00:38:54 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h index 289768d956..f555fb4bdf 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION ".dll" +# define DSO_EXTENSION "" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm index 2aede40d9e..cda3538dba 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm @@ -456,4 +456,3 @@ $L$tail_rdseed_bytes: $L$done_rdseed_bytes: DB 0F3h,0C3h ;repret - diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h index fd1ca5612f..01084232d8 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index 1924b0294f..8fccfe154d 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -215,7 +215,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -574,7 +572,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index d33be7b8a3..b7918f728d 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -34,7 +34,7 @@ our %config = ( hashbangperl => "/usr/bin/env perl", libdir => "", major => "1", - makedepprog => "", + makedepprog => "/usr/bin/makedepend", minor => "1.0", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "VC-WIN64A", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -96,7 +96,7 @@ our %target = ( des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", dso_cflags => "/Zi /Fddso", - dso_extension => ".dll", + dso_extension => "", dso_scheme => "WIN32", ec_asm_src => "", ec_obj => "", @@ -132,8 +132,8 @@ our %target = ( rmd160_obj => "", shared_cflag => "", shared_defines => [ ], - shared_extension => ".dll", - shared_extension_simple => ".dll", + shared_extension => "", + shared_extension_simple => "", shared_ldflag => "/dll", shared_rcflag => "", shared_target => "win-shared", @@ -263,7 +263,6 @@ our %disabled = ( "fuzz-afl" => "default", "fuzz-libfuzzer" => "default", "heartbeats" => "default", - "makedepend" => "unavailable", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -1101,10 +1100,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1271,22 +1266,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3979,12 +3962,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5120,12 +5097,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6275,12 +6246,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7268,10 +7233,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7377,10 +7338,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7470,23 +7427,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7642,7 +7586,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7667,7 +7610,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7684,10 +7626,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7710,10 +7649,448 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], "libcrypto" => [ "crypto/dllmain.o", ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8704,10 +9081,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9448,10 +9821,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10156,10 +10525,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10679,7 +11044,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10864,7 +11228,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11041,7 +11404,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12045,15 +12407,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12254,14 +12607,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12411,14 +12756,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12427,23 +12764,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h index a7939bd1e6..12173ecb40 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h @@ -9,4 +9,4 @@ static const char cflags[] = { 'c','o','m','p','i','l','e','r',':',' ','c','c','\0' }; #define PLATFORM "platform: " -#define DATE "built on: Tue Nov 20 09:39:16 2018" +#define DATE "built on: Tue Apr 3 00:38:58 2018" diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h index 289768d956..f555fb4bdf 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h @@ -12,5 +12,5 @@ #ifndef HEADER_DSO_CONF_H # define HEADER_DSO_CONF_H -# define DSO_EXTENSION ".dll" +# define DSO_EXTENSION "" #endif diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h index 097c8ae7bf..dfe71f8c60 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h @@ -108,18 +108,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi index 51bf2fe679..54cef95adb 100644 --- a/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm index 4eddfafd2c..4fe3ed16b6 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -871,6 +871,11 @@ our %unified_info = ( "libcrypto", "libssl", ], + "test/buildtest_opensslconf" => + [ + "libcrypto", + "libssl", + ], "test/buildtest_opensslv" => [ "libcrypto", @@ -1079,10 +1084,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1249,22 +1250,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -2339,6 +2328,11 @@ our %unified_info = ( "test/generate_buildtest.pl", "ocsp", ], + "test/buildtest_opensslconf.c" => + [ + "test/generate_buildtest.pl", + "opensslconf", + ], "test/buildtest_opensslv.c" => [ "test/generate_buildtest.pl", @@ -3981,12 +3975,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5116,12 +5104,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6325,12 +6307,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7136,6 +7112,10 @@ our %unified_info = ( [ "include", ], + "test/buildtest_opensslconf.o" => + [ + "include", + ], "test/buildtest_opensslv.o" => [ "include", @@ -7318,10 +7298,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7427,10 +7403,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7520,23 +7492,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7648,6 +7607,7 @@ our %unified_info = ( "test/buildtest_obj_mac", "test/buildtest_objects", "test/buildtest_ocsp", + "test/buildtest_opensslconf", "test/buildtest_opensslv", "test/buildtest_ossl_typ", "test/buildtest_pem", @@ -7692,7 +7652,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7717,7 +7676,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7734,10 +7692,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7804,258 +7759,702 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslconf" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", ], "apps/tsget" => [ @@ -8809,10 +9208,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9549,10 +9944,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10293,10 +10684,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10821,7 +11208,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11006,7 +11392,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11192,7 +11577,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -11838,6 +12222,14 @@ our %unified_info = ( [ "test/buildtest_ocsp.c", ], + "test/buildtest_opensslconf" => + [ + "test/buildtest_opensslconf.o", + ], + "test/buildtest_opensslconf.o" => + [ + "test/buildtest_opensslconf.c", + ], "test/buildtest_opensslv" => [ "test/buildtest_opensslv.o", @@ -12196,15 +12588,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12405,14 +12788,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12562,14 +12937,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12578,23 +12945,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s index dad9e59c71..2b16116024 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ LAES_Te: mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ LAES_Td: mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -739,7 +739,7 @@ Lenc_done: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -819,7 +819,7 @@ Lenc_loop: bc 16,0,Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -884,7 +884,7 @@ Lenc_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1029,7 +1029,7 @@ Lenc_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1173,7 +1173,7 @@ Ldec_done: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1253,7 +1253,7 @@ Ldec_loop: bc 16,0,Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1318,7 +1318,7 @@ Ldec_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1548,7 +1548,7 @@ Ldec_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s index af77b04524..bd2926e0b4 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ Lconsts: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -277,7 +277,7 @@ Ldone: Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -325,7 +325,7 @@ Ldeckey: xor 3,3,3 Ldec_key_abort: addi 1,1,32 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -392,7 +392,7 @@ Loop_enc: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -459,7 +459,7 @@ Loop_dec: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -620,7 +620,7 @@ Lcbc_done: stvx 2,10,7 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -910,8 +910,8 @@ Loop_cbc_dec8x: addic. 5,5,128 beq Lcbc_dec8x_done - nop - nop + nop + nop Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -999,15 +999,15 @@ Loop_cbc_dec8x_tail: cmplwi 5,32 blt Lcbc_dec8x_one - nop + nop beq Lcbc_dec8x_two cmplwi 5,64 blt Lcbc_dec8x_three - nop + nop beq Lcbc_dec8x_four cmplwi 5,96 blt Lcbc_dec8x_five - nop + nop beq Lcbc_dec8x_six Lcbc_dec8x_seven: @@ -1194,7 +1194,7 @@ Lcbc_dec8x_done: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1301,7 +1301,7 @@ Loop_ctr32_enc: stvx 2,0,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1604,15 +1604,15 @@ Loop_ctr32_enc8x_middle: Lctr32_enc8x_break: cmpwi 5,-0x60 blt Lctr32_enc8x_one - nop + nop beq Lctr32_enc8x_two cmpwi 5,-0x40 blt Lctr32_enc8x_three - nop + nop beq Lctr32_enc8x_four cmpwi 5,-0x20 blt Lctr32_enc8x_five - nop + nop beq Lctr32_enc8x_six cmpwi 5,0x00 blt Lctr32_enc8x_seven @@ -1821,7 +1821,7 @@ Lctr32_enc8x_done: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1958,7 +1958,7 @@ Loop_xts_enc: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2031,7 +2031,7 @@ Lxts_enc_done: Lxts_enc_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2171,7 +2171,7 @@ Loop_xts_dec: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2236,7 +2236,7 @@ Loop_xts_dec_short: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2287,7 +2287,7 @@ Lxts_dec_done: Lxts_dec_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2618,11 +2618,11 @@ Loop_xts_enc6x: beq Lxts_enc6x_zero cmpwi 5,0x20 blt Lxts_enc6x_one - nop + nop beq Lxts_enc6x_two cmpwi 5,0x40 blt Lxts_enc6x_three - nop + nop beq Lxts_enc6x_four Lxts_enc6x_five: @@ -2719,7 +2719,7 @@ Lxts_enc6x_two: .align 4 Lxts_enc6x_one: vxor 7,5,17 - nop + nop Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2855,7 +2855,7 @@ Lxts_enc6x_ret: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2940,7 +2940,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3268,11 +3268,11 @@ Loop_xts_dec6x: beq Lxts_dec6x_zero cmpwi 5,0x20 blt Lxts_dec6x_one - nop + nop beq Lxts_dec6x_two cmpwi 5,0x40 blt Lxts_dec6x_three - nop + nop beq Lxts_dec6x_four Lxts_dec6x_five: @@ -3373,7 +3373,7 @@ Lxts_dec6x_two: .align 4 Lxts_dec6x_one: vxor 7,5,17 - nop + nop Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3543,7 +3543,7 @@ Lxts_dec6x_ret: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3628,6 +3628,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s index b264c90033..6f29a012fa 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ Lconsts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ Lenc_entry: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -318,7 +318,7 @@ Lenc_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -360,7 +360,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -455,7 +455,7 @@ Ldec_entry: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -550,7 +550,7 @@ Ldec_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -777,7 +777,7 @@ Lcbc_abort: lwz 31,236(1) mtlr 0 addi 1,1,240 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -831,7 +831,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1077,7 +1077,7 @@ Lschedule_mangle_done: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1105,7 +1105,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1171,7 +1171,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1193,7 +1193,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1245,7 +1245,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 Lschedule_mangle_dec: @@ -1296,7 +1296,7 @@ Lschedule_mangle_dec: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1372,7 +1372,7 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1455,8 +1455,7 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 - diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s index 3f3b3057de..51fd8f0b49 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s @@ -227,7 +227,7 @@ stw 9,24(3) stw 10,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -655,7 +655,7 @@ stw 9, 60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -809,7 +809,7 @@ stw 10,24(3) stw 11,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1348,7 +1348,7 @@ adde 10,10,9 stw 12,56(3) stw 10,60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1399,7 +1399,7 @@ Lppcasm_sub_mainloop: Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1445,7 +1445,7 @@ Lppcasm_add_mainloop: bc 16,0,Lppcasm_add_mainloop Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1474,7 +1474,7 @@ Lppcasm_add_adios: cmplwi 0,5,0 bne Lppcasm_div1 li 3,-1 - blr + blr Lppcasm_div1: xor 0,0,0 li 8,32 @@ -1561,7 +1561,7 @@ Lppcasm_div8: b Lppcasm_divouterloop Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1603,7 +1603,7 @@ Lppcasm_sqr_mainloop: stwu 8,4(3) bc 16,0,Lppcasm_sqr_mainloop Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1709,7 +1709,7 @@ Lppcasm_mw_REM: Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1835,7 +1835,7 @@ Lppcasm_maw_leftover: Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s index 267308a6ac..a9384f70b0 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s @@ -9,7 +9,7 @@ li 3,0 bclr 12,0 cmpwi 8,32 - bgelr + bgelr slwi 8,8,2 li 12,-4096 addi 3,8,256 @@ -182,16 +182,15 @@ Lsub: lwzx 12,22,21 li 21,0 mtctr 8 subfe 3,21,3 + and 4,22,3 + andc 6,9,3 + or 4,4,6 .align 4 Lcopy: - lwzx 12,22,21 - lwzx 10,9,21 - and 12,12,3 - andc 10,10,3 + lwzx 12,4,21 + stwx 12,9,21 stwx 21,22,21 - or 10,10,12 - stwx 10,9,21 addi 21,21,4 bc 16,0,Lcopy @@ -210,7 +209,7 @@ Lcopy: lwz 30,-8(12) lwz 31,-4(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s index 1506bcc03a..281d64ae7d 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s @@ -888,8 +888,11 @@ Lsub: lwz 24,12(10) li 12,0 subfe 3,12,3 - addi 4,1,196 + addi 10,1,196 subf 9,8,9 + and 4,10,3 + andc 6,9,3 + or 4,4,6 addi 10,1,192 mtctr 11 @@ -899,10 +902,6 @@ Lcopy: lwz 25,8(4) lwz 26,12(4) lwzu 27,16(4) - lwz 28,4(9) - lwz 29,8(9) - lwz 30,12(9) - lwz 31,16(9) std 12,8(22) std 12,16(22) std 12,24(22) @@ -911,18 +910,6 @@ Lcopy: std 12,48(22) std 12,56(22) stdu 12,64(22) - and 24,24,3 - and 25,25,3 - and 26,26,3 - and 27,27,3 - andc 28,28,3 - andc 29,29,3 - andc 30,30,3 - andc 31,31,3 - or 24,24,28 - or 25,25,29 - or 26,26,30 - or 27,27,31 stw 24,4(9) stw 25,8(9) stw 26,12(9) @@ -958,7 +945,7 @@ Lcopy: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h index 1248f50fda..f75553781f 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Tue Nov 20 09:37:21 2018" +#define DATE "built on: Tue Apr 3 00:38:08 2018" diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s index e4e4612d3a..9130400355 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/chacha/chacha-ppc.s @@ -59,7 +59,7 @@ __ChaCha20_ctr32_int: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -345,7 +345,7 @@ Loop: bne Loop_outer - blr + blr .align 4 Ltail: @@ -396,7 +396,7 @@ Loop_tail: stw 1,80(1) stw 1,84(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -554,7 +554,7 @@ Loop_outer_vmx: vspltisw 27,7 mtctr 0 - nop + nop Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1047,7 +1047,7 @@ Laligned_vmx: cmplwi 5,255 bgt Loop_outer_vmx - nop + nop Ldone_vmx: cmplwi 5,0 @@ -1100,7 +1100,7 @@ Ldone_vmx: lwz 31,364(1) mtlr 0 addi 1,1,368 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1113,7 +1113,7 @@ Lconsts: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s index 81d7d24b74..972f88d9b8 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/modes/ghashp8-ppc.s @@ -122,7 +122,7 @@ .long 0x7E4A1F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -171,7 +171,7 @@ .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -287,7 +287,7 @@ Leven: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -554,7 +554,7 @@ Ldone_4x: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s index 1adc3641db..3063cd30a2 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppc.s @@ -35,7 +35,7 @@ Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 @@ -236,7 +236,7 @@ Loop: lwz 31,92(1) addi 1,1,96 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,18,4,0 @@ -300,7 +300,7 @@ Labort: lwz 30,88(1) lwz 31,92(1) addi 1,1,96 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s index f4cc796fa7..17d3aeb195 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/poly1305/poly1305-ppcfp.s @@ -145,7 +145,7 @@ Lno_key: xor 3,3,3 addi 1,1,24 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 @@ -460,7 +460,7 @@ Lentry: lfd 31,208(1) addi 1,1,216 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 @@ -544,7 +544,7 @@ Labort: lwz 30,32(1) lwz 31,36(1) addi 1,1,40 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 @@ -555,7 +555,7 @@ LPICmeup: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s index 2eb7bd60a4..85665a6046 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s @@ -5,7 +5,7 @@ .align 4 .OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -14,7 +14,7 @@ .OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -23,7 +23,7 @@ .align 4 .OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -33,7 +33,7 @@ .OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -44,7 +44,7 @@ xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -76,7 +76,7 @@ xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -89,7 +89,7 @@ Ladd: lwarx 5,0,3 stwcx. 0,0,3 bne- Ladd mr 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -104,7 +104,7 @@ Loop_rdtsc: mftbu 4 cmplw 0,4,5 bne Loop_rdtsc - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -121,7 +121,7 @@ Little: mtctr 4 stb 0,0(3) addi 3,3,1 bc 16,0,$-8 - blr + blr Lot: andi. 5,3,3 beq Laligned stb 0,0(3) @@ -136,7 +136,7 @@ Laligned: bc 16,0,$-8 andi. 4,4,3 bne Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -162,7 +162,7 @@ Lno_data: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -193,7 +193,7 @@ Loop: mftb 6 bc 16,0,Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -245,8 +245,7 @@ Loop2: Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 - diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s index 2cbfbd5a3c..41cf5f850a 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha1-ppc.s @@ -100,7 +100,7 @@ Ldone: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1108,7 +1108,7 @@ Lsha1_block_private: mr 11,20 addi 4,4,64 bc 16,0,Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s index 0be5e923ef..1b8f108174 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256-ppc.s @@ -120,7 +120,7 @@ Ldone: lwz 31,188(1) mtlr 0 addi 1,1,192 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1286,7 +1286,7 @@ Lrounds: cmplw 0,31,5 stw 15,28(3) bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1297,7 +1297,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s index e252f6fe29..8f73813109 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha256p8-ppc.s @@ -772,7 +772,7 @@ L16_xx: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -784,7 +784,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s index ca3c3629a0..82da5d2e4e 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512-ppc.s @@ -127,7 +127,7 @@ Ldone: lwz 31,252(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -2972,7 +2972,7 @@ Lrounds: stw 4,164(1) cmplw 0,4,5 bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -2983,7 +2983,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s index 930f009de7..08ca5b4573 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/crypto/sha/sha512p8-ppc.s @@ -773,7 +773,7 @@ L16_xx: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -785,7 +785,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h index b3ae627c1a..8f5c4f48d2 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi index 20ffeaffa0..68196fdabf 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi @@ -217,7 +217,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -402,7 +401,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,7 +577,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm index f664e12c22..b8674f9537 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3950,12 +3934,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5085,12 +5063,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6240,12 +6212,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7233,10 +7199,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7342,10 +7304,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7435,23 +7393,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7607,7 +7552,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7632,7 +7576,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7649,10 +7592,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7719,6 +7659,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8704,10 +9085,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9444,10 +9821,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10152,10 +10525,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10675,7 +11044,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10860,7 +11228,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11037,7 +11404,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12041,15 +12407,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12250,14 +12607,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12407,14 +12756,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12423,23 +12764,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h index 40df6f2a2a..8f97dac70a 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Tue Nov 20 09:37:23 2018" +#define DATE "built on: Tue Apr 3 00:38:09 2018" diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h index de84cb510b..ae6ea775d7 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h @@ -108,18 +108,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi index 42f01941bc..70dc22a387 100644 --- a/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm index 0435582228..1512a38c0e 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix64-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1079,10 +1079,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1249,22 +1245,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3981,12 +3965,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5116,12 +5094,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6325,12 +6297,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7318,10 +7284,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7427,10 +7389,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7498,8 +7456,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7520,23 +7478,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7692,7 +7637,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7717,7 +7661,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7734,10 +7677,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7804,268 +7744,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8809,10 +9190,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9549,10 +9926,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10293,10 +10666,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10821,7 +11190,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11006,7 +11374,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11192,7 +11559,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12196,15 +12562,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12405,14 +12762,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12562,14 +12911,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12578,23 +12919,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s index 32c684cd9c..cc96236fe5 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ LAES_Te: mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ LAES_Td: mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -739,7 +739,7 @@ Lenc_done: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -819,7 +819,7 @@ Lenc_loop: bc 16,0,Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -884,7 +884,7 @@ Lenc_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1029,7 +1029,7 @@ Lenc_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1173,7 +1173,7 @@ Ldec_done: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1253,7 +1253,7 @@ Ldec_loop: bc 16,0,Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1318,7 +1318,7 @@ Ldec_loop: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1515,7 +1515,7 @@ Ldec_compact_done: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s index 0c906d1798..0893f20dc8 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ Lconsts: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -277,7 +277,7 @@ Ldone: Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -325,7 +325,7 @@ Ldeckey: xor 3,3,3 Ldec_key_abort: addi 1,1,64 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -392,7 +392,7 @@ Loop_enc: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -459,7 +459,7 @@ Loop_dec: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -620,7 +620,7 @@ Lcbc_done: stvx 2,10,7 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -910,8 +910,8 @@ Loop_cbc_dec8x: addic. 5,5,128 beq Lcbc_dec8x_done - nop - nop + nop + nop Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -999,15 +999,15 @@ Loop_cbc_dec8x_tail: cmplwi 5,32 blt Lcbc_dec8x_one - nop + nop beq Lcbc_dec8x_two cmplwi 5,64 blt Lcbc_dec8x_three - nop + nop beq Lcbc_dec8x_four cmplwi 5,96 blt Lcbc_dec8x_five - nop + nop beq Lcbc_dec8x_six Lcbc_dec8x_seven: @@ -1194,7 +1194,7 @@ Lcbc_dec8x_done: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1301,7 +1301,7 @@ Loop_ctr32_enc: stvx 2,0,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1604,15 +1604,15 @@ Loop_ctr32_enc8x_middle: Lctr32_enc8x_break: cmpwi 5,-0x60 blt Lctr32_enc8x_one - nop + nop beq Lctr32_enc8x_two cmpwi 5,-0x40 blt Lctr32_enc8x_three - nop + nop beq Lctr32_enc8x_four cmpwi 5,-0x20 blt Lctr32_enc8x_five - nop + nop beq Lctr32_enc8x_six cmpwi 5,0x00 blt Lctr32_enc8x_seven @@ -1821,7 +1821,7 @@ Lctr32_enc8x_done: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1958,7 +1958,7 @@ Loop_xts_enc: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2031,7 +2031,7 @@ Lxts_enc_done: Lxts_enc_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2171,7 +2171,7 @@ Loop_xts_dec: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2236,7 +2236,7 @@ Loop_xts_dec_short: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2287,7 +2287,7 @@ Lxts_dec_done: Lxts_dec_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2618,11 +2618,11 @@ Loop_xts_enc6x: beq Lxts_enc6x_zero cmpwi 5,0x20 blt Lxts_enc6x_one - nop + nop beq Lxts_enc6x_two cmpwi 5,0x40 blt Lxts_enc6x_three - nop + nop beq Lxts_enc6x_four Lxts_enc6x_five: @@ -2719,7 +2719,7 @@ Lxts_enc6x_two: .align 4 Lxts_enc6x_one: vxor 7,5,17 - nop + nop Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2855,7 +2855,7 @@ Lxts_enc6x_ret: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2940,7 +2940,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3268,11 +3268,11 @@ Loop_xts_dec6x: beq Lxts_dec6x_zero cmpwi 5,0x20 blt Lxts_dec6x_one - nop + nop beq Lxts_dec6x_two cmpwi 5,0x40 blt Lxts_dec6x_three - nop + nop beq Lxts_dec6x_four Lxts_dec6x_five: @@ -3373,7 +3373,7 @@ Lxts_dec6x_two: .align 4 Lxts_dec6x_one: vxor 7,5,17 - nop + nop Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3543,7 +3543,7 @@ Lxts_dec6x_ret: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3628,6 +3628,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s index 0e35758de8..f2682de7c1 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ Lconsts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ Lenc_entry: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -318,7 +318,7 @@ Lenc_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -360,7 +360,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -455,7 +455,7 @@ Ldec_entry: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -550,7 +550,7 @@ Ldec_done: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -777,7 +777,7 @@ Lcbc_abort: ld 31,264(1) mtlr 0 addi 1,1,272 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -831,7 +831,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1077,7 +1077,7 @@ Lschedule_mangle_done: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1105,7 +1105,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1171,7 +1171,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1193,7 +1193,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1245,7 +1245,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 Lschedule_mangle_dec: @@ -1296,7 +1296,7 @@ Lschedule_mangle_dec: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1372,7 +1372,7 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1455,8 +1455,7 @@ Lschedule_mangle_dec: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 - diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s index 0f88fd28ff..b8414b98f4 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/bn-ppc.s @@ -227,7 +227,7 @@ std 9,48(3) std 10,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -655,7 +655,7 @@ std 9, 120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -809,7 +809,7 @@ std 10,48(3) std 11,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1348,7 +1348,7 @@ adde 10,10,9 std 12,112(3) std 10,120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1399,7 +1399,7 @@ Lppcasm_sub_mainloop: Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1445,7 +1445,7 @@ Lppcasm_add_mainloop: bc 16,0,Lppcasm_add_mainloop Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1474,7 +1474,7 @@ Lppcasm_add_adios: cmpldi 0,5,0 bne Lppcasm_div1 li 3,-1 - blr + blr Lppcasm_div1: xor 0,0,0 li 8,64 @@ -1561,7 +1561,7 @@ Lppcasm_div8: b Lppcasm_divouterloop Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1603,7 +1603,7 @@ Lppcasm_sqr_mainloop: stdu 8,8(3) bc 16,0,Lppcasm_sqr_mainloop Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1709,7 +1709,7 @@ Lppcasm_mw_REM: Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1835,7 +1835,7 @@ Lppcasm_maw_leftover: Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s index 4b8b852812..b767b00a56 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc-mont.s @@ -180,16 +180,15 @@ Lsub: ldx 12,22,21 li 21,0 mtctr 8 subfe 3,21,3 + and 4,22,3 + andc 6,9,3 + or 4,4,6 .align 4 Lcopy: - ldx 12,22,21 - ldx 10,9,21 - and 12,12,3 - andc 10,10,3 + ldx 12,4,21 + stdx 12,9,21 stdx 21,22,21 - or 10,10,12 - stdx 10,9,21 addi 21,21,8 bc 16,0,Lcopy @@ -208,7 +207,7 @@ Lcopy: ld 30,-16(12) ld 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s index 96ef2a9ea7..2b5e5c9b25 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s @@ -679,14 +679,16 @@ Lsub: ldx 24,10,12 li 12,0 subfe 3,12,3 + and 4,10,3 + andc 6,9,3 + or 4,4,6 + addi 31,4,8 mtctr 11 .align 4 Lcopy: - ldx 24,10,12 - ldx 25,28,12 - ldx 26,9,12 - ldx 27,30,12 + ldx 24,4,12 + ldx 25,31,12 std 12,8(22) std 12,16(22) std 12,24(22) @@ -695,12 +697,6 @@ Lcopy: std 12,48(22) std 12,56(22) stdu 12,64(22) - and 24,24,3 - and 25,25,3 - andc 26,26,3 - andc 27,27,3 - or 24,24,26 - or 25,25,27 stdx 24,9,12 stdx 25,30,12 stdx 12,10,12 @@ -735,7 +731,7 @@ Lcopy: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h index 76c26c119d..eb144269c7 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix64-gcc" -#define DATE "built on: Tue Nov 20 09:37:25 2018" +#define DATE "built on: Tue Apr 3 00:38:10 2018" diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s index 89e9d28bad..60cf843569 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/chacha/chacha-ppc.s @@ -59,7 +59,7 @@ __ChaCha20_ctr32_int: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -345,7 +345,7 @@ Loop: bne Loop_outer - blr + blr .align 4 Ltail: @@ -396,7 +396,7 @@ Loop_tail: stw 1,104(1) stw 1,108(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -554,7 +554,7 @@ Loop_outer_vmx: vspltisw 27,7 mtctr 0 - nop + nop Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1047,7 +1047,7 @@ Laligned_vmx: cmpldi 5,255 bgt Loop_outer_vmx - nop + nop Ldone_vmx: cmpldi 5,0 @@ -1100,7 +1100,7 @@ Ldone_vmx: ld 31,456(1) mtlr 0 addi 1,1,464 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1113,7 +1113,7 @@ Lconsts: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s index db4f73d559..252ddc9d4f 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/modes/ghashp8-ppc.s @@ -122,7 +122,7 @@ .long 0x7E4A1F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -171,7 +171,7 @@ .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -287,7 +287,7 @@ Leven: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -554,7 +554,7 @@ Ldone_4x: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s index e5253a563b..0c976f6691 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppc.s @@ -32,7 +32,7 @@ Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 @@ -126,7 +126,7 @@ Loop: ld 31,184(1) addi 1,1,192 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,5,4,0 @@ -166,7 +166,7 @@ Labort: li 12,12 stwbrx 8,11,4 stwbrx 7,12,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s index 912a1f5933..a6393e8365 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/poly1305/poly1305-ppcfp.s @@ -145,7 +145,7 @@ Lno_key: xor 3,3,3 addi 1,1,48 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 @@ -460,7 +460,7 @@ Lentry: lfd 31,232(1) addi 1,1,240 Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 @@ -547,7 +547,7 @@ Labort: ld 30,64(1) ld 31,72(1) addi 1,1,80 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 @@ -558,7 +558,7 @@ LPICmeup: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s index 4eabc38344..d07c409ce4 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/ppccpuid.s @@ -5,7 +5,7 @@ .align 4 .OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -14,7 +14,7 @@ .OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -23,7 +23,7 @@ .align 4 .OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -33,7 +33,7 @@ .OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -44,7 +44,7 @@ xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -76,7 +76,7 @@ xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -89,7 +89,7 @@ Ladd: lwarx 5,0,3 stwcx. 0,0,3 bne- Ladd extsw 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -99,7 +99,7 @@ Ladd: lwarx 5,0,3 .align 4 .OPENSSL_rdtsc: mftb 3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -116,7 +116,7 @@ Little: mtctr 4 stb 0,0(3) addi 3,3,1 bc 16,0,$-8 - blr + blr Lot: andi. 5,3,3 beq Laligned stb 0,0(3) @@ -131,7 +131,7 @@ Laligned: bc 16,0,$-8 andi. 4,4,3 bne Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -157,7 +157,7 @@ Lno_data: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -188,7 +188,7 @@ Loop: mftb 6 bc 16,0,Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -240,8 +240,7 @@ Loop2: Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 - diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s index 1ffbb93d46..28dcdd1419 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha1-ppc.s @@ -100,7 +100,7 @@ Ldone: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1108,7 +1108,7 @@ Lsha1_block_private: mr 11,20 addi 4,4,64 bc 16,0,Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s index b77b0151df..8f1d4b3129 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256-ppc.s @@ -120,7 +120,7 @@ Ldone: ld 31,312(1) mtlr 0 addi 1,1,320 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1286,7 +1286,7 @@ Lrounds: cmpld 31,5 stw 15,28(3) bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1297,7 +1297,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s index fa3ea24514..d765e58116 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha256p8-ppc.s @@ -772,7 +772,7 @@ L16_xx: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -784,7 +784,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s index 9106079093..3a2073c9c8 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512-ppc.s @@ -120,7 +120,7 @@ Ldone: ld 31,376(1) mtlr 0 addi 1,1,384 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1318,7 +1318,7 @@ Lrounds: cmpld 31,5 std 15,56(3) bne Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1329,7 +1329,7 @@ LPICmeup: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s index 60c23d4372..a08d4748c1 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/crypto/sha/sha512p8-ppc.s @@ -773,7 +773,7 @@ L16_xx: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -785,7 +785,7 @@ LPICmeup: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h index f4459a98a4..5f12b2933d 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi index 1b5ea438a5..0985c459cc 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix64-gcc/asm/openssl.gypi @@ -217,7 +217,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -402,7 +401,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,7 +577,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm index 3597329e08..5e25c7b88b 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "aix64-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3950,12 +3934,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5085,12 +5063,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6240,12 +6212,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7233,10 +7199,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7342,10 +7304,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7435,23 +7393,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7607,7 +7552,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7632,7 +7576,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7649,10 +7592,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7719,6 +7659,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8704,10 +9085,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9444,10 +9821,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10152,10 +10525,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10675,7 +11044,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10860,7 +11228,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11037,7 +11404,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12041,15 +12407,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12250,14 +12607,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12407,14 +12756,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12423,23 +12764,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h index 7120f1058f..88cd72b844 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: aix64-gcc" -#define DATE "built on: Tue Nov 20 09:37:27 2018" +#define DATE "built on: Tue Apr 3 00:38:11 2018" diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h index 123e7f66ed..d2aa623535 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h @@ -108,18 +108,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi index b7ed1e2aab..25974f0d08 100644 --- a/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index bcfad2c161..0f822647df 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin-i386-cc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3962,12 +3946,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5109,12 +5087,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6300,12 +6272,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7305,10 +7271,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7414,10 +7376,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7507,23 +7465,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7679,7 +7624,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7704,7 +7648,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7721,10 +7664,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7791,6 +7731,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8784,10 +9165,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9532,10 +9909,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10264,10 +10637,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10797,7 +11166,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10984,7 +11352,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11167,7 +11534,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12173,15 +12539,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12382,14 +12739,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12539,14 +12888,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12555,23 +12896,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s index bf02384737..a7f782d965 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bf/bf-586.s @@ -11,7 +11,7 @@ L_BF_encrypt_begin: movl 16(%esp),%ebp pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl (%ebx),%edi movl 4(%ebx),%esi xorl %eax,%eax @@ -19,7 +19,7 @@ L_BF_encrypt_begin: xorl %ecx,%ecx xorl %ebx,%edi - # Round 0 + # Round 0 movl 4(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -39,7 +39,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 1 + # Round 1 movl 8(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -59,7 +59,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 2 + # Round 2 movl 12(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -79,7 +79,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 3 + # Round 3 movl 16(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -99,7 +99,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 4 + # Round 4 movl 20(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -119,7 +119,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 5 + # Round 5 movl 24(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -139,7 +139,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 6 + # Round 6 movl 28(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -159,7 +159,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 7 + # Round 7 movl 32(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -179,7 +179,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 8 + # Round 8 movl 36(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -199,7 +199,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 9 + # Round 9 movl 40(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -219,7 +219,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 10 + # Round 10 movl 44(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -239,7 +239,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 11 + # Round 11 movl 48(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -259,7 +259,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 12 + # Round 12 movl 52(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -279,7 +279,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 13 + # Round 13 movl 56(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -299,7 +299,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 14 + # Round 14 movl 60(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -319,7 +319,7 @@ L_BF_encrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 15 + # Round 15 movl 64(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -336,7 +336,7 @@ L_BF_encrypt_begin: xorl %eax,%ebx movl 3144(%ebp,%edx,4),%edx addl %edx,%ebx - # Load parameter 0 (16) enc=1 + # Load parameter 0 (16) enc=1 movl 20(%esp),%eax xorl %ebx,%edi movl 68(%ebp),%edx @@ -359,7 +359,7 @@ L_BF_decrypt_begin: movl 16(%esp),%ebp pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl (%ebx),%edi movl 4(%ebx),%esi xorl %eax,%eax @@ -367,7 +367,7 @@ L_BF_decrypt_begin: xorl %ecx,%ecx xorl %ebx,%edi - # Round 16 + # Round 16 movl 64(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -387,7 +387,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 15 + # Round 15 movl 60(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -407,7 +407,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 14 + # Round 14 movl 56(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -427,7 +427,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 13 + # Round 13 movl 52(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -447,7 +447,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 12 + # Round 12 movl 48(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -467,7 +467,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 11 + # Round 11 movl 44(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -487,7 +487,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 10 + # Round 10 movl 40(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -507,7 +507,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 9 + # Round 9 movl 36(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -527,7 +527,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 8 + # Round 8 movl 32(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -547,7 +547,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 7 + # Round 7 movl 28(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -567,7 +567,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 6 + # Round 6 movl 24(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -587,7 +587,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 5 + # Round 5 movl 20(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -607,7 +607,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 4 + # Round 4 movl 16(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -627,7 +627,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 3 + # Round 3 movl 12(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -647,7 +647,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%edi - # Round 2 + # Round 2 movl 8(%ebp),%edx movl %edi,%ebx xorl %edx,%esi @@ -667,7 +667,7 @@ L_BF_decrypt_begin: xorl %eax,%eax xorl %ebx,%esi - # Round 1 + # Round 1 movl 4(%ebp),%edx movl %esi,%ebx xorl %edx,%edi @@ -684,7 +684,7 @@ L_BF_decrypt_begin: xorl %eax,%ebx movl 3144(%ebp,%edx,4),%edx addl %edx,%ebx - # Load parameter 0 (1) enc=0 + # Load parameter 0 (1) enc=0 movl 20(%esp),%eax xorl %ebx,%edi movl (%ebp),%edx @@ -706,7 +706,7 @@ L_BF_cbc_encrypt_begin: pushl %esi pushl %edi movl 28(%esp),%ebp - # getting iv ptr from parameter 4 + # getting iv ptr from parameter 4 movl 36(%esp),%ebx movl (%ebx),%esi movl 4(%ebx),%edi @@ -717,9 +717,9 @@ L_BF_cbc_encrypt_begin: movl %esp,%ebx movl 36(%esp),%esi movl 40(%esp),%edi - # getting encrypt flag from parameter 5 + # getting encrypt flag from parameter 5 movl 56(%esp),%ecx - # get and push parameter 3 + # get and push parameter 3 movl 48(%esp),%eax pushl %eax pushl %ebx diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s index 7e6ccce487..11f7e704c0 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s @@ -115,7 +115,7 @@ L001maw_non_sse2: jz L006maw_finish .align 4,0x90 L007maw_loop: - # Round 0 + # Round 0 movl (%ebx),%eax mull %ebp addl %esi,%eax @@ -124,7 +124,7 @@ L007maw_loop: adcl $0,%edx movl %eax,(%edi) movl %edx,%esi - # Round 4 + # Round 4 movl 4(%ebx),%eax mull %ebp addl %esi,%eax @@ -133,7 +133,7 @@ L007maw_loop: adcl $0,%edx movl %eax,4(%edi) movl %edx,%esi - # Round 8 + # Round 8 movl 8(%ebx),%eax mull %ebp addl %esi,%eax @@ -142,7 +142,7 @@ L007maw_loop: adcl $0,%edx movl %eax,8(%edi) movl %edx,%esi - # Round 12 + # Round 12 movl 12(%ebx),%eax mull %ebp addl %esi,%eax @@ -151,7 +151,7 @@ L007maw_loop: adcl $0,%edx movl %eax,12(%edi) movl %edx,%esi - # Round 16 + # Round 16 movl 16(%ebx),%eax mull %ebp addl %esi,%eax @@ -160,7 +160,7 @@ L007maw_loop: adcl $0,%edx movl %eax,16(%edi) movl %edx,%esi - # Round 20 + # Round 20 movl 20(%ebx),%eax mull %ebp addl %esi,%eax @@ -169,7 +169,7 @@ L007maw_loop: adcl $0,%edx movl %eax,20(%edi) movl %edx,%esi - # Round 24 + # Round 24 movl 24(%ebx),%eax mull %ebp addl %esi,%eax @@ -178,7 +178,7 @@ L007maw_loop: adcl $0,%edx movl %eax,24(%edi) movl %edx,%esi - # Round 28 + # Round 28 movl 28(%ebx),%eax mull %ebp addl %esi,%eax @@ -198,7 +198,7 @@ L006maw_finish: jnz L008maw_finish2 jmp L009maw_end L008maw_finish2: - # Tail Round 0 + # Tail Round 0 movl (%ebx),%eax mull %ebp addl %esi,%eax @@ -209,7 +209,7 @@ L008maw_finish2: movl %eax,(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 1 + # Tail Round 1 movl 4(%ebx),%eax mull %ebp addl %esi,%eax @@ -220,7 +220,7 @@ L008maw_finish2: movl %eax,4(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 2 + # Tail Round 2 movl 8(%ebx),%eax mull %ebp addl %esi,%eax @@ -231,7 +231,7 @@ L008maw_finish2: movl %eax,8(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 3 + # Tail Round 3 movl 12(%ebx),%eax mull %ebp addl %esi,%eax @@ -242,7 +242,7 @@ L008maw_finish2: movl %eax,12(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 4 + # Tail Round 4 movl 16(%ebx),%eax mull %ebp addl %esi,%eax @@ -253,7 +253,7 @@ L008maw_finish2: movl %eax,16(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 5 + # Tail Round 5 movl 20(%ebx),%eax mull %ebp addl %esi,%eax @@ -264,7 +264,7 @@ L008maw_finish2: movl %eax,20(%edi) movl %edx,%esi jz L009maw_end - # Tail Round 6 + # Tail Round 6 movl 24(%ebx),%eax mull %ebp addl %esi,%eax @@ -325,56 +325,56 @@ L011mw_non_sse2: andl $4294967288,%ebp jz L013mw_finish L014mw_loop: - # Round 0 + # Round 0 movl (%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,(%edi) movl %edx,%esi - # Round 4 + # Round 4 movl 4(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,4(%edi) movl %edx,%esi - # Round 8 + # Round 8 movl 8(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,8(%edi) movl %edx,%esi - # Round 12 + # Round 12 movl 12(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,12(%edi) movl %edx,%esi - # Round 16 + # Round 16 movl 16(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,16(%edi) movl %edx,%esi - # Round 20 + # Round 20 movl 20(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,20(%edi) movl %edx,%esi - # Round 24 + # Round 24 movl 24(%ebx),%eax mull %ecx addl %esi,%eax adcl $0,%edx movl %eax,24(%edi) movl %edx,%esi - # Round 28 + # Round 28 movl 28(%ebx),%eax mull %ecx addl %esi,%eax @@ -393,7 +393,7 @@ L013mw_finish: jnz L015mw_finish2 jmp L016mw_end L015mw_finish2: - # Tail Round 0 + # Tail Round 0 movl (%ebx),%eax mull %ecx addl %esi,%eax @@ -402,7 +402,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 1 + # Tail Round 1 movl 4(%ebx),%eax mull %ecx addl %esi,%eax @@ -411,7 +411,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 2 + # Tail Round 2 movl 8(%ebx),%eax mull %ecx addl %esi,%eax @@ -420,7 +420,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 3 + # Tail Round 3 movl 12(%ebx),%eax mull %ecx addl %esi,%eax @@ -429,7 +429,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 4 + # Tail Round 4 movl 16(%ebx),%eax mull %ecx addl %esi,%eax @@ -438,7 +438,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 5 + # Tail Round 5 movl 20(%ebx),%eax mull %ecx addl %esi,%eax @@ -447,7 +447,7 @@ L015mw_finish2: movl %edx,%esi decl %ebp jz L016mw_end - # Tail Round 6 + # Tail Round 6 movl 24(%ebx),%eax mull %ecx addl %esi,%eax @@ -498,42 +498,42 @@ L018sqr_non_sse2: andl $4294967288,%ebx jz L020sw_finish L021sw_loop: - # Round 0 + # Round 0 movl (%edi),%eax mull %eax movl %eax,(%esi) movl %edx,4(%esi) - # Round 4 + # Round 4 movl 4(%edi),%eax mull %eax movl %eax,8(%esi) movl %edx,12(%esi) - # Round 8 + # Round 8 movl 8(%edi),%eax mull %eax movl %eax,16(%esi) movl %edx,20(%esi) - # Round 12 + # Round 12 movl 12(%edi),%eax mull %eax movl %eax,24(%esi) movl %edx,28(%esi) - # Round 16 + # Round 16 movl 16(%edi),%eax mull %eax movl %eax,32(%esi) movl %edx,36(%esi) - # Round 20 + # Round 20 movl 20(%edi),%eax mull %eax movl %eax,40(%esi) movl %edx,44(%esi) - # Round 24 + # Round 24 movl 24(%edi),%eax mull %eax movl %eax,48(%esi) movl %edx,52(%esi) - # Round 28 + # Round 28 movl 28(%edi),%eax mull %eax movl %eax,56(%esi) @@ -547,49 +547,49 @@ L020sw_finish: movl 28(%esp),%ebx andl $7,%ebx jz L022sw_end - # Tail Round 0 + # Tail Round 0 movl (%edi),%eax mull %eax movl %eax,(%esi) decl %ebx movl %edx,4(%esi) jz L022sw_end - # Tail Round 1 + # Tail Round 1 movl 4(%edi),%eax mull %eax movl %eax,8(%esi) decl %ebx movl %edx,12(%esi) jz L022sw_end - # Tail Round 2 + # Tail Round 2 movl 8(%edi),%eax mull %eax movl %eax,16(%esi) decl %ebx movl %edx,20(%esi) jz L022sw_end - # Tail Round 3 + # Tail Round 3 movl 12(%edi),%eax mull %eax movl %eax,24(%esi) decl %ebx movl %edx,28(%esi) jz L022sw_end - # Tail Round 4 + # Tail Round 4 movl 16(%edi),%eax mull %eax movl %eax,32(%esi) decl %ebx movl %edx,36(%esi) jz L022sw_end - # Tail Round 5 + # Tail Round 5 movl 20(%edi),%eax mull %eax movl %eax,40(%esi) decl %ebx movl %edx,44(%esi) jz L022sw_end - # Tail Round 6 + # Tail Round 6 movl 24(%edi),%eax mull %eax movl %eax,48(%esi) @@ -626,7 +626,7 @@ L_bn_add_words_begin: andl $4294967288,%ebp jz L023aw_finish L024aw_loop: - # Round 0 + # Round 0 movl (%esi),%ecx movl (%edi),%edx addl %eax,%ecx @@ -635,7 +635,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # Round 1 + # Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx addl %eax,%ecx @@ -644,7 +644,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # Round 2 + # Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx addl %eax,%ecx @@ -653,7 +653,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # Round 3 + # Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx addl %eax,%ecx @@ -662,7 +662,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # Round 4 + # Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx addl %eax,%ecx @@ -671,7 +671,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # Round 5 + # Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx addl %eax,%ecx @@ -680,7 +680,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # Round 6 + # Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx addl %eax,%ecx @@ -689,7 +689,7 @@ L024aw_loop: addl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # Round 7 + # Round 7 movl 28(%esi),%ecx movl 28(%edi),%edx addl %eax,%ecx @@ -708,7 +708,7 @@ L023aw_finish: movl 32(%esp),%ebp andl $7,%ebp jz L025aw_end - # Tail Round 0 + # Tail Round 0 movl (%esi),%ecx movl (%edi),%edx addl %eax,%ecx @@ -719,7 +719,7 @@ L023aw_finish: decl %ebp movl %ecx,(%ebx) jz L025aw_end - # Tail Round 1 + # Tail Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx addl %eax,%ecx @@ -730,7 +730,7 @@ L023aw_finish: decl %ebp movl %ecx,4(%ebx) jz L025aw_end - # Tail Round 2 + # Tail Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx addl %eax,%ecx @@ -741,7 +741,7 @@ L023aw_finish: decl %ebp movl %ecx,8(%ebx) jz L025aw_end - # Tail Round 3 + # Tail Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx addl %eax,%ecx @@ -752,7 +752,7 @@ L023aw_finish: decl %ebp movl %ecx,12(%ebx) jz L025aw_end - # Tail Round 4 + # Tail Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx addl %eax,%ecx @@ -763,7 +763,7 @@ L023aw_finish: decl %ebp movl %ecx,16(%ebx) jz L025aw_end - # Tail Round 5 + # Tail Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx addl %eax,%ecx @@ -774,7 +774,7 @@ L023aw_finish: decl %ebp movl %ecx,20(%ebx) jz L025aw_end - # Tail Round 6 + # Tail Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx addl %eax,%ecx @@ -806,7 +806,7 @@ L_bn_sub_words_begin: andl $4294967288,%ebp jz L026aw_finish L027aw_loop: - # Round 0 + # Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -815,7 +815,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # Round 1 + # Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -824,7 +824,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # Round 2 + # Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -833,7 +833,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # Round 3 + # Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -842,7 +842,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # Round 4 + # Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -851,7 +851,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # Round 5 + # Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -860,7 +860,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # Round 6 + # Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -869,7 +869,7 @@ L027aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # Round 7 + # Round 7 movl 28(%esi),%ecx movl 28(%edi),%edx subl %eax,%ecx @@ -888,7 +888,7 @@ L026aw_finish: movl 32(%esp),%ebp andl $7,%ebp jz L028aw_end - # Tail Round 0 + # Tail Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -899,7 +899,7 @@ L026aw_finish: decl %ebp movl %ecx,(%ebx) jz L028aw_end - # Tail Round 1 + # Tail Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -910,7 +910,7 @@ L026aw_finish: decl %ebp movl %ecx,4(%ebx) jz L028aw_end - # Tail Round 2 + # Tail Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -921,7 +921,7 @@ L026aw_finish: decl %ebp movl %ecx,8(%ebx) jz L028aw_end - # Tail Round 3 + # Tail Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -932,7 +932,7 @@ L026aw_finish: decl %ebp movl %ecx,12(%ebx) jz L028aw_end - # Tail Round 4 + # Tail Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -943,7 +943,7 @@ L026aw_finish: decl %ebp movl %ecx,16(%ebx) jz L028aw_end - # Tail Round 5 + # Tail Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -954,7 +954,7 @@ L026aw_finish: decl %ebp movl %ecx,20(%ebx) jz L028aw_end - # Tail Round 6 + # Tail Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -986,7 +986,7 @@ L_bn_sub_part_words_begin: andl $4294967288,%ebp jz L029aw_finish L030aw_loop: - # Round 0 + # Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -995,7 +995,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # Round 1 + # Round 1 movl 4(%esi),%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -1004,7 +1004,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # Round 2 + # Round 2 movl 8(%esi),%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -1013,7 +1013,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # Round 3 + # Round 3 movl 12(%esi),%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -1022,7 +1022,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # Round 4 + # Round 4 movl 16(%esi),%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -1031,7 +1031,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # Round 5 + # Round 5 movl 20(%esi),%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -1040,7 +1040,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # Round 6 + # Round 6 movl 24(%esi),%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -1049,7 +1049,7 @@ L030aw_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # Round 7 + # Round 7 movl 28(%esi),%ecx movl 28(%edi),%edx subl %eax,%ecx @@ -1068,7 +1068,7 @@ L029aw_finish: movl 32(%esp),%ebp andl $7,%ebp jz L031aw_end - # Tail Round 0 + # Tail Round 0 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1082,7 +1082,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 1 + # Tail Round 1 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1096,7 +1096,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 2 + # Tail Round 2 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1110,7 +1110,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 3 + # Tail Round 3 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1124,7 +1124,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 4 + # Tail Round 4 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1138,7 +1138,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 5 + # Tail Round 5 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1152,7 +1152,7 @@ L029aw_finish: addl $4,%ebx decl %ebp jz L031aw_end - # Tail Round 6 + # Tail Round 6 movl (%esi),%ecx movl (%edi),%edx subl %eax,%ecx @@ -1171,14 +1171,14 @@ L031aw_end: cmpl $0,%ebp je L032pw_end jge L033pw_pos - # pw_neg + # pw_neg movl $0,%edx subl %ebp,%edx movl %edx,%ebp andl $4294967288,%ebp jz L034pw_neg_finish L035pw_neg_loop: - # dl<0 Round 0 + # dl<0 Round 0 movl $0,%ecx movl (%edi),%edx subl %eax,%ecx @@ -1187,7 +1187,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,(%ebx) - # dl<0 Round 1 + # dl<0 Round 1 movl $0,%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -1196,7 +1196,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,4(%ebx) - # dl<0 Round 2 + # dl<0 Round 2 movl $0,%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -1205,7 +1205,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,8(%ebx) - # dl<0 Round 3 + # dl<0 Round 3 movl $0,%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -1214,7 +1214,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,12(%ebx) - # dl<0 Round 4 + # dl<0 Round 4 movl $0,%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -1223,7 +1223,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,16(%ebx) - # dl<0 Round 5 + # dl<0 Round 5 movl $0,%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -1232,7 +1232,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,20(%ebx) - # dl<0 Round 6 + # dl<0 Round 6 movl $0,%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -1241,7 +1241,7 @@ L035pw_neg_loop: subl %edx,%ecx adcl $0,%eax movl %ecx,24(%ebx) - # dl<0 Round 7 + # dl<0 Round 7 movl $0,%ecx movl 28(%edi),%edx subl %eax,%ecx @@ -1261,7 +1261,7 @@ L034pw_neg_finish: subl %edx,%ebp andl $7,%ebp jz L032pw_end - # dl<0 Tail Round 0 + # dl<0 Tail Round 0 movl $0,%ecx movl (%edi),%edx subl %eax,%ecx @@ -1272,7 +1272,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,(%ebx) jz L032pw_end - # dl<0 Tail Round 1 + # dl<0 Tail Round 1 movl $0,%ecx movl 4(%edi),%edx subl %eax,%ecx @@ -1283,7 +1283,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,4(%ebx) jz L032pw_end - # dl<0 Tail Round 2 + # dl<0 Tail Round 2 movl $0,%ecx movl 8(%edi),%edx subl %eax,%ecx @@ -1294,7 +1294,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,8(%ebx) jz L032pw_end - # dl<0 Tail Round 3 + # dl<0 Tail Round 3 movl $0,%ecx movl 12(%edi),%edx subl %eax,%ecx @@ -1305,7 +1305,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,12(%ebx) jz L032pw_end - # dl<0 Tail Round 4 + # dl<0 Tail Round 4 movl $0,%ecx movl 16(%edi),%edx subl %eax,%ecx @@ -1316,7 +1316,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,16(%ebx) jz L032pw_end - # dl<0 Tail Round 5 + # dl<0 Tail Round 5 movl $0,%ecx movl 20(%edi),%edx subl %eax,%ecx @@ -1327,7 +1327,7 @@ L034pw_neg_finish: decl %ebp movl %ecx,20(%ebx) jz L032pw_end - # dl<0 Tail Round 6 + # dl<0 Tail Round 6 movl $0,%ecx movl 24(%edi),%edx subl %eax,%ecx @@ -1341,42 +1341,42 @@ L033pw_pos: andl $4294967288,%ebp jz L036pw_pos_finish L037pw_pos_loop: - # dl>0 Round 0 + # dl>0 Round 0 movl (%esi),%ecx subl %eax,%ecx movl %ecx,(%ebx) jnc L038pw_nc0 - # dl>0 Round 1 + # dl>0 Round 1 movl 4(%esi),%ecx subl %eax,%ecx movl %ecx,4(%ebx) jnc L039pw_nc1 - # dl>0 Round 2 + # dl>0 Round 2 movl 8(%esi),%ecx subl %eax,%ecx movl %ecx,8(%ebx) jnc L040pw_nc2 - # dl>0 Round 3 + # dl>0 Round 3 movl 12(%esi),%ecx subl %eax,%ecx movl %ecx,12(%ebx) jnc L041pw_nc3 - # dl>0 Round 4 + # dl>0 Round 4 movl 16(%esi),%ecx subl %eax,%ecx movl %ecx,16(%ebx) jnc L042pw_nc4 - # dl>0 Round 5 + # dl>0 Round 5 movl 20(%esi),%ecx subl %eax,%ecx movl %ecx,20(%ebx) jnc L043pw_nc5 - # dl>0 Round 6 + # dl>0 Round 6 movl 24(%esi),%ecx subl %eax,%ecx movl %ecx,24(%ebx) jnc L044pw_nc6 - # dl>0 Round 7 + # dl>0 Round 7 movl 28(%esi),%ecx subl %eax,%ecx movl %ecx,28(%ebx) @@ -1390,49 +1390,49 @@ L036pw_pos_finish: movl 36(%esp),%ebp andl $7,%ebp jz L032pw_end - # dl>0 Tail Round 0 + # dl>0 Tail Round 0 movl (%esi),%ecx subl %eax,%ecx movl %ecx,(%ebx) jnc L046pw_tail_nc0 decl %ebp jz L032pw_end - # dl>0 Tail Round 1 + # dl>0 Tail Round 1 movl 4(%esi),%ecx subl %eax,%ecx movl %ecx,4(%ebx) jnc L047pw_tail_nc1 decl %ebp jz L032pw_end - # dl>0 Tail Round 2 + # dl>0 Tail Round 2 movl 8(%esi),%ecx subl %eax,%ecx movl %ecx,8(%ebx) jnc L048pw_tail_nc2 decl %ebp jz L032pw_end - # dl>0 Tail Round 3 + # dl>0 Tail Round 3 movl 12(%esi),%ecx subl %eax,%ecx movl %ecx,12(%ebx) jnc L049pw_tail_nc3 decl %ebp jz L032pw_end - # dl>0 Tail Round 4 + # dl>0 Tail Round 4 movl 16(%esi),%ecx subl %eax,%ecx movl %ecx,16(%ebx) jnc L050pw_tail_nc4 decl %ebp jz L032pw_end - # dl>0 Tail Round 5 + # dl>0 Tail Round 5 movl 20(%esi),%ecx subl %eax,%ecx movl %ecx,20(%ebx) jnc L051pw_tail_nc5 decl %ebp jz L032pw_end - # dl>0 Tail Round 6 + # dl>0 Tail Round 6 movl 24(%esi),%ecx subl %eax,%ecx movl %ecx,24(%ebx) diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s index d82fdcbc7d..3e49f0a867 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s @@ -14,9 +14,9 @@ L_bn_mul_comba8_begin: movl (%esi),%eax xorl %ecx,%ecx movl (%edi),%edx - # ################## Calculate word 0 + # ################## Calculate word 0 xorl %ebp,%ebp - # mul a[0]*b[0] + # mul a[0]*b[0] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -25,17 +25,17 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,(%eax) movl 4(%esi),%eax - # saved r[0] - # ################## Calculate word 1 + # saved r[0] + # ################## Calculate word 1 xorl %ebx,%ebx - # mul a[1]*b[0] + # mul a[1]*b[0] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[0]*b[1] + # mul a[0]*b[1] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -44,24 +44,24 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,4(%eax) movl 8(%esi),%eax - # saved r[1] - # ################## Calculate word 2 + # saved r[1] + # ################## Calculate word 2 xorl %ecx,%ecx - # mul a[2]*b[0] + # mul a[2]*b[0] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 4(%edi),%edx adcl $0,%ecx - # mul a[1]*b[1] + # mul a[1]*b[1] mull %edx addl %eax,%ebp movl (%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[0]*b[2] + # mul a[0]*b[2] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -70,31 +70,31 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,8(%eax) movl 12(%esi),%eax - # saved r[2] - # ################## Calculate word 3 + # saved r[2] + # ################## Calculate word 3 xorl %ebp,%ebp - # mul a[3]*b[0] + # mul a[3]*b[0] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 4(%edi),%edx adcl $0,%ebp - # mul a[2]*b[1] + # mul a[2]*b[1] mull %edx addl %eax,%ebx movl 4(%esi),%eax adcl %edx,%ecx movl 8(%edi),%edx adcl $0,%ebp - # mul a[1]*b[2] + # mul a[1]*b[2] mull %edx addl %eax,%ebx movl (%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[0]*b[3] + # mul a[0]*b[3] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -103,38 +103,38 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,12(%eax) movl 16(%esi),%eax - # saved r[3] - # ################## Calculate word 4 + # saved r[3] + # ################## Calculate word 4 xorl %ebx,%ebx - # mul a[4]*b[0] + # mul a[4]*b[0] mull %edx addl %eax,%ecx movl 12(%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[3]*b[1] + # mul a[3]*b[1] mull %edx addl %eax,%ecx movl 8(%esi),%eax adcl %edx,%ebp movl 8(%edi),%edx adcl $0,%ebx - # mul a[2]*b[2] + # mul a[2]*b[2] mull %edx addl %eax,%ecx movl 4(%esi),%eax adcl %edx,%ebp movl 12(%edi),%edx adcl $0,%ebx - # mul a[1]*b[3] + # mul a[1]*b[3] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 16(%edi),%edx adcl $0,%ebx - # mul a[0]*b[4] + # mul a[0]*b[4] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -143,45 +143,45 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,16(%eax) movl 20(%esi),%eax - # saved r[4] - # ################## Calculate word 5 + # saved r[4] + # ################## Calculate word 5 xorl %ecx,%ecx - # mul a[5]*b[0] + # mul a[5]*b[0] mull %edx addl %eax,%ebp movl 16(%esi),%eax adcl %edx,%ebx movl 4(%edi),%edx adcl $0,%ecx - # mul a[4]*b[1] + # mul a[4]*b[1] mull %edx addl %eax,%ebp movl 12(%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[3]*b[2] + # mul a[3]*b[2] mull %edx addl %eax,%ebp movl 8(%esi),%eax adcl %edx,%ebx movl 12(%edi),%edx adcl $0,%ecx - # mul a[2]*b[3] + # mul a[2]*b[3] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 16(%edi),%edx adcl $0,%ecx - # mul a[1]*b[4] + # mul a[1]*b[4] mull %edx addl %eax,%ebp movl (%esi),%eax adcl %edx,%ebx movl 20(%edi),%edx adcl $0,%ecx - # mul a[0]*b[5] + # mul a[0]*b[5] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -190,52 +190,52 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,20(%eax) movl 24(%esi),%eax - # saved r[5] - # ################## Calculate word 6 + # saved r[5] + # ################## Calculate word 6 xorl %ebp,%ebp - # mul a[6]*b[0] + # mul a[6]*b[0] mull %edx addl %eax,%ebx movl 20(%esi),%eax adcl %edx,%ecx movl 4(%edi),%edx adcl $0,%ebp - # mul a[5]*b[1] + # mul a[5]*b[1] mull %edx addl %eax,%ebx movl 16(%esi),%eax adcl %edx,%ecx movl 8(%edi),%edx adcl $0,%ebp - # mul a[4]*b[2] + # mul a[4]*b[2] mull %edx addl %eax,%ebx movl 12(%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[3]*b[3] + # mul a[3]*b[3] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 16(%edi),%edx adcl $0,%ebp - # mul a[2]*b[4] + # mul a[2]*b[4] mull %edx addl %eax,%ebx movl 4(%esi),%eax adcl %edx,%ecx movl 20(%edi),%edx adcl $0,%ebp - # mul a[1]*b[5] + # mul a[1]*b[5] mull %edx addl %eax,%ebx movl (%esi),%eax adcl %edx,%ecx movl 24(%edi),%edx adcl $0,%ebp - # mul a[0]*b[6] + # mul a[0]*b[6] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -244,59 +244,59 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,24(%eax) movl 28(%esi),%eax - # saved r[6] - # ################## Calculate word 7 + # saved r[6] + # ################## Calculate word 7 xorl %ebx,%ebx - # mul a[7]*b[0] + # mul a[7]*b[0] mull %edx addl %eax,%ecx movl 24(%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[6]*b[1] + # mul a[6]*b[1] mull %edx addl %eax,%ecx movl 20(%esi),%eax adcl %edx,%ebp movl 8(%edi),%edx adcl $0,%ebx - # mul a[5]*b[2] + # mul a[5]*b[2] mull %edx addl %eax,%ecx movl 16(%esi),%eax adcl %edx,%ebp movl 12(%edi),%edx adcl $0,%ebx - # mul a[4]*b[3] + # mul a[4]*b[3] mull %edx addl %eax,%ecx movl 12(%esi),%eax adcl %edx,%ebp movl 16(%edi),%edx adcl $0,%ebx - # mul a[3]*b[4] + # mul a[3]*b[4] mull %edx addl %eax,%ecx movl 8(%esi),%eax adcl %edx,%ebp movl 20(%edi),%edx adcl $0,%ebx - # mul a[2]*b[5] + # mul a[2]*b[5] mull %edx addl %eax,%ecx movl 4(%esi),%eax adcl %edx,%ebp movl 24(%edi),%edx adcl $0,%ebx - # mul a[1]*b[6] + # mul a[1]*b[6] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 28(%edi),%edx adcl $0,%ebx - # mul a[0]*b[7] + # mul a[0]*b[7] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -305,52 +305,52 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,28(%eax) movl 28(%esi),%eax - # saved r[7] - # ################## Calculate word 8 + # saved r[7] + # ################## Calculate word 8 xorl %ecx,%ecx - # mul a[7]*b[1] + # mul a[7]*b[1] mull %edx addl %eax,%ebp movl 24(%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[6]*b[2] + # mul a[6]*b[2] mull %edx addl %eax,%ebp movl 20(%esi),%eax adcl %edx,%ebx movl 12(%edi),%edx adcl $0,%ecx - # mul a[5]*b[3] + # mul a[5]*b[3] mull %edx addl %eax,%ebp movl 16(%esi),%eax adcl %edx,%ebx movl 16(%edi),%edx adcl $0,%ecx - # mul a[4]*b[4] + # mul a[4]*b[4] mull %edx addl %eax,%ebp movl 12(%esi),%eax adcl %edx,%ebx movl 20(%edi),%edx adcl $0,%ecx - # mul a[3]*b[5] + # mul a[3]*b[5] mull %edx addl %eax,%ebp movl 8(%esi),%eax adcl %edx,%ebx movl 24(%edi),%edx adcl $0,%ecx - # mul a[2]*b[6] + # mul a[2]*b[6] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 28(%edi),%edx adcl $0,%ecx - # mul a[1]*b[7] + # mul a[1]*b[7] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -359,45 +359,45 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,32(%eax) movl 28(%esi),%eax - # saved r[8] - # ################## Calculate word 9 + # saved r[8] + # ################## Calculate word 9 xorl %ebp,%ebp - # mul a[7]*b[2] + # mul a[7]*b[2] mull %edx addl %eax,%ebx movl 24(%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[6]*b[3] + # mul a[6]*b[3] mull %edx addl %eax,%ebx movl 20(%esi),%eax adcl %edx,%ecx movl 16(%edi),%edx adcl $0,%ebp - # mul a[5]*b[4] + # mul a[5]*b[4] mull %edx addl %eax,%ebx movl 16(%esi),%eax adcl %edx,%ecx movl 20(%edi),%edx adcl $0,%ebp - # mul a[4]*b[5] + # mul a[4]*b[5] mull %edx addl %eax,%ebx movl 12(%esi),%eax adcl %edx,%ecx movl 24(%edi),%edx adcl $0,%ebp - # mul a[3]*b[6] + # mul a[3]*b[6] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 28(%edi),%edx adcl $0,%ebp - # mul a[2]*b[7] + # mul a[2]*b[7] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -406,38 +406,38 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,36(%eax) movl 28(%esi),%eax - # saved r[9] - # ################## Calculate word 10 + # saved r[9] + # ################## Calculate word 10 xorl %ebx,%ebx - # mul a[7]*b[3] + # mul a[7]*b[3] mull %edx addl %eax,%ecx movl 24(%esi),%eax adcl %edx,%ebp movl 16(%edi),%edx adcl $0,%ebx - # mul a[6]*b[4] + # mul a[6]*b[4] mull %edx addl %eax,%ecx movl 20(%esi),%eax adcl %edx,%ebp movl 20(%edi),%edx adcl $0,%ebx - # mul a[5]*b[5] + # mul a[5]*b[5] mull %edx addl %eax,%ecx movl 16(%esi),%eax adcl %edx,%ebp movl 24(%edi),%edx adcl $0,%ebx - # mul a[4]*b[6] + # mul a[4]*b[6] mull %edx addl %eax,%ecx movl 12(%esi),%eax adcl %edx,%ebp movl 28(%edi),%edx adcl $0,%ebx - # mul a[3]*b[7] + # mul a[3]*b[7] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -446,31 +446,31 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,40(%eax) movl 28(%esi),%eax - # saved r[10] - # ################## Calculate word 11 + # saved r[10] + # ################## Calculate word 11 xorl %ecx,%ecx - # mul a[7]*b[4] + # mul a[7]*b[4] mull %edx addl %eax,%ebp movl 24(%esi),%eax adcl %edx,%ebx movl 20(%edi),%edx adcl $0,%ecx - # mul a[6]*b[5] + # mul a[6]*b[5] mull %edx addl %eax,%ebp movl 20(%esi),%eax adcl %edx,%ebx movl 24(%edi),%edx adcl $0,%ecx - # mul a[5]*b[6] + # mul a[5]*b[6] mull %edx addl %eax,%ebp movl 16(%esi),%eax adcl %edx,%ebx movl 28(%edi),%edx adcl $0,%ecx - # mul a[4]*b[7] + # mul a[4]*b[7] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -479,24 +479,24 @@ L_bn_mul_comba8_begin: adcl $0,%ecx movl %ebp,44(%eax) movl 28(%esi),%eax - # saved r[11] - # ################## Calculate word 12 + # saved r[11] + # ################## Calculate word 12 xorl %ebp,%ebp - # mul a[7]*b[5] + # mul a[7]*b[5] mull %edx addl %eax,%ebx movl 24(%esi),%eax adcl %edx,%ecx movl 24(%edi),%edx adcl $0,%ebp - # mul a[6]*b[6] + # mul a[6]*b[6] mull %edx addl %eax,%ebx movl 20(%esi),%eax adcl %edx,%ecx movl 28(%edi),%edx adcl $0,%ebp - # mul a[5]*b[7] + # mul a[5]*b[7] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -505,17 +505,17 @@ L_bn_mul_comba8_begin: adcl $0,%ebp movl %ebx,48(%eax) movl 28(%esi),%eax - # saved r[12] - # ################## Calculate word 13 + # saved r[12] + # ################## Calculate word 13 xorl %ebx,%ebx - # mul a[7]*b[6] + # mul a[7]*b[6] mull %edx addl %eax,%ecx movl 24(%esi),%eax adcl %edx,%ebp movl 28(%edi),%edx adcl $0,%ebx - # mul a[6]*b[7] + # mul a[6]*b[7] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -524,18 +524,18 @@ L_bn_mul_comba8_begin: adcl $0,%ebx movl %ecx,52(%eax) movl 28(%esi),%eax - # saved r[13] - # ################## Calculate word 14 + # saved r[13] + # ################## Calculate word 14 xorl %ecx,%ecx - # mul a[7]*b[7] + # mul a[7]*b[7] mull %edx addl %eax,%ebp movl 20(%esp),%eax adcl %edx,%ebx adcl $0,%ecx movl %ebp,56(%eax) - # saved r[14] - # save r[15] + # saved r[14] + # save r[15] movl %ebx,60(%eax) popl %ebx popl %ebp @@ -556,9 +556,9 @@ L_bn_mul_comba4_begin: movl (%esi),%eax xorl %ecx,%ecx movl (%edi),%edx - # ################## Calculate word 0 + # ################## Calculate word 0 xorl %ebp,%ebp - # mul a[0]*b[0] + # mul a[0]*b[0] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -567,17 +567,17 @@ L_bn_mul_comba4_begin: adcl $0,%ebp movl %ebx,(%eax) movl 4(%esi),%eax - # saved r[0] - # ################## Calculate word 1 + # saved r[0] + # ################## Calculate word 1 xorl %ebx,%ebx - # mul a[1]*b[0] + # mul a[1]*b[0] mull %edx addl %eax,%ecx movl (%esi),%eax adcl %edx,%ebp movl 4(%edi),%edx adcl $0,%ebx - # mul a[0]*b[1] + # mul a[0]*b[1] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -586,24 +586,24 @@ L_bn_mul_comba4_begin: adcl $0,%ebx movl %ecx,4(%eax) movl 8(%esi),%eax - # saved r[1] - # ################## Calculate word 2 + # saved r[1] + # ################## Calculate word 2 xorl %ecx,%ecx - # mul a[2]*b[0] + # mul a[2]*b[0] mull %edx addl %eax,%ebp movl 4(%esi),%eax adcl %edx,%ebx movl 4(%edi),%edx adcl $0,%ecx - # mul a[1]*b[1] + # mul a[1]*b[1] mull %edx addl %eax,%ebp movl (%esi),%eax adcl %edx,%ebx movl 8(%edi),%edx adcl $0,%ecx - # mul a[0]*b[2] + # mul a[0]*b[2] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -612,31 +612,31 @@ L_bn_mul_comba4_begin: adcl $0,%ecx movl %ebp,8(%eax) movl 12(%esi),%eax - # saved r[2] - # ################## Calculate word 3 + # saved r[2] + # ################## Calculate word 3 xorl %ebp,%ebp - # mul a[3]*b[0] + # mul a[3]*b[0] mull %edx addl %eax,%ebx movl 8(%esi),%eax adcl %edx,%ecx movl 4(%edi),%edx adcl $0,%ebp - # mul a[2]*b[1] + # mul a[2]*b[1] mull %edx addl %eax,%ebx movl 4(%esi),%eax adcl %edx,%ecx movl 8(%edi),%edx adcl $0,%ebp - # mul a[1]*b[2] + # mul a[1]*b[2] mull %edx addl %eax,%ebx movl (%esi),%eax adcl %edx,%ecx movl 12(%edi),%edx adcl $0,%ebp - # mul a[0]*b[3] + # mul a[0]*b[3] mull %edx addl %eax,%ebx movl 20(%esp),%eax @@ -645,24 +645,24 @@ L_bn_mul_comba4_begin: adcl $0,%ebp movl %ebx,12(%eax) movl 12(%esi),%eax - # saved r[3] - # ################## Calculate word 4 + # saved r[3] + # ################## Calculate word 4 xorl %ebx,%ebx - # mul a[3]*b[1] + # mul a[3]*b[1] mull %edx addl %eax,%ecx movl 8(%esi),%eax adcl %edx,%ebp movl 8(%edi),%edx adcl $0,%ebx - # mul a[2]*b[2] + # mul a[2]*b[2] mull %edx addl %eax,%ecx movl 4(%esi),%eax adcl %edx,%ebp movl 12(%edi),%edx adcl $0,%ebx - # mul a[1]*b[3] + # mul a[1]*b[3] mull %edx addl %eax,%ecx movl 20(%esp),%eax @@ -671,17 +671,17 @@ L_bn_mul_comba4_begin: adcl $0,%ebx movl %ecx,16(%eax) movl 12(%esi),%eax - # saved r[4] - # ################## Calculate word 5 + # saved r[4] + # ################## Calculate word 5 xorl %ecx,%ecx - # mul a[3]*b[2] + # mul a[3]*b[2] mull %edx addl %eax,%ebp movl 8(%esi),%eax adcl %edx,%ebx movl 12(%edi),%edx adcl $0,%ecx - # mul a[2]*b[3] + # mul a[2]*b[3] mull %edx addl %eax,%ebp movl 20(%esp),%eax @@ -690,18 +690,18 @@ L_bn_mul_comba4_begin: adcl $0,%ecx movl %ebp,20(%eax) movl 12(%esi),%eax - # saved r[5] - # ################## Calculate word 6 + # saved r[5] + # ################## Calculate word 6 xorl %ebp,%ebp - # mul a[3]*b[3] + # mul a[3]*b[3] mull %edx addl %eax,%ebx movl 20(%esp),%eax adcl %edx,%ecx adcl $0,%ebp movl %ebx,24(%eax) - # saved r[6] - # save r[7] + # saved r[6] + # save r[7] movl %ecx,28(%eax) popl %ebx popl %ebp @@ -721,9 +721,9 @@ L_bn_sqr_comba8_begin: xorl %ebx,%ebx xorl %ecx,%ecx movl (%esi),%eax - # ############### Calculate word 0 + # ############### Calculate word 0 xorl %ebp,%ebp - # sqr a[0]*a[0] + # sqr a[0]*a[0] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -731,10 +731,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,(%edi) movl 4(%esi),%eax - # saved r[0] - # ############### Calculate word 1 + # saved r[0] + # ############### Calculate word 1 xorl %ebx,%ebx - # sqr a[1]*a[0] + # sqr a[1]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -745,10 +745,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,4(%edi) movl (%esi),%edx - # saved r[1] - # ############### Calculate word 2 + # saved r[1] + # ############### Calculate word 2 xorl %ecx,%ecx - # sqr a[2]*a[0] + # sqr a[2]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -757,7 +757,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebx movl 4(%esi),%eax adcl $0,%ecx - # sqr a[1]*a[1] + # sqr a[1]*a[1] mull %eax addl %eax,%ebp adcl %edx,%ebx @@ -765,10 +765,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,8(%edi) movl 12(%esi),%eax - # saved r[2] - # ############### Calculate word 3 + # saved r[2] + # ############### Calculate word 3 xorl %ebp,%ebp - # sqr a[3]*a[0] + # sqr a[3]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -778,7 +778,7 @@ L_bn_sqr_comba8_begin: movl 8(%esi),%eax adcl $0,%ebp movl 4(%esi),%edx - # sqr a[2]*a[1] + # sqr a[2]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -789,10 +789,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,12(%edi) movl (%esi),%edx - # saved r[3] - # ############### Calculate word 4 + # saved r[3] + # ############### Calculate word 4 xorl %ebx,%ebx - # sqr a[4]*a[0] + # sqr a[4]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -802,7 +802,7 @@ L_bn_sqr_comba8_begin: movl 12(%esi),%eax adcl $0,%ebx movl 4(%esi),%edx - # sqr a[3]*a[1] + # sqr a[3]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -811,7 +811,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebp movl 8(%esi),%eax adcl $0,%ebx - # sqr a[2]*a[2] + # sqr a[2]*a[2] mull %eax addl %eax,%ecx adcl %edx,%ebp @@ -819,10 +819,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,16(%edi) movl 20(%esi),%eax - # saved r[4] - # ############### Calculate word 5 + # saved r[4] + # ############### Calculate word 5 xorl %ecx,%ecx - # sqr a[5]*a[0] + # sqr a[5]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -832,7 +832,7 @@ L_bn_sqr_comba8_begin: movl 16(%esi),%eax adcl $0,%ecx movl 4(%esi),%edx - # sqr a[4]*a[1] + # sqr a[4]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -842,7 +842,7 @@ L_bn_sqr_comba8_begin: movl 12(%esi),%eax adcl $0,%ecx movl 8(%esi),%edx - # sqr a[3]*a[2] + # sqr a[3]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -853,10 +853,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,20(%edi) movl (%esi),%edx - # saved r[5] - # ############### Calculate word 6 + # saved r[5] + # ############### Calculate word 6 xorl %ebp,%ebp - # sqr a[6]*a[0] + # sqr a[6]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -866,7 +866,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ebp movl 4(%esi),%edx - # sqr a[5]*a[1] + # sqr a[5]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -876,7 +876,7 @@ L_bn_sqr_comba8_begin: movl 16(%esi),%eax adcl $0,%ebp movl 8(%esi),%edx - # sqr a[4]*a[2] + # sqr a[4]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -885,7 +885,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ecx movl 12(%esi),%eax adcl $0,%ebp - # sqr a[3]*a[3] + # sqr a[3]*a[3] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -893,10 +893,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,24(%edi) movl 28(%esi),%eax - # saved r[6] - # ############### Calculate word 7 + # saved r[6] + # ############### Calculate word 7 xorl %ebx,%ebx - # sqr a[7]*a[0] + # sqr a[7]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -906,7 +906,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ebx movl 4(%esi),%edx - # sqr a[6]*a[1] + # sqr a[6]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -916,7 +916,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ebx movl 8(%esi),%edx - # sqr a[5]*a[2] + # sqr a[5]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -926,7 +926,7 @@ L_bn_sqr_comba8_begin: movl 16(%esi),%eax adcl $0,%ebx movl 12(%esi),%edx - # sqr a[4]*a[3] + # sqr a[4]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -937,10 +937,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,28(%edi) movl 4(%esi),%edx - # saved r[7] - # ############### Calculate word 8 + # saved r[7] + # ############### Calculate word 8 xorl %ecx,%ecx - # sqr a[7]*a[1] + # sqr a[7]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -950,7 +950,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ecx movl 8(%esi),%edx - # sqr a[6]*a[2] + # sqr a[6]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -960,7 +960,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ecx movl 12(%esi),%edx - # sqr a[5]*a[3] + # sqr a[5]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -969,7 +969,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebx movl 16(%esi),%eax adcl $0,%ecx - # sqr a[4]*a[4] + # sqr a[4]*a[4] mull %eax addl %eax,%ebp adcl %edx,%ebx @@ -977,10 +977,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,32(%edi) movl 28(%esi),%eax - # saved r[8] - # ############### Calculate word 9 + # saved r[8] + # ############### Calculate word 9 xorl %ebp,%ebp - # sqr a[7]*a[2] + # sqr a[7]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -990,7 +990,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ebp movl 12(%esi),%edx - # sqr a[6]*a[3] + # sqr a[6]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1000,7 +1000,7 @@ L_bn_sqr_comba8_begin: movl 20(%esi),%eax adcl $0,%ebp movl 16(%esi),%edx - # sqr a[5]*a[4] + # sqr a[5]*a[4] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1011,10 +1011,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,36(%edi) movl 12(%esi),%edx - # saved r[9] - # ############### Calculate word 10 + # saved r[9] + # ############### Calculate word 10 xorl %ebx,%ebx - # sqr a[7]*a[3] + # sqr a[7]*a[3] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1024,7 +1024,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ebx movl 16(%esi),%edx - # sqr a[6]*a[4] + # sqr a[6]*a[4] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1033,7 +1033,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ebp movl 20(%esi),%eax adcl $0,%ebx - # sqr a[5]*a[5] + # sqr a[5]*a[5] mull %eax addl %eax,%ecx adcl %edx,%ebp @@ -1041,10 +1041,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebx movl %ecx,40(%edi) movl 28(%esi),%eax - # saved r[10] - # ############### Calculate word 11 + # saved r[10] + # ############### Calculate word 11 xorl %ecx,%ecx - # sqr a[7]*a[4] + # sqr a[7]*a[4] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1054,7 +1054,7 @@ L_bn_sqr_comba8_begin: movl 24(%esi),%eax adcl $0,%ecx movl 20(%esi),%edx - # sqr a[6]*a[5] + # sqr a[6]*a[5] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1065,10 +1065,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ecx movl %ebp,44(%edi) movl 20(%esi),%edx - # saved r[11] - # ############### Calculate word 12 + # saved r[11] + # ############### Calculate word 12 xorl %ebp,%ebp - # sqr a[7]*a[5] + # sqr a[7]*a[5] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1077,7 +1077,7 @@ L_bn_sqr_comba8_begin: adcl %edx,%ecx movl 24(%esi),%eax adcl $0,%ebp - # sqr a[6]*a[6] + # sqr a[6]*a[6] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -1085,10 +1085,10 @@ L_bn_sqr_comba8_begin: adcl $0,%ebp movl %ebx,48(%edi) movl 28(%esi),%eax - # saved r[12] - # ############### Calculate word 13 + # saved r[12] + # ############### Calculate word 13 xorl %ebx,%ebx - # sqr a[7]*a[6] + # sqr a[7]*a[6] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1098,16 +1098,16 @@ L_bn_sqr_comba8_begin: movl 28(%esi),%eax adcl $0,%ebx movl %ecx,52(%edi) - # saved r[13] - # ############### Calculate word 14 + # saved r[13] + # ############### Calculate word 14 xorl %ecx,%ecx - # sqr a[7]*a[7] + # sqr a[7]*a[7] mull %eax addl %eax,%ebp adcl %edx,%ebx adcl $0,%ecx movl %ebp,56(%edi) - # saved r[14] + # saved r[14] movl %ebx,60(%edi) popl %ebx popl %ebp @@ -1127,9 +1127,9 @@ L_bn_sqr_comba4_begin: xorl %ebx,%ebx xorl %ecx,%ecx movl (%esi),%eax - # ############### Calculate word 0 + # ############### Calculate word 0 xorl %ebp,%ebp - # sqr a[0]*a[0] + # sqr a[0]*a[0] mull %eax addl %eax,%ebx adcl %edx,%ecx @@ -1137,10 +1137,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebp movl %ebx,(%edi) movl 4(%esi),%eax - # saved r[0] - # ############### Calculate word 1 + # saved r[0] + # ############### Calculate word 1 xorl %ebx,%ebx - # sqr a[1]*a[0] + # sqr a[1]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1151,10 +1151,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebx movl %ecx,4(%edi) movl (%esi),%edx - # saved r[1] - # ############### Calculate word 2 + # saved r[1] + # ############### Calculate word 2 xorl %ecx,%ecx - # sqr a[2]*a[0] + # sqr a[2]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1163,7 +1163,7 @@ L_bn_sqr_comba4_begin: adcl %edx,%ebx movl 4(%esi),%eax adcl $0,%ecx - # sqr a[1]*a[1] + # sqr a[1]*a[1] mull %eax addl %eax,%ebp adcl %edx,%ebx @@ -1171,10 +1171,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ecx movl %ebp,8(%edi) movl 12(%esi),%eax - # saved r[2] - # ############### Calculate word 3 + # saved r[2] + # ############### Calculate word 3 xorl %ebp,%ebp - # sqr a[3]*a[0] + # sqr a[3]*a[0] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1184,7 +1184,7 @@ L_bn_sqr_comba4_begin: movl 8(%esi),%eax adcl $0,%ebp movl 4(%esi),%edx - # sqr a[2]*a[1] + # sqr a[2]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1195,10 +1195,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebp movl %ebx,12(%edi) movl 4(%esi),%edx - # saved r[3] - # ############### Calculate word 4 + # saved r[3] + # ############### Calculate word 4 xorl %ebx,%ebx - # sqr a[3]*a[1] + # sqr a[3]*a[1] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1207,7 +1207,7 @@ L_bn_sqr_comba4_begin: adcl %edx,%ebp movl 8(%esi),%eax adcl $0,%ebx - # sqr a[2]*a[2] + # sqr a[2]*a[2] mull %eax addl %eax,%ecx adcl %edx,%ebp @@ -1215,10 +1215,10 @@ L_bn_sqr_comba4_begin: adcl $0,%ebx movl %ecx,16(%edi) movl 12(%esi),%eax - # saved r[4] - # ############### Calculate word 5 + # saved r[4] + # ############### Calculate word 5 xorl %ecx,%ecx - # sqr a[3]*a[2] + # sqr a[3]*a[2] mull %edx addl %eax,%eax adcl %edx,%edx @@ -1228,16 +1228,16 @@ L_bn_sqr_comba4_begin: movl 12(%esi),%eax adcl $0,%ecx movl %ebp,20(%edi) - # saved r[5] - # ############### Calculate word 6 + # saved r[5] + # ############### Calculate word 6 xorl %ebp,%ebp - # sqr a[3]*a[3] + # sqr a[3]*a[3] mull %eax addl %eax,%ebx adcl %edx,%ecx adcl $0,%ebp movl %ebx,24(%edi) - # saved r[6] + # saved r[6] movl %ecx,28(%edi) popl %ebx popl %ebp diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s index 3183bbb657..35db106f8c 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s @@ -444,18 +444,16 @@ L017sub: leal 1(%edx),%edx jge L017sub sbbl $0,%eax - movl $-1,%edx - xorl %eax,%edx - jmp L018copy + andl %eax,%esi + notl %eax + movl %edi,%ebp + andl %eax,%ebp + orl %ebp,%esi .align 4,0x90 L018copy: - movl 32(%esp,%ebx,4),%esi - movl (%edi,%ebx,4),%ebp + movl (%esi,%ebx,4),%eax + movl %eax,(%edi,%ebx,4) movl %ecx,32(%esp,%ebx,4) - andl %eax,%esi - andl %edx,%ebp - orl %esi,%ebp - movl %ebp,(%edi,%ebx,4) decl %ebx jge L018copy movl 24(%esp),%esp diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h index 9d7d1041fe..005ca0b704 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h @@ -37,4 +37,4 @@ static const char cflags[] = { ' ','\0' }; #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Tue Nov 20 09:37:49 2018" +#define DATE "built on: Tue Apr 3 00:38:21 2018" diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s index 9156a65a1e..1731c53faa 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s @@ -9,7 +9,7 @@ L_fcrypt_body_begin: pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words xorl %edi,%edi xorl %esi,%esi call L000PIC_me_up @@ -21,7 +21,7 @@ L000PIC_me_up: pushl $25 L001start: - # Round 0 + # Round 0 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -71,7 +71,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 1 + # Round 1 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -121,7 +121,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 2 + # Round 2 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -171,7 +171,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 3 + # Round 3 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -221,7 +221,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 4 + # Round 4 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -271,7 +271,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 5 + # Round 5 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -321,7 +321,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 6 + # Round 6 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -371,7 +371,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 7 + # Round 7 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -421,7 +421,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 8 + # Round 8 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -471,7 +471,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 9 + # Round 9 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -521,7 +521,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 10 + # Round 10 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -571,7 +571,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 11 + # Round 11 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -621,7 +621,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 12 + # Round 12 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -671,7 +671,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 13 + # Round 13 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -721,7 +721,7 @@ L001start: xorl %ebx,%esi movl 32(%esp),%ebp - # Round 14 + # Round 14 movl 36(%esp),%eax movl %esi,%edx shrl $16,%edx @@ -771,7 +771,7 @@ L001start: xorl %ebx,%edi movl 32(%esp),%ebp - # Round 15 + # Round 15 movl 36(%esp),%eax movl %edi,%edx shrl $16,%edx @@ -828,7 +828,7 @@ L001start: movl %ebx,(%esp) jnz L001start - # FP + # FP movl 28(%esp),%edx rorl $1,%edi movl %esi,%eax diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s index d0c1a2e486..43354871fc 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/des/des-586.s @@ -4,7 +4,7 @@ .align 4 __x86_DES_encrypt: pushl %ecx - # Round 0 + # Round 0 movl (%ecx),%eax xorl %ebx,%ebx movl 4(%ecx),%edx @@ -33,7 +33,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 1 + # Round 1 movl 8(%ecx),%eax xorl %ebx,%ebx movl 12(%ecx),%edx @@ -62,7 +62,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 2 + # Round 2 movl 16(%ecx),%eax xorl %ebx,%ebx movl 20(%ecx),%edx @@ -91,7 +91,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 3 + # Round 3 movl 24(%ecx),%eax xorl %ebx,%ebx movl 28(%ecx),%edx @@ -120,7 +120,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 4 + # Round 4 movl 32(%ecx),%eax xorl %ebx,%ebx movl 36(%ecx),%edx @@ -149,7 +149,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 5 + # Round 5 movl 40(%ecx),%eax xorl %ebx,%ebx movl 44(%ecx),%edx @@ -178,7 +178,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 6 + # Round 6 movl 48(%ecx),%eax xorl %ebx,%ebx movl 52(%ecx),%edx @@ -207,7 +207,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 7 + # Round 7 movl 56(%ecx),%eax xorl %ebx,%ebx movl 60(%ecx),%edx @@ -236,7 +236,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 8 + # Round 8 movl 64(%ecx),%eax xorl %ebx,%ebx movl 68(%ecx),%edx @@ -265,7 +265,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 9 + # Round 9 movl 72(%ecx),%eax xorl %ebx,%ebx movl 76(%ecx),%edx @@ -294,7 +294,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 10 + # Round 10 movl 80(%ecx),%eax xorl %ebx,%ebx movl 84(%ecx),%edx @@ -323,7 +323,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 11 + # Round 11 movl 88(%ecx),%eax xorl %ebx,%ebx movl 92(%ecx),%edx @@ -352,7 +352,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 12 + # Round 12 movl 96(%ecx),%eax xorl %ebx,%ebx movl 100(%ecx),%edx @@ -381,7 +381,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 13 + # Round 13 movl 104(%ecx),%eax xorl %ebx,%ebx movl 108(%ecx),%edx @@ -410,7 +410,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 14 + # Round 14 movl 112(%ecx),%eax xorl %ebx,%ebx movl 116(%ecx),%edx @@ -439,7 +439,7 @@ __x86_DES_encrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 15 + # Round 15 movl 120(%ecx),%eax xorl %ebx,%ebx movl 124(%ecx),%edx @@ -473,7 +473,7 @@ __x86_DES_encrypt: .align 4 __x86_DES_decrypt: pushl %ecx - # Round 15 + # Round 15 movl 120(%ecx),%eax xorl %ebx,%ebx movl 124(%ecx),%edx @@ -502,7 +502,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 14 + # Round 14 movl 112(%ecx),%eax xorl %ebx,%ebx movl 116(%ecx),%edx @@ -531,7 +531,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 13 + # Round 13 movl 104(%ecx),%eax xorl %ebx,%ebx movl 108(%ecx),%edx @@ -560,7 +560,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 12 + # Round 12 movl 96(%ecx),%eax xorl %ebx,%ebx movl 100(%ecx),%edx @@ -589,7 +589,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 11 + # Round 11 movl 88(%ecx),%eax xorl %ebx,%ebx movl 92(%ecx),%edx @@ -618,7 +618,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 10 + # Round 10 movl 80(%ecx),%eax xorl %ebx,%ebx movl 84(%ecx),%edx @@ -647,7 +647,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 9 + # Round 9 movl 72(%ecx),%eax xorl %ebx,%ebx movl 76(%ecx),%edx @@ -676,7 +676,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 8 + # Round 8 movl 64(%ecx),%eax xorl %ebx,%ebx movl 68(%ecx),%edx @@ -705,7 +705,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 7 + # Round 7 movl 56(%ecx),%eax xorl %ebx,%ebx movl 60(%ecx),%edx @@ -734,7 +734,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 6 + # Round 6 movl 48(%ecx),%eax xorl %ebx,%ebx movl 52(%ecx),%edx @@ -763,7 +763,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 5 + # Round 5 movl 40(%ecx),%eax xorl %ebx,%ebx movl 44(%ecx),%edx @@ -792,7 +792,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 4 + # Round 4 movl 32(%ecx),%eax xorl %ebx,%ebx movl 36(%ecx),%edx @@ -821,7 +821,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 3 + # Round 3 movl 24(%ecx),%eax xorl %ebx,%ebx movl 28(%ecx),%edx @@ -850,7 +850,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 2 + # Round 2 movl 16(%ecx),%eax xorl %ebx,%ebx movl 20(%ecx),%edx @@ -879,7 +879,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%esi xorl 0x500(%ebp,%edx,1),%esi - # Round 1 + # Round 1 movl 8(%ecx),%eax xorl %ebx,%ebx movl 12(%ecx),%edx @@ -908,7 +908,7 @@ __x86_DES_decrypt: movl (%esp),%ecx xorl 0x400(%ebp,%eax,1),%edi xorl 0x500(%ebp,%edx,1),%edi - # Round 0 + # Round 0 movl (%ecx),%eax xorl %ebx,%ebx movl 4(%ecx),%edx @@ -946,7 +946,7 @@ L_DES_encrypt1_begin: pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl 12(%esp),%esi xorl %ecx,%ecx pushl %ebx @@ -955,7 +955,7 @@ L_DES_encrypt1_begin: movl 28(%esp),%ebx movl 4(%esi),%edi - # IP + # IP roll $4,%eax movl %eax,%esi xorl %edi,%eax @@ -1005,7 +1005,7 @@ L001decrypt: call __x86_DES_decrypt L002done: - # FP + # FP movl 20(%esp),%edx rorl $1,%esi movl %edi,%eax @@ -1057,7 +1057,7 @@ L_DES_encrypt2_begin: pushl %esi pushl %edi - # Load the 2 words + # Load the 2 words movl 12(%esp),%eax xorl %ecx,%ecx pushl %ebx @@ -1080,7 +1080,7 @@ L004decrypt: call __x86_DES_decrypt L005done: - # Fixup + # Fixup rorl $3,%edi movl 20(%esp),%eax rorl $3,%esi @@ -1101,12 +1101,12 @@ L_DES_encrypt3_begin: pushl %esi pushl %edi - # Load the data words + # Load the data words movl (%ebx),%edi movl 4(%ebx),%esi subl $12,%esp - # IP + # IP roll $4,%edi movl %edi,%edx xorl %esi,%edi @@ -1165,7 +1165,7 @@ L_DES_encrypt3_begin: movl (%ebx),%edi movl 4(%ebx),%esi - # FP + # FP roll $2,%esi roll $3,%edi movl %edi,%eax @@ -1220,12 +1220,12 @@ L_DES_decrypt3_begin: pushl %esi pushl %edi - # Load the data words + # Load the data words movl (%ebx),%edi movl 4(%ebx),%esi subl $12,%esp - # IP + # IP roll $4,%edi movl %edi,%edx xorl %esi,%edi @@ -1284,7 +1284,7 @@ L_DES_decrypt3_begin: movl (%ebx),%edi movl 4(%ebx),%esi - # FP + # FP roll $2,%esi roll $3,%edi movl %edi,%eax @@ -1339,7 +1339,7 @@ L_DES_ncbc_encrypt_begin: pushl %esi pushl %edi movl 28(%esp),%ebp - # getting iv ptr from parameter 4 + # getting iv ptr from parameter 4 movl 36(%esp),%ebx movl (%ebx),%esi movl 4(%ebx),%edi @@ -1350,11 +1350,11 @@ L_DES_ncbc_encrypt_begin: movl %esp,%ebx movl 36(%esp),%esi movl 40(%esp),%edi - # getting encrypt flag from parameter 5 + # getting encrypt flag from parameter 5 movl 56(%esp),%ecx - # get and push parameter 5 + # get and push parameter 5 pushl %ecx - # get and push parameter 3 + # get and push parameter 3 movl 52(%esp),%eax pushl %eax pushl %ebx @@ -1517,7 +1517,7 @@ L_DES_ede3_cbc_encrypt_begin: pushl %esi pushl %edi movl 28(%esp),%ebp - # getting iv ptr from parameter 6 + # getting iv ptr from parameter 6 movl 44(%esp),%ebx movl (%ebx),%esi movl 4(%ebx),%edi @@ -1528,15 +1528,15 @@ L_DES_ede3_cbc_encrypt_begin: movl %esp,%ebx movl 36(%esp),%esi movl 40(%esp),%edi - # getting encrypt flag from parameter 7 + # getting encrypt flag from parameter 7 movl 64(%esp),%ecx - # get and push parameter 5 + # get and push parameter 5 movl 56(%esp),%eax pushl %eax - # get and push parameter 4 + # get and push parameter 4 movl 56(%esp),%eax pushl %eax - # get and push parameter 3 + # get and push parameter 3 movl 56(%esp),%eax pushl %eax pushl %ebx diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s index fe6e89a4db..f2163103ef 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s @@ -3822,7 +3822,7 @@ L_ecp_nistz256_scatter_w7_begin: movl 20(%esp),%edi movl 24(%esp),%esi movl 28(%esp),%ebp - leal (%edi,%ebp,1),%edi + leal -1(%edi,%ebp,1),%edi movl $16,%ebp L007scatter_w7_loop: movl (%esi),%eax diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s index 93c6693b5a..4e70351041 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s @@ -21,10 +21,10 @@ L_md5_block_asm_data_order_begin: movl 12(%edi),%edx L000start: - # R0 section + # R0 section movl %ecx,%edi movl (%esi),%ebp - # R0 0 + # R0 0 xorl %edx,%edi andl %ebx,%edi leal 3614090360(%eax,%ebp,1),%eax @@ -34,7 +34,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 1 + # R0 1 xorl %ecx,%edi andl %eax,%edi leal 3905402710(%edx,%ebp,1),%edx @@ -44,7 +44,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 2 + # R0 2 xorl %ebx,%edi andl %edx,%edi leal 606105819(%ecx,%ebp,1),%ecx @@ -54,7 +54,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 3 + # R0 3 xorl %eax,%edi andl %ecx,%edi leal 3250441966(%ebx,%ebp,1),%ebx @@ -64,7 +64,7 @@ L000start: roll $22,%ebx movl %ecx,%edi addl %ecx,%ebx - # R0 4 + # R0 4 xorl %edx,%edi andl %ebx,%edi leal 4118548399(%eax,%ebp,1),%eax @@ -74,7 +74,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 5 + # R0 5 xorl %ecx,%edi andl %eax,%edi leal 1200080426(%edx,%ebp,1),%edx @@ -84,7 +84,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 6 + # R0 6 xorl %ebx,%edi andl %edx,%edi leal 2821735955(%ecx,%ebp,1),%ecx @@ -94,7 +94,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 7 + # R0 7 xorl %eax,%edi andl %ecx,%edi leal 4249261313(%ebx,%ebp,1),%ebx @@ -104,7 +104,7 @@ L000start: roll $22,%ebx movl %ecx,%edi addl %ecx,%ebx - # R0 8 + # R0 8 xorl %edx,%edi andl %ebx,%edi leal 1770035416(%eax,%ebp,1),%eax @@ -114,7 +114,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 9 + # R0 9 xorl %ecx,%edi andl %eax,%edi leal 2336552879(%edx,%ebp,1),%edx @@ -124,7 +124,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 10 + # R0 10 xorl %ebx,%edi andl %edx,%edi leal 4294925233(%ecx,%ebp,1),%ecx @@ -134,7 +134,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 11 + # R0 11 xorl %eax,%edi andl %ecx,%edi leal 2304563134(%ebx,%ebp,1),%ebx @@ -144,7 +144,7 @@ L000start: roll $22,%ebx movl %ecx,%edi addl %ecx,%ebx - # R0 12 + # R0 12 xorl %edx,%edi andl %ebx,%edi leal 1804603682(%eax,%ebp,1),%eax @@ -154,7 +154,7 @@ L000start: roll $7,%eax movl %ebx,%edi addl %ebx,%eax - # R0 13 + # R0 13 xorl %ecx,%edi andl %eax,%edi leal 4254626195(%edx,%ebp,1),%edx @@ -164,7 +164,7 @@ L000start: roll $12,%edx movl %eax,%edi addl %eax,%edx - # R0 14 + # R0 14 xorl %ebx,%edi andl %edx,%edi leal 2792965006(%ecx,%ebp,1),%ecx @@ -174,7 +174,7 @@ L000start: roll $17,%ecx movl %edx,%edi addl %edx,%ecx - # R0 15 + # R0 15 xorl %eax,%edi andl %ecx,%edi leal 1236535329(%ebx,%ebp,1),%ebx @@ -185,8 +185,8 @@ L000start: movl %ecx,%edi addl %ecx,%ebx - # R1 section - # R1 16 + # R1 section + # R1 16 xorl %ebx,%edi andl %edx,%edi leal 4129170786(%eax,%ebp,1),%eax @@ -196,7 +196,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 17 + # R1 17 xorl %eax,%edi andl %ecx,%edi leal 3225465664(%edx,%ebp,1),%edx @@ -206,7 +206,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 18 + # R1 18 xorl %edx,%edi andl %ebx,%edi leal 643717713(%ecx,%ebp,1),%ecx @@ -216,7 +216,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 19 + # R1 19 xorl %ecx,%edi andl %eax,%edi leal 3921069994(%ebx,%ebp,1),%ebx @@ -226,7 +226,7 @@ L000start: movl %ecx,%edi roll $20,%ebx addl %ecx,%ebx - # R1 20 + # R1 20 xorl %ebx,%edi andl %edx,%edi leal 3593408605(%eax,%ebp,1),%eax @@ -236,7 +236,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 21 + # R1 21 xorl %eax,%edi andl %ecx,%edi leal 38016083(%edx,%ebp,1),%edx @@ -246,7 +246,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 22 + # R1 22 xorl %edx,%edi andl %ebx,%edi leal 3634488961(%ecx,%ebp,1),%ecx @@ -256,7 +256,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 23 + # R1 23 xorl %ecx,%edi andl %eax,%edi leal 3889429448(%ebx,%ebp,1),%ebx @@ -266,7 +266,7 @@ L000start: movl %ecx,%edi roll $20,%ebx addl %ecx,%ebx - # R1 24 + # R1 24 xorl %ebx,%edi andl %edx,%edi leal 568446438(%eax,%ebp,1),%eax @@ -276,7 +276,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 25 + # R1 25 xorl %eax,%edi andl %ecx,%edi leal 3275163606(%edx,%ebp,1),%edx @@ -286,7 +286,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 26 + # R1 26 xorl %edx,%edi andl %ebx,%edi leal 4107603335(%ecx,%ebp,1),%ecx @@ -296,7 +296,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 27 + # R1 27 xorl %ecx,%edi andl %eax,%edi leal 1163531501(%ebx,%ebp,1),%ebx @@ -306,7 +306,7 @@ L000start: movl %ecx,%edi roll $20,%ebx addl %ecx,%ebx - # R1 28 + # R1 28 xorl %ebx,%edi andl %edx,%edi leal 2850285829(%eax,%ebp,1),%eax @@ -316,7 +316,7 @@ L000start: movl %ebx,%edi roll $5,%eax addl %ebx,%eax - # R1 29 + # R1 29 xorl %eax,%edi andl %ecx,%edi leal 4243563512(%edx,%ebp,1),%edx @@ -326,7 +326,7 @@ L000start: movl %eax,%edi roll $9,%edx addl %eax,%edx - # R1 30 + # R1 30 xorl %edx,%edi andl %ebx,%edi leal 1735328473(%ecx,%ebp,1),%ecx @@ -336,7 +336,7 @@ L000start: movl %edx,%edi roll $14,%ecx addl %edx,%ecx - # R1 31 + # R1 31 xorl %ecx,%edi andl %eax,%edi leal 2368359562(%ebx,%ebp,1),%ebx @@ -347,8 +347,8 @@ L000start: roll $20,%ebx addl %ecx,%ebx - # R2 section - # R2 32 + # R2 section + # R2 32 xorl %edx,%edi xorl %ebx,%edi leal 4294588738(%eax,%ebp,1),%eax @@ -356,7 +356,7 @@ L000start: movl 32(%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 33 + # R2 33 addl %ebx,%eax xorl %ecx,%edi leal 2272392833(%edx,%ebp,1),%edx @@ -366,7 +366,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 34 + # R2 34 xorl %ebx,%edi xorl %edx,%edi leal 1839030562(%ecx,%ebp,1),%ecx @@ -374,7 +374,7 @@ L000start: movl 56(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 35 + # R2 35 addl %edx,%ecx xorl %eax,%edi leal 4259657740(%ebx,%ebp,1),%ebx @@ -384,7 +384,7 @@ L000start: movl %ecx,%edi roll $23,%ebx addl %ecx,%ebx - # R2 36 + # R2 36 xorl %edx,%edi xorl %ebx,%edi leal 2763975236(%eax,%ebp,1),%eax @@ -392,7 +392,7 @@ L000start: movl 16(%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 37 + # R2 37 addl %ebx,%eax xorl %ecx,%edi leal 1272893353(%edx,%ebp,1),%edx @@ -402,7 +402,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 38 + # R2 38 xorl %ebx,%edi xorl %edx,%edi leal 4139469664(%ecx,%ebp,1),%ecx @@ -410,7 +410,7 @@ L000start: movl 40(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 39 + # R2 39 addl %edx,%ecx xorl %eax,%edi leal 3200236656(%ebx,%ebp,1),%ebx @@ -420,7 +420,7 @@ L000start: movl %ecx,%edi roll $23,%ebx addl %ecx,%ebx - # R2 40 + # R2 40 xorl %edx,%edi xorl %ebx,%edi leal 681279174(%eax,%ebp,1),%eax @@ -428,7 +428,7 @@ L000start: movl (%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 41 + # R2 41 addl %ebx,%eax xorl %ecx,%edi leal 3936430074(%edx,%ebp,1),%edx @@ -438,7 +438,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 42 + # R2 42 xorl %ebx,%edi xorl %edx,%edi leal 3572445317(%ecx,%ebp,1),%ecx @@ -446,7 +446,7 @@ L000start: movl 24(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 43 + # R2 43 addl %edx,%ecx xorl %eax,%edi leal 76029189(%ebx,%ebp,1),%ebx @@ -456,7 +456,7 @@ L000start: movl %ecx,%edi roll $23,%ebx addl %ecx,%ebx - # R2 44 + # R2 44 xorl %edx,%edi xorl %ebx,%edi leal 3654602809(%eax,%ebp,1),%eax @@ -464,7 +464,7 @@ L000start: movl 48(%esi),%ebp roll $4,%eax movl %ebx,%edi - # R2 45 + # R2 45 addl %ebx,%eax xorl %ecx,%edi leal 3873151461(%edx,%ebp,1),%edx @@ -474,7 +474,7 @@ L000start: movl %eax,%edi roll $11,%edx addl %eax,%edx - # R2 46 + # R2 46 xorl %ebx,%edi xorl %edx,%edi leal 530742520(%ecx,%ebp,1),%ecx @@ -482,7 +482,7 @@ L000start: movl 8(%esi),%ebp roll $16,%ecx movl %edx,%edi - # R2 47 + # R2 47 addl %edx,%ecx xorl %eax,%edi leal 3299628645(%ebx,%ebp,1),%ebx @@ -493,8 +493,8 @@ L000start: roll $23,%ebx addl %ecx,%ebx - # R3 section - # R3 48 + # R3 section + # R3 48 xorl %edx,%edi orl %ebx,%edi leal 4096336452(%eax,%ebp,1),%eax @@ -505,7 +505,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 49 + # R3 49 orl %eax,%edi leal 1126891415(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -515,7 +515,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 50 + # R3 50 orl %edx,%edi leal 2878612391(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -525,7 +525,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 51 + # R3 51 orl %ecx,%edi leal 4237533241(%ebx,%ebp,1),%ebx xorl %edx,%edi @@ -535,7 +535,7 @@ L000start: roll $21,%ebx xorl %edx,%edi addl %ecx,%ebx - # R3 52 + # R3 52 orl %ebx,%edi leal 1700485571(%eax,%ebp,1),%eax xorl %ecx,%edi @@ -545,7 +545,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 53 + # R3 53 orl %eax,%edi leal 2399980690(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -555,7 +555,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 54 + # R3 54 orl %edx,%edi leal 4293915773(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -565,7 +565,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 55 + # R3 55 orl %ecx,%edi leal 2240044497(%ebx,%ebp,1),%ebx xorl %edx,%edi @@ -575,7 +575,7 @@ L000start: roll $21,%ebx xorl %edx,%edi addl %ecx,%ebx - # R3 56 + # R3 56 orl %ebx,%edi leal 1873313359(%eax,%ebp,1),%eax xorl %ecx,%edi @@ -585,7 +585,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 57 + # R3 57 orl %eax,%edi leal 4264355552(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -595,7 +595,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 58 + # R3 58 orl %edx,%edi leal 2734768916(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -605,7 +605,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 59 + # R3 59 orl %ecx,%edi leal 1309151649(%ebx,%ebp,1),%ebx xorl %edx,%edi @@ -615,7 +615,7 @@ L000start: roll $21,%ebx xorl %edx,%edi addl %ecx,%ebx - # R3 60 + # R3 60 orl %ebx,%edi leal 4149444226(%eax,%ebp,1),%eax xorl %ecx,%edi @@ -625,7 +625,7 @@ L000start: roll $6,%eax xorl %ecx,%edi addl %ebx,%eax - # R3 61 + # R3 61 orl %eax,%edi leal 3174756917(%edx,%ebp,1),%edx xorl %ebx,%edi @@ -635,7 +635,7 @@ L000start: roll $10,%edx xorl %ebx,%edi addl %eax,%edx - # R3 62 + # R3 62 orl %edx,%edi leal 718787259(%ecx,%ebp,1),%ecx xorl %eax,%edi @@ -645,7 +645,7 @@ L000start: roll $15,%ecx xorl %eax,%edi addl %edx,%ecx - # R3 63 + # R3 63 orl %ecx,%edi leal 3951481745(%ebx,%ebp,1),%ebx xorl %edx,%edi diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s index 0a19b1429b..15dd76c69a 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ripemd/rmd-586.s @@ -51,7 +51,7 @@ L000start: movl %edi,%eax movl 12(%edx),%ebx movl 16(%edx),%ebp - # 0 + # 0 xorl %ebx,%eax movl (%esp),%edx xorl %esi,%eax @@ -61,7 +61,7 @@ L000start: movl %esi,%eax roll $11,%ecx addl %ebp,%ecx - # 1 + # 1 xorl %edi,%eax movl 4(%esp),%edx xorl %ecx,%eax @@ -72,7 +72,7 @@ L000start: xorl %esi,%eax roll $14,%ebp addl %ebx,%ebp - # 2 + # 2 movl 8(%esp),%edx xorl %ebp,%eax addl %edx,%ebx @@ -81,7 +81,7 @@ L000start: movl %ebp,%eax roll $15,%ebx addl %edi,%ebx - # 3 + # 3 xorl %ecx,%eax movl 12(%esp),%edx xorl %ebx,%eax @@ -92,7 +92,7 @@ L000start: xorl %ebp,%eax roll $12,%edi addl %esi,%edi - # 4 + # 4 movl 16(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -101,7 +101,7 @@ L000start: movl %edi,%eax roll $5,%esi addl %ecx,%esi - # 5 + # 5 xorl %ebx,%eax movl 20(%esp),%edx xorl %esi,%eax @@ -112,7 +112,7 @@ L000start: xorl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 6 + # 6 movl 24(%esp),%edx xorl %ecx,%eax addl %edx,%ebp @@ -121,7 +121,7 @@ L000start: movl %ecx,%eax roll $7,%ebp addl %ebx,%ebp - # 7 + # 7 xorl %esi,%eax movl 28(%esp),%edx xorl %ebp,%eax @@ -132,7 +132,7 @@ L000start: xorl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 8 + # 8 movl 32(%esp),%edx xorl %ebx,%eax addl %edx,%edi @@ -141,7 +141,7 @@ L000start: movl %ebx,%eax roll $11,%edi addl %esi,%edi - # 9 + # 9 xorl %ebp,%eax movl 36(%esp),%edx xorl %edi,%eax @@ -152,7 +152,7 @@ L000start: xorl %ebx,%eax roll $13,%esi addl %ecx,%esi - # 10 + # 10 movl 40(%esp),%edx xorl %esi,%eax addl %edx,%ecx @@ -161,7 +161,7 @@ L000start: movl %esi,%eax roll $14,%ecx addl %ebp,%ecx - # 11 + # 11 xorl %edi,%eax movl 44(%esp),%edx xorl %ecx,%eax @@ -172,7 +172,7 @@ L000start: xorl %esi,%eax roll $15,%ebp addl %ebx,%ebp - # 12 + # 12 movl 48(%esp),%edx xorl %ebp,%eax addl %edx,%ebx @@ -181,7 +181,7 @@ L000start: movl %ebp,%eax roll $6,%ebx addl %edi,%ebx - # 13 + # 13 xorl %ecx,%eax movl 52(%esp),%edx xorl %ebx,%eax @@ -192,7 +192,7 @@ L000start: xorl %ebp,%eax roll $7,%edi addl %esi,%edi - # 14 + # 14 movl 56(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -201,7 +201,7 @@ L000start: movl %edi,%eax roll $9,%esi addl %ecx,%esi - # 15 + # 15 xorl %ebx,%eax movl 60(%esp),%edx xorl %esi,%eax @@ -212,7 +212,7 @@ L000start: movl 28(%esp),%edx roll $8,%ecx addl %ebp,%ecx - # 16 + # 16 addl %edx,%ebp movl %esi,%edx subl %ecx,%eax @@ -225,7 +225,7 @@ L000start: movl $-1,%edx roll $7,%ebp addl %ebx,%ebp - # 17 + # 17 addl %eax,%ebx movl %ecx,%eax subl %ebp,%edx @@ -238,7 +238,7 @@ L000start: movl $-1,%eax roll $6,%ebx addl %edi,%ebx - # 18 + # 18 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -251,7 +251,7 @@ L000start: movl $-1,%edx roll $8,%edi addl %esi,%edi - # 19 + # 19 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -264,7 +264,7 @@ L000start: movl $-1,%eax roll $13,%esi addl %ecx,%esi - # 20 + # 20 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -277,7 +277,7 @@ L000start: movl $-1,%edx roll $11,%ecx addl %ebp,%ecx - # 21 + # 21 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -290,7 +290,7 @@ L000start: movl $-1,%eax roll $9,%ebp addl %ebx,%ebp - # 22 + # 22 addl %edx,%ebx movl %ecx,%edx subl %ebp,%eax @@ -303,7 +303,7 @@ L000start: movl $-1,%edx roll $7,%ebx addl %edi,%ebx - # 23 + # 23 addl %eax,%edi movl %ebp,%eax subl %ebx,%edx @@ -316,7 +316,7 @@ L000start: movl $-1,%eax roll $15,%edi addl %esi,%edi - # 24 + # 24 addl %edx,%esi movl %ebx,%edx subl %edi,%eax @@ -329,7 +329,7 @@ L000start: movl $-1,%edx roll $7,%esi addl %ecx,%esi - # 25 + # 25 addl %eax,%ecx movl %edi,%eax subl %esi,%edx @@ -342,7 +342,7 @@ L000start: movl $-1,%eax roll $12,%ecx addl %ebp,%ecx - # 26 + # 26 addl %edx,%ebp movl %esi,%edx subl %ecx,%eax @@ -355,7 +355,7 @@ L000start: movl $-1,%edx roll $15,%ebp addl %ebx,%ebp - # 27 + # 27 addl %eax,%ebx movl %ecx,%eax subl %ebp,%edx @@ -368,7 +368,7 @@ L000start: movl $-1,%eax roll $9,%ebx addl %edi,%ebx - # 28 + # 28 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -381,7 +381,7 @@ L000start: movl $-1,%edx roll $11,%edi addl %esi,%edi - # 29 + # 29 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -394,7 +394,7 @@ L000start: movl $-1,%eax roll $7,%esi addl %ecx,%esi - # 30 + # 30 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -407,7 +407,7 @@ L000start: movl $-1,%edx roll $13,%ecx addl %ebp,%ecx - # 31 + # 31 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -420,7 +420,7 @@ L000start: subl %ecx,%edx roll $12,%ebp addl %ebx,%ebp - # 32 + # 32 movl 12(%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -431,7 +431,7 @@ L000start: subl %ebp,%eax roll $11,%ebx addl %edi,%ebx - # 33 + # 33 movl 40(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -442,7 +442,7 @@ L000start: subl %ebx,%edx roll $13,%edi addl %esi,%edi - # 34 + # 34 movl 56(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -453,7 +453,7 @@ L000start: subl %edi,%eax roll $6,%esi addl %ecx,%esi - # 35 + # 35 movl 16(%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -464,7 +464,7 @@ L000start: subl %esi,%edx roll $7,%ecx addl %ebp,%ecx - # 36 + # 36 movl 36(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -475,7 +475,7 @@ L000start: subl %ecx,%eax roll $14,%ebp addl %ebx,%ebp - # 37 + # 37 movl 60(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -486,7 +486,7 @@ L000start: subl %ebp,%edx roll $9,%ebx addl %edi,%ebx - # 38 + # 38 movl 32(%esp),%eax orl %ebx,%edx addl %eax,%edi @@ -497,7 +497,7 @@ L000start: subl %ebx,%eax roll $13,%edi addl %esi,%edi - # 39 + # 39 movl 4(%esp),%edx orl %edi,%eax addl %edx,%esi @@ -508,7 +508,7 @@ L000start: subl %edi,%edx roll $15,%esi addl %ecx,%esi - # 40 + # 40 movl 8(%esp),%eax orl %esi,%edx addl %eax,%ecx @@ -519,7 +519,7 @@ L000start: subl %esi,%eax roll $14,%ecx addl %ebp,%ecx - # 41 + # 41 movl 28(%esp),%edx orl %ecx,%eax addl %edx,%ebp @@ -530,7 +530,7 @@ L000start: subl %ecx,%edx roll $8,%ebp addl %ebx,%ebp - # 42 + # 42 movl (%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -541,7 +541,7 @@ L000start: subl %ebp,%eax roll $13,%ebx addl %edi,%ebx - # 43 + # 43 movl 24(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -552,7 +552,7 @@ L000start: subl %ebx,%edx roll $6,%edi addl %esi,%edi - # 44 + # 44 movl 52(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -563,7 +563,7 @@ L000start: subl %edi,%eax roll $5,%esi addl %ecx,%esi - # 45 + # 45 movl 44(%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -574,7 +574,7 @@ L000start: subl %esi,%edx roll $12,%ecx addl %ebp,%ecx - # 46 + # 46 movl 20(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -585,7 +585,7 @@ L000start: subl %ecx,%eax roll $7,%ebp addl %ebx,%ebp - # 47 + # 47 movl 48(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -596,7 +596,7 @@ L000start: movl %ecx,%eax roll $5,%ebx addl %edi,%ebx - # 48 + # 48 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -609,7 +609,7 @@ L000start: movl %ebp,%eax roll $11,%edi addl %esi,%edi - # 49 + # 49 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -622,7 +622,7 @@ L000start: movl %ebx,%eax roll $12,%esi addl %ecx,%esi - # 50 + # 50 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -635,7 +635,7 @@ L000start: movl %edi,%eax roll $14,%ecx addl %ebp,%ecx - # 51 + # 51 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -648,7 +648,7 @@ L000start: movl %esi,%eax roll $15,%ebp addl %ebx,%ebp - # 52 + # 52 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -661,7 +661,7 @@ L000start: movl %ecx,%eax roll $14,%ebx addl %edi,%ebx - # 53 + # 53 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -674,7 +674,7 @@ L000start: movl %ebp,%eax roll $15,%edi addl %esi,%edi - # 54 + # 54 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -687,7 +687,7 @@ L000start: movl %ebx,%eax roll $9,%esi addl %ecx,%esi - # 55 + # 55 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -700,7 +700,7 @@ L000start: movl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 56 + # 56 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -713,7 +713,7 @@ L000start: movl %esi,%eax roll $9,%ebp addl %ebx,%ebp - # 57 + # 57 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -726,7 +726,7 @@ L000start: movl %ecx,%eax roll $14,%ebx addl %edi,%ebx - # 58 + # 58 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -739,7 +739,7 @@ L000start: movl %ebp,%eax roll $5,%edi addl %esi,%edi - # 59 + # 59 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -752,7 +752,7 @@ L000start: movl %ebx,%eax roll $6,%esi addl %ecx,%esi - # 60 + # 60 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -765,7 +765,7 @@ L000start: movl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 61 + # 61 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -778,7 +778,7 @@ L000start: movl %esi,%eax roll $6,%ebp addl %ebx,%ebp - # 62 + # 62 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -791,7 +791,7 @@ L000start: movl %ecx,%eax roll $5,%ebx addl %edi,%ebx - # 63 + # 63 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -804,7 +804,7 @@ L000start: subl %ebp,%edx roll $12,%edi addl %esi,%edi - # 64 + # 64 movl 16(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -815,7 +815,7 @@ L000start: subl %ebx,%eax roll $9,%esi addl %ecx,%esi - # 65 + # 65 movl (%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -826,7 +826,7 @@ L000start: subl %edi,%edx roll $15,%ecx addl %ebp,%ecx - # 66 + # 66 movl 20(%esp),%eax orl %esi,%edx addl %eax,%ebp @@ -837,7 +837,7 @@ L000start: subl %esi,%eax roll $5,%ebp addl %ebx,%ebp - # 67 + # 67 movl 36(%esp),%edx orl %ecx,%eax addl %edx,%ebx @@ -848,7 +848,7 @@ L000start: subl %ecx,%edx roll $11,%ebx addl %edi,%ebx - # 68 + # 68 movl 28(%esp),%eax orl %ebp,%edx addl %eax,%edi @@ -859,7 +859,7 @@ L000start: subl %ebp,%eax roll $6,%edi addl %esi,%edi - # 69 + # 69 movl 48(%esp),%edx orl %ebx,%eax addl %edx,%esi @@ -870,7 +870,7 @@ L000start: subl %ebx,%edx roll $8,%esi addl %ecx,%esi - # 70 + # 70 movl 8(%esp),%eax orl %edi,%edx addl %eax,%ecx @@ -881,7 +881,7 @@ L000start: subl %edi,%eax roll $13,%ecx addl %ebp,%ecx - # 71 + # 71 movl 40(%esp),%edx orl %esi,%eax addl %edx,%ebp @@ -892,7 +892,7 @@ L000start: subl %esi,%edx roll $12,%ebp addl %ebx,%ebp - # 72 + # 72 movl 56(%esp),%eax orl %ecx,%edx addl %eax,%ebx @@ -903,7 +903,7 @@ L000start: subl %ecx,%eax roll $5,%ebx addl %edi,%ebx - # 73 + # 73 movl 4(%esp),%edx orl %ebp,%eax addl %edx,%edi @@ -914,7 +914,7 @@ L000start: subl %ebp,%edx roll $12,%edi addl %esi,%edi - # 74 + # 74 movl 12(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -925,7 +925,7 @@ L000start: subl %ebx,%eax roll $13,%esi addl %ecx,%esi - # 75 + # 75 movl 32(%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -936,7 +936,7 @@ L000start: subl %edi,%edx roll $14,%ecx addl %ebp,%ecx - # 76 + # 76 movl 44(%esp),%eax orl %esi,%edx addl %eax,%ebp @@ -947,7 +947,7 @@ L000start: subl %esi,%eax roll $11,%ebp addl %ebx,%ebp - # 77 + # 77 movl 24(%esp),%edx orl %ecx,%eax addl %edx,%ebx @@ -958,7 +958,7 @@ L000start: subl %ecx,%edx roll $8,%ebx addl %edi,%ebx - # 78 + # 78 movl 60(%esp),%eax orl %ebp,%edx addl %eax,%edi @@ -969,7 +969,7 @@ L000start: subl %ebp,%eax roll $5,%edi addl %esi,%edi - # 79 + # 79 movl 52(%esp),%edx orl %ebx,%eax addl %edx,%esi @@ -989,7 +989,7 @@ L000start: movl %ebp,80(%esp) movl 12(%edx),%ebx movl 16(%edx),%ebp - # 80 + # 80 movl $-1,%edx subl %ebx,%edx movl 20(%esp),%eax @@ -1002,7 +1002,7 @@ L000start: subl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 81 + # 81 movl 56(%esp),%edx orl %esi,%eax addl %edx,%ebp @@ -1013,7 +1013,7 @@ L000start: subl %esi,%edx roll $9,%ebp addl %ebx,%ebp - # 82 + # 82 movl 28(%esp),%eax orl %ecx,%edx addl %eax,%ebx @@ -1024,7 +1024,7 @@ L000start: subl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 83 + # 83 movl (%esp),%edx orl %ebp,%eax addl %edx,%edi @@ -1035,7 +1035,7 @@ L000start: subl %ebp,%edx roll $11,%edi addl %esi,%edi - # 84 + # 84 movl 36(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -1046,7 +1046,7 @@ L000start: subl %ebx,%eax roll $13,%esi addl %ecx,%esi - # 85 + # 85 movl 8(%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -1057,7 +1057,7 @@ L000start: subl %edi,%edx roll $15,%ecx addl %ebp,%ecx - # 86 + # 86 movl 44(%esp),%eax orl %esi,%edx addl %eax,%ebp @@ -1068,7 +1068,7 @@ L000start: subl %esi,%eax roll $15,%ebp addl %ebx,%ebp - # 87 + # 87 movl 16(%esp),%edx orl %ecx,%eax addl %edx,%ebx @@ -1079,7 +1079,7 @@ L000start: subl %ecx,%edx roll $5,%ebx addl %edi,%ebx - # 88 + # 88 movl 52(%esp),%eax orl %ebp,%edx addl %eax,%edi @@ -1090,7 +1090,7 @@ L000start: subl %ebp,%eax roll $7,%edi addl %esi,%edi - # 89 + # 89 movl 24(%esp),%edx orl %ebx,%eax addl %edx,%esi @@ -1101,7 +1101,7 @@ L000start: subl %ebx,%edx roll $7,%esi addl %ecx,%esi - # 90 + # 90 movl 60(%esp),%eax orl %edi,%edx addl %eax,%ecx @@ -1112,7 +1112,7 @@ L000start: subl %edi,%eax roll $8,%ecx addl %ebp,%ecx - # 91 + # 91 movl 32(%esp),%edx orl %esi,%eax addl %edx,%ebp @@ -1123,7 +1123,7 @@ L000start: subl %esi,%edx roll $11,%ebp addl %ebx,%ebp - # 92 + # 92 movl 4(%esp),%eax orl %ecx,%edx addl %eax,%ebx @@ -1134,7 +1134,7 @@ L000start: subl %ecx,%eax roll $14,%ebx addl %edi,%ebx - # 93 + # 93 movl 40(%esp),%edx orl %ebp,%eax addl %edx,%edi @@ -1145,7 +1145,7 @@ L000start: subl %ebp,%edx roll $14,%edi addl %esi,%edi - # 94 + # 94 movl 12(%esp),%eax orl %ebx,%edx addl %eax,%esi @@ -1156,7 +1156,7 @@ L000start: subl %ebx,%eax roll $12,%esi addl %ecx,%esi - # 95 + # 95 movl 48(%esp),%edx orl %edi,%eax addl %edx,%ecx @@ -1167,7 +1167,7 @@ L000start: movl %edi,%eax roll $6,%ecx addl %ebp,%ecx - # 96 + # 96 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1180,7 +1180,7 @@ L000start: movl %esi,%eax roll $9,%ebp addl %ebx,%ebp - # 97 + # 97 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -1193,7 +1193,7 @@ L000start: movl %ecx,%eax roll $13,%ebx addl %edi,%ebx - # 98 + # 98 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -1206,7 +1206,7 @@ L000start: movl %ebp,%eax roll $15,%edi addl %esi,%edi - # 99 + # 99 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -1219,7 +1219,7 @@ L000start: movl %ebx,%eax roll $7,%esi addl %ecx,%esi - # 100 + # 100 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -1232,7 +1232,7 @@ L000start: movl %edi,%eax roll $12,%ecx addl %ebp,%ecx - # 101 + # 101 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1245,7 +1245,7 @@ L000start: movl %esi,%eax roll $8,%ebp addl %ebx,%ebp - # 102 + # 102 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -1258,7 +1258,7 @@ L000start: movl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 103 + # 103 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -1271,7 +1271,7 @@ L000start: movl %ebp,%eax roll $11,%edi addl %esi,%edi - # 104 + # 104 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -1284,7 +1284,7 @@ L000start: movl %ebx,%eax roll $7,%esi addl %ecx,%esi - # 105 + # 105 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -1297,7 +1297,7 @@ L000start: movl %edi,%eax roll $7,%ecx addl %ebp,%ecx - # 106 + # 106 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1310,7 +1310,7 @@ L000start: movl %esi,%eax roll $12,%ebp addl %ebx,%ebp - # 107 + # 107 subl %esi,%edx andl %ebp,%eax andl %ecx,%edx @@ -1323,7 +1323,7 @@ L000start: movl %ecx,%eax roll $7,%ebx addl %edi,%ebx - # 108 + # 108 subl %ecx,%edx andl %ebx,%eax andl %ebp,%edx @@ -1336,7 +1336,7 @@ L000start: movl %ebp,%eax roll $6,%edi addl %esi,%edi - # 109 + # 109 subl %ebp,%edx andl %edi,%eax andl %ebx,%edx @@ -1349,7 +1349,7 @@ L000start: movl %ebx,%eax roll $15,%esi addl %ecx,%esi - # 110 + # 110 subl %ebx,%edx andl %esi,%eax andl %edi,%edx @@ -1362,7 +1362,7 @@ L000start: movl %edi,%eax roll $13,%ecx addl %ebp,%ecx - # 111 + # 111 subl %edi,%edx andl %ecx,%eax andl %esi,%edx @@ -1375,7 +1375,7 @@ L000start: subl %ecx,%edx roll $11,%ebp addl %ebx,%ebp - # 112 + # 112 movl 60(%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -1386,7 +1386,7 @@ L000start: subl %ebp,%eax roll $9,%ebx addl %edi,%ebx - # 113 + # 113 movl 20(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -1397,7 +1397,7 @@ L000start: subl %ebx,%edx roll $7,%edi addl %esi,%edi - # 114 + # 114 movl 4(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -1408,7 +1408,7 @@ L000start: subl %edi,%eax roll $15,%esi addl %ecx,%esi - # 115 + # 115 movl 12(%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -1419,7 +1419,7 @@ L000start: subl %esi,%edx roll $11,%ecx addl %ebp,%ecx - # 116 + # 116 movl 28(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -1430,7 +1430,7 @@ L000start: subl %ecx,%eax roll $8,%ebp addl %ebx,%ebp - # 117 + # 117 movl 56(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -1441,7 +1441,7 @@ L000start: subl %ebp,%edx roll $6,%ebx addl %edi,%ebx - # 118 + # 118 movl 24(%esp),%eax orl %ebx,%edx addl %eax,%edi @@ -1452,7 +1452,7 @@ L000start: subl %ebx,%eax roll $6,%edi addl %esi,%edi - # 119 + # 119 movl 36(%esp),%edx orl %edi,%eax addl %edx,%esi @@ -1463,7 +1463,7 @@ L000start: subl %edi,%edx roll $14,%esi addl %ecx,%esi - # 120 + # 120 movl 44(%esp),%eax orl %esi,%edx addl %eax,%ecx @@ -1474,7 +1474,7 @@ L000start: subl %esi,%eax roll $12,%ecx addl %ebp,%ecx - # 121 + # 121 movl 32(%esp),%edx orl %ecx,%eax addl %edx,%ebp @@ -1485,7 +1485,7 @@ L000start: subl %ecx,%edx roll $13,%ebp addl %ebx,%ebp - # 122 + # 122 movl 48(%esp),%eax orl %ebp,%edx addl %eax,%ebx @@ -1496,7 +1496,7 @@ L000start: subl %ebp,%eax roll $5,%ebx addl %edi,%ebx - # 123 + # 123 movl 8(%esp),%edx orl %ebx,%eax addl %edx,%edi @@ -1507,7 +1507,7 @@ L000start: subl %ebx,%edx roll $14,%edi addl %esi,%edi - # 124 + # 124 movl 40(%esp),%eax orl %edi,%edx addl %eax,%esi @@ -1518,7 +1518,7 @@ L000start: subl %edi,%eax roll $13,%esi addl %ecx,%esi - # 125 + # 125 movl (%esp),%edx orl %esi,%eax addl %edx,%ecx @@ -1529,7 +1529,7 @@ L000start: subl %esi,%edx roll $13,%ecx addl %ebp,%ecx - # 126 + # 126 movl 16(%esp),%eax orl %ecx,%edx addl %eax,%ebp @@ -1540,7 +1540,7 @@ L000start: subl %ecx,%eax roll $7,%ebp addl %ebx,%ebp - # 127 + # 127 movl 52(%esp),%edx orl %ebp,%eax addl %edx,%ebx @@ -1551,7 +1551,7 @@ L000start: movl $-1,%eax roll $5,%ebx addl %edi,%ebx - # 128 + # 128 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -1564,7 +1564,7 @@ L000start: movl $-1,%edx roll $15,%edi addl %esi,%edi - # 129 + # 129 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -1577,7 +1577,7 @@ L000start: movl $-1,%eax roll $5,%esi addl %ecx,%esi - # 130 + # 130 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -1590,7 +1590,7 @@ L000start: movl $-1,%edx roll $8,%ecx addl %ebp,%ecx - # 131 + # 131 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -1603,7 +1603,7 @@ L000start: movl $-1,%eax roll $11,%ebp addl %ebx,%ebp - # 132 + # 132 addl %edx,%ebx movl %ecx,%edx subl %ebp,%eax @@ -1616,7 +1616,7 @@ L000start: movl $-1,%edx roll $14,%ebx addl %edi,%ebx - # 133 + # 133 addl %eax,%edi movl %ebp,%eax subl %ebx,%edx @@ -1629,7 +1629,7 @@ L000start: movl $-1,%eax roll $14,%edi addl %esi,%edi - # 134 + # 134 addl %edx,%esi movl %ebx,%edx subl %edi,%eax @@ -1642,7 +1642,7 @@ L000start: movl $-1,%edx roll $6,%esi addl %ecx,%esi - # 135 + # 135 addl %eax,%ecx movl %edi,%eax subl %esi,%edx @@ -1655,7 +1655,7 @@ L000start: movl $-1,%eax roll $14,%ecx addl %ebp,%ecx - # 136 + # 136 addl %edx,%ebp movl %esi,%edx subl %ecx,%eax @@ -1668,7 +1668,7 @@ L000start: movl $-1,%edx roll $6,%ebp addl %ebx,%ebp - # 137 + # 137 addl %eax,%ebx movl %ecx,%eax subl %ebp,%edx @@ -1681,7 +1681,7 @@ L000start: movl $-1,%eax roll $9,%ebx addl %edi,%ebx - # 138 + # 138 addl %edx,%edi movl %ebp,%edx subl %ebx,%eax @@ -1694,7 +1694,7 @@ L000start: movl $-1,%edx roll $12,%edi addl %esi,%edi - # 139 + # 139 addl %eax,%esi movl %ebx,%eax subl %edi,%edx @@ -1707,7 +1707,7 @@ L000start: movl $-1,%eax roll $9,%esi addl %ecx,%esi - # 140 + # 140 addl %edx,%ecx movl %edi,%edx subl %esi,%eax @@ -1720,7 +1720,7 @@ L000start: movl $-1,%edx roll $12,%ecx addl %ebp,%ecx - # 141 + # 141 addl %eax,%ebp movl %esi,%eax subl %ecx,%edx @@ -1733,7 +1733,7 @@ L000start: movl $-1,%eax roll $5,%ebp addl %ebx,%ebp - # 142 + # 142 addl %edx,%ebx movl %ecx,%edx subl %ebp,%eax @@ -1746,7 +1746,7 @@ L000start: movl $-1,%edx roll $15,%ebx addl %edi,%ebx - # 143 + # 143 addl %eax,%edi movl %ebp,%eax subl %ebx,%edx @@ -1759,7 +1759,7 @@ L000start: xorl %ebp,%eax roll $8,%edi addl %esi,%edi - # 144 + # 144 movl 48(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -1768,7 +1768,7 @@ L000start: movl %edi,%eax roll $8,%esi addl %ecx,%esi - # 145 + # 145 xorl %ebx,%eax movl 60(%esp),%edx xorl %esi,%eax @@ -1779,7 +1779,7 @@ L000start: xorl %edi,%eax roll $5,%ecx addl %ebp,%ecx - # 146 + # 146 movl 40(%esp),%edx xorl %ecx,%eax addl %edx,%ebp @@ -1788,7 +1788,7 @@ L000start: movl %ecx,%eax roll $12,%ebp addl %ebx,%ebp - # 147 + # 147 xorl %esi,%eax movl 16(%esp),%edx xorl %ebp,%eax @@ -1799,7 +1799,7 @@ L000start: xorl %ecx,%eax roll $9,%ebx addl %edi,%ebx - # 148 + # 148 movl 4(%esp),%edx xorl %ebx,%eax addl %edx,%edi @@ -1808,7 +1808,7 @@ L000start: movl %ebx,%eax roll $12,%edi addl %esi,%edi - # 149 + # 149 xorl %ebp,%eax movl 20(%esp),%edx xorl %edi,%eax @@ -1819,7 +1819,7 @@ L000start: xorl %ebx,%eax roll $5,%esi addl %ecx,%esi - # 150 + # 150 movl 32(%esp),%edx xorl %esi,%eax addl %edx,%ecx @@ -1828,7 +1828,7 @@ L000start: movl %esi,%eax roll $14,%ecx addl %ebp,%ecx - # 151 + # 151 xorl %edi,%eax movl 28(%esp),%edx xorl %ecx,%eax @@ -1839,7 +1839,7 @@ L000start: xorl %esi,%eax roll $6,%ebp addl %ebx,%ebp - # 152 + # 152 movl 24(%esp),%edx xorl %ebp,%eax addl %edx,%ebx @@ -1848,7 +1848,7 @@ L000start: movl %ebp,%eax roll $8,%ebx addl %edi,%ebx - # 153 + # 153 xorl %ecx,%eax movl 8(%esp),%edx xorl %ebx,%eax @@ -1859,7 +1859,7 @@ L000start: xorl %ebp,%eax roll $13,%edi addl %esi,%edi - # 154 + # 154 movl 52(%esp),%edx xorl %edi,%eax addl %edx,%esi @@ -1868,7 +1868,7 @@ L000start: movl %edi,%eax roll $6,%esi addl %ecx,%esi - # 155 + # 155 xorl %ebx,%eax movl 56(%esp),%edx xorl %esi,%eax @@ -1879,7 +1879,7 @@ L000start: xorl %edi,%eax roll $5,%ecx addl %ebp,%ecx - # 156 + # 156 movl (%esp),%edx xorl %ecx,%eax addl %edx,%ebp @@ -1888,7 +1888,7 @@ L000start: movl %ecx,%eax roll $15,%ebp addl %ebx,%ebp - # 157 + # 157 xorl %esi,%eax movl 12(%esp),%edx xorl %ebp,%eax @@ -1899,7 +1899,7 @@ L000start: xorl %ecx,%eax roll $13,%ebx addl %edi,%ebx - # 158 + # 158 movl 36(%esp),%edx xorl %ebx,%eax addl %edx,%edi @@ -1908,7 +1908,7 @@ L000start: movl %ebx,%eax roll $11,%edi addl %esi,%edi - # 159 + # 159 xorl %ebp,%eax movl 44(%esp),%edx xorl %edi,%eax diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s index eea95f6cf2..d75e61693d 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/sha/sha1-586.s @@ -94,7 +94,7 @@ L002loop: movl 4(%ebp),%ebx movl 8(%ebp),%ecx movl 12(%ebp),%edx - # 00_15 0 + # 00_15 0 movl %ecx,%esi movl %eax,%ebp roll $5,%ebp @@ -106,7 +106,7 @@ L002loop: xorl %edx,%esi leal 1518500249(%ebp,%edi,1),%ebp addl %esi,%ebp - # 00_15 1 + # 00_15 1 movl %ebx,%edi movl %ebp,%esi roll $5,%ebp @@ -118,7 +118,7 @@ L002loop: xorl %ecx,%edi leal 1518500249(%ebp,%edx,1),%ebp addl %edi,%ebp - # 00_15 2 + # 00_15 2 movl %eax,%edx movl %ebp,%edi roll $5,%ebp @@ -130,7 +130,7 @@ L002loop: xorl %ebx,%edx leal 1518500249(%ebp,%ecx,1),%ebp addl %edx,%ebp - # 00_15 3 + # 00_15 3 movl %esi,%ecx movl %ebp,%edx roll $5,%ebp @@ -142,7 +142,7 @@ L002loop: xorl %eax,%ecx leal 1518500249(%ebp,%ebx,1),%ebp addl %ecx,%ebp - # 00_15 4 + # 00_15 4 movl %edi,%ebx movl %ebp,%ecx roll $5,%ebp @@ -154,7 +154,7 @@ L002loop: xorl %esi,%ebx leal 1518500249(%ebp,%eax,1),%ebp addl %ebx,%ebp - # 00_15 5 + # 00_15 5 movl %edx,%eax movl %ebp,%ebx roll $5,%ebp @@ -166,7 +166,7 @@ L002loop: xorl %edi,%eax leal 1518500249(%ebp,%esi,1),%ebp addl %eax,%ebp - # 00_15 6 + # 00_15 6 movl %ecx,%esi movl %ebp,%eax roll $5,%ebp @@ -178,7 +178,7 @@ L002loop: xorl %edx,%esi leal 1518500249(%ebp,%edi,1),%ebp addl %esi,%ebp - # 00_15 7 + # 00_15 7 movl %ebx,%edi movl %ebp,%esi roll $5,%ebp @@ -190,7 +190,7 @@ L002loop: xorl %ecx,%edi leal 1518500249(%ebp,%edx,1),%ebp addl %edi,%ebp - # 00_15 8 + # 00_15 8 movl %eax,%edx movl %ebp,%edi roll $5,%ebp @@ -202,7 +202,7 @@ L002loop: xorl %ebx,%edx leal 1518500249(%ebp,%ecx,1),%ebp addl %edx,%ebp - # 00_15 9 + # 00_15 9 movl %esi,%ecx movl %ebp,%edx roll $5,%ebp @@ -214,7 +214,7 @@ L002loop: xorl %eax,%ecx leal 1518500249(%ebp,%ebx,1),%ebp addl %ecx,%ebp - # 00_15 10 + # 00_15 10 movl %edi,%ebx movl %ebp,%ecx roll $5,%ebp @@ -226,7 +226,7 @@ L002loop: xorl %esi,%ebx leal 1518500249(%ebp,%eax,1),%ebp addl %ebx,%ebp - # 00_15 11 + # 00_15 11 movl %edx,%eax movl %ebp,%ebx roll $5,%ebp @@ -238,7 +238,7 @@ L002loop: xorl %edi,%eax leal 1518500249(%ebp,%esi,1),%ebp addl %eax,%ebp - # 00_15 12 + # 00_15 12 movl %ecx,%esi movl %ebp,%eax roll $5,%ebp @@ -250,7 +250,7 @@ L002loop: xorl %edx,%esi leal 1518500249(%ebp,%edi,1),%ebp addl %esi,%ebp - # 00_15 13 + # 00_15 13 movl %ebx,%edi movl %ebp,%esi roll $5,%ebp @@ -262,7 +262,7 @@ L002loop: xorl %ecx,%edi leal 1518500249(%ebp,%edx,1),%ebp addl %edi,%ebp - # 00_15 14 + # 00_15 14 movl %eax,%edx movl %ebp,%edi roll $5,%ebp @@ -274,7 +274,7 @@ L002loop: xorl %ebx,%edx leal 1518500249(%ebp,%ecx,1),%ebp addl %edx,%ebp - # 00_15 15 + # 00_15 15 movl %esi,%ecx movl %ebp,%edx roll $5,%ebp @@ -287,7 +287,7 @@ L002loop: leal 1518500249(%ebp,%ebx,1),%ebp movl (%esp),%ebx addl %ebp,%ecx - # 16_19 16 + # 16_19 16 movl %edi,%ebp xorl 8(%esp),%ebx xorl %esi,%ebp @@ -304,7 +304,7 @@ L002loop: leal 1518500249(%ebx,%eax,1),%ebx movl 4(%esp),%eax addl %ebp,%ebx - # 16_19 17 + # 16_19 17 movl %edx,%ebp xorl 12(%esp),%eax xorl %edi,%ebp @@ -321,7 +321,7 @@ L002loop: leal 1518500249(%eax,%esi,1),%eax movl 8(%esp),%esi addl %ebp,%eax - # 16_19 18 + # 16_19 18 movl %ecx,%ebp xorl 16(%esp),%esi xorl %edx,%ebp @@ -338,7 +338,7 @@ L002loop: leal 1518500249(%esi,%edi,1),%esi movl 12(%esp),%edi addl %ebp,%esi - # 16_19 19 + # 16_19 19 movl %ebx,%ebp xorl 20(%esp),%edi xorl %ecx,%ebp @@ -355,7 +355,7 @@ L002loop: leal 1518500249(%edi,%edx,1),%edi movl 16(%esp),%edx addl %ebp,%edi - # 20_39 20 + # 20_39 20 movl %esi,%ebp xorl 24(%esp),%edx xorl %eax,%ebp @@ -371,7 +371,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 20(%esp),%ecx addl %ebp,%edx - # 20_39 21 + # 20_39 21 movl %edi,%ebp xorl 28(%esp),%ecx xorl %esi,%ebp @@ -387,7 +387,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 24(%esp),%ebx addl %ebp,%ecx - # 20_39 22 + # 20_39 22 movl %edx,%ebp xorl 32(%esp),%ebx xorl %edi,%ebp @@ -403,7 +403,7 @@ L002loop: leal 1859775393(%ebx,%eax,1),%ebx movl 28(%esp),%eax addl %ebp,%ebx - # 20_39 23 + # 20_39 23 movl %ecx,%ebp xorl 36(%esp),%eax xorl %edx,%ebp @@ -419,7 +419,7 @@ L002loop: leal 1859775393(%eax,%esi,1),%eax movl 32(%esp),%esi addl %ebp,%eax - # 20_39 24 + # 20_39 24 movl %ebx,%ebp xorl 40(%esp),%esi xorl %ecx,%ebp @@ -435,7 +435,7 @@ L002loop: leal 1859775393(%esi,%edi,1),%esi movl 36(%esp),%edi addl %ebp,%esi - # 20_39 25 + # 20_39 25 movl %eax,%ebp xorl 44(%esp),%edi xorl %ebx,%ebp @@ -451,7 +451,7 @@ L002loop: leal 1859775393(%edi,%edx,1),%edi movl 40(%esp),%edx addl %ebp,%edi - # 20_39 26 + # 20_39 26 movl %esi,%ebp xorl 48(%esp),%edx xorl %eax,%ebp @@ -467,7 +467,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 44(%esp),%ecx addl %ebp,%edx - # 20_39 27 + # 20_39 27 movl %edi,%ebp xorl 52(%esp),%ecx xorl %esi,%ebp @@ -483,7 +483,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 48(%esp),%ebx addl %ebp,%ecx - # 20_39 28 + # 20_39 28 movl %edx,%ebp xorl 56(%esp),%ebx xorl %edi,%ebp @@ -499,7 +499,7 @@ L002loop: leal 1859775393(%ebx,%eax,1),%ebx movl 52(%esp),%eax addl %ebp,%ebx - # 20_39 29 + # 20_39 29 movl %ecx,%ebp xorl 60(%esp),%eax xorl %edx,%ebp @@ -515,7 +515,7 @@ L002loop: leal 1859775393(%eax,%esi,1),%eax movl 56(%esp),%esi addl %ebp,%eax - # 20_39 30 + # 20_39 30 movl %ebx,%ebp xorl (%esp),%esi xorl %ecx,%ebp @@ -531,7 +531,7 @@ L002loop: leal 1859775393(%esi,%edi,1),%esi movl 60(%esp),%edi addl %ebp,%esi - # 20_39 31 + # 20_39 31 movl %eax,%ebp xorl 4(%esp),%edi xorl %ebx,%ebp @@ -547,7 +547,7 @@ L002loop: leal 1859775393(%edi,%edx,1),%edi movl (%esp),%edx addl %ebp,%edi - # 20_39 32 + # 20_39 32 movl %esi,%ebp xorl 8(%esp),%edx xorl %eax,%ebp @@ -563,7 +563,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 4(%esp),%ecx addl %ebp,%edx - # 20_39 33 + # 20_39 33 movl %edi,%ebp xorl 12(%esp),%ecx xorl %esi,%ebp @@ -579,7 +579,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 8(%esp),%ebx addl %ebp,%ecx - # 20_39 34 + # 20_39 34 movl %edx,%ebp xorl 16(%esp),%ebx xorl %edi,%ebp @@ -595,7 +595,7 @@ L002loop: leal 1859775393(%ebx,%eax,1),%ebx movl 12(%esp),%eax addl %ebp,%ebx - # 20_39 35 + # 20_39 35 movl %ecx,%ebp xorl 20(%esp),%eax xorl %edx,%ebp @@ -611,7 +611,7 @@ L002loop: leal 1859775393(%eax,%esi,1),%eax movl 16(%esp),%esi addl %ebp,%eax - # 20_39 36 + # 20_39 36 movl %ebx,%ebp xorl 24(%esp),%esi xorl %ecx,%ebp @@ -627,7 +627,7 @@ L002loop: leal 1859775393(%esi,%edi,1),%esi movl 20(%esp),%edi addl %ebp,%esi - # 20_39 37 + # 20_39 37 movl %eax,%ebp xorl 28(%esp),%edi xorl %ebx,%ebp @@ -643,7 +643,7 @@ L002loop: leal 1859775393(%edi,%edx,1),%edi movl 24(%esp),%edx addl %ebp,%edi - # 20_39 38 + # 20_39 38 movl %esi,%ebp xorl 32(%esp),%edx xorl %eax,%ebp @@ -659,7 +659,7 @@ L002loop: leal 1859775393(%edx,%ecx,1),%edx movl 28(%esp),%ecx addl %ebp,%edx - # 20_39 39 + # 20_39 39 movl %edi,%ebp xorl 36(%esp),%ecx xorl %esi,%ebp @@ -675,7 +675,7 @@ L002loop: leal 1859775393(%ecx,%ebx,1),%ecx movl 32(%esp),%ebx addl %ebp,%ecx - # 40_59 40 + # 40_59 40 movl %edi,%ebp xorl 40(%esp),%ebx xorl %esi,%ebp @@ -694,7 +694,7 @@ L002loop: andl %esi,%ebp movl 36(%esp),%eax addl %ebp,%ebx - # 40_59 41 + # 40_59 41 movl %edx,%ebp xorl 44(%esp),%eax xorl %edi,%ebp @@ -713,7 +713,7 @@ L002loop: andl %edi,%ebp movl 40(%esp),%esi addl %ebp,%eax - # 40_59 42 + # 40_59 42 movl %ecx,%ebp xorl 48(%esp),%esi xorl %edx,%ebp @@ -732,7 +732,7 @@ L002loop: andl %edx,%ebp movl 44(%esp),%edi addl %ebp,%esi - # 40_59 43 + # 40_59 43 movl %ebx,%ebp xorl 52(%esp),%edi xorl %ecx,%ebp @@ -751,7 +751,7 @@ L002loop: andl %ecx,%ebp movl 48(%esp),%edx addl %ebp,%edi - # 40_59 44 + # 40_59 44 movl %eax,%ebp xorl 56(%esp),%edx xorl %ebx,%ebp @@ -770,7 +770,7 @@ L002loop: andl %ebx,%ebp movl 52(%esp),%ecx addl %ebp,%edx - # 40_59 45 + # 40_59 45 movl %esi,%ebp xorl 60(%esp),%ecx xorl %eax,%ebp @@ -789,7 +789,7 @@ L002loop: andl %eax,%ebp movl 56(%esp),%ebx addl %ebp,%ecx - # 40_59 46 + # 40_59 46 movl %edi,%ebp xorl (%esp),%ebx xorl %esi,%ebp @@ -808,7 +808,7 @@ L002loop: andl %esi,%ebp movl 60(%esp),%eax addl %ebp,%ebx - # 40_59 47 + # 40_59 47 movl %edx,%ebp xorl 4(%esp),%eax xorl %edi,%ebp @@ -827,7 +827,7 @@ L002loop: andl %edi,%ebp movl (%esp),%esi addl %ebp,%eax - # 40_59 48 + # 40_59 48 movl %ecx,%ebp xorl 8(%esp),%esi xorl %edx,%ebp @@ -846,7 +846,7 @@ L002loop: andl %edx,%ebp movl 4(%esp),%edi addl %ebp,%esi - # 40_59 49 + # 40_59 49 movl %ebx,%ebp xorl 12(%esp),%edi xorl %ecx,%ebp @@ -865,7 +865,7 @@ L002loop: andl %ecx,%ebp movl 8(%esp),%edx addl %ebp,%edi - # 40_59 50 + # 40_59 50 movl %eax,%ebp xorl 16(%esp),%edx xorl %ebx,%ebp @@ -884,7 +884,7 @@ L002loop: andl %ebx,%ebp movl 12(%esp),%ecx addl %ebp,%edx - # 40_59 51 + # 40_59 51 movl %esi,%ebp xorl 20(%esp),%ecx xorl %eax,%ebp @@ -903,7 +903,7 @@ L002loop: andl %eax,%ebp movl 16(%esp),%ebx addl %ebp,%ecx - # 40_59 52 + # 40_59 52 movl %edi,%ebp xorl 24(%esp),%ebx xorl %esi,%ebp @@ -922,7 +922,7 @@ L002loop: andl %esi,%ebp movl 20(%esp),%eax addl %ebp,%ebx - # 40_59 53 + # 40_59 53 movl %edx,%ebp xorl 28(%esp),%eax xorl %edi,%ebp @@ -941,7 +941,7 @@ L002loop: andl %edi,%ebp movl 24(%esp),%esi addl %ebp,%eax - # 40_59 54 + # 40_59 54 movl %ecx,%ebp xorl 32(%esp),%esi xorl %edx,%ebp @@ -960,7 +960,7 @@ L002loop: andl %edx,%ebp movl 28(%esp),%edi addl %ebp,%esi - # 40_59 55 + # 40_59 55 movl %ebx,%ebp xorl 36(%esp),%edi xorl %ecx,%ebp @@ -979,7 +979,7 @@ L002loop: andl %ecx,%ebp movl 32(%esp),%edx addl %ebp,%edi - # 40_59 56 + # 40_59 56 movl %eax,%ebp xorl 40(%esp),%edx xorl %ebx,%ebp @@ -998,7 +998,7 @@ L002loop: andl %ebx,%ebp movl 36(%esp),%ecx addl %ebp,%edx - # 40_59 57 + # 40_59 57 movl %esi,%ebp xorl 44(%esp),%ecx xorl %eax,%ebp @@ -1017,7 +1017,7 @@ L002loop: andl %eax,%ebp movl 40(%esp),%ebx addl %ebp,%ecx - # 40_59 58 + # 40_59 58 movl %edi,%ebp xorl 48(%esp),%ebx xorl %esi,%ebp @@ -1036,7 +1036,7 @@ L002loop: andl %esi,%ebp movl 44(%esp),%eax addl %ebp,%ebx - # 40_59 59 + # 40_59 59 movl %edx,%ebp xorl 52(%esp),%eax xorl %edi,%ebp @@ -1055,7 +1055,7 @@ L002loop: andl %edi,%ebp movl 48(%esp),%esi addl %ebp,%eax - # 20_39 60 + # 20_39 60 movl %ebx,%ebp xorl 56(%esp),%esi xorl %ecx,%ebp @@ -1071,7 +1071,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 52(%esp),%edi addl %ebp,%esi - # 20_39 61 + # 20_39 61 movl %eax,%ebp xorl 60(%esp),%edi xorl %ebx,%ebp @@ -1087,7 +1087,7 @@ L002loop: leal 3395469782(%edi,%edx,1),%edi movl 56(%esp),%edx addl %ebp,%edi - # 20_39 62 + # 20_39 62 movl %esi,%ebp xorl (%esp),%edx xorl %eax,%ebp @@ -1103,7 +1103,7 @@ L002loop: leal 3395469782(%edx,%ecx,1),%edx movl 60(%esp),%ecx addl %ebp,%edx - # 20_39 63 + # 20_39 63 movl %edi,%ebp xorl 4(%esp),%ecx xorl %esi,%ebp @@ -1119,7 +1119,7 @@ L002loop: leal 3395469782(%ecx,%ebx,1),%ecx movl (%esp),%ebx addl %ebp,%ecx - # 20_39 64 + # 20_39 64 movl %edx,%ebp xorl 8(%esp),%ebx xorl %edi,%ebp @@ -1135,7 +1135,7 @@ L002loop: leal 3395469782(%ebx,%eax,1),%ebx movl 4(%esp),%eax addl %ebp,%ebx - # 20_39 65 + # 20_39 65 movl %ecx,%ebp xorl 12(%esp),%eax xorl %edx,%ebp @@ -1151,7 +1151,7 @@ L002loop: leal 3395469782(%eax,%esi,1),%eax movl 8(%esp),%esi addl %ebp,%eax - # 20_39 66 + # 20_39 66 movl %ebx,%ebp xorl 16(%esp),%esi xorl %ecx,%ebp @@ -1167,7 +1167,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 12(%esp),%edi addl %ebp,%esi - # 20_39 67 + # 20_39 67 movl %eax,%ebp xorl 20(%esp),%edi xorl %ebx,%ebp @@ -1183,7 +1183,7 @@ L002loop: leal 3395469782(%edi,%edx,1),%edi movl 16(%esp),%edx addl %ebp,%edi - # 20_39 68 + # 20_39 68 movl %esi,%ebp xorl 24(%esp),%edx xorl %eax,%ebp @@ -1199,7 +1199,7 @@ L002loop: leal 3395469782(%edx,%ecx,1),%edx movl 20(%esp),%ecx addl %ebp,%edx - # 20_39 69 + # 20_39 69 movl %edi,%ebp xorl 28(%esp),%ecx xorl %esi,%ebp @@ -1215,7 +1215,7 @@ L002loop: leal 3395469782(%ecx,%ebx,1),%ecx movl 24(%esp),%ebx addl %ebp,%ecx - # 20_39 70 + # 20_39 70 movl %edx,%ebp xorl 32(%esp),%ebx xorl %edi,%ebp @@ -1231,7 +1231,7 @@ L002loop: leal 3395469782(%ebx,%eax,1),%ebx movl 28(%esp),%eax addl %ebp,%ebx - # 20_39 71 + # 20_39 71 movl %ecx,%ebp xorl 36(%esp),%eax xorl %edx,%ebp @@ -1247,7 +1247,7 @@ L002loop: leal 3395469782(%eax,%esi,1),%eax movl 32(%esp),%esi addl %ebp,%eax - # 20_39 72 + # 20_39 72 movl %ebx,%ebp xorl 40(%esp),%esi xorl %ecx,%ebp @@ -1263,7 +1263,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 36(%esp),%edi addl %ebp,%esi - # 20_39 73 + # 20_39 73 movl %eax,%ebp xorl 44(%esp),%edi xorl %ebx,%ebp @@ -1279,7 +1279,7 @@ L002loop: leal 3395469782(%edi,%edx,1),%edi movl 40(%esp),%edx addl %ebp,%edi - # 20_39 74 + # 20_39 74 movl %esi,%ebp xorl 48(%esp),%edx xorl %eax,%ebp @@ -1295,7 +1295,7 @@ L002loop: leal 3395469782(%edx,%ecx,1),%edx movl 44(%esp),%ecx addl %ebp,%edx - # 20_39 75 + # 20_39 75 movl %edi,%ebp xorl 52(%esp),%ecx xorl %esi,%ebp @@ -1311,7 +1311,7 @@ L002loop: leal 3395469782(%ecx,%ebx,1),%ecx movl 48(%esp),%ebx addl %ebp,%ecx - # 20_39 76 + # 20_39 76 movl %edx,%ebp xorl 56(%esp),%ebx xorl %edi,%ebp @@ -1327,7 +1327,7 @@ L002loop: leal 3395469782(%ebx,%eax,1),%ebx movl 52(%esp),%eax addl %ebp,%ebx - # 20_39 77 + # 20_39 77 movl %ecx,%ebp xorl 60(%esp),%eax xorl %edx,%ebp @@ -1342,7 +1342,7 @@ L002loop: leal 3395469782(%eax,%esi,1),%eax movl 56(%esp),%esi addl %ebp,%eax - # 20_39 78 + # 20_39 78 movl %ebx,%ebp xorl (%esp),%esi xorl %ecx,%ebp @@ -1357,7 +1357,7 @@ L002loop: leal 3395469782(%esi,%edi,1),%esi movl 60(%esp),%edi addl %ebp,%esi - # 20_39 79 + # 20_39 79 movl %eax,%ebp xorl 4(%esp),%edi xorl %ebx,%ebp diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h index cd3e29a4f3..f53c3d3eb7 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index 423502679d..19ae424ab5 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -211,7 +211,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -395,7 +394,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -569,7 +567,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm index 035bc93eea..768c6baae0 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin-i386-cc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3949,12 +3933,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5084,12 +5062,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6239,12 +6211,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,10 +7198,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7341,10 +7303,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7412,8 +7370,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7434,23 +7392,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7606,7 +7551,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7631,7 +7575,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7648,10 +7591,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7718,268 +7658,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8703,10 +9084,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9443,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10151,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10674,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10859,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11036,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12040,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12249,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12406,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12422,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index 44161204be..3f09529c5b 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Tue Nov 20 09:37:53 2018" +#define DATE "built on: Tue Apr 3 00:38:22 2018" diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h index b2fe2bef12..af8c1f66f8 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h @@ -108,18 +108,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi index 1b5a1389a0..c1d26d10f5 100644 --- a/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm index 095e614945..9976ff77d5 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin64-x86_64-cc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -4010,12 +3994,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5157,12 +5135,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6360,12 +6332,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7365,10 +7331,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7474,10 +7436,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7567,23 +7525,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7739,7 +7684,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7764,7 +7708,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7781,10 +7724,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7851,6 +7791,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8876,10 +9257,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9624,10 +10001,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10364,10 +10737,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10905,7 +11274,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11092,7 +11460,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11277,7 +11644,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12283,15 +12649,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12492,14 +12849,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12649,14 +12998,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12665,23 +13006,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s index 9a337fb897..f28903cd57 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s index 75ce16175c..f127e013ea 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -1432,4 +1432,3 @@ L$dec8x_done: leaq (%rax),%rsp L$dec8x_epilogue: .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s index b14cf7691a..cdce52cd0a 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _aesni_cbc_sha1_enc @@ -2982,4 +2982,3 @@ L$aesenclast14: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s index 08025a0bae..40e75bfedb 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _aesni_cbc_sha256_enc @@ -4352,4 +4352,3 @@ L$aesenclast4: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s index 2c741239ef..258ee335ad 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _aesni_encrypt diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s index da5d1b1122..52ae782e9a 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -2495,4 +2495,3 @@ L$63: .quad 0x6363636363636363, 0x6363636363636363 .byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 .p2align 6 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s index bcd4865659..2ffd0bc100 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -824,4 +824,3 @@ L$k_dsbo: .quad 0x12D7560F93441D00, 0xCA4B8159D8C58E9C .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 .p2align 6 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s index 785a35ac91..f2bc63be34 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl _rsaz_1024_sqr_avx2 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s index 7f4a01109e..8a6e44932d 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s index af1ffdd59b..c0f0b4bd68 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s index dd43da0d86..a8b7f998a1 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ L$inner_enter: xorq %r14,%r14 movq (%rsp),%rax + leaq (%rsp),%rsi movq %r9,%r15 - + jmp L$sub .p2align 4 L$sub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsp,%r14,8),%rax + movq 8(%rsi,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz L$sub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.p2align 4 L$copy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx - movq %r9,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq (%rsi,%r14,8),%rax + movq %r14,(%rsp,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz L$copy @@ -574,10 +574,10 @@ L$inner4x: cmpq %r9,%r14 jb L$outer4x movq 16(%rsp,%r9,8),%rdi - leaq -4(%r9),%r15 movq 0(%rsp),%rax + pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r15 + shrq $2,%r9 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,7 +585,9 @@ L$inner4x: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - + leaq -1(%r9),%r15 + jmp L$sub4x +.p2align 4 L$sub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -612,35 +614,34 @@ L$sub4x: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - pxor %xmm0,%xmm0 -.byte 102,72,15,110,224 - pcmpeqd %xmm5,%xmm5 - pshufd $0,%xmm4,%xmm4 - movq %r9,%r15 - pxor %xmm4,%xmm5 - shrq $2,%r15 - xorl %eax,%eax - + xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx + leaq -1(%r9),%r15 + orq %rcx,%rsi + + movdqu (%rsi),%xmm1 + movdqa %xmm0,(%rsp) + movdqu %xmm1,(%rdi) jmp L$copy4x .p2align 4 L$copy4x: - movdqa (%rsp,%rax,1),%xmm1 - movdqu (%rdi,%rax,1),%xmm2 - pand %xmm4,%xmm1 - pand %xmm5,%xmm2 - movdqa 16(%rsp,%rax,1),%xmm3 - movdqa %xmm0,(%rsp,%rax,1) - por %xmm2,%xmm1 - movdqu 16(%rdi,%rax,1),%xmm2 - movdqu %xmm1,(%rdi,%rax,1) - pand %xmm4,%xmm3 - pand %xmm5,%xmm2 - movdqa %xmm0,16(%rsp,%rax,1) - por %xmm2,%xmm3 - movdqu %xmm3,16(%rdi,%rax,1) - leaq 32(%rax),%rax + movdqu 16(%rsi,%r14,1),%xmm2 + movdqu 32(%rsi,%r14,1),%xmm1 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) + movdqa %xmm0,32(%rsp,%r14,1) + movdqu %xmm1,32(%rdi,%r14,1) + leaq 32(%r14),%r14 decq %r15 jnz L$copy4x + + shlq $2,%r9 + movdqu 16(%rsi,%r14,1),%xmm2 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s index f415b8d80c..2f62889472 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,19 +393,18 @@ L$sub: sbbq (%rcx,%r14,8),%rax jnz L$sub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.p2align 4 L$copy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx + movq (%rsi,%r14,8),%rax movq %r14,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz L$copy diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index ecb27f8a3a..b72d49d68b 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Tue Nov 20 09:37:39 2018" +#define DATE "built on: Tue Apr 3 00:38:16 2018" diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s index 35a3ea550a..8025d088fd 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s index afd47bdf68..58f4283a79 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text @@ -1990,4 +1990,3 @@ L$done8x: vzeroall movq 640(%rsp),%rsp .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s index 77102c6a41..37e6f155b6 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _ecp_nistz256_precomputed .p2align 12 @@ -2372,7 +2372,7 @@ _ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd -.text +.text @@ -5931,4 +5931,3 @@ L$point_add_affinex: popq %rbx popq %rbp .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s index f385ea2a3f..76a65a7ed8 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 .globl _md5_block_asm_data_order @@ -662,4 +662,3 @@ L$end: addq $40,%rsp L$epilogue: .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s index f01a002363..af27718a59 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 5 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s index 502af78349..76f3b7cdfd 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s index c68f5a6fbe..e4769a669c 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s index 47dce361a6..a9c582fdbb 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .p2align 4 .globl _rc4_md5_enc @@ -1256,4 +1256,3 @@ L$oop: L$epilogue: L$abort: .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s index 86ef486662..b842ec60de 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _RC4 @@ -612,4 +612,3 @@ L$opts: .byte 114,99,52,40,49,54,120,44,105,110,116,41,0 .byte 82,67,52,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .p2align 6 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s index 7026de0e76..ac6ad9bb8c 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s index 3e3633911f..1c52e05e39 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s index 95e0e774af..897dacd5b4 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s index 05e973612b..3cbe0a170c 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _sha256_block_data_order @@ -5355,4 +5355,3 @@ L$done_avx2: leaq 48(%rsi),%rsp L$epilogue_avx2: .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s index 234616bc3b..91821da126 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _sha512_block_data_order @@ -5362,4 +5362,3 @@ L$done_avx2: leaq 48(%rsi),%rsp L$epilogue_avx2: .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s index 4057ba32ac..ad43b5a1b3 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _whirlpool_block diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s index 8f16835f71..f9987b733a 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s @@ -7,7 +7,7 @@ .private_extern _OPENSSL_ia32cap_P .comm _OPENSSL_ia32cap_P,16,2 -.text +.text .globl _OPENSSL_atomic_add @@ -455,4 +455,3 @@ L$tail_rdseed_bytes: L$done_rdseed_bytes: .byte 0xf3,0xc3 - diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s index b2c06a9919..5121b7a05c 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl _padlock_capability .p2align 4 @@ -1020,7 +1020,7 @@ L$ctr32_abort: .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .p2align 4 -.data +.data .p2align 3 L$padlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h index dd9f0d18ab..f7d6eb8114 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index c9d8fe025d..20d6fbba6a 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi @@ -215,7 +215,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -574,7 +572,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index b2f66ad053..5c67787780 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "darwin64-x86_64-cc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3949,12 +3933,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5084,12 +5062,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6239,12 +6211,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,10 +7198,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7341,10 +7303,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7412,8 +7370,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7434,23 +7392,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7606,7 +7551,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7631,7 +7575,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7648,10 +7591,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7718,268 +7658,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8703,10 +9084,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9443,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10151,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10674,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10859,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11036,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12040,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12249,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12406,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12422,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h index 3d9d8631fe..c390a3edf1 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Tue Nov 20 09:37:48 2018" +#define DATE "built on: Tue Apr 3 00:38:20 2018" diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h index 77321f72a6..8ebbf01547 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h @@ -108,18 +108,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi index d354fe610e..3ec9ac0dd0 100644 --- a/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index d2eec2550e..954f89a92d 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-aarch64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3970,12 +3954,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5114,12 +5092,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6278,12 +6250,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7271,10 +7237,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7380,10 +7342,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7451,9 +7409,9 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", "include", + "test", ".", ], "test/threadstest.o" => @@ -7473,23 +7431,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7645,7 +7590,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7670,7 +7614,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7687,10 +7630,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7757,268 +7697,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8762,10 +9143,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9510,10 +9887,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10234,10 +10607,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10762,7 +11131,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10949,7 +11317,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11130,7 +11497,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12134,15 +12500,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12343,14 +12700,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12500,14 +12849,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12516,23 +12857,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h index de00160217..8eff4c899c 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -27,4 +27,4 @@ static const char cflags[] = { '1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Tue Nov 20 09:37:54 2018" +#define DATE "built on: Tue Apr 3 00:38:23 2018" diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S index 85e76b8253..d5b1539950 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S @@ -2765,7 +2765,7 @@ __ecp_nistz256_sqr_mont: // *| | | | | | | | 2| // +|a3*a3|a2*a2|a1*a1|a0*a0| // |--+--+--+--+--+--+--+--| - // |A7|A6|A5|A4|A3|A2|A1|A0|, where Ax is , i.e. follow + // |A7|A6|A5|A4|A3|A2|A1|A0|, where Ax is , i.e. follow // // "can't overflow" below mark carrying into high part of // multiplication result, which can't overflow, because it @@ -3752,21 +3752,21 @@ ecp_nistz256_scatter_w7: prfm pstl1strm,[x0,#4096+64*5] prfm pstl1strm,[x0,#4096+64*6] prfm pstl1strm,[x0,#4096+64*7] - strb w3,[x0,#64*0] + strb w3,[x0,#64*0-1] lsr x3,x3,#8 - strb w3,[x0,#64*1] + strb w3,[x0,#64*1-1] lsr x3,x3,#8 - strb w3,[x0,#64*2] + strb w3,[x0,#64*2-1] lsr x3,x3,#8 - strb w3,[x0,#64*3] + strb w3,[x0,#64*3-1] lsr x3,x3,#8 - strb w3,[x0,#64*4] + strb w3,[x0,#64*4-1] lsr x3,x3,#8 - strb w3,[x0,#64*5] + strb w3,[x0,#64*5-1] lsr x3,x3,#8 - strb w3,[x0,#64*6] + strb w3,[x0,#64*6-1] lsr x3,x3,#8 - strb w3,[x0,#64*7] + strb w3,[x0,#64*7-1] add x0,x0,#64*8 b.ne .Loop_scatter_w7 diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S index c3e7c97d09..20d797bfa7 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/crypto/modes/ghashv8-armx.S @@ -1,6 +1,5 @@ #include "arm_arch.h" -#if __ARM_MAX_ARCH__>=7 .text .arch armv8-a+crypto .globl gcm_init_v8 @@ -227,4 +226,3 @@ gcm_ghash_v8: .byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 -#endif diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h index 8bd973e750..3976dadb19 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi index a35b09bebc..e0a7b48970 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -405,7 +404,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm index cc97299507..6c0451cfb7 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-aarch64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1076,10 +1076,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1246,22 +1242,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3948,12 +3932,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5083,12 +5061,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6238,12 +6210,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7231,10 +7197,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7340,10 +7302,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7433,23 +7391,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7605,7 +7550,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7630,7 +7574,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7647,10 +7590,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7717,6 +7657,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8702,10 +9083,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9442,10 +9819,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10150,10 +10523,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10673,7 +11042,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10858,7 +11226,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11035,7 +11402,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12039,15 +12405,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12248,14 +12605,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12405,14 +12754,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12421,23 +12762,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h index ef978bd9e7..fbcadcd5ff 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Tue Nov 20 09:37:57 2018" +#define DATE "built on: Tue Apr 3 00:38:24 2018" diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h index 08bf3d4394..af3a003d51 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi index e15c5ddbf4..9d9b4c82f8 100644 --- a/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index 5fcbd4ee5e..cb318fa4a5 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-armv4", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3964,12 +3948,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5108,12 +5086,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6275,12 +6247,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7268,10 +7234,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7377,10 +7339,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7448,8 +7406,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7470,23 +7428,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7642,7 +7587,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7667,7 +7611,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7684,10 +7627,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7754,268 +7694,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8763,10 +9144,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9511,10 +9888,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10239,10 +10612,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10768,7 +11137,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10955,7 +11323,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11137,7 +11504,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12141,15 +12507,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12350,14 +12707,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12507,14 +12856,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12523,23 +12864,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S index eae2d6ad25..deb6016737 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S @@ -104,7 +104,7 @@ CRYPTO_memcmp: ldmia sp!,{r4,r5} .Lno_data: - rsb r0,ip,#0 + neg r0,ip mov r0,r0,lsr#31 #if __ARM_ARCH__>=5 bx lr diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S index 9f6e7e0c79..bd5efa8156 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S @@ -165,15 +165,14 @@ bn_mul_mont: mov r4,sp @ "rewind" r4 sub r2,r2,r5 @ "rewind" r2 -.Lcopy: ldr r7,[r4] @ conditional copy - ldr r5,[r2] + and r1,r4,r14 + bic r3,r2,r14 + orr r1,r1,r3 @ ap=borrow?tp:rp + +.Lcopy: ldr r7,[r1],#4 @ copy or in-place refresh str sp,[r4],#4 @ zap tp -#ifdef __thumb2__ - it cc -#endif - movcc r5,r7 - str r5,[r2],#4 - teq r4,r0 @ preserve carry + str r7,[r2],#4 + cmp r4,r0 bne .Lcopy mov sp,r0 diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h index 189f3673f2..6a7c2e2220 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -30,4 +30,4 @@ static const char cflags[] = { '"','"',' ','\0' }; #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Tue Nov 20 09:37:59 2018" +#define DATE "built on: Tue Apr 3 00:38:25 2018" diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S index ee64a0b30b..625e9506de 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S @@ -3432,13 +3432,13 @@ ecp_nistz256_scatter_w7: .Loop_scatter_w7: ldr r3,[r1],#4 subs r2,r2,#1 - strb r3,[r0,#64*0] + strb r3,[r0,#64*0-1] mov r3,r3,lsr#8 - strb r3,[r0,#64*1] + strb r3,[r0,#64*1-1] mov r3,r3,lsr#8 - strb r3,[r0,#64*2] + strb r3,[r0,#64*2-1] mov r3,r3,lsr#8 - strb r3,[r0,#64*3] + strb r3,[r0,#64*3-1] add r0,r0,#64*4 bne .Loop_scatter_w7 @@ -4114,7 +4114,7 @@ ecp_nistz256_point_add: stmia r0!,{r4,r5} .Ladd_done: add sp,sp,#32*18+16+16 @ +16 means "skip even over saved r0-r3" -#if __ARM_ARCH__>=5 || !defined(__thumb__) +#if __ARM_ARCH__>=5 || defined(__thumb__) ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc} #else ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr} diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S index e654d9480f..2134f9b647 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S @@ -3,8 +3,6 @@ .text #if defined(__thumb2__) || defined(__clang__) .syntax unified -#define ldrplb ldrbpl -#define ldrneb ldrbne #endif #if defined(__thumb2__) .thumb @@ -12,6 +10,11 @@ .code 32 #endif +#ifdef __clang__ +#define ldrplb ldrbpl +#define ldrneb ldrbne +#endif + .type rem_4bit,%object .align 5 rem_4bit: diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S index ceceb743ec..f6fb3f1f73 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S @@ -1,6 +1,5 @@ #include "arm_arch.h" -#if __ARM_MAX_ARCH__>=7 .text .fpu neon .code 32 @@ -231,4 +230,3 @@ gcm_ghash_v8: .byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 -#endif diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S index 16b0eb0e9f..7484c33b84 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S @@ -132,7 +132,6 @@ poly1305_init: .type poly1305_blocks,%function .align 5 poly1305_blocks: -.Lpoly1305_blocks: stmdb sp!,{r3,r4,r5,r6,r7,r8,r9,r10,r11,lr} ands r2,r2,#-16 @@ -607,7 +606,7 @@ poly1305_blocks_neon: cmp r2,#64 bhs .Lenter_neon tst ip,ip @ is_base2_26? - beq .Lpoly1305_blocks + beq poly1305_blocks .Lenter_neon: stmdb sp!,{r4,r5,r6,r7} diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S index 3efcde6b6e..239e7504f1 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy @@ -1831,7 +1831,7 @@ sha256_block_data_order: eor r12,r12,r6 @ Maj(a,b,c) add r4,r4,r0,ror#2 @ h+=Sigma0(a) @ add r4,r4,r12 @ h+=Maj(a,b,c) -#ifdef __thumb2__ +#if __ARM_ARCH__>=7 ite eq @ Thumb2 thing, sanity check in ARM #endif ldreq r3,[sp,#16*4] @ pull ctx diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S index 1e2fbf6350..14eb87e0ce 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy @@ -265,7 +265,7 @@ sha512_block_data_order: teq r9,#148 ldr r12,[sp,#16+0] @ c.lo -#ifdef __thumb2__ +#if __ARM_ARCH__>=7 it eq @ Thumb2 thing, sanity check in ARM #endif orreq r14,r14,#1 @@ -405,7 +405,7 @@ sha512_block_data_order: teq r9,#23 ldr r12,[sp,#16+0] @ c.lo -#ifdef __thumb2__ +#if __ARM_ARCH__>=7 it eq @ Thumb2 thing, sanity check in ARM #endif orreq r14,r14,#1 @@ -442,7 +442,7 @@ sha512_block_data_order: adc r6,r6,r4 @ h += T tst r14,#1 add r14,r14,#8 -#ifdef __thumb2__ +#if __ARM_ARCH__>=7 ittt eq @ Thumb2 thing, sanity check in ARM #endif ldreq r9,[sp,#184+0] diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h index 21dd8cc643..2f9817e43b 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi index 3115373ca3..fcb4548956 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi @@ -218,7 +218,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -580,7 +578,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm index e61c41fe89..af91de539b 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-armv4", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1076,10 +1076,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1246,22 +1242,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3948,12 +3932,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5083,12 +5061,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6238,12 +6210,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7231,10 +7197,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7340,10 +7302,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7411,9 +7369,9 @@ our %unified_info = ( ], "test/testutil.o" => [ + "test", "crypto/include", "include", - "test", ".", ], "test/threadstest.o" => @@ -7433,23 +7391,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7605,7 +7550,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7630,7 +7574,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7647,10 +7590,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7717,268 +7657,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8702,10 +9083,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9442,10 +9819,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10150,10 +10523,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10673,7 +11042,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10858,7 +11226,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11035,7 +11402,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12039,15 +12405,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12248,14 +12605,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12405,14 +12754,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12421,23 +12762,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h index 9ce6cc98a0..edce6b669b 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Tue Nov 20 09:38:01 2018" +#define DATE "built on: Tue Apr 3 00:38:26 2018" diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h index 5ba3b88d4e..1f0c62b3c9 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi index c62e0fcd55..9a109fd874 100644 --- a/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm index 7e545b5512..e1c530bd87 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-elf", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3961,12 +3945,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5108,12 +5086,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6299,12 +6271,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7304,10 +7270,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7413,10 +7375,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7484,8 +7442,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7506,23 +7464,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7678,7 +7623,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7703,7 +7647,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7720,10 +7663,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7790,268 +7730,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8783,10 +9164,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9531,10 +9908,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10263,10 +10636,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10796,7 +11165,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10983,7 +11351,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11166,7 +11533,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12172,15 +12538,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12381,14 +12738,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12538,14 +12887,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12554,23 +12895,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s index 8212ff0825..945d9e5824 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s +++ b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/bn/x86-mont.s @@ -445,18 +445,16 @@ bn_mul_mont: leal 1(%edx),%edx jge .L017sub sbbl $0,%eax - movl $-1,%edx - xorl %eax,%edx - jmp .L018copy + andl %eax,%esi + notl %eax + movl %edi,%ebp + andl %eax,%ebp + orl %ebp,%esi .align 16 .L018copy: - movl 32(%esp,%ebx,4),%esi - movl (%edi,%ebx,4),%ebp + movl (%esi,%ebx,4),%eax + movl %eax,(%edi,%ebx,4) movl %ecx,32(%esp,%ebx,4) - andl %eax,%esi - andl %edx,%ebp - orl %esi,%ebp - movl %ebp,(%edi,%ebx,4) decl %ebx jge .L018copy movl 24(%esp),%esp diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h index fd614bb4f9..8baf29639c 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -37,4 +37,4 @@ static const char cflags[] = { '"',' ','\0' }; #define PLATFORM "platform: linux-elf" -#define DATE "built on: Tue Nov 20 09:38:03 2018" +#define DATE "built on: Tue Apr 3 00:38:27 2018" diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s index 9092d66321..cbccc5ebf7 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s +++ b/worker/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s @@ -3857,7 +3857,7 @@ ecp_nistz256_scatter_w7: movl 20(%esp),%edi movl 24(%esp),%esi movl 28(%esp),%ebp - leal (%edi,%ebp,1),%edi + leal -1(%edi,%ebp,1),%edi movl $16,%ebp .L007scatter_w7_loop: movl (%esi),%eax diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h index b9d6509c0b..e819a68f0b 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index cde3a2ab12..bbc226b89b 100644 --- a/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -211,7 +211,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -395,7 +394,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -569,7 +567,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm index f68371d14a..59021fb1d4 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-elf", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1075,10 +1075,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1245,22 +1241,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3947,12 +3931,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5082,12 +5060,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6237,12 +6209,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7230,10 +7196,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7339,10 +7301,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7432,23 +7390,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7604,7 +7549,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7629,7 +7573,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7646,10 +7589,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7716,6 +7656,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8701,10 +9082,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9441,10 +9818,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10149,10 +10522,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10672,7 +11041,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10857,7 +11225,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11034,7 +11401,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12038,15 +12404,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12247,14 +12604,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12404,14 +12753,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12420,23 +12761,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h index 5d8720c723..606ace102e 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-elf" -#define DATE "built on: Tue Nov 20 09:38:06 2018" +#define DATE "built on: Tue Apr 3 00:38:29 2018" diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h index d0fb48f465..b20dbd0212 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi index 63eb964d68..b869b1a864 100644 --- a/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm index ecb0191666..5e487cc374 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3979,12 +3963,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5114,12 +5092,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6323,12 +6295,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7316,10 +7282,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7425,10 +7387,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7496,8 +7454,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7518,23 +7476,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7690,7 +7635,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7715,7 +7659,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7732,10 +7675,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7802,268 +7742,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8807,10 +9188,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9547,10 +9924,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10291,10 +10664,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10819,7 +11188,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11004,7 +11372,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11190,7 +11557,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12194,15 +12560,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12403,14 +12760,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12560,14 +12909,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12576,23 +12917,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s index 7a2b6fce83..d59a397c0d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -740,7 +740,7 @@ AES_encrypt: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -820,7 +820,7 @@ AES_encrypt: bdnz .Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -885,7 +885,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1030,7 +1030,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_encrypt,.-AES_encrypt @@ -1175,7 +1175,7 @@ AES_decrypt: lwz 31,124(1) mtlr 0 addi 1,1,128 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1255,7 +1255,7 @@ AES_decrypt: bdnz .Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1320,7 +1320,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1550,7 +1550,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_decrypt,.-AES_decrypt diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s index 16ddeda378..5eb788907d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ rcon: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -278,7 +278,7 @@ aes_p8_set_encrypt_key: .Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -327,7 +327,7 @@ aes_p8_set_decrypt_key: xor 3,3,3 .Ldec_key_abort: addi 1,1,32 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -395,7 +395,7 @@ aes_p8_encrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -463,7 +463,7 @@ aes_p8_decrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -625,7 +625,7 @@ aes_p8_cbc_encrypt: stvx 2,10,7 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -915,8 +915,8 @@ _aesp8_cbc_decrypt8x: addic. 5,5,128 beq .Lcbc_dec8x_done - nop - nop + nop + nop .Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -1004,15 +1004,15 @@ _aesp8_cbc_decrypt8x: cmplwi 5,32 blt .Lcbc_dec8x_one - nop + nop beq .Lcbc_dec8x_two cmplwi 5,64 blt .Lcbc_dec8x_three - nop + nop beq .Lcbc_dec8x_four cmplwi 5,96 blt .Lcbc_dec8x_five - nop + nop beq .Lcbc_dec8x_six .Lcbc_dec8x_seven: @@ -1199,7 +1199,7 @@ _aesp8_cbc_decrypt8x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1307,7 +1307,7 @@ aes_p8_ctr32_encrypt_blocks: stvx 2,0,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1610,15 +1610,15 @@ _aesp8_ctr32_encrypt8x: .Lctr32_enc8x_break: cmpwi 5,-0x60 blt .Lctr32_enc8x_one - nop + nop beq .Lctr32_enc8x_two cmpwi 5,-0x40 blt .Lctr32_enc8x_three - nop + nop beq .Lctr32_enc8x_four cmpwi 5,-0x20 blt .Lctr32_enc8x_five - nop + nop beq .Lctr32_enc8x_six cmpwi 5,0x00 blt .Lctr32_enc8x_seven @@ -1827,7 +1827,7 @@ _aesp8_ctr32_encrypt8x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1965,7 +1965,7 @@ aes_p8_xts_encrypt: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2038,7 +2038,7 @@ aes_p8_xts_encrypt: .Lxts_enc_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2179,7 +2179,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2244,7 +2244,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2295,7 +2295,7 @@ aes_p8_xts_decrypt: .Lxts_dec_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2626,11 +2626,11 @@ _aesp8_xts_encrypt6x: beq .Lxts_enc6x_zero cmpwi 5,0x20 blt .Lxts_enc6x_one - nop + nop beq .Lxts_enc6x_two cmpwi 5,0x40 blt .Lxts_enc6x_three - nop + nop beq .Lxts_enc6x_four .Lxts_enc6x_five: @@ -2727,7 +2727,7 @@ _aesp8_xts_encrypt6x: .align 4 .Lxts_enc6x_one: vxor 7,5,17 - nop + nop .Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2863,7 +2863,7 @@ _aesp8_xts_encrypt6x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2948,7 +2948,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3276,11 +3276,11 @@ _aesp8_xts_decrypt6x: beq .Lxts_dec6x_zero cmpwi 5,0x20 blt .Lxts_dec6x_one - nop + nop beq .Lxts_dec6x_two cmpwi 5,0x40 blt .Lxts_dec6x_three - nop + nop beq .Lxts_dec6x_four .Lxts_dec6x_five: @@ -3381,7 +3381,7 @@ _aesp8_xts_decrypt6x: .align 4 .Lxts_dec6x_one: vxor 7,5,17 - nop + nop .Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3551,7 +3551,7 @@ _aesp8_xts_decrypt6x: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3636,6 +3636,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s index 12bc03a588..babd699bf7 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ _vpaes_consts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ _vpaes_encrypt_core: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -319,7 +319,7 @@ vpaes_encrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -361,7 +361,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -456,7 +456,7 @@ _vpaes_decrypt_core: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -552,7 +552,7 @@ vpaes_decrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -780,7 +780,7 @@ vpaes_cbc_encrypt: lwz 31,236(1) mtlr 0 addi 1,1,240 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -834,7 +834,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1080,7 +1080,7 @@ _vpaes_schedule_core: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1108,7 +1108,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1174,7 +1174,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1196,7 +1196,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1248,7 +1248,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 .Lschedule_mangle_dec: @@ -1299,7 +1299,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1376,7 +1376,7 @@ vpaes_set_encrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1460,7 +1460,7 @@ vpaes_set_decrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s index b029cc94b0..4745306e54 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s @@ -237,7 +237,7 @@ bn_sqr_comba4: stw 9,24(3) stw 10,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -665,7 +665,7 @@ bn_sqr_comba8: stw 9, 60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -819,7 +819,7 @@ bn_mul_comba4: stw 10,24(3) stw 11,28(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1358,7 +1358,7 @@ bn_mul_comba8: adde 10,10,9 stw 12,56(3) stw 10,60(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1409,7 +1409,7 @@ bn_sub_words: .Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1455,7 +1455,7 @@ bn_add_words: bdnz .Lppcasm_add_mainloop .Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1484,7 +1484,7 @@ bn_div_words: cmplwi 0,5,0 bne .Lppcasm_div1 li 3,-1 - blr + blr .Lppcasm_div1: xor 0,0,0 li 8,32 @@ -1571,7 +1571,7 @@ bn_div_words: b .Lppcasm_divouterloop .Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1613,7 +1613,7 @@ bn_sqr_words: stwu 8,4(3) bdnz .Lppcasm_sqr_mainloop .Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1719,7 +1719,7 @@ bn_mul_words: .Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1845,7 +1845,7 @@ bn_mul_add_words: .Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s index 5bba1e47ac..aefd29c9d8 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s @@ -10,7 +10,7 @@ bn_mul_mont_int: li 3,0 .long 0x4d800020 cmpwi 8,32 - bgelr + bgelr slwi 8,8,2 li 12,-4096 addi 3,8,256 @@ -183,16 +183,15 @@ bn_mul_mont_int: li 21,0 mtctr 8 subfe 3,21,3 + and 4,22,3 + andc 6,9,3 + or 4,4,6 .align 4 .Lcopy: - lwzx 12,22,21 - lwzx 10,9,21 - and 12,12,3 - andc 10,10,3 + lwzx 12,4,21 + stwx 12,9,21 stwx 21,22,21 - or 10,10,12 - stwx 10,9,21 addi 21,21,4 bdnz .Lcopy @@ -211,7 +210,7 @@ bn_mul_mont_int: lwz 30,-8(12) lwz 31,-4(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s index 774b4c4dea..49c6e9c741 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s @@ -889,8 +889,11 @@ bn_mul_mont_fpu64: li 12,0 subfe 3,12,3 - addi 4,1,196 + addi 10,1,196 subf 9,8,9 + and 4,10,3 + andc 6,9,3 + or 4,4,6 addi 10,1,192 mtctr 11 @@ -900,10 +903,6 @@ bn_mul_mont_fpu64: lwz 25,8(4) lwz 26,12(4) lwzu 27,16(4) - lwz 28,4(9) - lwz 29,8(9) - lwz 30,12(9) - lwz 31,16(9) std 12,8(22) std 12,16(22) std 12,24(22) @@ -912,18 +911,6 @@ bn_mul_mont_fpu64: std 12,48(22) std 12,56(22) stdu 12,64(22) - and 24,24,3 - and 25,25,3 - and 26,26,3 - and 27,27,3 - andc 28,28,3 - andc 29,29,3 - andc 30,30,3 - andc 31,31,3 - or 24,24,28 - or 25,25,29 - or 26,26,30 - or 27,27,31 stw 24,4(9) stw 25,8(9) stw 26,12(9) @@ -959,7 +946,7 @@ bn_mul_mont_fpu64: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h index ed6f9705a9..1a32730b38 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Tue Nov 20 09:38:30 2018" +#define DATE "built on: Tue Apr 3 00:38:38 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s index 02f53619e5..e07f5837a0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/chacha/chacha-ppc.s @@ -60,7 +60,7 @@ __ChaCha20_ctr32_int: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -346,7 +346,7 @@ __ChaCha20_1x: bne .Loop_outer - blr + blr .align 4 .Ltail: @@ -397,7 +397,7 @@ __ChaCha20_1x: stw 1,80(1) stw 1,84(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -556,7 +556,7 @@ ChaCha20_ctr32_vmx: vspltisw 27,7 mtctr 0 - nop + nop .Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1049,7 +1049,7 @@ ChaCha20_ctr32_vmx: cmplwi 5,255 bgt .Loop_outer_vmx - nop + nop .Ldone_vmx: cmplwi 5,0 @@ -1102,7 +1102,7 @@ ChaCha20_ctr32_vmx: lwz 31,364(1) mtlr 0 addi 1,1,368 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1115,7 +1115,7 @@ ChaCha20_ctr32_vmx: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s index a0e364910f..28cbe1956f 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/modes/ghashp8-ppc.s @@ -123,7 +123,7 @@ gcm_init_p8: .long 0x7E4A1F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -173,7 +173,7 @@ gcm_gmult_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -290,7 +290,7 @@ gcm_ghash_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -557,7 +557,7 @@ gcm_ghash_p8: lvx 30,10,1 lvx 31,11,1 addi 1,1,232 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s index 940d4fa853..a03a08d66c 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppc.s @@ -36,7 +36,7 @@ poly1305_init_int: .Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .size poly1305_init_int,.-poly1305_init_int @@ -238,7 +238,7 @@ poly1305_blocks: lwz 31,92(1) addi 1,1,96 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,18,4,0 .size poly1305_blocks,.-poly1305_blocks @@ -303,7 +303,7 @@ poly1305_emit: lwz 30,88(1) lwz 31,92(1) addi 1,1,96 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit,.-poly1305_emit diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s index ee69ce054c..519158eefd 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/poly1305/poly1305-ppcfp.s @@ -146,7 +146,7 @@ poly1305_init_fpu: .Lno_key: xor 3,3,3 addi 1,1,24 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 .size poly1305_init_fpu,.-poly1305_init_fpu @@ -462,7 +462,7 @@ poly1305_blocks_fpu: lfd 31,208(1) addi 1,1,216 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 .size poly1305_blocks_fpu,.-poly1305_blocks_fpu @@ -547,7 +547,7 @@ poly1305_emit_fpu: lwz 30,32(1) lwz 31,36(1) addi 1,1,40 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit_fpu,.-poly1305_emit_fpu @@ -558,7 +558,7 @@ poly1305_emit_fpu: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s index 19fac1f319..59359e7919 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/ppccpuid.s @@ -6,7 +6,7 @@ .align 4 OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_fpu_probe,.-OPENSSL_fpu_probe @@ -16,7 +16,7 @@ OPENSSL_fpu_probe: OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_ppc64_probe,.-OPENSSL_ppc64_probe @@ -26,7 +26,7 @@ OPENSSL_ppc64_probe: .align 4 OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_altivec_probe,.-OPENSSL_altivec_probe @@ -37,7 +37,7 @@ OPENSSL_altivec_probe: OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_crypto207_probe,.-OPENSSL_crypto207_probe @@ -49,7 +49,7 @@ OPENSSL_madd300_probe: xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -82,7 +82,7 @@ OPENSSL_wipe_cpu: xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu @@ -96,7 +96,7 @@ OPENSSL_atomic_add: stwcx. 0,0,3 bne- .Ladd mr 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -112,7 +112,7 @@ OPENSSL_rdtsc: mftbu 4 .long 0x7c042840 bne .Loop_rdtsc - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_rdtsc,.-OPENSSL_rdtsc @@ -130,7 +130,7 @@ OPENSSL_cleanse: stb 0,0(3) addi 3,3,1 bdnz $-8 - blr + blr .Lot: andi. 5,3,3 beq .Laligned stb 0,0(3) @@ -145,7 +145,7 @@ OPENSSL_cleanse: bdnz $-8 andi. 4,4,3 bne .Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -172,7 +172,7 @@ CRYPTO_memcmp: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -204,7 +204,7 @@ OPENSSL_instrument_bus: bdnz .Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -257,7 +257,7 @@ OPENSSL_instrument_bus2: .Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s index ca8c279a2c..5f577714e5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha1-ppc.s @@ -101,7 +101,7 @@ sha1_block_data_order: lwz 31,156(1) mtlr 0 addi 1,1,160 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1109,7 +1109,7 @@ sha1_block_data_order: mr 11,20 addi 4,4,64 bdnz .Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha1_block_data_order,.-sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s index 83c86c17fa..1e92cd5884 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256-ppc.s @@ -121,7 +121,7 @@ sha256_block_ppc: lwz 31,188(1) mtlr 0 addi 1,1,192 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1287,7 +1287,7 @@ sha256_block_ppc: .long 0x7c1f2840 stw 15,28(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha256_block_ppc,.-sha256_block_ppc @@ -1298,7 +1298,7 @@ sha256_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s index 7c06a0bc05..888cef888e 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha256p8-ppc.s @@ -773,7 +773,7 @@ sha256_block_p8: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -785,7 +785,7 @@ sha256_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s index 2ae1bd579f..582aee7682 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512-ppc.s @@ -128,7 +128,7 @@ sha512_block_ppc: lwz 31,252(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -2973,7 +2973,7 @@ sha512_block_ppc: stw 4,164(1) .long 0x7c042840 bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha512_block_ppc,.-sha512_block_ppc @@ -2984,7 +2984,7 @@ sha512_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s index fc14a5e50f..00b9f36b42 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/crypto/sha/sha512p8-ppc.s @@ -774,7 +774,7 @@ sha512_block_p8: lwz 30,384(1) lwz 31,388(1) addi 1,1,392 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -786,7 +786,7 @@ sha512_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h index 21dd8cc643..2f9817e43b 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi index 1aea69b8a0..046400b5d2 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi @@ -217,7 +217,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -402,7 +401,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,7 +577,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm index 5d0823ce15..2a36895668 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1076,10 +1076,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1246,22 +1242,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3948,12 +3932,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5083,12 +5061,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6238,12 +6210,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7231,10 +7197,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7340,10 +7302,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7433,23 +7391,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7605,7 +7550,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7630,7 +7574,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7647,10 +7590,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7717,6 +7657,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8702,10 +9083,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9442,10 +9819,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10150,10 +10523,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10673,7 +11042,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10858,7 +11226,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11035,7 +11402,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12039,15 +12405,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12248,14 +12605,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12405,14 +12754,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12421,23 +12762,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h index b13be7e738..fcfb67646e 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Tue Nov 20 09:38:33 2018" +#define DATE "built on: Tue Apr 3 00:38:40 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h index 5ba3b88d4e..1f0c62b3c9 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi index db9f598242..08a06ab1d9 100644 --- a/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm index 3a2627b63e..09ca2343e7 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3980,12 +3964,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5115,12 +5093,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6324,12 +6296,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7317,10 +7283,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7426,10 +7388,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7519,23 +7477,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7691,7 +7636,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7716,7 +7660,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7733,10 +7676,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7803,6 +7743,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8808,10 +9189,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9548,10 +9925,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10292,10 +10665,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10820,7 +11189,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11005,7 +11373,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11191,7 +11558,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12195,15 +12561,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12404,14 +12761,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12561,14 +12910,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12577,23 +12918,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s index 95c8377dc1..b46c8c82a2 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s @@ -8,7 +8,7 @@ mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -18,7 +18,7 @@ mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -746,7 +746,7 @@ AES_encrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -826,7 +826,7 @@ AES_encrypt: bdnz .Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -891,7 +891,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1036,7 +1036,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_encrypt,.-.AES_encrypt @@ -1188,7 +1188,7 @@ AES_decrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1268,7 +1268,7 @@ AES_decrypt: bdnz .Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1333,7 +1333,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1530,7 +1530,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_decrypt,.-.AES_decrypt diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s index 52a195558d..36fa7e356d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s @@ -14,7 +14,7 @@ rcon: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -284,7 +284,7 @@ aes_p8_set_encrypt_key: .Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -340,7 +340,7 @@ aes_p8_set_decrypt_key: xor 3,3,3 .Ldec_key_abort: addi 1,1,64 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -415,7 +415,7 @@ aes_p8_encrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -490,7 +490,7 @@ aes_p8_decrypt: stvx 0,7,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -659,7 +659,7 @@ aes_p8_cbc_encrypt: stvx 2,10,7 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -949,8 +949,8 @@ _aesp8_cbc_decrypt8x: addic. 5,5,128 beq .Lcbc_dec8x_done - nop - nop + nop + nop .Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -1038,15 +1038,15 @@ _aesp8_cbc_decrypt8x: cmplwi 5,32 blt .Lcbc_dec8x_one - nop + nop beq .Lcbc_dec8x_two cmplwi 5,64 blt .Lcbc_dec8x_three - nop + nop beq .Lcbc_dec8x_four cmplwi 5,96 blt .Lcbc_dec8x_five - nop + nop beq .Lcbc_dec8x_six .Lcbc_dec8x_seven: @@ -1233,7 +1233,7 @@ _aesp8_cbc_decrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1348,7 +1348,7 @@ aes_p8_ctr32_encrypt_blocks: stvx 2,0,4 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1651,15 +1651,15 @@ _aesp8_ctr32_encrypt8x: .Lctr32_enc8x_break: cmpwi 5,-0x60 blt .Lctr32_enc8x_one - nop + nop beq .Lctr32_enc8x_two cmpwi 5,-0x40 blt .Lctr32_enc8x_three - nop + nop beq .Lctr32_enc8x_four cmpwi 5,-0x20 blt .Lctr32_enc8x_five - nop + nop beq .Lctr32_enc8x_six cmpwi 5,0x00 blt .Lctr32_enc8x_seven @@ -1868,7 +1868,7 @@ _aesp8_ctr32_encrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2013,7 +2013,7 @@ aes_p8_xts_encrypt: .long 0x10620509 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2086,7 +2086,7 @@ aes_p8_xts_encrypt: .Lxts_enc_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2234,7 +2234,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 addi 4,4,16 @@ -2299,7 +2299,7 @@ aes_p8_xts_decrypt: .long 0x10620549 - nop + nop .long 0x7C602799 @@ -2350,7 +2350,7 @@ aes_p8_xts_decrypt: .Lxts_dec_ret: mtspr 256,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2682,11 +2682,11 @@ _aesp8_xts_encrypt6x: beq .Lxts_enc6x_zero cmpwi 5,0x20 blt .Lxts_enc6x_one - nop + nop beq .Lxts_enc6x_two cmpwi 5,0x40 blt .Lxts_enc6x_three - nop + nop beq .Lxts_enc6x_four .Lxts_enc6x_five: @@ -2783,7 +2783,7 @@ _aesp8_xts_encrypt6x: .align 4 .Lxts_enc6x_one: vxor 7,5,17 - nop + nop .Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2919,7 +2919,7 @@ _aesp8_xts_encrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3004,7 +3004,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3332,11 +3332,11 @@ _aesp8_xts_decrypt6x: beq .Lxts_dec6x_zero cmpwi 5,0x20 blt .Lxts_dec6x_one - nop + nop beq .Lxts_dec6x_two cmpwi 5,0x40 blt .Lxts_dec6x_three - nop + nop beq .Lxts_dec6x_four .Lxts_dec6x_five: @@ -3437,7 +3437,7 @@ _aesp8_xts_decrypt6x: .align 4 .Lxts_dec6x_one: vxor 7,5,17 - nop + nop .Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3607,7 +3607,7 @@ _aesp8_xts_decrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3692,6 +3692,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s index c5f074f37f..1168f546f0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s @@ -95,7 +95,7 @@ _vpaes_consts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -135,7 +135,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -223,7 +223,7 @@ _vpaes_encrypt_core: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -325,7 +325,7 @@ vpaes_encrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -368,7 +368,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -463,7 +463,7 @@ _vpaes_decrypt_core: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -565,7 +565,7 @@ vpaes_decrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -800,7 +800,7 @@ vpaes_cbc_encrypt: ld 31,264(1) mtlr 0 addi 1,1,272 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -855,7 +855,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1101,7 +1101,7 @@ _vpaes_schedule_core: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1129,7 +1129,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 6, 9, 8 vsldoi 6, 9, 6, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1195,7 +1195,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1217,7 +1217,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1269,7 +1269,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 .Lschedule_mangle_dec: @@ -1320,7 +1320,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1403,7 +1403,7 @@ vpaes_set_encrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1494,7 +1494,7 @@ vpaes_set_decrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s index 60dd49f863..0a3a2a76f5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s @@ -297,7 +297,7 @@ bn_mul_add_words: std 9,48(3) std 10,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -726,7 +726,7 @@ bn_mul_add_words: std 9, 120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -881,7 +881,7 @@ bn_mul_add_words: std 10,48(3) std 11,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1421,7 +1421,7 @@ bn_mul_add_words: adde 10,10,9 std 12,112(3) std 10,120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1473,7 +1473,7 @@ bn_mul_add_words: .Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1520,7 +1520,7 @@ bn_mul_add_words: bdnz .Lppcasm_add_mainloop .Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1550,7 +1550,7 @@ bn_mul_add_words: cmpldi 0,5,0 bne .Lppcasm_div1 li 3,-1 - blr + blr .Lppcasm_div1: xor 0,0,0 li 8,64 @@ -1637,7 +1637,7 @@ bn_mul_add_words: b .Lppcasm_divouterloop .Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1680,7 +1680,7 @@ bn_mul_add_words: stdu 8,8(3) bdnz .Lppcasm_sqr_mainloop .Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1787,7 +1787,7 @@ bn_mul_add_words: .Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1914,7 +1914,7 @@ bn_mul_add_words: .Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s index 353c449244..ac8653f240 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s @@ -187,16 +187,15 @@ bn_mul_mont_int: li 21,0 mtctr 8 subfe 3,21,3 + and 4,22,3 + andc 6,9,3 + or 4,4,6 .align 4 .Lcopy: - ldx 12,22,21 - ldx 10,9,21 - and 12,12,3 - andc 10,10,3 + ldx 12,4,21 + stdx 12,9,21 stdx 21,22,21 - or 10,10,12 - stdx 10,9,21 addi 21,21,8 bdnz .Lcopy @@ -215,7 +214,7 @@ bn_mul_mont_int: ld 30,-16(12) ld 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s index c8a045698b..8450d9a939 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s @@ -686,14 +686,16 @@ bn_mul_mont_fpu64: li 12,0 subfe 3,12,3 + and 4,10,3 + andc 6,9,3 + or 4,4,6 + addi 31,4,8 mtctr 11 .align 4 .Lcopy: - ldx 24,10,12 - ldx 25,28,12 - ldx 26,9,12 - ldx 27,30,12 + ldx 24,4,12 + ldx 25,31,12 std 12,8(22) std 12,16(22) std 12,24(22) @@ -702,12 +704,6 @@ bn_mul_mont_fpu64: std 12,48(22) std 12,56(22) stdu 12,64(22) - and 24,24,3 - and 25,25,3 - andc 26,26,3 - andc 27,27,3 - or 24,24,26 - or 25,25,27 stdx 24,9,12 stdx 25,30,12 stdx 12,10,12 @@ -742,7 +738,7 @@ bn_mul_mont_fpu64: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h index 16aeae7e46..12830ce399 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Tue Nov 20 09:38:34 2018" +#define DATE "built on: Tue Apr 3 00:38:40 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s index b69868c41f..93efe4d9b5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s @@ -66,7 +66,7 @@ __ChaCha20_ctr32_int: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -353,7 +353,7 @@ __ChaCha20_1x: bne .Loop_outer - blr + blr .align 4 .Ltail: @@ -404,7 +404,7 @@ __ChaCha20_1x: stw 1,104(1) stw 1,108(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -569,7 +569,7 @@ ChaCha20_ctr32_vmx: vspltisw 27,7 mtctr 0 - nop + nop .Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -1062,7 +1062,7 @@ ChaCha20_ctr32_vmx: cmpldi 5,255 bgt .Loop_outer_vmx - nop + nop .Ldone_vmx: cmpldi 5,0 @@ -1115,7 +1115,7 @@ ChaCha20_ctr32_vmx: ld 31,456(1) mtlr 0 addi 1,1,464 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -1129,7 +1129,7 @@ ChaCha20_ctr32_vmx: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s index 8294ab9b95..5ca8640eda 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s @@ -129,7 +129,7 @@ gcm_init_p8: .long 0x7E4A1F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -186,7 +186,7 @@ gcm_gmult_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -310,7 +310,7 @@ gcm_ghash_p8: .long 0x7C001F99 mtspr 256,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -577,7 +577,7 @@ gcm_ghash_p8: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s index 4006308ab2..0907f4ae20 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s @@ -39,7 +39,7 @@ poly1305_init_int: .Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .size poly1305_init_int,.-.poly1305_init_int @@ -141,7 +141,7 @@ poly1305_blocks: ld 31,184(1) addi 1,1,192 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,5,4,0 .size poly1305_blocks,.-.poly1305_blocks @@ -189,7 +189,7 @@ poly1305_emit: li 12,12 stwbrx 8,11,4 stwbrx 7,12,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .size poly1305_emit,.-.poly1305_emit diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s index a5a6dfd505..a26ff5adba 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s @@ -152,7 +152,7 @@ poly1305_init_fpu: .Lno_key: xor 3,3,3 addi 1,1,48 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 .size poly1305_init_fpu,.-.poly1305_init_fpu @@ -475,7 +475,7 @@ poly1305_blocks_fpu: lfd 31,232(1) addi 1,1,240 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 .size poly1305_blocks_fpu,.-.poly1305_blocks_fpu @@ -570,7 +570,7 @@ poly1305_emit_fpu: ld 30,64(1) ld 31,72(1) addi 1,1,80 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit_fpu,.-.poly1305_emit_fpu @@ -582,7 +582,7 @@ poly1305_emit_fpu: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s index 55fa667f64..adc9731bb6 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s @@ -12,7 +12,7 @@ OPENSSL_fpu_probe: .align 4 .OPENSSL_fpu_probe: fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_fpu_probe,.-.OPENSSL_fpu_probe @@ -29,7 +29,7 @@ OPENSSL_ppc64_probe: .OPENSSL_ppc64_probe: fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_ppc64_probe,.-.OPENSSL_ppc64_probe @@ -46,7 +46,7 @@ OPENSSL_altivec_probe: .align 4 .OPENSSL_altivec_probe: .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_altivec_probe,.-.OPENSSL_altivec_probe @@ -64,7 +64,7 @@ OPENSSL_crypto207_probe: .OPENSSL_crypto207_probe: .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_crypto207_probe,.-.OPENSSL_crypto207_probe @@ -83,7 +83,7 @@ OPENSSL_madd300_probe: xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -122,7 +122,7 @@ OPENSSL_wipe_cpu: xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_wipe_cpu,.-.OPENSSL_wipe_cpu @@ -143,7 +143,7 @@ OPENSSL_atomic_add: stwcx. 0,0,3 bne- .Ladd extsw 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -161,7 +161,7 @@ OPENSSL_rdtsc: .align 4 .OPENSSL_rdtsc: mftb 3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_rdtsc,.-.OPENSSL_rdtsc @@ -186,7 +186,7 @@ OPENSSL_cleanse: stb 0,0(3) addi 3,3,1 bdnz $-8 - blr + blr .Lot: andi. 5,3,3 beq .Laligned stb 0,0(3) @@ -201,7 +201,7 @@ OPENSSL_cleanse: bdnz $-8 andi. 4,4,3 bne .Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -235,7 +235,7 @@ CRYPTO_memcmp: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -274,7 +274,7 @@ OPENSSL_instrument_bus: bdnz .Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -334,7 +334,7 @@ OPENSSL_instrument_bus2: .Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s index e332225e3b..aa47944d37 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s @@ -107,7 +107,7 @@ sha1_block_data_order: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1115,7 +1115,7 @@ sha1_block_data_order: mr 11,20 addi 4,4,64 bdnz .Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha1_block_data_order,.-.sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s index 8a55a49ed3..8bc52879f4 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s @@ -127,7 +127,7 @@ sha256_block_ppc: ld 31,312(1) mtlr 0 addi 1,1,320 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1293,7 +1293,7 @@ sha256_block_ppc: cmpld 31,5 stw 15,28(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha256_block_ppc,.-.sha256_block_ppc @@ -1305,7 +1305,7 @@ sha256_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s index 23db0265f5..cfa6282d6d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s @@ -779,7 +779,7 @@ sha256_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -792,7 +792,7 @@ sha256_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s index 775b64d0fb..9c699a4f32 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s @@ -127,7 +127,7 @@ sha512_block_ppc: ld 31,376(1) mtlr 0 addi 1,1,384 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1325,7 +1325,7 @@ sha512_block_ppc: cmpld 31,5 std 15,56(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha512_block_ppc,.-.sha512_block_ppc @@ -1337,7 +1337,7 @@ sha512_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s index 6526b53ff0..03c09abfe1 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s @@ -780,7 +780,7 @@ sha512_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -793,7 +793,7 @@ sha512_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h index 8bd973e750..3976dadb19 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi index d4d832520c..b99768aed0 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi @@ -217,7 +217,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -402,7 +401,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,7 +577,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm index 34fcb52aeb..3385fae227 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3949,12 +3933,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5084,12 +5062,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6239,12 +6211,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,10 +7198,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7341,10 +7303,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7412,8 +7370,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7434,23 +7392,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7606,7 +7551,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7631,7 +7575,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7648,10 +7591,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7718,268 +7658,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8703,10 +9084,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9443,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10151,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10674,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10859,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11036,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12040,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12249,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12406,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12422,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h index d09dbd7c84..e00115c55c 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Tue Nov 20 09:38:37 2018" +#define DATE "built on: Tue Apr 3 00:38:41 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h index 08bf3d4394..af3a003d51 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi index f5c23cbf66..e45227748e 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index 33639132f0..f83a155f66 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64le", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3979,12 +3963,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5114,12 +5092,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6323,12 +6295,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7316,10 +7282,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7425,10 +7387,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7496,8 +7454,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "crypto/include", "test", + "crypto/include", "include", ".", ], @@ -7518,23 +7476,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7690,7 +7635,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7715,7 +7659,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7732,10 +7675,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7802,268 +7742,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8807,10 +9188,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9547,10 +9924,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10291,10 +10664,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10819,7 +11188,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11004,7 +11372,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11190,7 +11557,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12194,15 +12560,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12403,14 +12760,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12560,14 +12909,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12576,23 +12917,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s index 2aa99e753a..bbc4e95d54 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s @@ -9,7 +9,7 @@ mflr 3 addi 3,3,120 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -19,7 +19,7 @@ mflr 3 addi 3,3,2360 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 @@ -766,7 +766,7 @@ AES_encrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -846,7 +846,7 @@ AES_encrypt: bdnz .Lenc_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -911,7 +911,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1056,7 +1056,7 @@ AES_encrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_encrypt,.-AES_encrypt @@ -1226,7 +1226,7 @@ AES_decrypt: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1306,7 +1306,7 @@ AES_decrypt: bdnz .Ldec_loop addi 7,3,2048 - nop + nop lwz 12,0(5) rlwinm 16,8,8,24,31 lwz 0,4(5) @@ -1371,7 +1371,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1568,7 +1568,7 @@ AES_decrypt: xor 9,9,0 xor 10,10,14 xor 11,11,15 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size AES_decrypt,.-AES_decrypt diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s index 581d16e664..54f61290bd 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/aesp8-ppc.s @@ -15,7 +15,7 @@ rcon: mflr 6 addi 6,6,-0x48 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 @@ -280,7 +280,7 @@ aes_p8_set_encrypt_key: .Lenc_key_abort: mr 3,6 - blr + blr .long 0 .byte 0,12,0x14,1,0,0,3,0 .long 0 @@ -330,7 +330,7 @@ aes_p8_set_decrypt_key: xor 3,3,3 .Ldec_key_abort: addi 1,1,64 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,3,0 .long 0 @@ -399,7 +399,7 @@ aes_p8_encrypt: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -468,7 +468,7 @@ aes_p8_decrypt: stvx 0,7,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -631,7 +631,7 @@ aes_p8_cbc_encrypt: stvx 2,10,7 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -921,8 +921,8 @@ _aesp8_cbc_decrypt8x: addic. 5,5,128 beq .Lcbc_dec8x_done - nop - nop + nop + nop .Loop_cbc_dec8x_tail: .long 0x11EFC548 @@ -1010,15 +1010,15 @@ _aesp8_cbc_decrypt8x: cmplwi 5,32 blt .Lcbc_dec8x_one - nop + nop beq .Lcbc_dec8x_two cmplwi 5,64 blt .Lcbc_dec8x_three - nop + nop beq .Lcbc_dec8x_four cmplwi 5,96 blt .Lcbc_dec8x_five - nop + nop beq .Lcbc_dec8x_six .Lcbc_dec8x_seven: @@ -1205,7 +1205,7 @@ _aesp8_cbc_decrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -1314,7 +1314,7 @@ aes_p8_ctr32_encrypt_blocks: stvx 2,0,4 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,6,0 .long 0 @@ -1617,15 +1617,15 @@ _aesp8_ctr32_encrypt8x: .Lctr32_enc8x_break: cmpwi 5,-0x60 blt .Lctr32_enc8x_one - nop + nop beq .Lctr32_enc8x_two cmpwi 5,-0x40 blt .Lctr32_enc8x_three - nop + nop beq .Lctr32_enc8x_four cmpwi 5,-0x20 blt .Lctr32_enc8x_five - nop + nop beq .Lctr32_enc8x_six cmpwi 5,0x00 blt .Lctr32_enc8x_seven @@ -1834,7 +1834,7 @@ _aesp8_ctr32_encrypt8x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2046,7 +2046,7 @@ aes_p8_xts_encrypt: .Lxts_enc_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2304,7 +2304,7 @@ aes_p8_xts_decrypt: .Lxts_dec_ret: or 12,12,12 li 3,0 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,6,6,0 .long 0 @@ -2635,11 +2635,11 @@ _aesp8_xts_encrypt6x: beq .Lxts_enc6x_zero cmpwi 5,0x20 blt .Lxts_enc6x_one - nop + nop beq .Lxts_enc6x_two cmpwi 5,0x40 blt .Lxts_enc6x_three - nop + nop beq .Lxts_enc6x_four .Lxts_enc6x_five: @@ -2736,7 +2736,7 @@ _aesp8_xts_encrypt6x: .align 4 .Lxts_enc6x_one: vxor 7,5,17 - nop + nop .Loop_xts_enc1x: .long 0x10E7C508 lvx 24,26,7 @@ -2872,7 +2872,7 @@ _aesp8_xts_encrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -2957,7 +2957,7 @@ _aesp8_xts_enc5x: .long 0x11AD1509 .long 0x11CE1D09 .long 0x11EF2509 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -3285,11 +3285,11 @@ _aesp8_xts_decrypt6x: beq .Lxts_dec6x_zero cmpwi 5,0x20 blt .Lxts_dec6x_one - nop + nop beq .Lxts_dec6x_two cmpwi 5,0x40 blt .Lxts_dec6x_three - nop + nop beq .Lxts_dec6x_four .Lxts_dec6x_five: @@ -3390,7 +3390,7 @@ _aesp8_xts_decrypt6x: .align 4 .Lxts_dec6x_one: vxor 7,5,17 - nop + nop .Loop_xts_dec1x: .long 0x10E7C548 lvx 24,26,7 @@ -3560,7 +3560,7 @@ _aesp8_xts_decrypt6x: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,6,6,0 .long 0 @@ -3645,6 +3645,6 @@ _aesp8_xts_dec5x: .long 0x11CE1D49 .long 0x11EF2549 mtctr 9 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s index 74d9d5f5ce..abd3016384 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/aes/vpaes-ppc.s @@ -96,7 +96,7 @@ _vpaes_consts: mflr 12 addi 12,12,-0x308 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0 @@ -136,7 +136,7 @@ _vpaes_encrypt_preheat: lvx 17, 12, 8 lvx 18, 12, 11 lvx 19, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -224,7 +224,7 @@ _vpaes_encrypt_core: vxor 4, 4, 5 vxor 0, 0, 4 vperm 0, 0, 7, 1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -321,7 +321,7 @@ vpaes_encrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -363,7 +363,7 @@ _vpaes_decrypt_preheat: lvx 21, 12, 8 lvx 22, 12, 11 lvx 23, 12, 10 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -458,7 +458,7 @@ _vpaes_decrypt_core: vxor 4, 4, 5 vxor 0, 1, 4 vperm 0, 0, 7, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -555,7 +555,7 @@ vpaes_decrypt: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -784,7 +784,7 @@ vpaes_cbc_encrypt: ld 31,264(1) mtlr 0 addi 1,1,272 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,2,6,0 .long 0 @@ -838,7 +838,7 @@ _vpaes_key_preheat: lvx 24, 12, 9 lvx 25, 0, 12 lvx 26, 12, 8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1084,7 +1084,7 @@ _vpaes_schedule_core: vxor 6, 6, 6 vxor 7, 7, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1112,7 +1112,7 @@ _vpaes_schedule_192_smear: vor 0, 6, 6 vsldoi 6, 9, 6, 16-8 vsldoi 6, 6, 9, 16-8 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1178,7 +1178,7 @@ _vpaes_schedule_low_round: vxor 0, 1, 7 vxor 7, 1, 7 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1200,7 +1200,7 @@ _vpaes_schedule_transform: vperm 2, 13, 13, 2 vxor 0, 0, 2 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1252,7 +1252,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .align 4 .Lschedule_mangle_dec: @@ -1303,7 +1303,7 @@ _vpaes_schedule_mangle: vsel 2, 28, 1, 30 vor 28, 1, 1 stvx 2, 0, 5 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -1381,7 +1381,7 @@ vpaes_set_encrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 @@ -1466,7 +1466,7 @@ vpaes_set_decrypt_key: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s index c846a555af..146f9af69d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s @@ -238,7 +238,7 @@ bn_sqr_comba4: std 9,48(3) std 10,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -667,7 +667,7 @@ bn_sqr_comba8: std 9, 120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -822,7 +822,7 @@ bn_mul_comba4: std 10,48(3) std 11,56(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1362,7 +1362,7 @@ bn_mul_comba8: adde 10,10,9 std 12,112(3) std 10,120(3) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1414,7 +1414,7 @@ bn_sub_words: .Lppcasm_sub_adios: subfze 3,0 andi. 3,3,1 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1461,7 +1461,7 @@ bn_add_words: bdnz .Lppcasm_add_mainloop .Lppcasm_add_adios: addze 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1491,7 +1491,7 @@ bn_div_words: cmpldi 0,5,0 bne .Lppcasm_div1 li 3,-1 - blr + blr .Lppcasm_div1: xor 0,0,0 li 8,64 @@ -1578,7 +1578,7 @@ bn_div_words: b .Lppcasm_divouterloop .Lppcasm_div9: or 3,8,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1621,7 +1621,7 @@ bn_sqr_words: stdu 8,8(3) bdnz .Lppcasm_sqr_mainloop .Lppcasm_sqr_adios: - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -1728,7 +1728,7 @@ bn_mul_words: .Lppcasm_mw_OVER: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -1855,7 +1855,7 @@ bn_mul_add_words: .Lppcasm_maw_adios: addi 3,12,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s index 763ad1a55b..83b5f96f13 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s @@ -183,16 +183,15 @@ bn_mul_mont_int: li 21,0 mtctr 8 subfe 3,21,3 + and 4,22,3 + andc 6,9,3 + or 4,4,6 .align 4 .Lcopy: - ldx 12,22,21 - ldx 10,9,21 - and 12,12,3 - andc 10,10,3 + ldx 12,4,21 + stdx 12,9,21 stdx 21,22,21 - or 10,10,12 - stdx 10,9,21 addi 21,21,8 bdnz .Lcopy @@ -211,7 +210,7 @@ bn_mul_mont_int: ld 30,-16(12) ld 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x80,12,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s index 5bafae2b27..520b855991 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s @@ -682,14 +682,16 @@ bn_mul_mont_fpu64: li 12,0 subfe 3,12,3 + and 4,10,3 + andc 6,9,3 + or 4,4,6 + addi 31,4,8 mtctr 11 .align 4 .Lcopy: - ldx 24,10,12 - ldx 25,28,12 - ldx 26,9,12 - ldx 27,30,12 + ldx 24,4,12 + ldx 25,31,12 std 12,8(22) std 12,16(22) std 12,24(22) @@ -698,12 +700,6 @@ bn_mul_mont_fpu64: std 12,48(22) std 12,56(22) stdu 12,64(22) - and 24,24,3 - and 25,25,3 - andc 26,26,3 - andc 27,27,3 - or 24,24,26 - or 25,25,27 stdx 24,9,12 stdx 25,30,12 stdx 12,10,12 @@ -738,7 +734,7 @@ bn_mul_mont_fpu64: lfd 30,-16(12) lfd 31,-8(12) mr 1,12 - blr + blr .long 0 .byte 0,12,4,0,0x8c,13,6,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h index 6247ce31fe..db18e0e136 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -26,4 +26,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Tue Nov 20 09:38:38 2018" +#define DATE "built on: Tue Apr 3 00:38:42 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s index dafa6a1eb5..d5173a6b2b 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/chacha/chacha-ppc.s @@ -62,7 +62,7 @@ __ChaCha20_ctr32_int: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,5,0 .long 0 @@ -284,7 +284,7 @@ __ChaCha20_1x: bne .Loop_outer - blr + blr .align 4 .Ltail: @@ -335,7 +335,7 @@ __ChaCha20_1x: stw 1,104(1) stw 1,108(1) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -495,7 +495,7 @@ ChaCha20_ctr32_vmx: vspltisw 27,7 mtctr 0 - nop + nop .Loop_vmx: vadduwm 0,0,1 add 16,16,20 @@ -924,7 +924,7 @@ ChaCha20_ctr32_vmx: cmpldi 5,255 bgt .Loop_outer_vmx - nop + nop .Ldone_vmx: cmpldi 5,0 @@ -977,7 +977,7 @@ ChaCha20_ctr32_vmx: ld 31,456(1) mtlr 0 addi 1,1,464 - blr + blr .long 0 .byte 0,12,0x04,1,0x80,18,5,0 .long 0 @@ -990,7 +990,7 @@ ChaCha20_ctr32_vmx: mflr 12 addi 12,12,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s index c5ace016e1..ec8ae8c05f 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/modes/ghashp8-ppc.s @@ -125,7 +125,7 @@ gcm_init_p8: .long 0x7E4A1F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -176,7 +176,7 @@ gcm_gmult_p8: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -294,7 +294,7 @@ gcm_ghash_p8: .long 0x7C001F99 or 12,12,12 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,4,0 .long 0 @@ -561,7 +561,7 @@ gcm_ghash_p8: lvx 30,10,1 lvx 31,11,1 addi 1,1,256 - blr + blr .long 0 .byte 0,12,0x04,0,0x80,0,4,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s index de5c728fe1..247885f631 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppc.s @@ -28,7 +28,7 @@ poly1305_init_int: .Lno_key: xor 3,3,3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .size poly1305_init_int,.-poly1305_init_int @@ -117,7 +117,7 @@ poly1305_blocks: ld 31,184(1) addi 1,1,192 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,5,4,0 .size poly1305_blocks,.-poly1305_blocks @@ -150,7 +150,7 @@ poly1305_emit: adde 8,8,5 std 7,0(4) std 8,8(4) - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .size poly1305_emit,.-poly1305_emit diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s index bf94546c85..0ddf681308 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/poly1305/poly1305-ppcfp.s @@ -148,7 +148,7 @@ poly1305_init_fpu: .Lno_key: xor 3,3,3 addi 1,1,48 - blr + blr .long 0 .byte 0,12,4,1,0x80,0,2,0 .size poly1305_init_fpu,.-poly1305_init_fpu @@ -465,7 +465,7 @@ poly1305_blocks_fpu: lfd 31,232(1) addi 1,1,240 .Labort: - blr + blr .long 0 .byte 0,12,4,1,0x80,0,4,0 .size poly1305_blocks_fpu,.-poly1305_blocks_fpu @@ -549,7 +549,7 @@ poly1305_emit_fpu: ld 30,64(1) ld 31,72(1) addi 1,1,80 - blr + blr .long 0 .byte 0,12,4,1,0x80,4,3,0 .size poly1305_emit_fpu,.-poly1305_emit_fpu @@ -560,7 +560,7 @@ poly1305_emit_fpu: mflr 5 addi 5,5,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s index 6a859efc09..a2b975fbe2 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/ppccpuid.s @@ -8,7 +8,7 @@ OPENSSL_fpu_probe: .localentry OPENSSL_fpu_probe,0 fmr 0,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_fpu_probe,.-OPENSSL_fpu_probe @@ -19,7 +19,7 @@ OPENSSL_ppc64_probe: .localentry OPENSSL_ppc64_probe,0 fcfid 1,1 rldicl 0,0,32,32 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_ppc64_probe,.-OPENSSL_ppc64_probe @@ -30,7 +30,7 @@ OPENSSL_ppc64_probe: OPENSSL_altivec_probe: .localentry OPENSSL_altivec_probe,0 .long 0x10000484 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_altivec_probe,.-OPENSSL_altivec_probe @@ -42,7 +42,7 @@ OPENSSL_crypto207_probe: .localentry OPENSSL_crypto207_probe,0 .long 0x7C000E99 .long 0x10000508 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_crypto207_probe,.-OPENSSL_crypto207_probe @@ -55,7 +55,7 @@ OPENSSL_madd300_probe: xor 0,0,0 .long 0x10600033 .long 0x10600031 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -89,7 +89,7 @@ OPENSSL_wipe_cpu: xor 12,12,12 fmr 12,31 fmr 13,31 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu @@ -104,7 +104,7 @@ OPENSSL_atomic_add: stwcx. 0,0,3 bne- .Ladd extsw 3,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -116,7 +116,7 @@ OPENSSL_atomic_add: OPENSSL_rdtsc: .localentry OPENSSL_rdtsc,0 mftb 3 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size OPENSSL_rdtsc,.-OPENSSL_rdtsc @@ -135,7 +135,7 @@ OPENSSL_cleanse: stb 0,0(3) addi 3,3,1 bdnz $-8 - blr + blr .Lot: andi. 5,3,3 beq .Laligned stb 0,0(3) @@ -150,7 +150,7 @@ OPENSSL_cleanse: bdnz $-8 andi. 4,4,3 bne .Little - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -178,7 +178,7 @@ CRYPTO_memcmp: li 3,0 sub 3,3,0 extrwi 3,3,1,0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 @@ -211,7 +211,7 @@ OPENSSL_instrument_bus: bdnz .Loop mr 3,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,2,0 .long 0 @@ -265,7 +265,7 @@ OPENSSL_instrument_bus2: .Ldone2: srwi 4,4,2 sub 3,0,4 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,3,0 .long 0 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s index ca4da78395..3b6f4a492c 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha1-ppc.s @@ -103,7 +103,7 @@ sha1_block_data_order: ld 31,248(1) mtlr 0 addi 1,1,256 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1159,7 +1159,7 @@ sha1_block_data_order: mr 11,20 addi 4,4,64 bdnz .Lsha1_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha1_block_data_order,.-sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s index 2e0c25a0c7..0c1539013d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256-ppc.s @@ -123,7 +123,7 @@ sha256_block_ppc: ld 31,312(1) mtlr 0 addi 1,1,320 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1337,7 +1337,7 @@ sha256_block_ppc: cmpld 31,5 stw 15,28(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha256_block_ppc,.-sha256_block_ppc @@ -1348,7 +1348,7 @@ sha256_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s index 80d4942b94..8536cf5e99 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha256p8-ppc.s @@ -783,7 +783,7 @@ sha256_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -795,7 +795,7 @@ sha256_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s index 9c40d44b0b..89d26735a5 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512-ppc.s @@ -123,7 +123,7 @@ sha512_block_ppc: ld 31,376(1) mtlr 0 addi 1,1,384 - blr + blr .long 0 .byte 0,12,4,1,0x80,18,3,0 .long 0 @@ -1417,7 +1417,7 @@ sha512_block_ppc: cmpld 31,5 std 15,56(3) bne .Lsha2_block_private - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .size sha512_block_ppc,.-sha512_block_ppc @@ -1428,7 +1428,7 @@ sha512_block_ppc: mflr 7 addi 7,7,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s index 408e974ea5..2214209e7d 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/crypto/sha/sha512p8-ppc.s @@ -788,7 +788,7 @@ sha512_block_p8: ld 30,432(1) ld 31,440(1) addi 1,1,448 - blr + blr .long 0 .byte 0,12,4,1,0x80,6,3,0 .long 0 @@ -800,7 +800,7 @@ sha512_block_p8: mflr 6 addi 6,6,56 mtlr 0 - blr + blr .long 0 .byte 0,12,0x14,0,0,0,0,0 .space 28 diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h index 8bd973e750..3976dadb19 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi index 41598e5287..c8d2c69df2 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi @@ -217,7 +217,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -402,7 +401,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -579,7 +577,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm index 22b293cbd0..00ea347e49 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-ppc64le", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1076,10 +1076,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1246,22 +1242,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3948,12 +3932,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5083,12 +5061,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6238,12 +6210,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7231,10 +7197,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7340,10 +7302,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7411,8 +7369,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7433,23 +7391,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7605,7 +7550,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7630,7 +7574,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7647,10 +7590,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7717,268 +7657,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8702,10 +9083,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9442,10 +9819,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10150,10 +10523,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10673,7 +11042,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10858,7 +11226,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11035,7 +11402,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12039,15 +12405,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12248,14 +12605,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12405,14 +12754,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12421,23 +12762,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h index e24a2b72e1..1a4d84b065 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Tue Nov 20 09:38:41 2018" +#define DATE "built on: Tue Apr 3 00:38:43 2018" diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h index 08bf3d4394..af3a003d51 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi index 34291bbb73..4f068803a3 100644 --- a/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm index 3c5848328c..31589f2288 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x32/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x32", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -4010,12 +3994,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5157,12 +5135,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6360,12 +6332,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7365,10 +7331,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7474,10 +7436,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7545,8 +7503,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7567,23 +7525,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7739,7 +7684,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7764,7 +7708,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7781,10 +7724,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7851,268 +7791,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8876,10 +9257,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9624,10 +10001,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10364,10 +10737,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10905,7 +11274,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11092,7 +11460,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11277,7 +11644,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12283,15 +12649,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12492,14 +12849,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12649,14 +12998,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12665,23 +13006,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s index 488ae6d781..aa7a1ea1cf 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s index 3dcd55d3f5..d493797832 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s index ca193ddb9e..c7c53e8771 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s index 427a1c7d12..70eed05b00 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s index e18f87c4e6..cd8b00f259 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s index c76c5a8afb..0fd201167f 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s index d193298940..bf7c2b0b6f 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s index ee619092c9..a2cccde636 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s index 795cebe1d7..b6797a6849 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s index a0b78a0565..f4e5337565 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s index 3a78cd8440..d19d4662b4 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax + leaq (%rsp),%rsi movq %r9,%r15 - + jmp .Lsub .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsp,%r14,8),%rax + movq 8(%rsi,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx - movq %r9,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq (%rsi,%r14,8),%rax + movq %r14,(%rsp,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi - leaq -4(%r9),%r15 movq 0(%rsp),%rax + pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r15 + shrq $2,%r9 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,7 +585,9 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - + leaq -1(%r9),%r15 + jmp .Lsub4x +.align 16 .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -612,35 +614,34 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - pxor %xmm0,%xmm0 -.byte 102,72,15,110,224 - pcmpeqd %xmm5,%xmm5 - pshufd $0,%xmm4,%xmm4 - movq %r9,%r15 - pxor %xmm4,%xmm5 - shrq $2,%r15 - xorl %eax,%eax - + xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx + leaq -1(%r9),%r15 + orq %rcx,%rsi + + movdqu (%rsi),%xmm1 + movdqa %xmm0,(%rsp) + movdqu %xmm1,(%rdi) jmp .Lcopy4x .align 16 .Lcopy4x: - movdqa (%rsp,%rax,1),%xmm1 - movdqu (%rdi,%rax,1),%xmm2 - pand %xmm4,%xmm1 - pand %xmm5,%xmm2 - movdqa 16(%rsp,%rax,1),%xmm3 - movdqa %xmm0,(%rsp,%rax,1) - por %xmm2,%xmm1 - movdqu 16(%rdi,%rax,1),%xmm2 - movdqu %xmm1,(%rdi,%rax,1) - pand %xmm4,%xmm3 - pand %xmm5,%xmm2 - movdqa %xmm0,16(%rsp,%rax,1) - por %xmm2,%xmm3 - movdqu %xmm3,16(%rdi,%rax,1) - leaq 32(%rax),%rax + movdqu 16(%rsi,%r14,1),%xmm2 + movdqu 32(%rsi,%r14,1),%xmm1 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) + movdqa %xmm0,32(%rsp,%r14,1) + movdqu %xmm1,32(%rdi,%r14,1) + leaq 32(%r14),%r14 decq %r15 jnz .Lcopy4x + + shlq $2,%r9 + movdqu 16(%rsi,%r14,1),%xmm2 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s index 0dd53512f9..a2fccf088e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,19 +393,18 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx + movq (%rsi,%r14,8),%rax movq %r14,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h index 9689f1ea0f..373b56f423 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x32" -#define DATE "built on: Tue Nov 20 09:38:08 2018" +#define DATE "built on: Tue Apr 3 00:38:29 2018" diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s index 1dead91b17..1117381f31 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s index a9fed05fd7..044b8f031e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s index 62a7ac611f..ce86d5d969 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s index 0defe666bb..0aa90515d6 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s index 21e49925f1..d1a1c895a3 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s index 0116ef1c94..10f5987415 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s index 5a05965c80..0d401b7e47 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s index aab3c6db13..9c7110f4ef 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s index 781b48b9eb..bdd0da3bd1 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s index d266d776ec..d2857f3288 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s index dbeebed9a0..195a148bb9 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s index f2896b4d6e..bd72a459ab 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s index 8264a7dbdf..23b932e1de 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s index 6f8488a38a..a1021c17a9 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s index a4d55b6afc..f83130ea68 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s index 7e1f5e2740..5a109c6fd9 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s index 38c02c188e..3e5ab736fd 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x32/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h index 546f077108..510bac93ae 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi index f3bfdd9737..99963ad8f4 100644 --- a/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x32/asm/openssl.gypi @@ -215,7 +215,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -574,7 +572,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm index 3d937ac91d..e6503fe62c 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x32", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3949,12 +3933,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5084,12 +5062,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6239,12 +6211,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,10 +7198,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7341,10 +7303,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7412,8 +7370,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7434,23 +7392,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7606,7 +7551,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7631,7 +7575,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7648,10 +7591,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7718,268 +7658,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8703,10 +9084,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9443,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10151,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10674,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10859,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11036,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12040,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12249,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12406,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12422,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h index 356e92607e..c45d8db17e 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x32" -#define DATE "built on: Tue Nov 20 09:38:17 2018" +#define DATE "built on: Tue Apr 3 00:38:33 2018" diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h index 9540032788..cbe32f64d8 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi index f7cb5e2b9e..014e893b95 100644 --- a/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm index 2acb2a7d76..9e9bd8b787 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x86_64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -4010,12 +3994,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5157,12 +5135,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6360,12 +6332,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7365,10 +7331,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7474,10 +7436,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7567,23 +7525,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7739,7 +7684,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7764,7 +7708,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7781,10 +7724,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7851,6 +7791,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8876,10 +9257,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9624,10 +10001,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10364,10 +10737,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10905,7 +11274,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11092,7 +11460,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11277,7 +11644,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12283,15 +12649,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12492,14 +12849,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12649,14 +12998,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12665,23 +13006,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s index 488ae6d781..aa7a1ea1cf 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s index 3dcd55d3f5..d493797832 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s index ca193ddb9e..c7c53e8771 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s index 427a1c7d12..70eed05b00 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s index e18f87c4e6..cd8b00f259 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s index c76c5a8afb..0fd201167f 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s index d193298940..bf7c2b0b6f 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s index ee619092c9..a2cccde636 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s index 795cebe1d7..b6797a6849 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s index a0b78a0565..f4e5337565 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s index 3a78cd8440..d19d4662b4 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax + leaq (%rsp),%rsi movq %r9,%r15 - + jmp .Lsub .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsp,%r14,8),%rax + movq 8(%rsi,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx - movq %r9,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq (%rsi,%r14,8),%rax + movq %r14,(%rsp,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi - leaq -4(%r9),%r15 movq 0(%rsp),%rax + pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r15 + shrq $2,%r9 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,7 +585,9 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - + leaq -1(%r9),%r15 + jmp .Lsub4x +.align 16 .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -612,35 +614,34 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - pxor %xmm0,%xmm0 -.byte 102,72,15,110,224 - pcmpeqd %xmm5,%xmm5 - pshufd $0,%xmm4,%xmm4 - movq %r9,%r15 - pxor %xmm4,%xmm5 - shrq $2,%r15 - xorl %eax,%eax - + xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx + leaq -1(%r9),%r15 + orq %rcx,%rsi + + movdqu (%rsi),%xmm1 + movdqa %xmm0,(%rsp) + movdqu %xmm1,(%rdi) jmp .Lcopy4x .align 16 .Lcopy4x: - movdqa (%rsp,%rax,1),%xmm1 - movdqu (%rdi,%rax,1),%xmm2 - pand %xmm4,%xmm1 - pand %xmm5,%xmm2 - movdqa 16(%rsp,%rax,1),%xmm3 - movdqa %xmm0,(%rsp,%rax,1) - por %xmm2,%xmm1 - movdqu 16(%rdi,%rax,1),%xmm2 - movdqu %xmm1,(%rdi,%rax,1) - pand %xmm4,%xmm3 - pand %xmm5,%xmm2 - movdqa %xmm0,16(%rsp,%rax,1) - por %xmm2,%xmm3 - movdqu %xmm3,16(%rdi,%rax,1) - leaq 32(%rax),%rax + movdqu 16(%rsi,%r14,1),%xmm2 + movdqu 32(%rsi,%r14,1),%xmm1 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) + movdqa %xmm0,32(%rsp,%r14,1) + movdqu %xmm1,32(%rdi,%r14,1) + leaq 32(%r14),%r14 decq %r15 jnz .Lcopy4x + + shlq $2,%r9 + movdqu 16(%rsi,%r14,1),%xmm2 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s index 0dd53512f9..a2fccf088e 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,19 +393,18 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx + movq (%rsi,%r14,8),%rax movq %r14,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h index 70d5c7e424..4e13db139d 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Tue Nov 20 09:38:19 2018" +#define DATE "built on: Tue Apr 3 00:38:34 2018" diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s index 1dead91b17..1117381f31 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s index a9fed05fd7..044b8f031e 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s index 62a7ac611f..ce86d5d969 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s index 0defe666bb..0aa90515d6 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s index 21e49925f1..d1a1c895a3 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s index 0116ef1c94..10f5987415 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s index 8b2e361ea1..5662696481 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s index aab3c6db13..9c7110f4ef 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s index 781b48b9eb..bdd0da3bd1 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s index d266d776ec..d2857f3288 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s index dbeebed9a0..195a148bb9 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s index f2896b4d6e..bd72a459ab 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s index 8264a7dbdf..23b932e1de 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s index 6f8488a38a..a1021c17a9 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s index a4d55b6afc..f83130ea68 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s index 7e1f5e2740..5a109c6fd9 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s index 38c02c188e..3e5ab736fd 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h index 7dd2101053..9df0f86ed6 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index 7e9040babc..69169eaaee 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -215,7 +215,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -574,7 +572,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm index 510e1c88f4..2e79f043b3 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux-x86_64", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3949,12 +3933,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5084,12 +5062,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6239,12 +6211,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,10 +7198,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7341,10 +7303,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7413,8 +7371,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "include", "test", + "include", ".", ], "test/threadstest.o" => @@ -7434,23 +7392,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7606,7 +7551,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7631,7 +7575,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7648,10 +7591,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7718,268 +7658,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8703,10 +9084,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9443,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10151,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10674,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10859,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11036,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12040,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12249,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12406,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12422,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h index 245939e5e7..131636a641 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Tue Nov 20 09:38:28 2018" +#define DATE "built on: Tue Apr 3 00:38:38 2018" diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h index 7b122bd86e..e20916814d 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi index fe9f801862..7232d4e55e 100644 --- a/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 811d022c71..47d017c24a 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux32-s390x", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3950,12 +3934,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5085,12 +5063,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6255,12 +6227,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7248,10 +7214,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7357,10 +7319,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7428,9 +7386,9 @@ our %unified_info = ( ], "test/testutil.o" => [ + "test", "crypto/include", "include", - "test", ".", ], "test/threadstest.o" => @@ -7450,23 +7408,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7622,7 +7567,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7647,7 +7591,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7664,10 +7607,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7734,268 +7674,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8723,10 +9104,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9463,10 +9840,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10191,10 +10564,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10715,7 +11084,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10900,7 +11268,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11082,7 +11449,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12086,15 +12452,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12295,14 +12652,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12452,14 +12801,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12468,23 +12809,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S index 541636080c..71138f8176 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S @@ -458,7 +458,7 @@ _s390x_AES_encrypt: or %r9,%r1 or %r2,%r6 or %r3,%r7 - + srlg %r5,%r10,5 # i0 srlg %r6,%r10,13 # i1 nr %r5,%r0 @@ -511,7 +511,7 @@ _s390x_AES_encrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_encrypt,.-_s390x_AES_encrypt .type AES_Td,@object .align 256 @@ -1015,7 +1015,7 @@ _s390x_AES_decrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_decrypt,.-_s390x_AES_decrypt # void AES_set_encrypt_key(const unsigned char *in, int bits, # AES_KEY *key) { @@ -1496,7 +1496,7 @@ AES_cbc_encrypt: .Lcbc_enc_done: l %r6,6*4(%r15) st %r8,0(%r6) - st %r9,4(%r6) + st %r9,4(%r6) st %r10,8(%r6) st %r11,12(%r6) @@ -1744,7 +1744,7 @@ _s390x_xts_km: llgc %r3,2*4-1(%r15) nill %r3,0x0f # %r3%=16 br %r14 - + .align 16 .Lxts_km_vanilla: # prepare and allocate stack frame at the top of 4K page @@ -1961,7 +1961,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,80+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2012,7 +2012,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,80+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2190,7 +2190,7 @@ AES_xts_decrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,80+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S index 0a6c67545a..cb7743cfea 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S @@ -152,16 +152,16 @@ bn_mul_mont: brct %r14,.Lsub lghi %r8,0 slbgr %r12,%r8 # handle upmost carry - lghi %r13,-1 - xgr %r13,%r12 + + ngr %r3,%r12 + lghi %r5,-1 + xgr %r5,%r12 + ngr %r5,%r2 + ogr %r3,%r5 # ap=borrow?tp:rp la %r7,0(%r0) lgr %r14,%r1 -.Lcopy: lg %r8,96(%r7,%r15) # conditional copy - lg %r9,0(%r7,%r2) - ngr %r8,%r12 - ngr %r9,%r13 - ogr %r9,%r8 +.Lcopy: lg %r9,0(%r7,%r3) # copy or in-place refresh rllg %r9,%r9,32 stg %r7,96(%r7,%r15) # zap tp stg %r9,0(%r7,%r2) diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h index e28d2b1884..64e7f072a3 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -30,4 +30,4 @@ static const char cflags[] = { 'e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Tue Nov 20 09:38:42 2018" +#define DATE "built on: Tue Apr 3 00:38:44 2018" diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S index 4a006d9c5d..88c26122cc 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S @@ -41,7 +41,7 @@ gcm_ghash_4bit: lg %r0,0+1(%r2) lghi %r12,0 .Louter: - xg %r0,0(%r4) # Xi ^= inp + xg %r0,0(%r4) # Xi ^= inp xg %r1,8(%r4) xgr %r0,%r12 stg %r1,8+1(%r2) diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S index f02c836633..cf1b7819a1 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S @@ -1234,7 +1234,7 @@ sha256_block_data_order: cl %r3,176(%r15) jne .Lloop - lm %r6,%r15,184(%r15) + lm %r6,%r15,184(%r15) br %r14 .size sha256_block_data_order,.-sha256_block_data_order .string "SHA256 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S index 3d682e8658..6900891667 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S @@ -1258,7 +1258,7 @@ sha512_block_data_order: cl %r3,240(%r15) jne .Lloop - lm %r6,%r15,248(%r15) + lm %r6,%r15,248(%r15) br %r14 .size sha512_block_data_order,.-sha512_block_data_order .string "SHA512 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h index 21dd8cc643..2f9817e43b 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi index 1474182807..ffff267d09 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi @@ -216,7 +216,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -577,7 +575,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm index 0fcbf6e406..5d1929317b 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux32-s390x", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3943,12 +3927,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5078,12 +5056,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6233,12 +6205,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7226,10 +7192,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7335,10 +7297,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7428,23 +7386,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7600,7 +7545,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7625,7 +7569,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7642,10 +7585,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7712,6 +7652,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8693,10 +9074,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9433,10 +9810,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10141,10 +10514,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10663,7 +11032,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10848,7 +11216,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11025,7 +11392,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12029,15 +12395,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12238,14 +12595,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12395,14 +12744,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12411,23 +12752,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h index 103c712bb3..d79eb3ca2a 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Tue Nov 20 09:38:44 2018" +#define DATE "built on: Tue Apr 3 00:38:45 2018" diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h index 5ba3b88d4e..1f0c62b3c9 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi index d174275b36..d3be0776df 100644 --- a/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi @@ -218,7 +218,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -403,7 +402,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -580,7 +578,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index 475bd469c1..ebdafeb184 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux64-s390x", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3950,12 +3934,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5085,12 +5063,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6255,12 +6227,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7248,10 +7214,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7357,10 +7319,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7450,23 +7408,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7622,7 +7567,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7647,7 +7591,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7664,10 +7607,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7734,6 +7674,447 @@ our %unified_info = ( ], "shared_sources" => { + "apps/openssl" => + [ + ], + "fuzz/asn1-test" => + [ + ], + "fuzz/asn1parse-test" => + [ + ], + "fuzz/bignum-test" => + [ + ], + "fuzz/bndiv-test" => + [ + ], + "fuzz/cms-test" => + [ + ], + "fuzz/conf-test" => + [ + ], + "fuzz/crl-test" => + [ + ], + "fuzz/ct-test" => + [ + ], + "fuzz/server-test" => + [ + ], + "fuzz/x509-test" => + [ + ], + "libcrypto" => + [ + ], + "libssl" => + [ + ], + "test/aborttest" => + [ + ], + "test/afalgtest" => + [ + ], + "test/asynciotest" => + [ + ], + "test/asynctest" => + [ + ], + "test/bad_dtls_test" => + [ + ], + "test/bftest" => + [ + ], + "test/bio_enc_test" => + [ + ], + "test/bioprinttest" => + [ + ], + "test/bntest" => + [ + ], + "test/buildtest_aes" => + [ + ], + "test/buildtest_asn1" => + [ + ], + "test/buildtest_asn1t" => + [ + ], + "test/buildtest_async" => + [ + ], + "test/buildtest_bio" => + [ + ], + "test/buildtest_blowfish" => + [ + ], + "test/buildtest_bn" => + [ + ], + "test/buildtest_buffer" => + [ + ], + "test/buildtest_camellia" => + [ + ], + "test/buildtest_cast" => + [ + ], + "test/buildtest_cmac" => + [ + ], + "test/buildtest_cms" => + [ + ], + "test/buildtest_conf" => + [ + ], + "test/buildtest_conf_api" => + [ + ], + "test/buildtest_crypto" => + [ + ], + "test/buildtest_ct" => + [ + ], + "test/buildtest_des" => + [ + ], + "test/buildtest_dh" => + [ + ], + "test/buildtest_dsa" => + [ + ], + "test/buildtest_dtls1" => + [ + ], + "test/buildtest_e_os2" => + [ + ], + "test/buildtest_ebcdic" => + [ + ], + "test/buildtest_ec" => + [ + ], + "test/buildtest_ecdh" => + [ + ], + "test/buildtest_ecdsa" => + [ + ], + "test/buildtest_engine" => + [ + ], + "test/buildtest_err" => + [ + ], + "test/buildtest_evp" => + [ + ], + "test/buildtest_hmac" => + [ + ], + "test/buildtest_idea" => + [ + ], + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], }, "sources" => { @@ -8723,10 +9104,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9463,10 +9840,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10191,10 +10564,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10715,7 +11084,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10900,7 +11268,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11082,7 +11449,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12086,15 +12452,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12295,14 +12652,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12452,14 +12801,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12468,23 +12809,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S index a44e72d047..1a1e4c224d 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S @@ -458,7 +458,7 @@ _s390x_AES_encrypt: or %r9,%r1 or %r2,%r6 or %r3,%r7 - + srlg %r5,%r10,5 # i0 srlg %r6,%r10,13 # i1 nr %r5,%r0 @@ -511,7 +511,7 @@ _s390x_AES_encrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_encrypt,.-_s390x_AES_encrypt .type AES_Td,@object .align 256 @@ -1015,7 +1015,7 @@ _s390x_AES_decrypt: x %r10,24(%r4) x %r11,28(%r4) - br %r14 + br %r14 .size _s390x_AES_decrypt,.-_s390x_AES_decrypt # void AES_set_encrypt_key(const unsigned char *in, int bits, # AES_KEY *key) { @@ -1496,7 +1496,7 @@ AES_cbc_encrypt: .Lcbc_enc_done: lg %r6,6*8(%r15) st %r8,0(%r6) - st %r9,4(%r6) + st %r9,4(%r6) st %r10,8(%r6) st %r11,12(%r6) @@ -1744,7 +1744,7 @@ _s390x_xts_km: llgc %r3,2*8-1(%r15) nill %r3,0x0f # %r3%=16 br %r14 - + .align 16 .Lxts_km_vanilla: # prepare and allocate stack frame at the top of 4K page @@ -1960,7 +1960,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,144+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2011,7 +2011,7 @@ AES_xts_encrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,144+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 @@ -2188,7 +2188,7 @@ AES_xts_decrypt: xgr %r9,%r1 lrvgr %r9,%r9 # flip byte order lrvgr %r11,%r11 - srlg %r8,%r9,32 # smash the tweak to 4x32-bits + srlg %r8,%r9,32 # smash the tweak to 4x32-bits stg %r9,144+0(%r15) # save the tweak llgfr %r9,%r9 srlg %r10,%r11,32 diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s index 1b90426659..e0b0822cae 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s @@ -206,7 +206,7 @@ bn_GF2m_mul_2x2: xgr %r4,%r7 xgr %r3,%r6 xgr %r4,%r8 - xgr %r3,%r9 + xgr %r3,%r9 xgr %r4,%r9 xgr %r3,%r4 stg %r4,16(%r2) diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S index b8dea0a66f..c4ee541906 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S @@ -26,12 +26,12 @@ bn_mul_mont: la %r4,0(%r7,%r4) # restore %r4 ahi %r1,-1 # adjust %r1 for inner loop lg %r6,0(%r6) # pull n0 - + lg %r2,0(%r4) - + lg %r9,0(%r3) - + mlgr %r8,%r2 # ap[0]*bp[0] lgr %r12,%r8 @@ -39,7 +39,7 @@ bn_mul_mont: msgr %r0,%r6 lg %r11,0(%r5) # - + mlgr %r10,%r0 # np[0]*m1 algr %r11,%r9 # +="tp[0]" lghi %r13,0 @@ -51,14 +51,14 @@ bn_mul_mont: .align 16 .L1st: lg %r9,0(%r7,%r3) - + mlgr %r8,%r2 # ap[j]*bp[0] algr %r9,%r12 lghi %r12,0 alcgr %r12,%r8 lg %r11,0(%r7,%r5) - + mlgr %r10,%r0 # np[j]*m1 algr %r11,%r13 lghi %r13,0 @@ -79,9 +79,9 @@ bn_mul_mont: .Louter: lg %r2,0(%r4) # bp[i] - + lg %r9,0(%r3) - + mlgr %r8,%r2 # ap[0]*bp[i] alg %r9,160(%r15) # +=tp[0] lghi %r12,0 @@ -91,7 +91,7 @@ bn_mul_mont: msgr %r0,%r6 # tp[0]*n0 lg %r11,0(%r5) # np[0] - + mlgr %r10,%r0 # np[0]*m1 algr %r11,%r9 # +="tp[0]" lghi %r13,0 @@ -103,7 +103,7 @@ bn_mul_mont: .align 16 .Linner: lg %r9,0(%r7,%r3) - + mlgr %r8,%r2 # ap[j]*bp[i] algr %r9,%r12 lghi %r12,0 @@ -112,7 +112,7 @@ bn_mul_mont: alcgr %r12,%r8 lg %r11,0(%r7,%r5) - + mlgr %r10,%r0 # np[j]*m1 algr %r11,%r13 lghi %r13,0 @@ -145,24 +145,24 @@ bn_mul_mont: lr %r14,%r1 .Lsub: lg %r9,0(%r7,%r3) lg %r11,0(%r7,%r5) - + slbgr %r9,%r11 stg %r9,0(%r7,%r2) la %r7,8(%r7) brct %r14,.Lsub lghi %r8,0 slbgr %r12,%r8 # handle upmost carry - lghi %r13,-1 - xgr %r13,%r12 + + ngr %r3,%r12 + lghi %r5,-1 + xgr %r5,%r12 + ngr %r5,%r2 + ogr %r3,%r5 # ap=borrow?tp:rp la %r7,0(%r0) lgr %r14,%r1 -.Lcopy: lg %r8,160(%r7,%r15) # conditional copy - lg %r9,0(%r7,%r2) - ngr %r8,%r12 - ngr %r9,%r13 - ogr %r9,%r8 - +.Lcopy: lg %r9,0(%r7,%r3) # copy or in-place refresh + stg %r7,160(%r7,%r15) # zap tp stg %r9,0(%r7,%r2) la %r7,8(%r7) diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h index 2f2e17886a..0539055a2c 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -30,4 +30,4 @@ static const char cflags[] = { 'e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Tue Nov 20 09:38:47 2018" +#define DATE "built on: Tue Apr 3 00:38:46 2018" diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S index 6dfaa76c35..a1c0217590 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S @@ -40,7 +40,7 @@ gcm_ghash_4bit: lg %r0,0+1(%r2) lghi %r12,0 .Louter: - xg %r0,0(%r4) # Xi ^= inp + xg %r0,0(%r4) # Xi ^= inp xg %r1,8(%r4) xgr %r0,%r12 stg %r1,8+1(%r2) diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S index e66c672764..28cbb63752 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S @@ -1234,7 +1234,7 @@ sha256_block_data_order: clg %r3,256(%r15) jne .Lloop - lmg %r6,%r15,272(%r15) + lmg %r6,%r15,272(%r15) br %r14 .size sha256_block_data_order,.-sha256_block_data_order .string "SHA256 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S index 5ff5c6bf9f..77c99e416b 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S @@ -1258,7 +1258,7 @@ sha512_block_data_order: clg %r3,320(%r15) jne .Lloop - lmg %r6,%r15,336(%r15) + lmg %r6,%r15,336(%r15) br %r14 .size sha512_block_data_order,.-sha512_block_data_order .string "SHA512 block transform for s390x, CRYPTOGAMS by " diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h index 8bd973e750..3976dadb19 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi b/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi index fcae58e93e..30272e9dbc 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi @@ -216,7 +216,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -577,7 +575,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm index cf41d1a8ac..5c9cbdcf00 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "linux64-s390x", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3949,12 +3933,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5084,12 +5062,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6239,12 +6211,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,10 +7198,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7341,10 +7303,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7413,8 +7371,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "include", "test", + "include", ".", ], "test/threadstest.o" => @@ -7434,23 +7392,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7606,7 +7551,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7631,7 +7575,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7648,10 +7591,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7718,268 +7658,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8703,10 +9084,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9443,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10151,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10674,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10859,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11036,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12040,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12249,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12406,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12422,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h index f454793ad3..a52b3fe333 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Tue Nov 20 09:38:48 2018" +#define DATE "built on: Tue Apr 3 00:38:47 2018" diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h index 08bf3d4394..af3a003d51 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi index bb0d0771c1..37430ef795 100644 --- a/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm index 541ce9980b..bebfecbdce 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris-x86-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3961,12 +3945,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5108,12 +5086,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6299,12 +6271,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7304,10 +7270,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7413,10 +7375,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7484,9 +7442,9 @@ our %unified_info = ( ], "test/testutil.o" => [ + "test", "crypto/include", "include", - "test", ".", ], "test/threadstest.o" => @@ -7506,23 +7464,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7678,7 +7623,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7703,7 +7647,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7720,10 +7663,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7790,268 +7730,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8783,10 +9164,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9531,10 +9908,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10263,10 +10636,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10796,7 +11165,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10983,7 +11351,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11166,7 +11533,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12172,15 +12538,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12381,14 +12738,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12538,14 +12887,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12554,23 +12895,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s index 8212ff0825..945d9e5824 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s @@ -445,18 +445,16 @@ bn_mul_mont: leal 1(%edx),%edx jge .L017sub sbbl $0,%eax - movl $-1,%edx - xorl %eax,%edx - jmp .L018copy + andl %eax,%esi + notl %eax + movl %edi,%ebp + andl %eax,%ebp + orl %ebp,%esi .align 16 .L018copy: - movl 32(%esp,%ebx,4),%esi - movl (%edi,%ebx,4),%ebp + movl (%esi,%ebx,4),%eax + movl %eax,(%edi,%ebx,4) movl %ecx,32(%esp,%ebx,4) - andl %eax,%esi - andl %edx,%ebp - orl %esi,%ebp - movl %ebp,(%edi,%ebx,4) decl %ebx jge .L018copy movl 24(%esp),%esp diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h index 3a93af610a..864103a8dc 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h @@ -37,4 +37,4 @@ static const char cflags[] = { '"',' ','\0' }; #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Tue Nov 20 09:38:50 2018" +#define DATE "built on: Tue Apr 3 00:38:47 2018" diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s index 9092d66321..cbccc5ebf7 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s @@ -3857,7 +3857,7 @@ ecp_nistz256_scatter_w7: movl 20(%esp),%edi movl 24(%esp),%esi movl 28(%esp),%ebp - leal (%edi,%ebp,1),%edi + leal -1(%edi,%ebp,1),%edi movl $16,%ebp .L007scatter_w7_loop: movl (%esi),%eax diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h index b9d6509c0b..e819a68f0b 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi index 46404972a5..af1d87642d 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi @@ -211,7 +211,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -395,7 +394,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -569,7 +567,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm index 4df2be4157..f6f187ac6d 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris-x86-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1075,10 +1075,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1245,22 +1241,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3947,12 +3931,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5082,12 +5060,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6237,12 +6209,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7230,10 +7196,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7339,10 +7301,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7411,8 +7369,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "include", "test", + "include", ".", ], "test/threadstest.o" => @@ -7432,23 +7390,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7604,7 +7549,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7629,7 +7573,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7646,10 +7589,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7716,268 +7656,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8701,10 +9082,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9441,10 +9818,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10149,10 +10522,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10672,7 +11041,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10857,7 +11225,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11034,7 +11401,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12038,15 +12404,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12247,14 +12604,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12404,14 +12753,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12420,23 +12761,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h index 217d42d422..e3ba51d54c 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Tue Nov 20 09:38:54 2018" +#define DATE "built on: Tue Apr 3 00:38:49 2018" diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h index d0fb48f465..b20dbd0212 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi index d25eac7b3e..4d880dad4e 100644 --- a/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm index 278eea138c..4f080d8013 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris64-x86_64-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1078,10 +1078,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1248,22 +1244,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -4010,12 +3994,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5157,12 +5135,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6360,12 +6332,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7365,10 +7331,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7474,10 +7436,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7545,8 +7503,8 @@ our %unified_info = ( ], "test/testutil.o" => [ - "test", "crypto/include", + "test", "include", ".", ], @@ -7567,23 +7525,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7739,7 +7684,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7764,7 +7708,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7781,10 +7724,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7851,268 +7791,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8876,10 +9257,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9624,10 +10001,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10364,10 +10737,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10905,7 +11274,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -11092,7 +11460,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11277,7 +11644,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12283,15 +12649,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12492,14 +12849,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12649,14 +12998,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12665,23 +13006,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s index 488ae6d781..aa7a1ea1cf 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _x86_64_AES_encrypt,@function .align 16 _x86_64_AES_encrypt: diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s index 3dcd55d3f5..d493797832 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s index ca193ddb9e..c7c53e8771 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha1_enc diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s index 427a1c7d12..70eed05b00 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_cbc_sha256_enc diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s index e18f87c4e6..cd8b00f259 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl aesni_encrypt .type aesni_encrypt,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s index c76c5a8afb..0fd201167f 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s index d193298940..bf7c2b0b6f 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/vpaes-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s index ee619092c9..a2cccde636 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s @@ -1,4 +1,4 @@ -.text +.text .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s index 795cebe1d7..b6797a6849 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s index a0b78a0565..f4e5337565 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s @@ -1,4 +1,4 @@ -.text +.text .type _mul_1x1,@function .align 16 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s index 3a78cd8440..d19d4662b4 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s @@ -1,4 +1,4 @@ -.text +.text @@ -197,30 +197,30 @@ bn_mul_mont: xorq %r14,%r14 movq (%rsp),%rax + leaq (%rsp),%rsi movq %r9,%r15 - + jmp .Lsub .align 16 .Lsub: sbbq (%rcx,%r14,8),%rax movq %rax,(%rdi,%r14,8) - movq 8(%rsp,%r14,8),%rax + movq 8(%rsi,%r14,8),%rax leaq 1(%r14),%r14 decq %r15 jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx - movq %r9,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq (%rsi,%r14,8),%rax + movq %r14,(%rsp,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy @@ -574,10 +574,10 @@ bn_mul4x_mont: cmpq %r9,%r14 jb .Louter4x movq 16(%rsp,%r9,8),%rdi - leaq -4(%r9),%r15 movq 0(%rsp),%rax + pxor %xmm0,%xmm0 movq 8(%rsp),%rdx - shrq $2,%r15 + shrq $2,%r9 leaq (%rsp),%rsi xorq %r14,%r14 @@ -585,7 +585,9 @@ bn_mul4x_mont: movq 16(%rsi),%rbx movq 24(%rsi),%rbp sbbq 8(%rcx),%rdx - + leaq -1(%r9),%r15 + jmp .Lsub4x +.align 16 .Lsub4x: movq %rax,0(%rdi,%r14,8) movq %rdx,8(%rdi,%r14,8) @@ -612,35 +614,34 @@ bn_mul4x_mont: sbbq $0,%rax movq %rbp,24(%rdi,%r14,8) - pxor %xmm0,%xmm0 -.byte 102,72,15,110,224 - pcmpeqd %xmm5,%xmm5 - pshufd $0,%xmm4,%xmm4 - movq %r9,%r15 - pxor %xmm4,%xmm5 - shrq $2,%r15 - xorl %eax,%eax - + xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx + leaq -1(%r9),%r15 + orq %rcx,%rsi + + movdqu (%rsi),%xmm1 + movdqa %xmm0,(%rsp) + movdqu %xmm1,(%rdi) jmp .Lcopy4x .align 16 .Lcopy4x: - movdqa (%rsp,%rax,1),%xmm1 - movdqu (%rdi,%rax,1),%xmm2 - pand %xmm4,%xmm1 - pand %xmm5,%xmm2 - movdqa 16(%rsp,%rax,1),%xmm3 - movdqa %xmm0,(%rsp,%rax,1) - por %xmm2,%xmm1 - movdqu 16(%rdi,%rax,1),%xmm2 - movdqu %xmm1,(%rdi,%rax,1) - pand %xmm4,%xmm3 - pand %xmm5,%xmm2 - movdqa %xmm0,16(%rsp,%rax,1) - por %xmm2,%xmm3 - movdqu %xmm3,16(%rdi,%rax,1) - leaq 32(%rax),%rax + movdqu 16(%rsi,%r14,1),%xmm2 + movdqu 32(%rsi,%r14,1),%xmm1 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) + movdqa %xmm0,32(%rsp,%r14,1) + movdqu %xmm1,32(%rdi,%r14,1) + leaq 32(%r14),%r14 decq %r15 jnz .Lcopy4x + + shlq $2,%r9 + movdqu 16(%rsi,%r14,1),%xmm2 + movdqa %xmm0,16(%rsp,%r14,1) + movdqu %xmm2,16(%rdi,%r14,1) movq 8(%rsp,%r9,8),%rsi movq $1,%rax movq -48(%rsi),%r15 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s index 0dd53512f9..a2fccf088e 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s @@ -1,4 +1,4 @@ -.text +.text @@ -393,19 +393,18 @@ bn_mul_mont_gather5: jnz .Lsub sbbq $0,%rax - movq $-1,%rbx - xorq %rax,%rbx xorq %r14,%r14 + andq %rax,%rsi + notq %rax + movq %rdi,%rcx + andq %rax,%rcx movq %r9,%r15 - + orq %rcx,%rsi +.align 16 .Lcopy: - movq (%rdi,%r14,8),%rcx - movq (%rsp,%r14,8),%rdx - andq %rbx,%rcx - andq %rax,%rdx + movq (%rsi,%r14,8),%rax movq %r14,(%rsp,%r14,8) - orq %rcx,%rdx - movq %rdx,(%rdi,%r14,8) + movq %rax,(%rdi,%r14,8) leaq 1(%r14),%r14 subq $1,%r15 jnz .Lcopy diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h index 816440ae63..e1b87d9f50 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h @@ -35,4 +35,4 @@ static const char cflags[] = { 'i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Tue Nov 20 09:38:56 2018" +#define DATE "built on: Tue Apr 3 00:38:50 2018" diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s index 1dead91b17..1117381f31 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl Camellia_EncryptBlock diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s index a9fed05fd7..044b8f031e 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/chacha/chacha-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s index 62a7ac611f..ce86d5d969 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl ecp_nistz256_precomputed .type ecp_nistz256_precomputed,@object .align 4096 @@ -2372,7 +2372,7 @@ ecp_nistz256_precomputed: .long 0x2a849870,0x4d33dd99,0x41576335,0xa716964b,0x179be0e5,0xff5e3a9b,0x83b13632,0x5b9d6b1b,0xa52f313b,0x3b8bd7d4,0x637a4660,0xc9dd95a0,0x0b3e218f,0x30035962,0xc7b28a3c,0xce1481a3 .long 0x43228d83,0xab41b43a,0x4ad63f99,0x24ae1c30,0x46a51229,0x8e525f1a,0xcd26d2b4,0x14af860f,0x3f714aa1,0xd6baef61,0xeb78795e,0xf51865ad,0xe6a9d694,0xd3e21fce,0x8a37b527,0x82ceb1dd .size ecp_nistz256_precomputed,.-ecp_nistz256_precomputed -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s index 0defe666bb..0aa90515d6 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl md5_block_asm_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s index 21e49925f1..d1a1c895a3 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .type _aesni_ctr32_ghash_6x,@function .align 32 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s index 0116ef1c94..10f5987415 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/ghash-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl gcm_gmult_4bit diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s index 8b2e361ea1..5662696481 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s index aab3c6db13..9c7110f4ef 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-md5-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .align 16 .globl rc4_md5_enc diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s index 781b48b9eb..bdd0da3bd1 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl RC4 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s index d266d776ec..d2857f3288 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s index dbeebed9a0..195a148bb9 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha1_block_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s index f2896b4d6e..bd72a459ab 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-mb-x86_64.s @@ -1,4 +1,4 @@ -.text +.text diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s index 8264a7dbdf..23b932e1de 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha256_block_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s index 6f8488a38a..a1021c17a9 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl sha512_block_data_order diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s index a4d55b6afc..f83130ea68 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/whrlpool/wp-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl whirlpool_block .type whirlpool_block,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s index 7e1f5e2740..5a109c6fd9 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s @@ -6,7 +6,7 @@ .hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,16,4 -.text +.text .globl OPENSSL_atomic_add .type OPENSSL_atomic_add,@function diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s index 38c02c188e..3e5ab736fd 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/engines/e_padlock-x86_64.s @@ -1,4 +1,4 @@ -.text +.text .globl padlock_capability .type padlock_capability,@function .align 16 @@ -1020,7 +1020,7 @@ padlock_ctr32_encrypt: .size padlock_ctr32_encrypt,.-padlock_ctr32_encrypt .byte 86,73,65,32,80,97,100,108,111,99,107,32,120,56,54,95,54,52,32,109,111,100,117,108,101,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 16 -.data +.data .align 8 .Lpadlock_saved_context: .quad 0 diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h index 7dd2101053..9df0f86ed6 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h @@ -102,18 +102,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi index bdef71da40..46a2ed34cf 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi @@ -215,7 +215,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -401,7 +400,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -574,7 +572,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm index 2c00fcf1a0..f0d822aa7d 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm @@ -56,8 +56,8 @@ our %config = ( shlib_version_number => "1.1", sourcedir => ".", target => "solaris64-x86_64-gcc", - version => "1.1.0j", - version_num => "0x101000afL", + version => "1.1.0h", + version_num => "0x1010008fL", ); our %target = ( @@ -1077,10 +1077,6 @@ our %unified_info = ( [ "libcrypto", ], - "test/errtest" => - [ - "libcrypto", - ], "test/evp_extra_test" => [ "libcrypto", @@ -1247,22 +1243,10 @@ our %unified_info = ( [ "libcrypto", ], - "test/versions" => - [ - "libcrypto", - ], "test/wp_test" => [ "libcrypto", ], - "test/x509_dup_cert_test" => - [ - "libcrypto", - ], - "test/x509_time_test" => - [ - "libcrypto", - ], "test/x509aux" => [ "libcrypto", @@ -3949,12 +3933,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/conf/conf_ssl.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/cpt_err.o" => [ ".", @@ -5084,12 +5062,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/getenv.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/hmac/hm_ameth.o" => [ ".", @@ -6239,12 +6211,6 @@ our %unified_info = ( "crypto/include", "include", ], - "crypto/x509/x509_meth.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/x509/x509_obj.o" => [ ".", @@ -7232,10 +7198,6 @@ our %unified_info = ( [ "include", ], - "test/errtest.o" => - [ - "include", - ], "test/evp_extra_test.o" => [ "include", @@ -7341,10 +7303,6 @@ our %unified_info = ( [ "include", ], - "test/rsa_complex.o" => - [ - "include", - ], "test/rsa_test.o" => [ ".", @@ -7413,8 +7371,8 @@ our %unified_info = ( "test/testutil.o" => [ "crypto/include", - "test", "include", + "test", ".", ], "test/threadstest.o" => @@ -7434,23 +7392,10 @@ our %unified_info = ( [ "include", ], - "test/versions.o" => - [ - "include", - ], "test/wp_test.o" => [ "include", ], - "test/x509_dup_cert_test.o" => - [ - "include", - ], - "test/x509_time_test.o" => - [ - ".", - "include", - ], "test/x509aux.o" => [ "include", @@ -7606,7 +7551,6 @@ our %unified_info = ( "test/ecdsatest", "test/ectest", "test/enginetest", - "test/errtest", "test/evp_extra_test", "test/evp_test", "test/exdatatest", @@ -7631,7 +7575,6 @@ our %unified_info = ( "test/rc4test", "test/rc5test", "test/rmdtest", - "test/rsa_complex", "test/rsa_test", "test/sanitytest", "test/secmemtest", @@ -7648,10 +7591,7 @@ our %unified_info = ( "test/v3ext", "test/v3nametest", "test/verify_extra_test", - "test/versions", "test/wp_test", - "test/x509_dup_cert_test", - "test/x509_time_test", "test/x509aux", ], "rawlines" => @@ -7718,268 +7658,709 @@ our %unified_info = ( ], "shared_sources" => { - }, - "sources" => - { - "apps/CA.pl" => + "apps/openssl" => [ - "apps/CA.pl.in", ], - "apps/app_rand.o" => + "fuzz/asn1-test" => [ - "apps/app_rand.c", ], - "apps/apps.o" => + "fuzz/asn1parse-test" => [ - "apps/apps.c", ], - "apps/asn1pars.o" => + "fuzz/bignum-test" => [ - "apps/asn1pars.c", ], - "apps/ca.o" => + "fuzz/bndiv-test" => [ - "apps/ca.c", ], - "apps/ciphers.o" => + "fuzz/cms-test" => [ - "apps/ciphers.c", ], - "apps/cms.o" => + "fuzz/conf-test" => [ - "apps/cms.c", ], - "apps/crl.o" => + "fuzz/crl-test" => [ - "apps/crl.c", ], - "apps/crl2p7.o" => + "fuzz/ct-test" => [ - "apps/crl2p7.c", ], - "apps/dgst.o" => + "fuzz/server-test" => [ - "apps/dgst.c", ], - "apps/dhparam.o" => + "fuzz/x509-test" => [ - "apps/dhparam.c", ], - "apps/dsa.o" => + "libcrypto" => [ - "apps/dsa.c", ], - "apps/dsaparam.o" => + "libssl" => [ - "apps/dsaparam.c", ], - "apps/ec.o" => + "test/aborttest" => [ - "apps/ec.c", ], - "apps/ecparam.o" => + "test/afalgtest" => [ - "apps/ecparam.c", ], - "apps/enc.o" => + "test/asynciotest" => [ - "apps/enc.c", ], - "apps/engine.o" => + "test/asynctest" => [ - "apps/engine.c", ], - "apps/errstr.o" => + "test/bad_dtls_test" => [ - "apps/errstr.c", ], - "apps/gendsa.o" => + "test/bftest" => [ - "apps/gendsa.c", ], - "apps/genpkey.o" => + "test/bio_enc_test" => [ - "apps/genpkey.c", ], - "apps/genrsa.o" => + "test/bioprinttest" => [ - "apps/genrsa.c", ], - "apps/nseq.o" => + "test/bntest" => [ - "apps/nseq.c", ], - "apps/ocsp.o" => + "test/buildtest_aes" => [ - "apps/ocsp.c", ], - "apps/openssl" => + "test/buildtest_asn1" => [ - "apps/app_rand.o", - "apps/apps.o", - "apps/asn1pars.o", - "apps/ca.o", - "apps/ciphers.o", - "apps/cms.o", - "apps/crl.o", - "apps/crl2p7.o", - "apps/dgst.o", - "apps/dhparam.o", - "apps/dsa.o", - "apps/dsaparam.o", - "apps/ec.o", - "apps/ecparam.o", - "apps/enc.o", - "apps/engine.o", - "apps/errstr.o", - "apps/gendsa.o", - "apps/genpkey.o", - "apps/genrsa.o", - "apps/nseq.o", - "apps/ocsp.o", - "apps/openssl.o", - "apps/opt.o", - "apps/passwd.o", - "apps/pkcs12.o", - "apps/pkcs7.o", - "apps/pkcs8.o", - "apps/pkey.o", - "apps/pkeyparam.o", - "apps/pkeyutl.o", - "apps/prime.o", - "apps/rand.o", - "apps/rehash.o", - "apps/req.o", - "apps/rsa.o", - "apps/rsautl.o", - "apps/s_cb.o", - "apps/s_client.o", - "apps/s_server.o", - "apps/s_socket.o", - "apps/s_time.o", - "apps/sess_id.o", - "apps/smime.o", - "apps/speed.o", - "apps/spkac.o", - "apps/srp.o", - "apps/ts.o", - "apps/verify.o", - "apps/version.o", - "apps/x509.o", ], - "apps/openssl.o" => + "test/buildtest_asn1t" => [ - "apps/openssl.c", ], - "apps/opt.o" => + "test/buildtest_async" => [ - "apps/opt.c", ], - "apps/passwd.o" => + "test/buildtest_bio" => [ - "apps/passwd.c", ], - "apps/pkcs12.o" => + "test/buildtest_blowfish" => [ - "apps/pkcs12.c", ], - "apps/pkcs7.o" => + "test/buildtest_bn" => [ - "apps/pkcs7.c", ], - "apps/pkcs8.o" => + "test/buildtest_buffer" => [ - "apps/pkcs8.c", ], - "apps/pkey.o" => + "test/buildtest_camellia" => [ - "apps/pkey.c", ], - "apps/pkeyparam.o" => + "test/buildtest_cast" => [ - "apps/pkeyparam.c", ], - "apps/pkeyutl.o" => + "test/buildtest_cmac" => [ - "apps/pkeyutl.c", ], - "apps/prime.o" => + "test/buildtest_cms" => [ - "apps/prime.c", ], - "apps/rand.o" => + "test/buildtest_conf" => [ - "apps/rand.c", ], - "apps/rehash.o" => + "test/buildtest_conf_api" => [ - "apps/rehash.c", ], - "apps/req.o" => + "test/buildtest_crypto" => [ - "apps/req.c", ], - "apps/rsa.o" => + "test/buildtest_ct" => [ - "apps/rsa.c", ], - "apps/rsautl.o" => + "test/buildtest_des" => [ - "apps/rsautl.c", ], - "apps/s_cb.o" => + "test/buildtest_dh" => [ - "apps/s_cb.c", ], - "apps/s_client.o" => + "test/buildtest_dsa" => [ - "apps/s_client.c", ], - "apps/s_server.o" => + "test/buildtest_dtls1" => [ - "apps/s_server.c", ], - "apps/s_socket.o" => + "test/buildtest_e_os2" => [ - "apps/s_socket.c", ], - "apps/s_time.o" => + "test/buildtest_ebcdic" => [ - "apps/s_time.c", ], - "apps/sess_id.o" => + "test/buildtest_ec" => [ - "apps/sess_id.c", ], - "apps/smime.o" => + "test/buildtest_ecdh" => [ - "apps/smime.c", ], - "apps/speed.o" => + "test/buildtest_ecdsa" => [ - "apps/speed.c", ], - "apps/spkac.o" => + "test/buildtest_engine" => [ - "apps/spkac.c", ], - "apps/srp.o" => + "test/buildtest_err" => [ - "apps/srp.c", ], - "apps/ts.o" => + "test/buildtest_evp" => [ - "apps/ts.c", ], - "apps/tsget" => + "test/buildtest_hmac" => [ - "apps/tsget.in", ], - "apps/verify.o" => + "test/buildtest_idea" => [ - "apps/verify.c", ], - "apps/version.o" => + "test/buildtest_kdf" => + [ + ], + "test/buildtest_lhash" => + [ + ], + "test/buildtest_md4" => + [ + ], + "test/buildtest_md5" => + [ + ], + "test/buildtest_mdc2" => + [ + ], + "test/buildtest_modes" => + [ + ], + "test/buildtest_obj_mac" => + [ + ], + "test/buildtest_objects" => + [ + ], + "test/buildtest_ocsp" => + [ + ], + "test/buildtest_opensslv" => + [ + ], + "test/buildtest_ossl_typ" => + [ + ], + "test/buildtest_pem" => + [ + ], + "test/buildtest_pem2" => + [ + ], + "test/buildtest_pkcs12" => + [ + ], + "test/buildtest_pkcs7" => + [ + ], + "test/buildtest_rand" => + [ + ], + "test/buildtest_rc2" => + [ + ], + "test/buildtest_rc4" => + [ + ], + "test/buildtest_ripemd" => + [ + ], + "test/buildtest_rsa" => + [ + ], + "test/buildtest_safestack" => + [ + ], + "test/buildtest_seed" => + [ + ], + "test/buildtest_sha" => + [ + ], + "test/buildtest_srp" => + [ + ], + "test/buildtest_srtp" => + [ + ], + "test/buildtest_ssl" => + [ + ], + "test/buildtest_ssl2" => + [ + ], + "test/buildtest_stack" => + [ + ], + "test/buildtest_symhacks" => + [ + ], + "test/buildtest_tls1" => + [ + ], + "test/buildtest_ts" => + [ + ], + "test/buildtest_txt_db" => + [ + ], + "test/buildtest_ui" => + [ + ], + "test/buildtest_whrlpool" => + [ + ], + "test/buildtest_x509" => + [ + ], + "test/buildtest_x509_vfy" => + [ + ], + "test/buildtest_x509v3" => + [ + ], + "test/casttest" => + [ + ], + "test/cipherlist_test" => + [ + ], + "test/clienthellotest" => + [ + ], + "test/constant_time_test" => + [ + ], + "test/crltest" => + [ + ], + "test/ct_test" => + [ + ], + "test/d2i_test" => + [ + ], + "test/danetest" => + [ + ], + "test/destest" => + [ + ], + "test/dhtest" => + [ + ], + "test/dsatest" => + [ + ], + "test/dtlstest" => + [ + ], + "test/dtlsv1listentest" => + [ + ], + "test/ecdsatest" => + [ + ], + "test/ectest" => + [ + ], + "test/enginetest" => + [ + ], + "test/evp_extra_test" => + [ + ], + "test/evp_test" => + [ + ], + "test/exdatatest" => + [ + ], + "test/exptest" => + [ + ], + "test/fatalerrtest" => + [ + ], + "test/gmdifftest" => + [ + ], + "test/heartbeat_test" => + [ + ], + "test/hmactest" => + [ + ], + "test/ideatest" => + [ + ], + "test/igetest" => + [ + ], + "test/md2test" => + [ + ], + "test/md4test" => + [ + ], + "test/md5test" => + [ + ], + "test/mdc2test" => + [ + ], + "test/memleaktest" => + [ + ], + "test/ocspapitest" => + [ + ], + "test/p5_crpt2_test" => + [ + ], + "test/packettest" => + [ + ], + "test/pbelutest" => + [ + ], + "test/randtest" => + [ + ], + "test/rc2test" => + [ + ], + "test/rc4test" => + [ + ], + "test/rc5test" => + [ + ], + "test/rmdtest" => + [ + ], + "test/rsa_test" => + [ + ], + "test/sanitytest" => + [ + ], + "test/secmemtest" => + [ + ], + "test/sha1test" => + [ + ], + "test/sha256t" => + [ + ], + "test/sha512t" => + [ + ], + "test/srptest" => + [ + ], + "test/ssl_test" => + [ + ], + "test/ssl_test_ctx_test" => + [ + ], + "test/sslapitest" => + [ + ], + "test/sslcorrupttest" => + [ + ], + "test/ssltest_old" => + [ + ], + "test/threadstest" => + [ + ], + "test/v3ext" => + [ + ], + "test/v3nametest" => + [ + ], + "test/verify_extra_test" => + [ + ], + "test/wp_test" => + [ + ], + "test/x509aux" => + [ + ], + }, + "sources" => + { + "apps/CA.pl" => + [ + "apps/CA.pl.in", + ], + "apps/app_rand.o" => + [ + "apps/app_rand.c", + ], + "apps/apps.o" => + [ + "apps/apps.c", + ], + "apps/asn1pars.o" => + [ + "apps/asn1pars.c", + ], + "apps/ca.o" => + [ + "apps/ca.c", + ], + "apps/ciphers.o" => + [ + "apps/ciphers.c", + ], + "apps/cms.o" => + [ + "apps/cms.c", + ], + "apps/crl.o" => + [ + "apps/crl.c", + ], + "apps/crl2p7.o" => + [ + "apps/crl2p7.c", + ], + "apps/dgst.o" => + [ + "apps/dgst.c", + ], + "apps/dhparam.o" => + [ + "apps/dhparam.c", + ], + "apps/dsa.o" => + [ + "apps/dsa.c", + ], + "apps/dsaparam.o" => + [ + "apps/dsaparam.c", + ], + "apps/ec.o" => + [ + "apps/ec.c", + ], + "apps/ecparam.o" => + [ + "apps/ecparam.c", + ], + "apps/enc.o" => + [ + "apps/enc.c", + ], + "apps/engine.o" => + [ + "apps/engine.c", + ], + "apps/errstr.o" => + [ + "apps/errstr.c", + ], + "apps/gendsa.o" => + [ + "apps/gendsa.c", + ], + "apps/genpkey.o" => + [ + "apps/genpkey.c", + ], + "apps/genrsa.o" => + [ + "apps/genrsa.c", + ], + "apps/nseq.o" => + [ + "apps/nseq.c", + ], + "apps/ocsp.o" => + [ + "apps/ocsp.c", + ], + "apps/openssl" => + [ + "apps/app_rand.o", + "apps/apps.o", + "apps/asn1pars.o", + "apps/ca.o", + "apps/ciphers.o", + "apps/cms.o", + "apps/crl.o", + "apps/crl2p7.o", + "apps/dgst.o", + "apps/dhparam.o", + "apps/dsa.o", + "apps/dsaparam.o", + "apps/ec.o", + "apps/ecparam.o", + "apps/enc.o", + "apps/engine.o", + "apps/errstr.o", + "apps/gendsa.o", + "apps/genpkey.o", + "apps/genrsa.o", + "apps/nseq.o", + "apps/ocsp.o", + "apps/openssl.o", + "apps/opt.o", + "apps/passwd.o", + "apps/pkcs12.o", + "apps/pkcs7.o", + "apps/pkcs8.o", + "apps/pkey.o", + "apps/pkeyparam.o", + "apps/pkeyutl.o", + "apps/prime.o", + "apps/rand.o", + "apps/rehash.o", + "apps/req.o", + "apps/rsa.o", + "apps/rsautl.o", + "apps/s_cb.o", + "apps/s_client.o", + "apps/s_server.o", + "apps/s_socket.o", + "apps/s_time.o", + "apps/sess_id.o", + "apps/smime.o", + "apps/speed.o", + "apps/spkac.o", + "apps/srp.o", + "apps/ts.o", + "apps/verify.o", + "apps/version.o", + "apps/x509.o", + ], + "apps/openssl.o" => + [ + "apps/openssl.c", + ], + "apps/opt.o" => + [ + "apps/opt.c", + ], + "apps/passwd.o" => + [ + "apps/passwd.c", + ], + "apps/pkcs12.o" => + [ + "apps/pkcs12.c", + ], + "apps/pkcs7.o" => + [ + "apps/pkcs7.c", + ], + "apps/pkcs8.o" => + [ + "apps/pkcs8.c", + ], + "apps/pkey.o" => + [ + "apps/pkey.c", + ], + "apps/pkeyparam.o" => + [ + "apps/pkeyparam.c", + ], + "apps/pkeyutl.o" => + [ + "apps/pkeyutl.c", + ], + "apps/prime.o" => + [ + "apps/prime.c", + ], + "apps/rand.o" => + [ + "apps/rand.c", + ], + "apps/rehash.o" => + [ + "apps/rehash.c", + ], + "apps/req.o" => + [ + "apps/req.c", + ], + "apps/rsa.o" => + [ + "apps/rsa.c", + ], + "apps/rsautl.o" => + [ + "apps/rsautl.c", + ], + "apps/s_cb.o" => + [ + "apps/s_cb.c", + ], + "apps/s_client.o" => + [ + "apps/s_client.c", + ], + "apps/s_server.o" => + [ + "apps/s_server.c", + ], + "apps/s_socket.o" => + [ + "apps/s_socket.c", + ], + "apps/s_time.o" => + [ + "apps/s_time.c", + ], + "apps/sess_id.o" => + [ + "apps/sess_id.c", + ], + "apps/smime.o" => + [ + "apps/smime.c", + ], + "apps/speed.o" => + [ + "apps/speed.c", + ], + "apps/spkac.o" => + [ + "apps/spkac.c", + ], + "apps/srp.o" => + [ + "apps/srp.c", + ], + "apps/ts.o" => + [ + "apps/ts.c", + ], + "apps/tsget" => + [ + "apps/tsget.in", + ], + "apps/verify.o" => + [ + "apps/verify.c", + ], + "apps/version.o" => [ "apps/version.c", ], @@ -8703,10 +9084,6 @@ our %unified_info = ( [ "crypto/conf/conf_sap.c", ], - "crypto/conf/conf_ssl.o" => - [ - "crypto/conf/conf_ssl.c", - ], "crypto/cpt_err.o" => [ "crypto/cpt_err.c", @@ -9443,10 +9820,6 @@ our %unified_info = ( [ "crypto/ex_data.c", ], - "crypto/getenv.o" => - [ - "crypto/getenv.c", - ], "crypto/hmac/hm_ameth.o" => [ "crypto/hmac/hm_ameth.c", @@ -10151,10 +10524,6 @@ our %unified_info = ( [ "crypto/x509/x509_lu.c", ], - "crypto/x509/x509_meth.o" => - [ - "crypto/x509/x509_meth.c", - ], "crypto/x509/x509_obj.o" => [ "crypto/x509/x509_obj.c", @@ -10674,7 +11043,6 @@ our %unified_info = ( "crypto/conf/conf_mall.o", "crypto/conf/conf_mod.o", "crypto/conf/conf_sap.o", - "crypto/conf/conf_ssl.o", "crypto/cpt_err.o", "crypto/cryptlib.o", "crypto/ct/ct_b64.o", @@ -10859,7 +11227,6 @@ our %unified_info = ( "crypto/evp/pmeth_lib.o", "crypto/evp/scrypt.o", "crypto/ex_data.o", - "crypto/getenv.o", "crypto/hmac/hm_ameth.o", "crypto/hmac/hm_pmeth.o", "crypto/hmac/hmac.o", @@ -11036,7 +11403,6 @@ our %unified_info = ( "crypto/x509/x509_err.o", "crypto/x509/x509_ext.o", "crypto/x509/x509_lu.o", - "crypto/x509/x509_meth.o", "crypto/x509/x509_obj.o", "crypto/x509/x509_r2x.o", "crypto/x509/x509_req.o", @@ -12040,15 +12406,6 @@ our %unified_info = ( [ "test/enginetest.c", ], - "test/errtest" => - [ - "test/errtest.o", - "test/testutil.o", - ], - "test/errtest.o" => - [ - "test/errtest.c", - ], "test/evp_extra_test" => [ "test/evp_extra_test.o", @@ -12249,14 +12606,6 @@ our %unified_info = ( [ "test/rmdtest.c", ], - "test/rsa_complex" => - [ - "test/rsa_complex.o", - ], - "test/rsa_complex.o" => - [ - "test/rsa_complex.c", - ], "test/rsa_test" => [ "test/rsa_test.o", @@ -12406,14 +12755,6 @@ our %unified_info = ( [ "test/verify_extra_test.c", ], - "test/versions" => - [ - "test/versions.o", - ], - "test/versions.o" => - [ - "test/versions.c", - ], "test/wp_test" => [ "test/wp_test.o", @@ -12422,23 +12763,6 @@ our %unified_info = ( [ "test/wp_test.c", ], - "test/x509_dup_cert_test" => - [ - "test/x509_dup_cert_test.o", - ], - "test/x509_dup_cert_test.o" => - [ - "test/x509_dup_cert_test.c", - ], - "test/x509_time_test" => - [ - "test/testutil.o", - "test/x509_time_test.o", - ], - "test/x509_time_test.o" => - [ - "test/x509_time_test.c", - ], "test/x509aux" => [ "test/x509aux.o", diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h index 9934b58f6c..506757d551 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h @@ -20,4 +20,4 @@ static const char cflags[] = { 'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0' }; #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Tue Nov 20 09:39:05 2018" +#define DATE "built on: Tue Apr 3 00:38:53 2018" diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h index 7b122bd86e..e20916814d 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h @@ -105,18 +105,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi index 481282d830..55006d7fe9 100644 --- a/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi +++ b/worker/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi @@ -219,7 +219,6 @@ 'openssl/crypto/conf/conf_mall.c', 'openssl/crypto/conf/conf_mod.c', 'openssl/crypto/conf/conf_sap.c', - 'openssl/crypto/conf/conf_ssl.c', 'openssl/crypto/cpt_err.c', 'openssl/crypto/cryptlib.c', 'openssl/crypto/ct/ct_b64.c', @@ -404,7 +403,6 @@ 'openssl/crypto/evp/pmeth_lib.c', 'openssl/crypto/evp/scrypt.c', 'openssl/crypto/ex_data.c', - 'openssl/crypto/getenv.c', 'openssl/crypto/hmac/hm_ameth.c', 'openssl/crypto/hmac/hm_pmeth.c', 'openssl/crypto/hmac/hmac.c', @@ -581,7 +579,6 @@ 'openssl/crypto/x509/x509_err.c', 'openssl/crypto/x509/x509_ext.c', 'openssl/crypto/x509/x509_lu.c', - 'openssl/crypto/x509/x509_meth.c', 'openssl/crypto/x509/x509_obj.c', 'openssl/crypto/x509/x509_r2x.c', 'openssl/crypto/x509/x509_req.c', diff --git a/worker/deps/openssl/openssl.gyp b/worker/deps/openssl/openssl.gyp index 4a6b556866..6b0770ebbc 100644 --- a/worker/deps/openssl/openssl.gyp +++ b/worker/deps/openssl/openssl.gyp @@ -1,4 +1,7 @@ { + 'variables': { + 'openssl_no_asm%': 0, + }, 'targets': [ { 'target_name': 'openssl', diff --git a/worker/deps/openssl/openssl/.travis.yml b/worker/deps/openssl/openssl/.travis.yml index 1c1db2b73d..b5fc443181 100644 --- a/worker/deps/openssl/openssl/.travis.yml +++ b/worker/deps/openssl/openssl/.travis.yml @@ -61,7 +61,7 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - env: UBUNTU_GCC_HACK="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" + env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" - os: linux addons: apt: @@ -69,7 +69,7 @@ matrix: - binutils-mingw-w64 - gcc-mingw-w64 compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-pic" + env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - os: linux addons: apt: @@ -85,7 +85,7 @@ matrix: - binutils-mingw-w64 - gcc-mingw-w64 compiler: x86_64-w64-mingw32-gcc - env: CONFIG_OPTS="no-pic" + env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - os: linux addons: apt: @@ -112,10 +112,6 @@ before_script: srcdir=.; top=.; fi - - if [ -n "$UBUNTU_GCC_HACK" ]; then - $CC -dumpspecs | sed "s/--push-state//g; s/--pop-state/--as-needed/g" > gcc-specs.txt; - CC="$CC -specs=gcc-specs.txt"; - fi - if [ "$CC" == i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; @@ -190,7 +186,7 @@ script: fi - if [ -n "$DESTDIR" ]; then mkdir "../$DESTDIR"; - if $make install DESTDIR="../$DESTDIR"; then + if $make install install_docs DESTDIR="../$DESTDIR"; then echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS OK'; else echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS FAILED'; false; diff --git a/worker/deps/openssl/openssl/CHANGES b/worker/deps/openssl/openssl/CHANGES index cf76704d15..9d65bc3a77 100644 --- a/worker/deps/openssl/openssl/CHANGES +++ b/worker/deps/openssl/openssl/CHANGES @@ -7,108 +7,6 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. - Changes between 1.1.0i and 1.1.0j [20 Nov 2018] - - *) Timing vulnerability in DSA signature generation - - The OpenSSL DSA signature algorithm has been shown to be vulnerable to a - timing side channel attack. An attacker could use variations in the signing - algorithm to recover the private key. - - This issue was reported to OpenSSL on 16th October 2018 by Samuel Weiser. - (CVE-2018-0734) - [Paul Dale] - - *) Timing vulnerability in ECDSA signature generation - - The OpenSSL ECDSA signature algorithm has been shown to be vulnerable to a - timing side channel attack. An attacker could use variations in the signing - algorithm to recover the private key. - - This issue was reported to OpenSSL on 25th October 2018 by Samuel Weiser. - (CVE-2018-0735) - [Paul Dale] - - *) Add coordinate blinding for EC_POINT and implement projective - coordinate blinding for generic prime curves as a countermeasure to - chosen point SCA attacks. - [Sohaib ul Hassan, Nicola Tuveri, Billy Bob Brumley] - - Changes between 1.1.0h and 1.1.0i [14 Aug 2018] - - *) Client DoS due to large DH parameter - - During key agreement in a TLS handshake using a DH(E) based ciphersuite a - malicious server can send a very large prime value to the client. This will - cause the client to spend an unreasonably long period of time generating a - key for this prime resulting in a hang until the client has finished. This - could be exploited in a Denial Of Service attack. - - This issue was reported to OpenSSL on 5th June 2018 by Guido Vranken - (CVE-2018-0732) - [Guido Vranken] - - *) Cache timing vulnerability in RSA Key Generation - - The OpenSSL RSA Key generation algorithm has been shown to be vulnerable to - a cache timing side channel attack. An attacker with sufficient access to - mount cache timing attacks during the RSA key generation process could - recover the private key. - - This issue was reported to OpenSSL on 4th April 2018 by Alejandro Cabrera - Aldaya, Billy Brumley, Cesar Pereida Garcia and Luis Manuel Alvarez Tapia. - (CVE-2018-0737) - [Billy Brumley] - - *) Make EVP_PKEY_asn1_new() a bit stricter about its input. A NULL pem_str - parameter is no longer accepted, as it leads to a corrupt table. NULL - pem_str is reserved for alias entries only. - [Richard Levitte] - - *) Revert blinding in ECDSA sign and instead make problematic addition - length-invariant. Switch even to fixed-length Montgomery multiplication. - [Andy Polyakov] - - *) Change generating and checking of primes so that the error rate of not - being prime depends on the intended use based on the size of the input. - For larger primes this will result in more rounds of Miller-Rabin. - The maximal error rate for primes with more than 1080 bits is lowered - to 2^-128. - [Kurt Roeckx, Annie Yousar] - - *) Increase the number of Miller-Rabin rounds for DSA key generating to 64. - [Kurt Roeckx] - - *) Add blinding to ECDSA and DSA signatures to protect against side channel - attacks discovered by Keegan Ryan (NCC Group). - [Matt Caswell] - - *) When unlocking a pass phrase protected PEM file or PKCS#8 container, we - now allow empty (zero character) pass phrases. - [Richard Levitte] - - *) Certificate time validation (X509_cmp_time) enforces stricter - compliance with RFC 5280. Fractional seconds and timezone offsets - are no longer allowed. - [Emilia Käsper] - - *) Fixed a text canonicalisation bug in CMS - - Where a CMS detached signature is used with text content the text goes - through a canonicalisation process first prior to signing or verifying a - signature. This process strips trailing space at the end of lines, converts - line terminators to CRLF and removes additional trailing line terminators - at the end of a file. A bug in the canonicalisation process meant that - some characters, such as form-feed, were incorrectly treated as whitespace - and removed. This is contrary to the specification (RFC5485). This fix - could mean that detached text data signed with an earlier version of - OpenSSL 1.1.0 may fail to verify using the fixed version, or text data - signed with a fixed OpenSSL may fail to verify with an earlier version of - OpenSSL 1.1.0. A workaround is to only verify the canonicalised text data - and use the "-binary" flag (for the "cms" command line application) or set - the SMIME_BINARY/PKCS7_BINARY/CMS_BINARY flags (if using CMS_verify()). - [Matt Caswell] - Changes between 1.1.0g and 1.1.0h [27 Mar 2018] *) Constructed ASN.1 types with a recursive definition could exceed the stack @@ -1246,13 +1144,13 @@ [Steve Henson] *) Experimental encrypt-then-mac support. - + Experimental support for encrypt then mac from draft-gutmann-tls-encrypt-then-mac-02.txt To enable it set the appropriate extension number (0x42 for the test server) using e.g. -DTLSEXT_TYPE_encrypt_then_mac=0x42 - + For non-compliant peers (i.e. just about everything) this should have no effect. @@ -1303,7 +1201,7 @@ *) Use separate DRBG fields for internal and external flags. New function FIPS_drbg_health_check() to perform on demand health checking. Add - generation tests to fips_test_suite with reduced health check interval to + generation tests to fips_test_suite with reduced health check interval to demonstrate periodic health checking. Add "nodh" option to fips_test_suite to skip very slow DH test. [Steve Henson] @@ -1317,7 +1215,7 @@ combination: call this in fips_test_suite. [Steve Henson] - *) Add support for canonical generation of DSA parameter 'g'. See + *) Add support for canonical generation of DSA parameter 'g'. See FIPS 186-3 A.2.3. *) Add support for HMAC DRBG from SP800-90. Update DRBG algorithm test and @@ -1341,7 +1239,7 @@ requested amount of entropy. [Steve Henson] - *) Add PRNG security strength checks to RSA, DSA and ECDSA using + *) Add PRNG security strength checks to RSA, DSA and ECDSA using information in FIPS186-3, SP800-57 and SP800-131A. [Steve Henson] @@ -1433,7 +1331,7 @@ can be set or retrieved with a ctrl. The IV length is by default 12 bytes (96 bits) but can be set to an alternative value. If the IV length exceeds the maximum IV length (currently 16 bytes) it cannot be - set before the key. + set before the key. [Steve Henson] *) New flag in ciphers: EVP_CIPH_FLAG_CUSTOM_CIPHER. This means the @@ -1476,7 +1374,7 @@ Add CMAC pkey methods. [Steve Henson] - *) Experimental renegotiation in s_server -www mode. If the client + *) Experimental renegotiation in s_server -www mode. If the client browses /reneg connection is renegotiated. If /renegcert it is renegotiated requesting a certificate. [Steve Henson] @@ -1496,7 +1394,7 @@ *) New macro __owur for "OpenSSL Warn Unused Result". This makes use of a gcc attribute to warn if the result of a function is ignored. This is enable if DEBUG_UNUSED is set. Add to several functions in evp.h - whose return value is often ignored. + whose return value is often ignored. [Steve Henson] *) New -noct, -requestct, -requirect and -ctlogfile options for s_client. @@ -3730,7 +3628,7 @@ *) New option -sigopt to dgst utility. Update dgst to use EVP_Digest{Sign,Verify}*. These two changes make it possible to use - alternative signing parameters such as X9.31 or PSS in the dgst + alternative signing parameters such as X9.31 or PSS in the dgst utility. [Steve Henson] @@ -12481,7 +12379,7 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k *) Fixed sk_insert which never worked properly. [Steve Henson] - *) Fix ASN1 macros so they can handle indefinite length constructed + *) Fix ASN1 macros so they can handle indefinite length constructed EXPLICIT tags. Some non standard certificates use these: they can now be read in. [Steve Henson] diff --git a/worker/deps/openssl/openssl/CONTRIBUTING b/worker/deps/openssl/openssl/CONTRIBUTING index a6977b8117..1eebaf37ec 100644 --- a/worker/deps/openssl/openssl/CONTRIBUTING +++ b/worker/deps/openssl/openssl/CONTRIBUTING @@ -1,26 +1,26 @@ -HOW TO CONTRIBUTE TO OpenSSL ----------------------------- +HOW TO CONTRIBUTE PATCHES TO OpenSSL +------------------------------------ (Please visit https://www.openssl.org/community/getting-started.html for other ideas about how to contribute.) -Development is done on GitHub, https://github.com/openssl/openssl. +Development is coordinated on the openssl-dev mailing list (see the +above link or https://mta.openssl.org for information on subscribing). +If you are unsure as to whether a feature will be useful for the general +OpenSSL community you might want to discuss it on the openssl-dev mailing +list first. Someone may be already working on the same thing or there +may be a good reason as to why that feature isn't implemented. -To request new features or report bugs, please open an issue on GitHub +To submit a patch, make a pull request on GitHub. If you think the patch +could use feedback from the community, please start a thread on openssl-dev +to discuss it. -To submit a patch, please open a pull request on GitHub. If you are thinking -of making a large contribution, open an issue for it before starting work, -to get comments from the community. Someone may be already working on -the same thing or there may be reasons why that feature isn't implemented. +Having addressed the following items before the PR will help make the +acceptance and review process faster: -To make it easier to review and accept your pull request, please follow these -guidelines: - - 1. Anything other than a trivial contribution requires a Contributor - License Agreement (CLA), giving us permission to use your code. See - https://www.openssl.org/policies/cla.html for details. If your - contribution is too small to require a CLA, put "CLA: trivial" on a - line by itself in your commit message body. + 1. Anything other than trivial contributions will require a contributor + licensing agreement, giving us permission to use your code. See + https://www.openssl.org/policies/cla.html for details. 2. All source files should start with the following text (with appropriate comment characters at the start of each line and the @@ -34,38 +34,21 @@ guidelines: https://www.openssl.org/source/license.html 3. Patches should be as current as possible; expect to have to rebase - often. We do not accept merge commits, you will have to remove them - (usually by rebasing) before it will be acceptable. + often. We do not accept merge commits; You will be asked to remove + them before a patch is considered acceptable. 4. Patches should follow our coding style (see - https://www.openssl.org/policies/codingstyle.html) and compile - without warnings. Where gcc or clang is available you should use the + https://www.openssl.org/policies/codingstyle.html) and compile without + warnings. Where gcc or clang is available you should use the --strict-warnings Configure option. OpenSSL compiles on many varied - platforms: try to ensure you only use portable features. Clean builds - via Travis and AppVeyor are required, and they are started automatically - whenever a PR is created or updated. + platforms: try to ensure you only use portable features. + Clean builds via Travis and AppVeyor are expected, and done whenever + a PR is created or updated. 5. When at all possible, patches should include tests. These can either be added to an existing test, or completely new. Please see test/README for information on the test framework. 6. New features or changed functionality must include - documentation. Please look at the "pod" files in doc for - examples of our style. - - 7. For user visible changes (API changes, behaviour changes, ...), - consider adding a note in CHANGES. This could be a summarising - description of the change, and could explain the grander details. - Have a look through existing entries for inspiration. - Please note that this is NOT simply a copy of git-log oneliners. - Also note that security fixes get an entry in CHANGES. - This file helps users get more in depth information of what comes - with a specific release without having to sift through the higher - noise ratio in git-log. - - 8. For larger or more important user visible changes, as well as - security fixes, please add a line in NEWS. On exception, it might be - worth adding a multi-line entry (such as the entry that announces all - the types that became opaque with OpenSSL 1.1.0). - This file helps users get a very quick summary of what comes with a - specific release, to see if an upgrade is worth the effort. + documentation. Please look at the "pod" files in doc/apps, doc/crypto + and doc/ssl for examples of our style. diff --git a/worker/deps/openssl/openssl/Configurations/00-base-templates.conf b/worker/deps/openssl/openssl/Configurations/00-base-templates.conf index 8503c2f348..a6b52de498 100644 --- a/worker/deps/openssl/openssl/Configurations/00-base-templates.conf +++ b/worker/deps/openssl/openssl/Configurations/00-base-templates.conf @@ -68,8 +68,6 @@ } return (); }, - shared_extension => ".so", - build_scheme => [ "unified", "unix" ], build_file => "Makefile", }, @@ -101,8 +99,6 @@ mtinflag => "-manifest ", mtoutflag => "-outputresource:", - shared_extension => ".dll", - build_file => "makefile", build_scheme => [ "unified", "windows" ], }, @@ -111,8 +107,6 @@ inherit_from => [ "BASE_common" ], template => 1, - shared_extension => ".exe", - build_file => "descrip.mms", build_scheme => [ "unified", "VMS" ], }, @@ -253,7 +247,7 @@ sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S", modes_asm_src => "ghash-armv4.S ghashv8-armx.S", chacha_asm_src => "chacha-armv4.S", - poly1305_asm_src=> "poly1305-armv4.S", + poly1305_asm_src=> "poly1305-armv4.S", perlasm_scheme => "void" }, aarch64_asm => { diff --git a/worker/deps/openssl/openssl/Configurations/10-main.conf b/worker/deps/openssl/openssl/Configurations/10-main.conf index 6c05c2809f..b49f04b5d7 100644 --- a/worker/deps/openssl/openssl/Configurations/10-main.conf +++ b/worker/deps/openssl/openssl/Configurations/10-main.conf @@ -14,7 +14,7 @@ sub vc_win64a_info { asflags => "/c /Cp /Cx /Zi", asoutflag => "/Fo" }; } else { - $die->("NASM not found - make sure it's installed and available on %PATH%\n"); + $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n"); $vc_win64a_info = { as => "{unknown}", asflags => "", asoutflag => "" }; @@ -39,7 +39,7 @@ sub vc_win32_info { asoutflag => "/Fo", perlasm_scheme => "win32" }; } else { - $die->("NASM not found - make sure it's installed and available on %PATH%\n"); + $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n"); $vc_win32_info = { as => "{unknown}", asflags => "", asoutflag => "", @@ -428,17 +428,8 @@ sub vms_info { # even PA-RISC 2.0-specific code paths, which are chosen at run-time, # thus adequate performance is provided even with PA-RISC 1.1 build. # - "hpux-common" => { - inherit_from => [ "BASE_unix" ], - template => 1, - defines => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED", - "_HPUX_ALT_XOPEN_SOCKET_API"), - thread_scheme => "pthreads", - dso_scheme => "dlfcn", # overridden in 32-bit PA-RISC builds - shared_target => "hpux-shared", - }, "hpux-parisc-gcc" => { - inherit_from => [ "hpux-common" ], + inherit_from => [ "BASE_unix" ], cc => "gcc", cflags => combine(picker(default => "-DB_ENDIAN -DBN_DIV2W", debug => "-O0 -g", @@ -446,7 +437,9 @@ sub vms_info { threads("-pthread")), ex_libs => add("-Wl,+s -ldld", threads("-pthread")), bn_ops => "BN_LLONG", + thread_scheme => "pthreads", dso_scheme => "dl", + shared_target => "hpux-shared", shared_cflag => "-fPIC", shared_ldflag => "-shared", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -456,7 +449,7 @@ sub vms_info { multilib => "/pa1.1", }, "hpux64-parisc2-gcc" => { - inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], + inherit_from => [ "BASE_unix", asm("parisc20_64_asm") ], cc => "gcc", cflags => combine(picker(default => "-DB_ENDIAN", debug => "-O0 -g", @@ -464,6 +457,9 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "hpux-shared", shared_cflag => "-fpic", shared_ldflag => "-shared", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -475,7 +471,7 @@ sub vms_info { # Chris Ruemmler # Kevin Steves "hpux-parisc-cc" => { - inherit_from => [ "hpux-common" ], + inherit_from => [ "BASE_unix" ], cc => "cc", cflags => combine(picker(default => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY", debug => "+O0 +d -g", @@ -483,7 +479,9 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-Wl,+s -ldld",threads("-lpthread")), bn_ops => "RC4_CHAR", + thread_scheme => "pthreads", dso_scheme => "dl", + shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "-b", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -494,7 +492,7 @@ sub vms_info { multilib => "/pa1.1", }, "hpux64-parisc2-cc" => { - inherit_from => [ "hpux-common", asm("parisc20_64_asm") ], + inherit_from => [ "BASE_unix", asm("parisc20_64_asm") ], cc => "cc", cflags => combine(picker(default => "+DD64 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY", debug => "+O0 +d -g", @@ -502,6 +500,9 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl",threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "+DD64 -b", shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -510,7 +511,7 @@ sub vms_info { # HP/UX IA-64 targets "hpux-ia64-cc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "BASE_unix", asm("ia64_asm") ], cc => "cc", cflags => combine(picker(default => "-Ae +DD32 +Olit=all -z -DB_ENDIAN", debug => "+O0 +d -g", @@ -518,6 +519,9 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl",threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "+DD32 -b", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -526,7 +530,7 @@ sub vms_info { # Frank Geurts has patiently assisted # with debugging of the following config. "hpux64-ia64-cc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "BASE_unix", asm("ia64_asm") ], cc => "cc", cflags => combine(picker(default => "-Ae +DD64 +Olit=all -z -DB_ENDIAN", debug => "+O0 +d -g", @@ -534,6 +538,9 @@ sub vms_info { threads("-D_REENTRANT")), ex_libs => add("-ldl", threads("-lpthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "hpux-shared", shared_cflag => "+Z", shared_ldflag => "+DD64 -b", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -541,7 +548,7 @@ sub vms_info { }, # GCC builds... "hpux-ia64-gcc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "BASE_unix", asm("ia64_asm") ], cc => "gcc", cflags => combine(picker(default => "-DB_ENDIAN", debug => "-O0 -g", @@ -549,13 +556,16 @@ sub vms_info { threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "hpux-shared", shared_cflag => "-fpic", shared_ldflag => "-shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "/hpux32", }, "hpux64-ia64-gcc" => { - inherit_from => [ "hpux-common", asm("ia64_asm") ], + inherit_from => [ "BASE_unix", asm("ia64_asm") ], cc => "gcc", cflags => combine(picker(default => "-mlp64 -DB_ENDIAN", debug => "-O0 -g", @@ -563,6 +573,9 @@ sub vms_info { threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "hpux-shared", shared_cflag => "-fpic", shared_ldflag => "-mlp64 -shared", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -1210,7 +1223,6 @@ sub vms_info { perlasm_scheme => "aix32", dso_scheme => "dlfcn", shared_target => "aix-shared", - shared_cflag => "-qpic", shared_ldflag => "-q32 -G", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", arflags => "-X 32", @@ -1229,7 +1241,6 @@ sub vms_info { perlasm_scheme => "aix64", dso_scheme => "dlfcn", shared_target => "aix-shared", - shared_cflag => "-qpic", shared_ldflag => "-q64 -G", shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", arflags => "-X 64", diff --git a/worker/deps/openssl/openssl/Configurations/90-team.conf b/worker/deps/openssl/openssl/Configurations/90-team.conf new file mode 100644 index 0000000000..0a83c22aaa --- /dev/null +++ b/worker/deps/openssl/openssl/Configurations/90-team.conf @@ -0,0 +1,112 @@ +## -*- mode: perl; -*- +## Build configuration targets for openssl-team members + +%targets = ( + "purify" => { + cc => "purify gcc", + cflags => "-g -Wall", + thread_scheme => "(unknown)", + ex_libs => add(" ","-lsocket -lnsl"), + }, + "debug" => { + cc => "gcc", + cflags => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror", + thread_scheme => "(unknown)", + }, + "debug-erbridge" => { + inherit_from => [ "x86_64_asm" ], + cc => "gcc", + cflags => combine("$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), + bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_ldflag => "-m64", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + multilib => "64", + }, + "debug-linux-pentium" => { + inherit_from => [ "x86_elf_asm" ], + cc => "gcc", + cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), + bn_ops => "BN_LLONG", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + }, + "debug-linux-ppro" => { + inherit_from => [ "x86_elf_asm" ], + cc => "gcc", + cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), + bn_ops => "BN_LLONG", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + }, + "debug-linux-ia32-aes" => { + cc => "gcc", + cflags => combine("-DL_ENDIAN -O3 -fomit-frame-pointer -Wall", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), + bn_ops => "BN_LLONG", + cpuid_asm_src => "x86cpuid.s", + bn_asm_src => "bn-586.s co-586.s x86-mont.s", + des_asm_src => "des-586.s crypt586.s", + aes_asm_src => "aes_x86core.s aes_cbc.s aesni-x86.s", + bf_asm_src => "bf-586.s", + md5_asm_src => "md5-586.s", + sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s", + cast_asm_src => "cast-586.s", + rc4_asm_src => "rc4-586.s", + rmd160_asm_src => "rmd-586.s", + rc5_asm_src => "rc5-586.s", + wp_asm_src => "wp_block.s wp-mmx.s", + modes_asm_src => "ghash-x86.s", + padlock_asm_src => "e_padlock-x86.s", + thread_scheme => "pthreads", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "dist" => { + cc => "cc", + cflags => "-O", + thread_scheme => "(unknown)", + }, + "debug-test-64-clang" => { + inherit_from => [ "x86_64_asm" ], + cc => "clang", + cflags => combine("$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", + threads("${BSDthreads}")), + bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "bsd-gcc-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "darwin64-debug-test-64-clang" => { + inherit_from => [ "x86_64_asm" ], + cc => "clang", + cflags => combine("-arch x86_64 -DL_ENDIAN $gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", + threads("${BSDthreads}")), + sys_id => "MACOSX", + bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", + perlasm_scheme => "macosx", + dso_scheme => "dlfcn", + shared_target => "darwin-shared", + shared_cflag => "-fPIC -fno-common", + shared_ldflag => "-arch x86_64 -dynamiclib", + shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + }, +); diff --git a/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure b/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure index b28305deca..6d148196ff 100644 --- a/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure +++ b/worker/deps/openssl/openssl/Configurations/INTERNALS.Configure @@ -133,4 +133,3 @@ Example 4: | ENDIF | 1 | | | ... whatever ... | | this line is processed | | ENDIF | | | - diff --git a/worker/deps/openssl/openssl/Configurations/README b/worker/deps/openssl/openssl/Configurations/README index 6e13645491..e85673c591 100644 --- a/worker/deps/openssl/openssl/Configurations/README +++ b/worker/deps/openssl/openssl/Configurations/README @@ -81,7 +81,7 @@ In each table entry, the following keys are significant: ''. This is very rarely needed. shared_extension => File name extension used for shared - libraries. + libraries. obj_extension => File name extension used for object files. On unix, this defaults to ".o" (NOTE: this is here for future use, it's not @@ -471,11 +471,11 @@ clash with those generated by Configure, it's possible to tell it not to generate them with the use of OVERRIDES, for example: SOURCE[libfoo]=foo.c bar.c - + OVERRIDES=bar.o BEGINRAW[Makefile(unix)] bar.o: bar.c - $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $< + $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $< ENDRAW[Makefile(unix)] See the documentation further up for more information on configuration diff --git a/worker/deps/openssl/openssl/Configurations/README.design b/worker/deps/openssl/openssl/Configurations/README.design index bea9790afb..7179ec027f 100644 --- a/worker/deps/openssl/openssl/Configurations/README.design +++ b/worker/deps/openssl/openssl/Configurations/README.design @@ -90,7 +90,7 @@ depends on the library 'libssl' to function properly. LIBS=../libcrypto SOURCE[../libcrypto]=aes.c evp.c cversion.c DEPEND[cversion.o]=buildinf.h - + GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" DEPEND[buildinf.h]=../Makefile DEPEND[../util/mkbuildinf.pl]=../util/Foo.pm @@ -105,7 +105,7 @@ show that duplicate information isn't an issue. This build.info file informs us that 'libcrypto' is built from a few source files, 'crypto/aes.c', 'crypto/evp.c' and 'crypto/cversion.c'. It also shows us that building the object file inferred from -'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it +'crypto/cversion.c' depends on 'crypto/buildinf.h'. Finally, it also shows the possibility to declare how some files are generated using some script, in this case a perl script, and how such scripts can be declared to depend on other files, in this case a perl module. @@ -157,7 +157,7 @@ information comes down to this: SOURCE[libssl]=ssl/tls.c INCLUDE[libssl]=include DEPEND[libssl]=libcrypto - + PROGRAMS=apps/openssl SOURCE[apps/openssl]=apps/openssl.c INCLUDE[apps/openssl]=. include @@ -172,7 +172,7 @@ information comes down to this: SOURCE[engines/ossltest]=engines/e_ossltest.c DEPEND[engines/ossltest]=libcrypto INCLUDE[engines/ossltest]=include - + GENERATE[crypto/buildinf.h]=util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" DEPEND[crypto/buildinf.h]=Makefile DEPEND[util/mkbuildinf.pl]=util/Foo.pm diff --git a/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl b/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl index 739928808b..7e3356f1f1 100644 --- a/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl +++ b/worker/deps/openssl/openssl/Configurations/descrip.mms.tmpl @@ -368,10 +368,12 @@ descrip.mms : FORCE # Install helper targets ############################################# -install_sw : install_dev install_engines install_runtime - +install_sw : all install_shared _install_dev_ns - + install_engines _install_runtime_ns - install_startup install_ivp -uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime - +uninstall_sw : uninstall_shared _uninstall_dev_ns - + uninstall_engines _uninstall_runtime_ns - uninstall_startup uninstall_ivp install_docs : install_html_docs @@ -394,7 +396,17 @@ install_ssldirs : check_INSTALLTOP COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} - ossl_dataroot:[000000]openssl.cnf -install_dev : check_INSTALLTOP install_runtime_libs +install_shared : check_INSTALLTOP + @ {- output_off() if $disabled{shared}; "" -} ! + @ WRITE SYS$OUTPUT "*** Installing shareable images" + @ ! Install shared (runtime) libraries + - CREATE/DIR ossl_installroot:[LIB.'arch'] + {- join("\n ", + map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" } + @install_shlibs) -} + @ {- output_on() if $disabled{shared}; "" -} ! + +_install_dev_ns : check_INSTALLTOP @ WRITE SYS$OUTPUT "*** Installing development files" @ ! Install header files - CREATE/DIR ossl_installroot:[include.openssl] @@ -405,29 +417,9 @@ install_dev : check_INSTALLTOP install_runtime_libs map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } @{$unified_info{install}->{libraries}}) -} -install_engines : check_INSTALLTOP install_runtime_libs build_engines - @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! - @ WRITE SYS$OUTPUT "*** Installing engines" - - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch'] - {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" } - @{$unified_info{install}->{engines}}) -} - @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! +install_dev : install_shared _install_dev_ns -install_runtime : install_programs - -install_runtime_libs : check_INSTALLTOP build_libs - @ {- output_off() if $disabled{shared}; "" -} ! - @ WRITE SYS$OUTPUT "*** Installing shareable images" - @ ! Install shared (runtime) libraries - - CREATE/DIR ossl_installroot:[LIB.'arch'] - {- join("\n ", - map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" } - @install_shlibs) -} - @ {- output_on() if $disabled{shared}; "" -} ! - -install_programs : check_INSTALLTOP install_runtime_libs build_programs - @ {- output_off() if $disabled{apps}; "" -} ! +_install_runtime_ns : check_INSTALLTOP @ ! Install the main program - CREATE/DIR ossl_installroot:[EXE.'arch'] COPY/PROT=W:RE [.APPS]openssl.EXE - @@ -436,6 +428,17 @@ install_programs : check_INSTALLTOP install_runtime_libs build_programs COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE] @ ! {- output_on() if $disabled{apps}; "" -} +install_runtime : install_shared _install_runtime_ns + +install_engines : check_INSTALLTOP + @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! + @ WRITE SYS$OUTPUT "*** Installing engines" + - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch'] + {- join("\n ", + map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" } + @{$unified_info{install}->{engines}}) -} + @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! + install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - [.VMS]openssl_utils.com, check_INSTALLTOP - CREATE/DIR ossl_installroot:[SYS$STARTUP] diff --git a/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl b/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl index 7254478af5..40cf2c3df4 100644 --- a/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl +++ b/worker/deps/openssl/openssl/Configurations/unix-Makefile.tmpl @@ -323,7 +323,7 @@ depend: # Install helper targets ############################################# -install_sw: install_dev install_engines install_runtime +install_sw: all install_dev install_engines install_runtime uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev @@ -355,7 +355,7 @@ install_ssldirs: chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \ fi -install_dev: install_runtime_libs +install_dev: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @echo "*** Installing development files" @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl @@ -461,7 +461,7 @@ uninstall_dev: -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) -install_engines: install_runtime_libs build_engines +install_engines: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/ @echo "*** Installing engines" @@ -488,10 +488,9 @@ uninstall_engines: done -$(RMDIR) $(DESTDIR)$(ENGINESDIR) -install_runtime: install_programs - -install_runtime_libs: build_libs +install_runtime: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin @ : {- output_off() if windowsdll(); "" -} @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) @ : {- output_on() if windowsdll(); "" -} @@ -513,11 +512,6 @@ install_runtime_libs: build_libs $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ : {- output_on() if windowsdll(); "" -}; \ done - -install_programs: install_runtime_libs build_programs - @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) - @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin - @echo "*** Installing runtime programs" @set -e; for x in dummy $(INSTALL_PROGRAMS); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ @@ -537,10 +531,8 @@ install_programs: install_runtime_libs build_programs $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done -uninstall_runtime: uninstall_programs uninstall_runtime_libs - -uninstall_programs: - @echo "*** Uninstalling runtime programs" +uninstall_runtime: + @echo "*** Uninstalling runtime files" @set -e; for x in dummy $(INSTALL_PROGRAMS); \ do \ if [ "$$x" = "dummy" ]; then continue; fi; \ @@ -555,10 +547,6 @@ uninstall_programs: echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done - -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin - -uninstall_runtime_libs: - @echo "*** Uninstalling runtime libraries" @ : {- output_off() unless windowsdll(); "" -} @set -e; for s in dummy $(INSTALL_SHLIBS); do \ if [ "$$s" = "dummy" ]; then continue; fi; \ @@ -567,6 +555,7 @@ uninstall_runtime_libs: $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done @ : {- output_on() unless windowsdll(); "" -} + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin install_man_docs: @@ -675,10 +664,8 @@ tar: DISTDIR=$(NAME); \ mkdir -p $$TMPDIR/$$DISTDIR; \ (cd $(SRCDIR); \ - excl_re="^(fuzz/corpora|Configurations/.*\.norelease\.conf)"; \ - echo "$$excl_re"; \ git ls-tree -r --name-only --full-tree HEAD \ - | egrep -v "$$excl_re" \ + | grep -v '^fuzz/corpora' \ | while read F; do \ mkdir -p $$TMPDIR/$$DISTDIR/`dirname $$F`; \ cp $$F $$TMPDIR/$$DISTDIR/$$F; \ @@ -861,7 +848,7 @@ EOF $recipe .= <<"EOF"; $obj$objext: $deps ( trap "rm -f \$@.*" INT 0; \\ - \$(CC) $incs \$(CFLAGS) $ecflags -E $srcs | \\ + \$(CPP) $incs \$(CFLAGS) $ecflags $srcs | \\ \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.s && \\ \$(CC) \$(CFLAGS) $ecflags -c -o \$\@ \$@.s ) EOF diff --git a/worker/deps/openssl/openssl/Configurations/windows-checker.pm b/worker/deps/openssl/openssl/Configurations/windows-checker.pm index 4b7105df33..de46fbc1df 100644 --- a/worker/deps/openssl/openssl/Configurations/windows-checker.pm +++ b/worker/deps/openssl/openssl/Configurations/windows-checker.pm @@ -6,7 +6,7 @@ use Config; # we expect for the platform use File::Spec::Functions qw(:DEFAULT rel2abs); -if (!$ENV{CONFIGURE_INSIST} && rel2abs('.') !~ m|\\|) { +if (rel2abs('.') !~ m|\\|) { die <{libraries}}) -} -INSTALL_SHLIBS={- join(" ", map { quotify_l(shlib($_)) } @{$unified_info{install}->{libraries}}) -} -INSTALL_SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; quotify_l(shlib($_)) } @{$unified_info{install}->{libraries}}) -} -INSTALL_ENGINES={- join(" ", map { quotify1(dso($_)) } @{$unified_info{install}->{engines}}) -} -INSTALL_ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; quotify1(dso($_)) } @{$unified_info{install}->{engines}}) -} -INSTALL_PROGRAMS={- join(" ", map { quotify1($_.$exeext) } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} -INSTALL_PROGRAMPDBS={- join(" ", map { quotify1($_.".pdb") } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} +INSTALL_LIBS={- join(" ", map { $_.$libext } @{$unified_info{install}->{libraries}}) -} +INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -} +INSTALL_SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; shlib($_) } @{$unified_info{install}->{libraries}}) -} +INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -} +INSTALL_ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{install}->{engines}}) -} +INSTALL_PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} +INSTALL_PROGRAMPDBS={- join(" ", map { $_.".pdb" } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} {- output_off() if $disabled{apps}; "" -} -BIN_SCRIPTS="$(BLDDIR)\tools\c_rehash.pl" -MISC_SCRIPTS="$(BLDDIR)\apps\CA.pl" "$(BLDDIR)\apps\tsget.pl" +BIN_SCRIPTS=$(BLDDIR)\tools\c_rehash.pl +MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl {- output_on() if $disabled{apps}; "" -} APPS_OPENSSL={- use File::Spec::Functions; - "\"".catfile("apps","openssl")."\"" -} + catfile("apps","openssl") -} # Do not edit these manually. Use Configure with --prefix or --openssldir # to change this! Short explanation in the top comment in Configure @@ -182,9 +182,6 @@ MTOUTFLAG={- $target{mtoutflag} || "-outputresource:" -}$(OSSL_EMPTY) AS={- $target{as} -} ASFLAGS={- $target{asflags} -} ASOUTFLAG={- $target{asoutflag} -}$(OSSL_EMPTY) - -ECHO="$(PERL)" "$(SRCDIR)\util\echo.pl" - PERLASM_SCHEME= {- $target{perlasm_scheme} -} PROCESSOR= {- $config{processor} -} @@ -210,7 +207,7 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) test: tests {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep - @{- output_off() if $disabled{tests}; "" -} + @rem {- output_off() if $disabled{tests}; "" -} -mkdir $(BLDDIR)\test\test-runs set SRCTOP=$(SRCDIR) set BLDTOP=$(BLDDIR) @@ -219,17 +216,17 @@ test: tests set OPENSSL_ENGINES=$(MAKEDIR)\engines set OPENSSL_DEBUG_MEMORY=on "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS) - @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} - @$(ECHO) "Tests are not supported with your chosen Configure options" - @{- output_on() if !$disabled{tests}; "" -} + @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} + @echo "Tests are not supported with your chosen Configure options" + @rem {- output_on() if !$disabled{tests}; "" -} list-tests: - @{- output_off() if $disabled{tests}; "" -} + @rem {- output_off() if $disabled{tests}; "" -} @set SRCTOP=$(SRCDIR) @"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list - @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} - @$(ECHO) "Tests are not supported with your chosen Configure options" - @{- output_on() if !$disabled{tests}; "" -} + @rem {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} + @echo "Tests are not supported with your chosen Configure options" + @rem {- output_on() if !$disabled{tests}; "" -} install: install_sw install_ssldirs install_docs @@ -267,7 +264,7 @@ depend: # Install helper targets ############################################# -install_sw: install_dev install_engines install_runtime +install_sw: all install_dev install_engines install_runtime uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev @@ -287,18 +284,17 @@ install_ssldirs: @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \ "$(OPENSSLDIR)\misc" -install_dev: install_runtime_libs - @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) - @$(ECHO) "*** Installing development files" +install_dev: + @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) + @echo *** Installing development files @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\include\openssl" - @{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} + @rem {- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\ms\applink.c" \ "$(INSTALLTOP)\include\openssl" - @{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} - @"$(PERL)" "$(SRCDIR)\util\copy.pl" "-exclude_re=/__DECC_" \ - "$(SRCDIR)\include\openssl\*.h" \ + @rem {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$target{defines}}; "" -} + @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\include\openssl\*.h" \ "$(INSTALLTOP)\include\openssl" - @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(BLDDIR)\include\openssl\*.h" \ + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \ "$(INSTALLTOP)\include\openssl" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\$(LIBDIR)" @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_LIBS) \ @@ -309,9 +305,9 @@ install_dev: install_runtime_libs uninstall_dev: -install_engines: install_runtime_libs build_engines - @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) - @$(ECHO) "*** Installing engines" +install_engines: + @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) + @echo *** Installing engines @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(ENGINESDIR)" @if not "$(ENGINES)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINES) "$(ENGINESDIR)" @@ -320,22 +316,15 @@ install_engines: install_runtime_libs build_engines uninstall_engines: -install_runtime: install_programs - -install_runtime_libs: build_libs - @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) - @$(ECHO) "*** Installing runtime libraries" +install_runtime: + @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) + @echo *** Installing runtime files @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" @if not "$(SHLIBS)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBS) "$(INSTALLTOP)\bin" @if not "$(SHLIBS)"=="" \ "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBPDBS) \ "$(INSTALLTOP)\bin" - -install_programs: install_runtime_libs build_programs - @if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 ) - @$(ECHO) "*** Installing runtime programs" - @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin" @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \ "$(INSTALLTOP)\bin" @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \ @@ -354,14 +343,14 @@ uninstall_html_docs: # Building targets ################################################### configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} - @$(ECHO) "Detected changed: $?" - @$(ECHO) "Reconfiguring..." + @echo "Detected changed: $?" + @echo "Reconfiguring..." "$(PERL)" "$(SRCDIR)\Configure" reconf - @$(ECHO) "**************************************************" - @$(ECHO) "*** ***" - @$(ECHO) "*** Please run the same make command again ***" - @$(ECHO) "*** ***" - @$(ECHO) "**************************************************" + @echo "**************************************************" + @echo "*** ***" + @echo "*** Please run the same make command again ***" + @echo "*** ***" + @echo "**************************************************" @exit 1 {- @@ -461,20 +450,22 @@ $obj$objext: $deps \$(AS) \$(ASFLAGS) \$(ASOUTFLAG)\$\@ $srcs EOF } - my $recipe = <<"EOF"; -$obj$objext: $deps - \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs -EOF - $recipe .= <<"EOF" unless $disabled{makedepend}; - \$(CC) $incs \$(CFLAGS) $ecflags /Zs /showIncludes $srcs 2>&1 | \\ + return <<"EOF" if (!$disabled{makedepend}); +$obj$depext: $deps + \$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\ "\$(PERL)" -n << > $obj$depext chomp; s/^Note: including file: *//; \$\$collect{\$\$_} = 1; END { print '$obj$objext: ',join(" ", sort keys \%collect),"\\n" } << +$obj$objext: $obj$depext + \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs +EOF + return <<"EOF" if ($disabled{makedepend}); +$obj$objext: $deps + \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs EOF - return $recipe; } # On Unix, we build shlibs from static libs, so we're ignoring the @@ -613,6 +604,8 @@ EOF foreach my $prod (@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) { if (dirname($prod) eq $dir) { push @deps, $prod.$extinfo{$type}; + } else { + push @actions, "\t@rem No support to produce $type ".join(", ", @{$unified_info{dirinfo}->{$dir}->{products}->{$type}}); } } } diff --git a/worker/deps/openssl/openssl/Configure b/worker/deps/openssl/openssl/Configure index a1ce65239e..c0033643c6 100755 --- a/worker/deps/openssl/openssl/Configure +++ b/worker/deps/openssl/openssl/Configure @@ -20,9 +20,6 @@ use OpenSSL::Glob; # see INSTALL for instructions. -my $orig_death_handler = $SIG{__DIE__}; -$SIG{__DIE__} = \&death_handler; - my $usage="Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n"; # Options: @@ -759,21 +756,21 @@ while (@argvcopy) else { $config{options} .= " ".$_; } } - } -if (defined($config{api}) && !exists $apitable->{$config{api}}) { - die "***** Unsupported api compatibility level: $config{api}\n", -} + if (defined($config{api}) && !exists $apitable->{$config{api}}) { + die "***** Unsupported api compatibility level: $config{api}\n", + } -if (keys %deprecated_options) - { - warn "***** Deprecated options: ", - join(", ", keys %deprecated_options), "\n"; - } -if (keys %unsupported_options) - { - die "***** Unsupported options: ", - join(", ", keys %unsupported_options), "\n"; + if (keys %deprecated_options) + { + warn "***** Deprecated options: ", + join(", ", keys %deprecated_options), "\n"; + } + if (keys %unsupported_options) + { + die "***** Unsupported options: ", + join(", ", keys %unsupported_options), "\n"; + } } if ($libs =~ /(^|\s)-Wl,-rpath,/ @@ -911,12 +908,11 @@ if ($d) { $target = $t; } } - -&usage if !$table{$target} || $table{$target}->{template}; - $config{target} = $target; my %target = resolve_config($target); +&usage if (!%target || $target{template}); + my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}}); $config{conf_files} = [ sort keys %conf_files ]; %target = ( %{$table{DEFAULTS}}, %target ); @@ -1219,10 +1215,8 @@ if ($^O ne "VMS") { if (!$disabled{makedepend}) { # We know that GNU C version 3 and up as well as all clang - # versions support dependency generation, but Xcode did not - # handle $cc -M before clang support (but claims __GNUC__ = 3) - if (($predefined{__GNUC__} // -1) >= 3 - && !($predefined{__APPLE_CC__} && !$predefined{__clang__})) { + # versions support dependency generation + if ($predefined{__GNUC__} >= 3) { $config{makedepprog} = $cc; } else { $config{makedepprog} = which('makedepend'); @@ -1906,8 +1900,8 @@ EOF next unless defined($unified_info{includes}->{$dest}->{$k}); my @incs = reverse @{$unified_info{includes}->{$dest}->{$k}}; foreach my $obj (grep /\.o$/, - (keys %{$unified_info{sources}->{$dest} // {}}, - keys %{$unified_info{shared_sources}->{$dest} // {}})) { + (keys %{$unified_info{sources}->{$dest}}, + keys %{$unified_info{shared_sources}->{$dest}})) { foreach my $inc (@incs) { unshift @{$unified_info{includes}->{$obj}->{$k}}, $inc unless grep { $_ eq $inc } @{$unified_info{includes}->{$obj}->{$k}}; @@ -2131,8 +2125,6 @@ my %builders = ( $builders{$builder}->($builder_platform, @builder_opts); -$SIG{__DIE__} = $orig_death_handler; - print <<"EOF"; Configured for $target. @@ -2161,24 +2153,6 @@ exit(0); # Helpers and utility functions # -# Death handler, to print a helpful message in case of failure ####### -# -sub death_handler { - die @_ if $^S; # To prevent the added message in eval blocks - my $build_file = $target{build_file} // "build file"; - my @message = ( <<"_____", @_ ); - -Failure! $build_file wasn't produced. -Please read INSTALL and associated NOTES files. You may also have to look over -your available compiler tool chain or change your configuration. - -_____ - - # Dying is terminal, so it's ok to reset the signal handler here. - $SIG{__DIE__} = $orig_death_handler; - die @message; -} - # Configuration file reading ######################################### # Note: All of the helper functions are for lazy evaluation. They all diff --git a/worker/deps/openssl/openssl/INSTALL b/worker/deps/openssl/openssl/INSTALL index 5a98d1da83..e9b33a5336 100644 --- a/worker/deps/openssl/openssl/INSTALL +++ b/worker/deps/openssl/openssl/INSTALL @@ -3,8 +3,7 @@ -------------------- This document describes installation on all supported operating - systems (the Unix/Linux family (which includes Mac OS/X), OpenVMS, - and Windows). + systems (the Linux/Unix family, OpenVMS and Windows) To install OpenSSL, you will need: @@ -77,7 +76,7 @@ If you want to just get on with it, do: - on Unix (again, this includes Mac OS/X): + on Unix: $ ./config $ make @@ -209,7 +208,7 @@ without a path). This flag must be provided if the zlib-dynamic option is not also used. If zlib-dynamic is used then this flag is optional and a default value ("ZLIB1") is - used if not provided. + used if not provided. On VMS: this is the filename of the zlib library (with or without a path). This flag is optional and if not provided then "GNV$LIBZSHR", "GNV$LIBZSHR32" or "GNV$LIBZSHR64" is @@ -664,7 +663,7 @@ $ nmake TESTS='test_rsa test_dsa' test # Windows And of course, you can combine (Unix example shown): - + $ make VERBOSE=1 TESTS='test_rsa test_dsa' test You can find the list of available tests like this: @@ -734,7 +733,7 @@ command symbols. [.SYSTEST] Contains the installation verification procedure. [.HTML] Contains the HTML rendition of the manual pages. - + Additionally, install will add the following directories under OPENSSLDIR (the directory given with --openssldir or its default) diff --git a/worker/deps/openssl/openssl/NEWS b/worker/deps/openssl/openssl/NEWS index 983fceb2bb..8744fe68ec 100644 --- a/worker/deps/openssl/openssl/NEWS +++ b/worker/deps/openssl/openssl/NEWS @@ -5,16 +5,6 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. - Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.0j [20 Nov 2018] - - o Timing vulnerability in DSA signature generation (CVE-2018-0734) - o Timing vulnerability in ECDSA signature generation (CVE-2018-0735) - - Major changes between OpenSSL 1.1.0h and OpenSSL 1.1.0i [14 Aug 2018] - - o Client DoS due to large DH parameter (CVE-2018-0732) - o Cache timing vulnerability in RSA Key Generation (CVE-2018-0737) - Major changes between OpenSSL 1.1.0g and OpenSSL 1.1.0h [27 Mar 2018] o Constructed ASN.1 types with a recursive definition could exceed the diff --git a/worker/deps/openssl/openssl/NOTES.DJGPP b/worker/deps/openssl/openssl/NOTES.DJGPP index bbe63dc154..d43d4e86de 100644 --- a/worker/deps/openssl/openssl/NOTES.DJGPP +++ b/worker/deps/openssl/openssl/NOTES.DJGPP @@ -1,5 +1,5 @@ - + INSTALLATION ON THE DOS PLATFORM WITH DJGPP ------------------------------------------- @@ -29,7 +29,7 @@ running "./Configure" with appropriate arguments: ./Configure no-threads --prefix=/dev/env/DJDIR DJGPP - + And finally fire up "make". You may run out of DPMI selectors when running in a DOS box under Windows. If so, just close the BASH shell, go back to Windows, and restart BASH. Then run "make" again. diff --git a/worker/deps/openssl/openssl/NOTES.VMS b/worker/deps/openssl/openssl/NOTES.VMS index 3e9a57e805..7d74f0dbdd 100644 --- a/worker/deps/openssl/openssl/NOTES.VMS +++ b/worker/deps/openssl/openssl/NOTES.VMS @@ -42,7 +42,7 @@ for now is to rename the OpenSSL source directory, as follows (please adjust for the actual source directory name you have): - $ rename openssl-1^.1^.0.DIR openssl-1_1_0.DIR + $ rename openssl-1^.1^.0.DIR openssl-1_1_0.DIR About MMS and DCL diff --git a/worker/deps/openssl/openssl/README b/worker/deps/openssl/openssl/README index 4694701909..3491280ead 100644 --- a/worker/deps/openssl/openssl/README +++ b/worker/deps/openssl/openssl/README @@ -1,7 +1,7 @@ - OpenSSL 1.1.0j 20 Nov 2018 + OpenSSL 1.1.0h 27 Mar 2018 - Copyright (c) 1998-2018 The OpenSSL Project + Copyright (c) 1998-2016 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson All rights reserved. diff --git a/worker/deps/openssl/openssl/README.ECC b/worker/deps/openssl/openssl/README.ECC index fa3cad7aa7..86f5b23070 100644 --- a/worker/deps/openssl/openssl/README.ECC +++ b/worker/deps/openssl/openssl/README.ECC @@ -5,57 +5,56 @@ Center (NCSC) dated 2010-11-04. That agreement permits implementation and distribution of software containing features covered by any or all of the following patents: -1.) U.S. Pat. No. 5,761,305 entitled "Key Agreement and Transport Protocol +1.) U.S. Pat. No. 5,761,305 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on June 2, 1998; -2.) Can. Pat. Appl. Ser. No. 2176972 entitled "Key Agreement and Transport - Protocol with Implicit Signature and Reduced Bandwidth" filed on May +2.) Can. Pat. Appl. Ser. No. 2176972 entitled "Key Agreement and Transport + Protocol with Implicit Signature and Reduced Bandwidth" filed on May 16, 1996; -3.) U.S. Pat. No. 5,889,865 entitled "Key Agreement and Transport Protocol +3.) U.S. Pat. No. 5,889,865 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on March 30, 1999; -4.) U.S. Pat. No. 5,896,455 entitled "Key Agreement and Transport Protocol +4.) U.S. Pat. No. 5,896,455 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on April 20, 1999; -5.) U.S. Pat. No. 5,933,504 entitled "Strengthened Public Key Protocol" +5.) U.S. Pat. No. 5,933,504 entitled "Strengthened Public Key Protocol" issued on August 3, 1999; -6.) Can. Pat. Appl. Ser. No. 2176866 entitled "Strengthened Public Key +6.) Can. Pat. Appl. Ser. No. 2176866 entitled "Strengthened Public Key Protocol" filed on May 17, 1996; -7.) E.P. Pat. Appl. Ser. No. 96201322.3 entitled "Strengthened Public Key +7.) E.P. Pat. Appl. Ser. No. 96201322.3 entitled "Strengthened Public Key Protocol" filed on May 17, 1996; -8.) U.S. Pat. No. 5,999,626 entitled "Digital Signatures on a Smartcard" +8.) U.S. Pat. No. 5,999,626 entitled "Digital Signatures on a Smartcard" issued on December 7, 1999; -9.) Can. Pat. Appl. Ser. No. 2202566 entitled "Digital Signatures on a +9.) Can. Pat. Appl. Ser. No. 2202566 entitled "Digital Signatures on a Smartcard" filed on April 14, 1997; -10.) E.P. Pat. Appl. No. 97106114.8 entitled "Digital Signatures on a +10.) E.P. Pat. Appl. No. 97106114.8 entitled "Digital Signatures on a Smartcard" filed on April 15, 1997; -11.) U.S Pat. No. 6,122,736 entitled "Key Agreement and Transport Protocol +11.) U.S Pat. No. 6,122,736 entitled "Key Agreement and Transport Protocol with Implicit Signatures" issued on September 19, 2000; -12.) Can. Pat. Appl. Ser. No. 2174261 entitled "Key Agreement and Transport +12.) Can. Pat. Appl. Ser. No. 2174261 entitled "Key Agreement and Transport Protocol with Implicit Signatures" filed on April 16, 1996; -13.) E.P. Pat. Appl. Ser. No. 96105920.1 entitled "Key Agreement and +13.) E.P. Pat. Appl. Ser. No. 96105920.1 entitled "Key Agreement and Transport Protocol with Implicit Signatures" filed on April 16, 1996; -14.) U.S. Pat. No. 6,141,420 entitled "Elliptic Curve Encryption Systems" +14.) U.S. Pat. No. 6,141,420 entitled "Elliptic Curve Encryption Systems" issued on October 31, 2000; -15.) Can. Pat. Appl. Ser. No. 2155038 entitled "Elliptic Curve Encryption +15.) Can. Pat. Appl. Ser. No. 2155038 entitled "Elliptic Curve Encryption Systems" filed on July 31, 1995; -16.) E.P. Pat. Appl. Ser. No. 95926348.4 entitled "Elliptic Curve Encryption +16.) E.P. Pat. Appl. Ser. No. 95926348.4 entitled "Elliptic Curve Encryption Systems" filed on July 31, 1995; -17.) U.S. Pat. No. 6,336,188 entitled "Authenticated Key Agreement" issued +17.) U.S. Pat. No. 6,336,188 entitled "Authenticated Key Agreement" issued on January 1, 2002; -18.) U.S. Pat. No. 6,487,661 entitled "Key Agreement and Transport Protocol" +18.) U.S. Pat. No. 6,487,661 entitled "Key Agreement and Transport Protocol" issued on November 26, 2002; -19.) Can. Pat. Appl. Ser. No. 2174260 entitled "Key Agreement and Transport +19.) Can. Pat. Appl. Ser. No. 2174260 entitled "Key Agreement and Transport Protocol" filed on April 16, 1996; -20.) E.P. Pat. Appl. Ser. No. 96105921.9 entitled "Key Agreement and +20.) E.P. Pat. Appl. Ser. No. 96105921.9 entitled "Key Agreement and Transport Protocol" filed on April 21, 1996; -21.) U.S. Pat. No. 6,563,928 entitled "Strengthened Public Key Protocol" +21.) U.S. Pat. No. 6,563,928 entitled "Strengthened Public Key Protocol" issued on May 13, 2003; -22.) U.S. Pat. No. 6,618,483 entitled "Elliptic Curve Encryption Systems" +22.) U.S. Pat. No. 6,618,483 entitled "Elliptic Curve Encryption Systems" issued September 9, 2003; -23.) U.S. Pat. Appl. Ser. No. 09/434,247 entitled "Digital Signatures on a +23.) U.S. Pat. Appl. Ser. No. 09/434,247 entitled "Digital Signatures on a Smartcard" filed on November 5, 1999; -24.) U.S. Pat. Appl. Ser. No. 09/558,256 entitled "Key Agreement and +24.) U.S. Pat. Appl. Ser. No. 09/558,256 entitled "Key Agreement and Transport Protocol with Implicit Signatures" filed on April 25, 2000; -25.) U.S. Pat. Appl. Ser. No. 09/942,492 entitled "Digital Signatures on a +25.) U.S. Pat. Appl. Ser. No. 09/942,492 entitled "Digital Signatures on a Smartcard" filed on August 29, 2001 and published on July 18, 2002; and, -26.) U.S. Pat. Appl. Ser. No. 10/185,735 entitled "Strengthened Public Key +26.) U.S. Pat. Appl. Ser. No. 10/185,735 entitled "Strengthened Public Key Protocol" filed on July 1, 2000. - diff --git a/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in b/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in index 825a699c4f..e888b52879 100644 --- a/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in +++ b/worker/deps/openssl/openssl/VMS/openssl_ivp.com.in @@ -16,7 +16,7 @@ $ OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") - $ $ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -} $ pz := {- $config{pointer_size} -} -$ +$ $ @'INSTALLTOP_'SYS$STARTUP]openssl_startup'v' $ @'INSTALLTOP_'SYS$STARTUP]openssl_utils'v' $ diff --git a/worker/deps/openssl/openssl/apps/apps.c b/worker/deps/openssl/openssl/apps/apps.c index 94efa5ac05..8703d0cc31 100644 --- a/worker/deps/openssl/openssl/apps/apps.c +++ b/worker/deps/openssl/openssl/apps/apps.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1012,8 +1012,7 @@ int set_name_ex(unsigned long *flags, const char *arg) }; if (set_multi_opts(flags, arg, ex_tbl) == 0) return 0; - if (*flags != XN_FLAG_COMPAT - && (*flags & XN_FLAG_SEP_MASK) == 0) + if ((*flags & XN_FLAG_SEP_MASK) == 0) *flags |= XN_FLAG_SEP_CPLUS_SPC; return 1; } @@ -1707,14 +1706,8 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti) char *work; X509_NAME *n; - if (*cp++ != '/') { - BIO_printf(bio_err, - "name is expected to be in the format " - "/type0=value0/type1=value1/type2=... where characters may " - "be escaped by \\. This name is not in that format: '%s'\n", - --cp); + if (*cp++ != '/') return NULL; - } n = X509_NAME_new(); if (n == NULL) @@ -1770,12 +1763,6 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti) opt_getprog(), typestr); continue; } - if (*valstr == '\0') { - BIO_printf(bio_err, - "%s: No value provided for Subject Attribute %s, skipped\n", - opt_getprog(), typestr); - continue; - } if (!X509_NAME_add_entry_by_NID(n, nid, chtype, valstr, strlen((char *)valstr), -1, ismulti ? -1 : 0)) diff --git a/worker/deps/openssl/openssl/apps/asn1pars.c b/worker/deps/openssl/openssl/apps/asn1pars.c index 008a6797d0..1ac261c762 100644 --- a/worker/deps/openssl/openssl/apps/asn1pars.c +++ b/worker/deps/openssl/openssl/apps/asn1pars.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -41,7 +41,7 @@ OPTIONS asn1parse_options[] = { {"dump", OPT_DUMP, 0, "unknown data in hex form"}, {"dlimit", OPT_DLIMIT, 'p', "dump the first arg bytes of unknown data in hex form"}, - {"strparse", OPT_STRPARSE, 'p', + {"strparse", OPT_STRPARSE, 's', "offset; a series of these can be used to 'dig'"}, {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"}, {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"}, @@ -113,13 +113,13 @@ int asn1parse_main(int argc, char **argv) offset = strtol(opt_arg(), NULL, 0); break; case OPT_LENGTH: - length = strtol(opt_arg(), NULL, 0); + length = atoi(opt_arg()); break; case OPT_DUMP: dump = -1; break; case OPT_DLIMIT: - dump = strtol(opt_arg(), NULL, 0); + dump = atoi(opt_arg()); break; case OPT_STRPARSE: sk_OPENSSL_STRING_push(osk, opt_arg()); @@ -191,7 +191,7 @@ int asn1parse_main(int argc, char **argv) num = 0; for (;;) { - if (!BUF_MEM_grow(buf, num + BUFSIZ)) + if (!BUF_MEM_grow(buf, (int)num + BUFSIZ)) goto end; i = BIO_read(in, &(buf->data[num]), BUFSIZ); if (i <= 0) @@ -211,9 +211,9 @@ int asn1parse_main(int argc, char **argv) for (i = 0; i < sk_OPENSSL_STRING_num(osk); i++) { ASN1_TYPE *atmp; int typ; - j = strtol(sk_OPENSSL_STRING_value(osk, i), NULL, 0); - if (j <= 0 || j >= tmplen) { - BIO_printf(bio_err, "'%s' is out of range\n", + j = atoi(sk_OPENSSL_STRING_value(osk, i)); + if (j == 0) { + BIO_printf(bio_err, "'%s' is an invalid number\n", sk_OPENSSL_STRING_value(osk, i)); continue; } @@ -244,14 +244,14 @@ int asn1parse_main(int argc, char **argv) num = tmplen; } - if (offset < 0 || offset >= num) { - BIO_printf(bio_err, "Error: offset out of range\n"); + if (offset >= num) { + BIO_printf(bio_err, "Error: offset too large\n"); goto end; } num -= offset; - if (length == 0 || length > (unsigned int)num) + if ((length == 0) || ((long)length > num)) length = (unsigned int)num; if (derout) { if (BIO_write(derout, str + offset, length) != (int)length) { diff --git a/worker/deps/openssl/openssl/apps/ca.c b/worker/deps/openssl/openssl/apps/ca.c index c69a2b5cdd..d474a2b69a 100644 --- a/worker/deps/openssl/openssl/apps/ca.c +++ b/worker/deps/openssl/openssl/apps/ca.c @@ -725,10 +725,10 @@ int ca_main(int argc, char **argv) /*****************************************************************/ if (req || gencrl) { - if (spkac_file != NULL) { - output_der = 1; - batch = 1; - } + /* FIXME: Is it really always text? */ + Sout = bio_open_default(outfile, 'w', FORMAT_TEXT); + if (Sout == NULL) + goto end; } if (md == NULL @@ -872,6 +872,10 @@ int ca_main(int argc, char **argv) BIO_printf(bio_err, "Memory allocation failure\n"); goto end; } + if (outfile) { + output_der = 1; + batch = 1; + } } } if (ss_cert_file != NULL) { @@ -925,13 +929,10 @@ int ca_main(int argc, char **argv) if (j > 0) { total_done++; BIO_printf(bio_err, "\n"); - if (!BN_add_word(serial, 1)) { - X509_free(x); + if (!BN_add_word(serial, 1)) goto end; - } if (!sk_X509_push(cert_sk, x)) { BIO_printf(bio_err, "Memory allocation failure\n"); - X509_free(x); goto end; } } @@ -1016,11 +1017,6 @@ int ca_main(int argc, char **argv) if (verbose) BIO_printf(bio_err, "writing %s\n", buf[2]); - Sout = bio_open_default(outfile, 'w', - output_der ? FORMAT_ASN1 : FORMAT_TEXT); - if (Sout == NULL) - goto end; - Cout = BIO_new_file(buf[2], "w"); if (Cout == NULL) { perror(buf[2]); @@ -1029,8 +1025,6 @@ int ca_main(int argc, char **argv) write_new_certificate(Cout, xi, 0, notext); write_new_certificate(Sout, xi, output_der, notext); BIO_free_all(Cout); - BIO_free_all(Sout); - Sout = NULL; } if (sk_X509_num(cert_sk)) { @@ -1179,11 +1173,6 @@ int ca_main(int argc, char **argv) if (!do_X509_CRL_sign(crl, pkey, dgst, sigopts)) goto end; - Sout = bio_open_default(outfile, 'w', - output_der ? FORMAT_ASN1 : FORMAT_TEXT); - if (Sout == NULL) - goto end; - PEM_write_bio_X509_CRL(Sout, crl); if (crlnumberfile != NULL) /* Rename the crlnumber file */ diff --git a/worker/deps/openssl/openssl/apps/cms.c b/worker/deps/openssl/openssl/apps/cms.c index 640f92eb1b..b999c70c95 100644 --- a/worker/deps/openssl/openssl/apps/cms.c +++ b/worker/deps/openssl/openssl/apps/cms.c @@ -146,7 +146,7 @@ OPTIONS cms_options[] = { "Do not load certificates from the default certificates directory"}, {"content", OPT_CONTENT, '<', "Supply or override content for detached signature"}, - {"print", OPT_PRINT, '-', + {"print", OPT_PRINT, '-', "For the -cmsout operation print out all fields of the CMS structure"}, {"secretkey", OPT_SECRETKEY, 's'}, {"secretkeyid", OPT_SECRETKEYID, 's'}, diff --git a/worker/deps/openssl/openssl/apps/ct_log_list.cnf b/worker/deps/openssl/openssl/apps/ct_log_list.cnf index 243487453c..a637b477af 100644 --- a/worker/deps/openssl/openssl/apps/ct_log_list.cnf +++ b/worker/deps/openssl/openssl/apps/ct_log_list.cnf @@ -31,4 +31,3 @@ key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEluqsHEYMG1XcDfy1lCdGV0JwOmkY4r87xNuroP [venafi] description = Venafi log key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolpIHxdSlTXLo1s6H1OCdpSj/4DyHDc8wLG9wVmLqy1lk9fz4ATVmm+/1iN2Nk8jmctUKK2MFUtlWXZBSpym97M7frGlSaQXUWyA3CqQUEuIJOmlEjKTBEiQAvpfDjCHjlV2Be4qTM6jamkJbiWtgnYPhJL6ONaGTiSPm7Byy57iaz/hbckldSOIoRhYBiMzeNoA0DiRZ9KmfSeXZ1rB8y8X5urSW+iBzf2SaOfzBvDpcoTuAaWx2DPazoOl28fP1hZ+kHUYvxbcMjttjauCFx+JII0dmuZNIwjfeG/GBb9frpSX219k1O4Wi6OEbHEr8at/XQ0y7gTikOxBn/s5wQIDAQAB - diff --git a/worker/deps/openssl/openssl/apps/dh1024.pem b/worker/deps/openssl/openssl/apps/dh1024.pem index f1a5e180aa..813e8a4a48 100644 --- a/worker/deps/openssl/openssl/apps/dh1024.pem +++ b/worker/deps/openssl/openssl/apps/dh1024.pem @@ -4,7 +4,7 @@ Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL /1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC -----END DH PARAMETERS----- -These are the 1024-bit DH parameters from "Internet Key Exchange +These are the 1024-bit DH parameters from "Internet Key Exchange Protocol Version 2 (IKEv2)": https://tools.ietf.org/html/rfc5996 See https://tools.ietf.org/html/rfc2412 for how they were generated. diff --git a/worker/deps/openssl/openssl/apps/dh2048.pem b/worker/deps/openssl/openssl/apps/dh2048.pem index e899f2e029..288a20997e 100644 --- a/worker/deps/openssl/openssl/apps/dh2048.pem +++ b/worker/deps/openssl/openssl/apps/dh2048.pem @@ -7,8 +7,8 @@ fDKQXkYuNs474553LBgOhgObJ4Oi7Aeij7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq 5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg== -----END DH PARAMETERS----- -These are the 2048-bit DH parameters from "More Modular Exponential -(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": +These are the 2048-bit DH parameters from "More Modular Exponential +(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": https://tools.ietf.org/html/rfc3526 See https://tools.ietf.org/html/rfc2412 for how they were generated. diff --git a/worker/deps/openssl/openssl/apps/dh4096.pem b/worker/deps/openssl/openssl/apps/dh4096.pem index adada2b558..08560e1284 100644 --- a/worker/deps/openssl/openssl/apps/dh4096.pem +++ b/worker/deps/openssl/openssl/apps/dh4096.pem @@ -12,8 +12,8 @@ ARpyPBKnh+bXiHGaEL26WyaZwycYavTiPBqUaDS2FQvaJYPpyirUTOjbu8LbBN6O HNAGkSfVsFqpk7TqmI2P3cGG/7fckKbAj030Nck0BjGZ//////////8CAQI= -----END DH PARAMETERS----- -These are the 4096-bit DH parameters from "More Modular Exponential -(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": +These are the 4096-bit DH parameters from "More Modular Exponential +(MODP) Diffie-Hellman groups for Internet Key Exchange (IKE)": https://tools.ietf.org/html/rfc3526 See https://tools.ietf.org/html/rfc2412 for how they were generated. diff --git a/worker/deps/openssl/openssl/apps/dhparam.c b/worker/deps/openssl/openssl/apps/dhparam.c index 8a28414562..94322e37de 100644 --- a/worker/deps/openssl/openssl/apps/dhparam.c +++ b/worker/deps/openssl/openssl/apps/dhparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -151,11 +151,6 @@ int dhparam_main(int argc, char **argv) goto end; } # endif - - out = bio_open_default(outfile, 'w', outformat); - if (out == NULL) - goto end; - /* DH parameters */ if (num && !g) g = 2; @@ -271,6 +266,10 @@ int dhparam_main(int argc, char **argv) /* dh != NULL */ } + out = bio_open_default(outfile, 'w', outformat); + if (out == NULL) + goto end; + if (text) { DHparams_print(out, dh); } diff --git a/worker/deps/openssl/openssl/apps/dsaparam.c b/worker/deps/openssl/openssl/apps/dsaparam.c index 20891cf3dd..5c3c8f8089 100644 --- a/worker/deps/openssl/openssl/apps/dsaparam.c +++ b/worker/deps/openssl/openssl/apps/dsaparam.c @@ -226,28 +226,25 @@ int dsaparam_main(int argc, char **argv) data = app_malloc(len + 20, "BN space"); - BIO_printf(bio_out, "static DSA *get_dsa%d(void)\n{\n", bits_p); - print_bignum_var(bio_out, p, "dsap", bits_p, data); - print_bignum_var(bio_out, q, "dsaq", bits_p, data); - print_bignum_var(bio_out, g, "dsag", bits_p, data); + BIO_printf(bio_out, "DSA *get_dsa%d()\n{\n", bits_p); + print_bignum_var(bio_out, p, "dsap", len, data); + print_bignum_var(bio_out, q, "dsaq", len, data); + print_bignum_var(bio_out, g, "dsag", len, data); BIO_printf(bio_out, " DSA *dsa = DSA_new();\n" - " BIGNUM *p, *q, *g;\n" "\n"); BIO_printf(bio_out, " if (dsa == NULL)\n" " return NULL;\n"); - BIO_printf(bio_out, " if (!DSA_set0_pqg(dsa, p = BN_bin2bn(dsap_%d, sizeof(dsap_%d), NULL),\n", - bits_p, bits_p); - BIO_printf(bio_out, " q = BN_bin2bn(dsaq_%d, sizeof(dsaq_%d), NULL),\n", - bits_p, bits_p); - BIO_printf(bio_out, " g = BN_bin2bn(dsag_%d, sizeof(dsag_%d), NULL))) {\n", - bits_p, bits_p); - BIO_printf(bio_out, " DSA_free(dsa);\n" - " BN_free(p);\n" - " BN_free(q);\n" - " BN_free(g);\n" + BIO_printf(bio_out, " dsa->p = BN_bin2bn(dsap_%d, sizeof(dsap_%d), NULL);\n", + bits_p, bits_p); + BIO_printf(bio_out, " dsa->q = BN_bin2bn(dsaq_%d, sizeof(dsaq_%d), NULL);\n", + bits_p, bits_p); + BIO_printf(bio_out, " dsa->g = BN_bin2bn(dsag_%d, sizeof(dsag_%d), NULL);\n", + bits_p, bits_p); + BIO_printf(bio_out, " if (!dsa->p || !dsa->q || !dsa->g) {\n" + " DSA_free(dsa);\n" " return NULL;\n" " }\n" - " return dsa;\n}\n"); + " return(dsa);\n}\n"); OPENSSL_free(data); } diff --git a/worker/deps/openssl/openssl/apps/ocsp.c b/worker/deps/openssl/openssl/apps/ocsp.c index 0c15f5114d..4b533348b4 100644 --- a/worker/deps/openssl/openssl/apps/ocsp.c +++ b/worker/deps/openssl/openssl/apps/ocsp.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -639,6 +639,7 @@ int ocsp_main(int argc, char **argv) OCSP_response_status_str(i), i); if (ignore_err) goto redo_accept; + ret = 0; goto end; } diff --git a/worker/deps/openssl/openssl/apps/pkey.c b/worker/deps/openssl/openssl/apps/pkey.c index 5c13d8b87a..ad1a3b10eb 100644 --- a/worker/deps/openssl/openssl/apps/pkey.c +++ b/worker/deps/openssl/openssl/apps/pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -141,30 +141,24 @@ int pkey_main(int argc, char **argv) if (!noout) { if (outformat == FORMAT_PEM) { - if (pubout) { - if (!PEM_write_bio_PUBKEY(out, pkey)) - goto end; - } else { + if (pubout) + PEM_write_bio_PUBKEY(out, pkey); + else { assert(private); - if (traditional) { - if (!PEM_write_bio_PrivateKey_traditional(out, pkey, cipher, - NULL, 0, NULL, - passout)) - goto end; - } else { - if (!PEM_write_bio_PrivateKey(out, pkey, cipher, - NULL, 0, NULL, passout)) - goto end; - } + if (traditional) + PEM_write_bio_PrivateKey_traditional(out, pkey, cipher, + NULL, 0, NULL, + passout); + else + PEM_write_bio_PrivateKey(out, pkey, cipher, + NULL, 0, NULL, passout); } } else if (outformat == FORMAT_ASN1) { - if (pubout) { - if (!i2d_PUBKEY_bio(out, pkey)) - goto end; - } else { + if (pubout) + i2d_PUBKEY_bio(out, pkey); + else { assert(private); - if (!i2d_PrivateKey_bio(out, pkey)) - goto end; + i2d_PrivateKey_bio(out, pkey); } } else { BIO_printf(bio_err, "Bad format specified for key\n"); @@ -174,21 +168,17 @@ int pkey_main(int argc, char **argv) } if (text) { - if (pubtext) { - if (EVP_PKEY_print_public(out, pkey, 0, NULL) <= 0) - goto end; - } else { + if (pubtext) + EVP_PKEY_print_public(out, pkey, 0, NULL); + else { assert(private); - if (EVP_PKEY_print_private(out, pkey, 0, NULL) <= 0) - goto end; + EVP_PKEY_print_private(out, pkey, 0, NULL); } } ret = 0; end: - if (ret != 0) - ERR_print_errors(bio_err); EVP_PKEY_free(pkey); release_engine(e); BIO_free_all(out); diff --git a/worker/deps/openssl/openssl/apps/rehash.c b/worker/deps/openssl/openssl/apps/rehash.c index aa3f8643a5..273ad74969 100644 --- a/worker/deps/openssl/openssl/apps/rehash.c +++ b/worker/deps/openssl/openssl/apps/rehash.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -130,10 +130,9 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename, for (ep = bp->first_entry; ep; ep = ep->next) { if (digest && memcmp(digest, ep->digest, evpmdsize) == 0) { BIO_printf(bio_err, - "%s: warning: skipping duplicate %s in %s\n", - opt_getprog(), + "%s: skipping duplicate %s in %s\n", opt_getprog(), type == TYPE_CERT ? "certificate" : "CRL", filename); - return 0; + return 1; } if (strcmp(filename, ep->filename) == 0) { found = ep; @@ -145,7 +144,7 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename, if (ep == NULL) { if (bp->num_needed >= MAX_COLLISIONS) { BIO_printf(bio_err, - "%s: error: hash table overflow for %s\n", + "%s: hash table overflow for %s\n", opt_getprog(), filename); return 1; } @@ -236,7 +235,7 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h) /* Does it have X.509 data in it? */ if ((b = BIO_new_file(fullpath, "r")) == NULL) { - BIO_printf(bio_err, "%s: error: skipping %s, cannot open file\n", + BIO_printf(bio_err, "%s: skipping %s, cannot open file\n", opt_getprog(), filename); errs++; goto end; @@ -248,7 +247,7 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h) if (sk_X509_INFO_num(inf) != 1) { BIO_printf(bio_err, - "%s: warning: skipping %s," + "%s: skipping %s," "it does not contain exactly one certificate or CRL\n", opt_getprog(), filename); /* This is not an error. */ @@ -503,14 +502,13 @@ int rehash_main(int argc, char **argv) if (*argv) { while (*argv) errs += do_dir(*argv++, h); - } else if ((env = getenv(X509_get_default_cert_dir_env())) != NULL) { - char lsc[2] = { LIST_SEPARATOR_CHAR, '\0' }; + } else if ((env = getenv("SSL_CERT_DIR")) != NULL) { m = OPENSSL_strdup(env); - for (e = strtok(m, lsc); e != NULL; e = strtok(NULL, lsc)) + for (e = strtok(m, ":"); e != NULL; e = strtok(NULL, ":")) errs += do_dir(e, h); OPENSSL_free(m); } else { - errs += do_dir(X509_get_default_cert_dir(), h); + errs += do_dir("/etc/ssl/certs", h); } end: diff --git a/worker/deps/openssl/openssl/apps/req.c b/worker/deps/openssl/openssl/apps/req.c index a20e7c1ef1..2a2156953a 100644 --- a/worker/deps/openssl/openssl/apps/req.c +++ b/worker/deps/openssl/openssl/apps/req.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -509,7 +509,8 @@ int req_main(int argc, char **argv) if (pkey_type == EVP_PKEY_EC) { BIO_printf(bio_err, "Generating an EC private key\n"); } else { - BIO_printf(bio_err, "Generating a %s private key\n", keyalgstr); + BIO_printf(bio_err, "Generating a %ld bit %s private key\n", + newkey, keyalgstr); } EVP_PKEY_CTX_set_cb(genctx, genpkey_cb); diff --git a/worker/deps/openssl/openssl/apps/s_client.c b/worker/deps/openssl/openssl/apps/s_client.c index 3c0c73e851..fb89f0cd61 100644 --- a/worker/deps/openssl/openssl/apps/s_client.c +++ b/worker/deps/openssl/openssl/apps/s_client.c @@ -593,8 +593,7 @@ OPTIONS s_client_options[] = { "Disable name checks when matching DANE-EE(3) TLSA records"}, {"reconnect", OPT_RECONNECT, '-', "Drop and re-make the connection with the same Session-ID"}, - {"showcerts", OPT_SHOWCERTS, '-', - "Show all certificates sent by the server"}, + {"showcerts", OPT_SHOWCERTS, '-', "Show all certificates in the chain"}, {"debug", OPT_DEBUG, '-', "Extra output"}, {"msg", OPT_MSG, '-', "Show protocol messages"}, {"msgfile", OPT_MSGFILE, '>', @@ -2115,7 +2114,8 @@ int s_client_main(int argc, char **argv) FD_ZERO(&readfds); FD_ZERO(&writefds); - if (SSL_is_dtls(con) && DTLSv1_get_timeout(con, &timeout)) + if ((SSL_version(con) == DTLS1_VERSION) && + DTLSv1_get_timeout(con, &timeout)) timeoutp = &timeout; else timeoutp = NULL; @@ -2235,8 +2235,10 @@ int s_client_main(int argc, char **argv) } } - if (SSL_is_dtls(con) && DTLSv1_handle_timeout(con) > 0) + if ((SSL_version(con) == DTLS1_VERSION) + && DTLSv1_handle_timeout(con) > 0) { BIO_printf(bio_err, "TIMEOUT occurred\n"); + } if (!ssl_pending && FD_ISSET(SSL_get_fd(con), &writefds)) { k = SSL_write(con, &(cbuf[cbuf_off]), (unsigned int)cbuf_len); diff --git a/worker/deps/openssl/openssl/apps/s_server.c b/worker/deps/openssl/openssl/apps/s_server.c index 86298334bd..31c90fdd0e 100644 --- a/worker/deps/openssl/openssl/apps/s_server.c +++ b/worker/deps/openssl/openssl/apps/s_server.c @@ -2012,7 +2012,9 @@ static int sv_body(int s, int stype, unsigned char *context) SSL *con = NULL; BIO *sbio; struct timeval timeout; -#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)) +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) + struct timeval tv; +#else struct timeval *timeoutp; #endif @@ -2147,23 +2149,26 @@ static int sv_body(int s, int stype, unsigned char *context) * second and check for any keypress. In a proper Windows * application we wouldn't do this because it is inefficient. */ - timeout.tv_sec = 1; - timeout.tv_usec = 0; - i = select(width, (void *)&readfds, NULL, NULL, &timeout); + tv.tv_sec = 1; + tv.tv_usec = 0; + i = select(width, (void *)&readfds, NULL, NULL, &tv); if (has_stdin_waiting()) read_from_terminal = 1; if ((i < 0) || (!i && !read_from_terminal)) continue; #else - if (SSL_is_dtls(con) && DTLSv1_get_timeout(con, &timeout)) + if ((SSL_version(con) == DTLS1_VERSION) && + DTLSv1_get_timeout(con, &timeout)) timeoutp = &timeout; else timeoutp = NULL; i = select(width, (void *)&readfds, NULL, NULL, timeoutp); - if ((SSL_is_dtls(con)) && DTLSv1_handle_timeout(con) > 0) + if ((SSL_version(con) == DTLS1_VERSION) + && DTLSv1_handle_timeout(con) > 0) { BIO_printf(bio_err, "TIMEOUT occurred\n"); + } if (i <= 0) continue; @@ -2660,10 +2665,8 @@ static int www_body(int s, int stype, unsigned char *context) if (context && !SSL_set_session_id_context(con, context, - strlen((char *)context))) { - SSL_free(con); + strlen((char *)context))) goto err; - } sbio = BIO_new_socket(s, BIO_NOCLOSE); if (s_nbio_test) { @@ -2675,7 +2678,7 @@ static int www_body(int s, int stype, unsigned char *context) SSL_set_bio(con, sbio, sbio); SSL_set_accept_state(con); - /* No need to free |con| after this. Done by BIO_free(ssl_bio) */ + /* SSL_set_fd(con,s); */ BIO_set_ssl(ssl_bio, con, BIO_CLOSE); BIO_push(io, ssl_bio); #ifdef CHARSET_EBCDIC @@ -3032,7 +3035,6 @@ static int rev_body(int s, int stype, unsigned char *context) if (context && !SSL_set_session_id_context(con, context, strlen((char *)context))) { - SSL_free(con); ERR_print_errors(bio_err); goto err; } @@ -3041,7 +3043,6 @@ static int rev_body(int s, int stype, unsigned char *context) SSL_set_bio(con, sbio, sbio); SSL_set_accept_state(con); - /* No need to free |con| after this. Done by BIO_free(ssl_bio) */ BIO_set_ssl(ssl_bio, con, BIO_CLOSE); BIO_push(io, ssl_bio); #ifdef CHARSET_EBCDIC diff --git a/worker/deps/openssl/openssl/apps/smime.c b/worker/deps/openssl/openssl/apps/smime.c index e18d7de75f..8edb1ed994 100644 --- a/worker/deps/openssl/openssl/apps/smime.c +++ b/worker/deps/openssl/openssl/apps/smime.c @@ -89,7 +89,7 @@ OPTIONS smime_options[] = { {"no-CApath", OPT_NOCAPATH, '-', "Do not load certificates from the default certificates directory"}, {"resign", OPT_RESIGN, '-', "Resign a signed message"}, - {"nochain", OPT_NOCHAIN, '-', + {"nochain", OPT_NOCHAIN, '-', "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" }, {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"}, {"stream", OPT_STREAM, '-', "Enable CMS streaming" }, diff --git a/worker/deps/openssl/openssl/apps/speed.c b/worker/deps/openssl/openssl/apps/speed.c index 6672fe606a..f388a9852d 100644 --- a/worker/deps/openssl/openssl/apps/speed.c +++ b/worker/deps/openssl/openssl/apps/speed.c @@ -129,6 +129,13 @@ #define BUFSIZE (1024*16+1) #define MAX_MISALIGNMENT 63 +#define ALGOR_NUM 30 +#define SIZE_NUM 6 +#define PRIME_NUM 3 +#define RSA_NUM 7 +#define DSA_NUM 3 + +#define EC_NUM 17 #define MAX_ECDH_SIZE 256 #define MISALIGN 64 @@ -137,6 +144,37 @@ static volatile int run = 0; static int mr = 0; static int usertime = 1; +typedef void *(*kdf_fn) ( + const void *in, size_t inlen, void *out, size_t *xoutlen); + +typedef struct loopargs_st { + ASYNC_JOB *inprogress_job; + ASYNC_WAIT_CTX *wait_ctx; + unsigned char *buf; + unsigned char *buf2; + unsigned char *buf_malloc; + unsigned char *buf2_malloc; + unsigned int siglen; +#ifndef OPENSSL_NO_RSA + RSA *rsa_key[RSA_NUM]; +#endif +#ifndef OPENSSL_NO_DSA + DSA *dsa_key[DSA_NUM]; +#endif +#ifndef OPENSSL_NO_EC + EC_KEY *ecdsa[EC_NUM]; + EC_KEY *ecdh_a[EC_NUM]; + EC_KEY *ecdh_b[EC_NUM]; + unsigned char *secret_a; + unsigned char *secret_b; + size_t outlen; + kdf_fn kdf; +#endif + EVP_CIPHER_CTX *ctx; + HMAC_CTX *hctx; + GCM128_CONTEXT *gcm_ctx; +} loopargs_t; + #ifndef OPENSSL_NO_MD2 static int EVP_Digest_MD2_loop(void *args); #endif @@ -189,6 +227,7 @@ static int ECDSA_sign_loop(void *args); static int ECDSA_verify_loop(void *args); static int ECDH_compute_key_loop(void *args); #endif +static int run_benchmark(int async_jobs, int (*loop_function)(void *), loopargs_t *loopargs); static double Time_F(int s); static void print_message(const char *s, long num, int length); @@ -199,10 +238,32 @@ static void print_result(int alg, int run_no, int count, double time_used); static int do_multi(int multi); #endif -static const int lengths[] = { +static const char *names[ALGOR_NUM] = { + "md2", "mdc2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4", + "des cbc", "des ede3", "idea cbc", "seed cbc", + "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc", + "aes-128 cbc", "aes-192 cbc", "aes-256 cbc", + "camellia-128 cbc", "camellia-192 cbc", "camellia-256 cbc", + "evp", "sha256", "sha512", "whirlpool", + "aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash" +}; + +static double results[ALGOR_NUM][SIZE_NUM]; + +static const int lengths[SIZE_NUM] = { 16, 64, 256, 1024, 8 * 1024, 16 * 1024 }; -#define SIZE_NUM OSSL_NELEM(lengths) + +#ifndef OPENSSL_NO_RSA +static double rsa_results[RSA_NUM][2]; +#endif +#ifndef OPENSSL_NO_DSA +static double dsa_results[DSA_NUM][2]; +#endif +#ifndef OPENSSL_NO_EC +static double ecdsa_results[EC_NUM][2]; +static double ecdh_results[EC_NUM][1]; +#endif #if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC) static const char rnd_seed[] = @@ -287,14 +348,9 @@ static double Time_F(int s) static void multiblock_speed(const EVP_CIPHER *evp_cipher); -#define found(value, pairs, result)\ - opt_found(value, result, pairs, OSSL_NELEM(pairs)) -static int opt_found(const char *name, unsigned int *result, - const OPT_PAIR pairs[], unsigned int nbelem) +static int found(const char *name, const OPT_PAIR *pairs, int *result) { - unsigned int idx; - - for (idx = 0; idx < nbelem; ++idx, pairs++) + for (; pairs->name; pairs++) if (strcmp(name, pairs->name) == 0) { *result = pairs->retval; return 1; @@ -331,7 +387,7 @@ OPTIONS speed_options[] = { #ifndef OPENSSL_NO_ENGINE {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"}, #endif - {NULL} + {NULL}, }; #define D_MD2 0 @@ -364,19 +420,7 @@ OPTIONS speed_options[] = { #define D_IGE_192_AES 27 #define D_IGE_256_AES 28 #define D_GHASH 29 -/* name of algorithms to test */ -static const char *names[] = { - "md2", "mdc2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4", - "des cbc", "des ede3", "idea cbc", "seed cbc", - "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc", - "aes-128 cbc", "aes-192 cbc", "aes-256 cbc", - "camellia-128 cbc", "camellia-192 cbc", "camellia-256 cbc", - "evp", "sha256", "sha512", "whirlpool", - "aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash" -}; -#define ALGOR_NUM OSSL_NELEM(names) -/* list of configured algorithm (remaining) */ -static const OPT_PAIR doit_choices[] = { +static OPT_PAIR doit_choices[] = { #ifndef OPENSSL_NO_MD2 {"md2", D_MD2}, #endif @@ -440,24 +484,21 @@ static const OPT_PAIR doit_choices[] = { {"cast", D_CBC_CAST}, {"cast5", D_CBC_CAST}, #endif - {"ghash", D_GHASH} + {"ghash", D_GHASH}, + {NULL} }; -static double results[ALGOR_NUM][SIZE_NUM]; - #ifndef OPENSSL_NO_DSA # define R_DSA_512 0 # define R_DSA_1024 1 # define R_DSA_2048 2 -static const OPT_PAIR dsa_choices[] = { +static OPT_PAIR dsa_choices[] = { {"dsa512", R_DSA_512}, {"dsa1024", R_DSA_1024}, - {"dsa2048", R_DSA_2048} + {"dsa2048", R_DSA_2048}, + {NULL}, }; -# define DSA_NUM OSSL_NELEM(dsa_choices) - -static double dsa_results[DSA_NUM][2]; /* 2 ops: sign then verify */ -#endif /* OPENSSL_NO_DSA */ +#endif #define R_RSA_512 0 #define R_RSA_1024 1 @@ -466,18 +507,16 @@ static double dsa_results[DSA_NUM][2]; /* 2 ops: sign then verify */ #define R_RSA_4096 4 #define R_RSA_7680 5 #define R_RSA_15360 6 -static const OPT_PAIR rsa_choices[] = { +static OPT_PAIR rsa_choices[] = { {"rsa512", R_RSA_512}, {"rsa1024", R_RSA_1024}, {"rsa2048", R_RSA_2048}, {"rsa3072", R_RSA_3072}, {"rsa4096", R_RSA_4096}, {"rsa7680", R_RSA_7680}, - {"rsa15360", R_RSA_15360} + {"rsa15360", R_RSA_15360}, + {NULL} }; -# define RSA_NUM OSSL_NELEM(rsa_choices) - -static double rsa_results[RSA_NUM][2]; /* 2 ops: sign then verify */ #define R_EC_P160 0 #define R_EC_P192 1 @@ -497,7 +536,7 @@ static double rsa_results[RSA_NUM][2]; /* 2 ops: sign then verify */ #define R_EC_B571 15 #define R_EC_X25519 16 #ifndef OPENSSL_NO_EC -static const OPT_PAIR ecdsa_choices[] = { +static OPT_PAIR ecdsa_choices[] = { {"ecdsap160", R_EC_P160}, {"ecdsap192", R_EC_P192}, {"ecdsap224", R_EC_P224}, @@ -513,13 +552,11 @@ static const OPT_PAIR ecdsa_choices[] = { {"ecdsab233", R_EC_B233}, {"ecdsab283", R_EC_B283}, {"ecdsab409", R_EC_B409}, - {"ecdsab571", R_EC_B571} + {"ecdsab571", R_EC_B571}, + {NULL} }; -# define ECDSA_NUM OSSL_NELEM(ecdsa_choices) - -static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */ -static const OPT_PAIR ecdh_choices[] = { +static OPT_PAIR ecdh_choices[] = { {"ecdhp160", R_EC_P160}, {"ecdhp192", R_EC_P192}, {"ecdhp224", R_EC_P224}, @@ -539,10 +576,7 @@ static const OPT_PAIR ecdh_choices[] = { {"ecdhx25519", R_EC_X25519}, {NULL} }; -# define EC_NUM OSSL_NELEM(ecdh_choices) - -static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */ -#endif /* OPENSSL_NO_EC */ +#endif #ifndef SIGALRM # define COND(d) (count < (d)) @@ -552,40 +586,7 @@ static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */ # define COUNT(d) (count) #endif /* SIGALRM */ -static unsigned int testnum; -typedef void *(*kdf_fn) (const void *in, size_t inlen, void *out, - size_t *xoutlen); - -typedef struct loopargs_st { - ASYNC_JOB *inprogress_job; - ASYNC_WAIT_CTX *wait_ctx; - unsigned char *buf; - unsigned char *buf2; - unsigned char *buf_malloc; - unsigned char *buf2_malloc; - unsigned int siglen; -#ifndef OPENSSL_NO_RSA - RSA *rsa_key[RSA_NUM]; -#endif -#ifndef OPENSSL_NO_DSA - DSA *dsa_key[DSA_NUM]; -#endif -#ifndef OPENSSL_NO_EC - EC_KEY *ecdsa[ECDSA_NUM]; - EC_KEY *ecdh_a[EC_NUM]; - EC_KEY *ecdh_b[EC_NUM]; - unsigned char *secret_a; - unsigned char *secret_b; - size_t outlen; - kdf_fn kdf; -#endif - EVP_CIPHER_CTX *ctx; - HMAC_CTX *hctx; - GCM128_CONTEXT *gcm_ctx; -} loopargs_t; - -static int run_benchmark(int async_jobs, int (*loop_function) (void *), - loopargs_t * loopargs); +static int testnum; /* Nb of iterations to do per algorithm and key-size */ static long c[ALGOR_NUM][SIZE_NUM]; @@ -994,7 +995,7 @@ static int DSA_verify_loop(void *args) #endif #ifndef OPENSSL_NO_EC -static long ecdsa_c[ECDSA_NUM][2]; +static long ecdsa_c[EC_NUM][2]; static int ECDSA_sign_loop(void *args) { loopargs_t *tempargs = *(loopargs_t **)args; @@ -1187,8 +1188,8 @@ static int run_benchmark(int async_jobs, continue; #endif - ret = ASYNC_start_job(&loopargs[i].inprogress_job, - loopargs[i].wait_ctx, &job_op_count, loop_function, + ret = ASYNC_start_job(&loopargs[i].inprogress_job, + loopargs[i].wait_ctx, &job_op_count, loop_function, (void *)(loopargs + i), sizeof(loopargs_t)); switch (ret) { case ASYNC_PAUSE: @@ -1221,23 +1222,26 @@ int speed_main(int argc, char **argv) { ENGINE *e = NULL; loopargs_t *loopargs = NULL; - const char *prog; + int async_init = 0; + int loopargs_len = 0; + char *prog; const char *engine_id = NULL; const EVP_CIPHER *evp_cipher = NULL; double d = 0.0; OPTION_CHOICE o; - int async_init = 0, multiblock = 0, pr_header = 0; + int multiblock = 0, pr_header = 0; int doit[ALGOR_NUM] = { 0 }; - int ret = 1, misalign = 0; + int ret = 1, i, k, misalign = 0; long count = 0; - unsigned int i, k, loop, loopargs_len = 0, async_jobs = 0; #ifndef NO_FORK int multi = 0; #endif + unsigned int async_jobs = 0; #if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) \ || !defined(OPENSSL_NO_EC) long rsa_count = 1; #endif + size_t loop; /* What follows are the buffers and key material. */ #ifndef OPENSSL_NO_RC5 @@ -1321,7 +1325,7 @@ int speed_main(int argc, char **argv) /* * We only test over the following curves as they are representative, To * add tests over more curves, simply add the curve NID and curve name to - * the following arrays and increase the |ecdh_choices| list accordingly. + * the following arrays and increase the EC_NUM value accordingly. */ static const unsigned int test_curves[EC_NUM] = { /* Prime Curves */ @@ -1356,7 +1360,7 @@ int speed_main(int argc, char **argv) 571, 253 /* X25519 */ }; - int ecdsa_doit[ECDSA_NUM] = { 0 }; + int ecdsa_doit[EC_NUM] = { 0 }; int ecdh_doit[EC_NUM] = { 0 }; #endif /* ndef OPENSSL_NO_EC */ @@ -1414,7 +1418,9 @@ int speed_main(int argc, char **argv) goto opterr; } if (async_jobs > 99999) { - BIO_printf(bio_err, "%s: too many async_jobs\n", prog); + BIO_printf(bio_err, + "%s: too many async_jobs\n", + prog); goto opterr; } #endif @@ -1465,8 +1471,10 @@ int speed_main(int argc, char **argv) if (strcmp(*argv, "openssl") == 0) continue; if (strcmp(*argv, "rsa") == 0) { - for (loop = 0; loop < OSSL_NELEM(rsa_doit); loop++) - rsa_doit[loop] = 1; + rsa_doit[R_RSA_512] = rsa_doit[R_RSA_1024] = + rsa_doit[R_RSA_2048] = rsa_doit[R_RSA_3072] = + rsa_doit[R_RSA_4096] = rsa_doit[R_RSA_7680] = + rsa_doit[R_RSA_15360] = 1; continue; } if (found(*argv, rsa_choices, &i)) { @@ -1499,8 +1507,8 @@ int speed_main(int argc, char **argv) #endif #ifndef OPENSSL_NO_EC if (strcmp(*argv, "ecdsa") == 0) { - for (loop = 0; loop < OSSL_NELEM(ecdsa_doit); loop++) - ecdsa_doit[loop] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdsa_choices); loop++) + ecdsa_doit[ecdsa_choices[loop].retval] = 1; continue; } if (found(*argv, ecdsa_choices, &i)) { @@ -1508,8 +1516,8 @@ int speed_main(int argc, char **argv) continue; } if (strcmp(*argv, "ecdh") == 0) { - for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++) - ecdh_doit[loop] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdh_choices); loop++) + ecdh_doit[ecdh_choices[loop].retval] = 1; continue; } if (found(*argv, ecdh_choices, &i)) { @@ -1576,10 +1584,10 @@ int speed_main(int argc, char **argv) dsa_doit[i] = 1; #endif #ifndef OPENSSL_NO_EC - for (loop = 0; loop < OSSL_NELEM(ecdsa_doit); loop++) - ecdsa_doit[loop] = 1; - for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++) - ecdh_doit[loop] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdsa_choices); loop++) + ecdsa_doit[ecdsa_choices[loop].retval] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdh_choices); loop++) + ecdh_doit[ecdh_choices[loop].retval] = 1; #endif } for (i = 0; i < ALGOR_NUM; i++) @@ -1842,8 +1850,6 @@ int speed_main(int argc, char **argv) } } } - /* default iteration count for the last EC Curve */ - ecdh_c[R_EC_X25519][0] = count / 1800; # endif # else @@ -2466,7 +2472,7 @@ int speed_main(int argc, char **argv) if (RAND_status() != 1) { RAND_seed(rnd_seed, sizeof(rnd_seed)); } - for (testnum = 0; testnum < ECDSA_NUM; testnum++) { + for (testnum = 0; testnum < EC_NUM; testnum++) { int st = 1; if (!ecdsa_doit[testnum]) @@ -2541,7 +2547,7 @@ int speed_main(int argc, char **argv) if (rsa_count <= 1) { /* if longer than 10s, don't do any more */ - for (testnum++; testnum < ECDSA_NUM; testnum++) + for (testnum++; testnum < EC_NUM; testnum++) ecdsa_doit[testnum] = 0; } } @@ -2578,7 +2584,7 @@ int speed_main(int argc, char **argv) ecdh_checks = 0; rsa_count = 1; } else { - int secret_size_a, secret_size_b, j; + int secret_size_a, secret_size_b; /* * If field size is not more than 24 octets, then use SHA-1 * hash of result; otherwise, use result (see section 4.8 of @@ -2607,8 +2613,8 @@ int speed_main(int argc, char **argv) else ecdh_checks = 1; - for (j = 0; j < secret_size_a && ecdh_checks == 1; j++) { - if (loopargs[i].secret_a[j] != loopargs[i].secret_b[j]) + for (k = 0; k < secret_size_a && ecdh_checks == 1; k++) { + if (loopargs[i].secret_a[k] != loopargs[i].secret_b[k]) ecdh_checks = 0; } @@ -2638,7 +2644,7 @@ int speed_main(int argc, char **argv) if (rsa_count <= 1) { /* if longer than 10s, don't do any more */ - for (testnum++; testnum < OSSL_NELEM(ecdh_doit); testnum++) + for (testnum++; testnum < EC_NUM; testnum++) ecdh_doit[testnum] = 0; } } @@ -2687,7 +2693,7 @@ int speed_main(int argc, char **argv) if (!doit[k]) continue; if (mr) - printf("+F:%u:%s", k, names[k]); + printf("+F:%d:%s", k, names[k]); else printf("%-13s", names[k]); for (testnum = 0; testnum < SIZE_NUM; testnum++) { @@ -2736,7 +2742,7 @@ int speed_main(int argc, char **argv) #endif #ifndef OPENSSL_NO_EC testnum = 1; - for (k = 0; k < OSSL_NELEM(ecdsa_doit); k++) { + for (k = 0; k < EC_NUM; k++) { if (!ecdsa_doit[k]) continue; if (testnum && !mr) { @@ -2794,9 +2800,8 @@ int speed_main(int argc, char **argv) DSA_free(loopargs[i].dsa_key[k]); #endif #ifndef OPENSSL_NO_EC - for (k = 0; k < ECDSA_NUM; k++) - EC_KEY_free(loopargs[i].ecdsa[k]); for (k = 0; k < EC_NUM; k++) { + EC_KEY_free(loopargs[i].ecdsa[k]); EC_KEY_free(loopargs[i].ecdh_a[k]); EC_KEY_free(loopargs[i].ecdh_b[k]); } @@ -2945,7 +2950,7 @@ static int do_multi(int multi) printf("Got: %s from %d\n", buf, n); if (strncmp(buf, "+F:", 3) == 0) { int alg; - unsigned int j; + int j; p = buf + 3; alg = atoi(sstrsep(&p, sep)); diff --git a/worker/deps/openssl/openssl/apps/verify.c b/worker/deps/openssl/openssl/apps/verify.c index 8bcbff6177..0925ee627f 100644 --- a/worker/deps/openssl/openssl/apps/verify.c +++ b/worker/deps/openssl/openssl/apps/verify.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -219,7 +219,6 @@ static int check(X509_STORE *ctx, const char *file, X509_STORE_set_flags(ctx, vflags); if (!X509_STORE_CTX_init(csc, ctx, x, uchain)) { - X509_STORE_CTX_free(csc); printf("error %s: X.509 store context initialization failed\n", (file == NULL) ? "stdin" : file); goto end; diff --git a/worker/deps/openssl/openssl/appveyor.yml b/worker/deps/openssl/openssl/appveyor.yml index ba291fdd17..8dd6cb6fb0 100644 --- a/worker/deps/openssl/openssl/appveyor.yml +++ b/worker/deps/openssl/openssl/appveyor.yml @@ -41,5 +41,5 @@ test_script: - cd _build - nmake test - mkdir ..\_install - - nmake install DESTDIR=..\_install + - nmake install install_docs DESTDIR=..\_install - cd .. diff --git a/worker/deps/openssl/openssl/config b/worker/deps/openssl/openssl/config index ef0841d12d..6331d905b4 100755 --- a/worker/deps/openssl/openssl/config +++ b/worker/deps/openssl/openssl/config @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -923,12 +923,11 @@ if [ $? = "0" ]; then if [ "$VERBOSE" = "true" ]; then echo $PERL $THERE/Configure $OUT $options - fi + fi if [ "$DRYRUN" = "false" ]; then $PERL $THERE/Configure $OUT $options fi else echo "This system ($OUT) is not supported. See file INSTALL for details." - exit 1 fi ) diff --git a/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl b/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl index d6b5f561c4..2e704a2124 100755 --- a/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl +++ b/worker/deps/openssl/openssl/crypto/aes/asm/vpaes-armv8.pl @@ -769,7 +769,7 @@ ld1 {v0.16b}, [$inp] // vmovdqu 16(%rdi),%xmm0 # load key part 2 (unaligned) bl _vpaes_schedule_transform // input transform mov $inp, #7 // mov \$7, %esi - + .Loop_schedule_256: sub $inp, $inp, #1 // dec %esi bl _vpaes_schedule_mangle // output low result @@ -778,7 +778,7 @@ // high round bl _vpaes_schedule_round cbz $inp, .Lschedule_mangle_last - bl _vpaes_schedule_mangle + bl _vpaes_schedule_mangle // low round. swap xmm7 and xmm6 dup v0.4s, v0.s[3] // vpshufd \$0xFF, %xmm0, %xmm0 @@ -787,7 +787,7 @@ mov v7.16b, v6.16b // vmovdqa %xmm6, %xmm7 bl _vpaes_schedule_low_round mov v7.16b, v5.16b // vmovdqa %xmm5, %xmm7 - + b .Loop_schedule_256 ## @@ -814,7 +814,7 @@ .Lschedule_mangle_last_dec: ld1 {v20.2d-v21.2d}, [x11] // reload constants - sub $out, $out, #16 // add \$-16, %rdx + sub $out, $out, #16 // add \$-16, %rdx eor v0.16b, v0.16b, v16.16b // vpxor .Lk_s63(%rip), %xmm0, %xmm0 bl _vpaes_schedule_transform // output transform st1 {v0.2d}, [$out] // vmovdqu %xmm0, (%rdx) # save last key diff --git a/worker/deps/openssl/openssl/crypto/arm_arch.h b/worker/deps/openssl/openssl/crypto/arm_arch.h index 25419e0df1..3fc9e69b1c 100644 --- a/worker/deps/openssl/openssl/crypto/arm_arch.h +++ b/worker/deps/openssl/openssl/crypto/arm_arch.h @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -69,7 +69,7 @@ # endif # endif -# ifndef __ASSEMBLER__ +# if !__ASSEMBLER__ extern unsigned int OPENSSL_armcap_P; # endif diff --git a/worker/deps/openssl/openssl/crypto/armcap.c b/worker/deps/openssl/openssl/crypto/armcap.c index 28e97c8c4a..432a06c0c1 100644 --- a/worker/deps/openssl/openssl/crypto/armcap.c +++ b/worker/deps/openssl/openssl/crypto/armcap.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -13,7 +13,6 @@ #include #include #include -#include #include "arm_arch.h" diff --git a/worker/deps/openssl/openssl/crypto/armv4cpuid.pl b/worker/deps/openssl/openssl/crypto/armv4cpuid.pl index ab007c19c3..f7d31a698a 100644 --- a/worker/deps/openssl/openssl/crypto/armv4cpuid.pl +++ b/worker/deps/openssl/openssl/crypto/armv4cpuid.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -125,7 +125,7 @@ ldmia sp!,{r4,r5} .Lno_data: - rsb r0,ip,#0 + neg r0,ip mov r0,r0,lsr#31 #if __ARM_ARCH__>=5 bx lr diff --git a/worker/deps/openssl/openssl/crypto/asn1/a_object.c b/worker/deps/openssl/openssl/crypto/asn1/a_object.c index 7d332ec2f6..1ec7a7e15f 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/a_object.c +++ b/worker/deps/openssl/openssl/crypto/asn1/a_object.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -19,7 +19,7 @@ int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp) { - unsigned char *p, *allocated = NULL; + unsigned char *p; int objsize; if ((a == NULL) || (a->data == NULL)) @@ -29,24 +29,13 @@ int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp) if (pp == NULL || objsize == -1) return objsize; - if (*pp == NULL) { - if ((p = allocated = OPENSSL_malloc(objsize)) == NULL) { - ASN1err(ASN1_F_I2D_ASN1_OBJECT, ERR_R_MALLOC_FAILURE); - return 0; - } - } else { - p = *pp; - } - + p = *pp; ASN1_put_object(&p, 0, a->length, V_ASN1_OBJECT, V_ASN1_UNIVERSAL); memcpy(p, a->data, a->length); + p += a->length; - /* - * If a new buffer was allocated, just return it back. - * If not, return the incremented buffer pointer. - */ - *pp = allocated != NULL ? allocated : p + a->length; - return objsize; + *pp = p; + return (objsize); } int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num) diff --git a/worker/deps/openssl/openssl/crypto/asn1/a_strex.c b/worker/deps/openssl/openssl/crypto/asn1/a_strex.c index 207190c52b..b91266b3c5 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/a_strex.c +++ b/worker/deps/openssl/openssl/crypto/asn1/a_strex.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -139,7 +139,7 @@ static int do_buf(unsigned char *buf, int buflen, int type, unsigned short flags, char *quotes, char_io *io_ch, void *arg) { - int i, outlen, len, charwidth; + int i, outlen, len; unsigned short orflags; unsigned char *p, *q; unsigned long c; @@ -147,32 +147,12 @@ static int do_buf(unsigned char *buf, int buflen, p = buf; q = buf + buflen; outlen = 0; - charwidth = type & BUF_TYPE_WIDTH_MASK; - - switch (charwidth) { - case 4: - if (buflen & 3) { - ASN1err(ASN1_F_DO_BUF, ASN1_R_INVALID_UNIVERSALSTRING_LENGTH); - return -1; - } - break; - case 2: - if (buflen & 1) { - ASN1err(ASN1_F_DO_BUF, ASN1_R_INVALID_BMPSTRING_LENGTH); - return -1; - } - break; - default: - break; - } - while (p != q) { if (p == buf && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_FIRST_ESC_2253; else orflags = 0; - - switch (charwidth) { + switch (type & BUF_TYPE_WIDTH_MASK) { case 4: c = ((unsigned long)*p++) << 24; c |= ((unsigned long)*p++) << 16; @@ -193,7 +173,6 @@ static int do_buf(unsigned char *buf, int buflen, i = UTF8_getc(p, buflen, &c); if (i < 0) return -1; /* Invalid UTF8String */ - buflen -= i; p += i; break; default: @@ -613,3 +592,53 @@ int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in) *out = stmp.data; return stmp.length; } + +/* Return 1 if host is a valid hostname and 0 otherwise */ +int asn1_valid_host(const ASN1_STRING *host) +{ + int hostlen = host->length; + const unsigned char *hostptr = host->data; + int type = host->type; + int i; + signed char width = -1; + unsigned short chflags = 0, prevchflags; + + if (type > 0 && type < 31) + width = tag2nbyte[type]; + if (width == -1 || hostlen == 0) + return 0; + /* Treat UTF8String as width 1 as any MSB set is invalid */ + if (width == 0) + width = 1; + for (i = 0 ; i < hostlen; i+= width) { + prevchflags = chflags; + /* Value must be <= 0x7F: check upper bytes are all zeroes */ + if (width == 4) { + if (*hostptr++ != 0 || *hostptr++ != 0 || *hostptr++ != 0) + return 0; + } else if (width == 2) { + if (*hostptr++ != 0) + return 0; + } + if (*hostptr > 0x7f) + return 0; + chflags = char_type[*hostptr++]; + if (!(chflags & (CHARTYPE_HOST_ANY | CHARTYPE_HOST_WILD))) { + /* Nothing else allowed at start or end of string */ + if (i == 0 || i == hostlen - 1) + return 0; + /* Otherwise invalid if not dot or hyphen */ + if (!(chflags & (CHARTYPE_HOST_DOT | CHARTYPE_HOST_HYPHEN))) + return 0; + /* + * If previous is dot or hyphen then illegal unless both + * are hyphens: as .- -. .. are all illegal + */ + if (prevchflags & (CHARTYPE_HOST_DOT | CHARTYPE_HOST_HYPHEN) + && ((prevchflags & CHARTYPE_HOST_DOT) + || (chflags & CHARTYPE_HOST_DOT))) + return 0; + } + } + return 1; +} diff --git a/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c b/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c index 9b0a2ccb20..b8ba067877 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c +++ b/worker/deps/openssl/openssl/crypto/asn1/ameth_lib.c @@ -255,18 +255,6 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags, goto err; } - /* - * One of the following must be true: - * - * pem_str == NULL AND ASN1_PKEY_ALIAS is set - * pem_str != NULL AND ASN1_PKEY_ALIAS is clear - * - * Anything else is an error and may lead to a corrupt ASN1 method table - */ - if (!((pem_str == NULL && (flags & ASN1_PKEY_ALIAS) != 0) - || (pem_str != NULL && (flags & ASN1_PKEY_ALIAS) == 0))) - goto err; - if (pem_str) { ameth->pem_str = OPENSSL_strdup(pem_str); if (!ameth->pem_str) diff --git a/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c b/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c index 5d895d3009..8602c408d9 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c +++ b/worker/deps/openssl/openssl/crypto/asn1/asn1_err.c @@ -92,10 +92,8 @@ static ERR_STRING_DATA ASN1_str_functs[] = { {ERR_FUNC(ASN1_F_D2I_AUTOPRIVATEKEY), "d2i_AutoPrivateKey"}, {ERR_FUNC(ASN1_F_D2I_PRIVATEKEY), "d2i_PrivateKey"}, {ERR_FUNC(ASN1_F_D2I_PUBLICKEY), "d2i_PublicKey"}, - {ERR_FUNC(ASN1_F_DO_BUF), "do_buf"}, {ERR_FUNC(ASN1_F_DO_TCREATE), "do_tcreate"}, {ERR_FUNC(ASN1_F_I2D_ASN1_BIO_STREAM), "i2d_ASN1_bio_stream"}, - {ERR_FUNC(ASN1_F_I2D_ASN1_OBJECT), "i2d_ASN1_OBJECT"}, {ERR_FUNC(ASN1_F_I2D_DSA_PUBKEY), "i2d_DSA_PUBKEY"}, {ERR_FUNC(ASN1_F_I2D_EC_PUBKEY), "i2d_EC_PUBKEY"}, {ERR_FUNC(ASN1_F_I2D_PRIVATEKEY), "i2d_PrivateKey"}, diff --git a/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c b/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c index da0085f680..84475e9470 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c +++ b/worker/deps/openssl/openssl/crypto/asn1/asn_mime.c @@ -969,14 +969,12 @@ static int strip_eol(char *linebuf, int *plen, int flags) p = linebuf + len - 1; for (p = linebuf + len - 1; len > 0; len--, p--) { c = *p; - if (c == '\n') { + if (c == '\n') is_eol = 1; - } else if (is_eol && flags & SMIME_ASCIICRLF && c == 32) { - /* Strip trailing space on a line; 32 == ASCII for ' ' */ + else if (is_eol && flags & SMIME_ASCIICRLF && c < 33) continue; - } else if (c != '\r') { + else if (c != '\r') break; - } } *plen = len; return is_eol; diff --git a/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c b/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c index 10a7360233..4cb7837498 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c +++ b/worker/deps/openssl/openssl/crypto/asn1/p5_scrypt.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -91,7 +91,7 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher, if (EVP_CIPHER_iv_length(cipher)) { if (aiv) memcpy(iv, aiv, EVP_CIPHER_iv_length(cipher)); - else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) <= 0) + else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0) goto err; } diff --git a/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c b/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c index 3b723a1845..caa48696da 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c +++ b/worker/deps/openssl/openssl/crypto/asn1/tasn_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -528,8 +528,6 @@ static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype, otmp = (ASN1_OBJECT *)*pval; cont = otmp->data; len = otmp->length; - if (cont == NULL || len == 0) - return -1; break; case V_ASN1_NULL: diff --git a/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c b/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c index 832603b1db..f79d7d6b44 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c +++ b/worker/deps/openssl/openssl/crypto/asn1/tasn_utl.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -76,7 +76,7 @@ int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it) } return 1; } - if (!CRYPTO_atomic_add(lck, op, &ret, *lock)) + if (CRYPTO_atomic_add(lck, op, &ret, *lock) < 0) return -1; /* failed */ #ifdef REF_PRINT fprintf(stderr, "%p:%4d:%s\n", it, *lck, it->sname); diff --git a/worker/deps/openssl/openssl/crypto/asn1/x_int64.c b/worker/deps/openssl/openssl/crypto/asn1/x_int64.c index 4433167a44..cbfa787362 100644 --- a/worker/deps/openssl/openssl/crypto/asn1/x_int64.c +++ b/worker/deps/openssl/openssl/crypto/asn1/x_int64.c @@ -262,4 +262,3 @@ ASN1_ITEM_start(ZUINT64) ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf, INTxx_FLAG_ZERO_DEFAULT, "ZUINT64" ASN1_ITEM_end(ZUINT64) - diff --git a/worker/deps/openssl/openssl/crypto/async/arch/async_null.c b/worker/deps/openssl/openssl/crypto/async/arch/async_null.c index 3eaf170f2e..da23c532b4 100644 --- a/worker/deps/openssl/openssl/crypto/async/arch/async_null.c +++ b/worker/deps/openssl/openssl/crypto/async/arch/async_null.c @@ -20,4 +20,3 @@ void async_local_cleanup(void) { } #endif - diff --git a/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h b/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h index 939b4ab183..76937a9e4d 100644 --- a/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h +++ b/worker/deps/openssl/openssl/crypto/async/arch/async_posix.h @@ -17,8 +17,7 @@ # include -# if _POSIX_VERSION >= 200112L \ - && (_POSIX_VERSION < 200809L || defined(__GLIBC__)) +# if _POSIX_VERSION >= 200112L # include diff --git a/worker/deps/openssl/openssl/crypto/async/async.c b/worker/deps/openssl/openssl/crypto/async/async.c index 0862cca21a..9a4e6b2657 100644 --- a/worker/deps/openssl/openssl/crypto/async/async.c +++ b/worker/deps/openssl/openssl/crypto/async/async.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -30,12 +30,11 @@ static CRYPTO_THREAD_LOCAL ctxkey; static CRYPTO_THREAD_LOCAL poolkey; +static void async_free_pool_internal(async_pool *pool); + static async_ctx *async_ctx_new(void) { - async_ctx *nctx; - - if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) - return NULL; + async_ctx *nctx = NULL; nctx = OPENSSL_malloc(sizeof(async_ctx)); if (nctx == NULL) { @@ -58,6 +57,9 @@ static async_ctx *async_ctx_new(void) async_ctx *async_get_ctx(void) { + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) + return NULL; + return (async_ctx *)CRYPTO_THREAD_get_local(&ctxkey); } @@ -167,19 +169,16 @@ void async_start_func(void) int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, int (*func)(void *), void *args, size_t size) { - async_ctx *ctx; - - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) - return ASYNC_ERR; - - ctx = async_get_ctx(); + async_ctx *ctx = async_get_ctx(); if (ctx == NULL) ctx = async_ctx_new(); - if (ctx == NULL) + if (ctx == NULL) { return ASYNC_ERR; + } - if (*job) + if (*job) { ctx->currjob = *job; + } for (;;) { if (ctx->currjob != NULL) { @@ -220,8 +219,9 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, } /* Start a new job */ - if ((ctx->currjob = async_get_pool_job()) == NULL) + if ((ctx->currjob = async_get_pool_job()) == NULL) { return ASYNC_NO_JOBS; + } if (args != NULL) { ctx->currjob->funcargs = OPENSSL_malloc(size); @@ -323,11 +323,12 @@ int ASYNC_init_thread(size_t max_size, size_t init_size) return 0; } - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) + if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) { return 0; - - if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) + } + if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) { return 0; + } pool = OPENSSL_zalloc(sizeof(*pool)); if (pool == NULL) { @@ -368,41 +369,32 @@ int ASYNC_init_thread(size_t max_size, size_t init_size) return 1; err: - async_empty_pool(pool); - sk_ASYNC_JOB_free(pool->jobs); - OPENSSL_free(pool); + async_free_pool_internal(pool); return 0; } -void async_delete_thread_state(void) +static void async_free_pool_internal(async_pool *pool) { - async_pool *pool = (async_pool *)CRYPTO_THREAD_get_local(&poolkey); + if (pool == NULL) + return; - if (pool != NULL) { - async_empty_pool(pool); - sk_ASYNC_JOB_free(pool->jobs); - OPENSSL_free(pool); - CRYPTO_THREAD_set_local(&poolkey, NULL); - } + async_empty_pool(pool); + sk_ASYNC_JOB_free(pool->jobs); + OPENSSL_free(pool); + CRYPTO_THREAD_set_local(&poolkey, NULL); async_local_cleanup(); async_ctx_free(); } void ASYNC_cleanup_thread(void) { - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) - return; - - async_delete_thread_state(); + async_free_pool_internal((async_pool *)CRYPTO_THREAD_get_local(&poolkey)); } ASYNC_JOB *ASYNC_get_current_job(void) { async_ctx *ctx; - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) - return NULL; - ctx = async_get_ctx(); if (ctx == NULL) return NULL; @@ -417,12 +409,7 @@ ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job) void ASYNC_block_pause(void) { - async_ctx *ctx; - - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) - return; - - ctx = async_get_ctx(); + async_ctx *ctx = async_get_ctx(); if (ctx == NULL || ctx->currjob == NULL) { /* * We're not in a job anyway so ignore this @@ -434,12 +421,7 @@ void ASYNC_block_pause(void) void ASYNC_unblock_pause(void) { - async_ctx *ctx; - - if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) - return; - - ctx = async_get_ctx(); + async_ctx *ctx = async_get_ctx(); if (ctx == NULL || ctx->currjob == NULL) { /* * We're not in a job anyway so ignore this diff --git a/worker/deps/openssl/openssl/crypto/async/async_locl.h b/worker/deps/openssl/openssl/crypto/async/async_locl.h index f0ac05a3db..0fe302a4ce 100644 --- a/worker/deps/openssl/openssl/crypto/async/async_locl.h +++ b/worker/deps/openssl/openssl/crypto/async/async_locl.h @@ -74,4 +74,3 @@ void async_start_func(void); async_ctx *async_get_ctx(void); void async_wait_ctx_reset_counts(ASYNC_WAIT_CTX *ctx); - diff --git a/worker/deps/openssl/openssl/crypto/bio/b_addr.c b/worker/deps/openssl/openssl/crypto/bio/b_addr.c index 6ed1652c8a..aea843a7b9 100644 --- a/worker/deps/openssl/openssl/crypto/bio/b_addr.c +++ b/worker/deps/openssl/openssl/crypto/bio/b_addr.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -66,18 +66,18 @@ void BIO_ADDR_clear(BIO_ADDR *ap) int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa) { if (sa->sa_family == AF_INET) { - memcpy(&(ap->s_in), sa, sizeof(struct sockaddr_in)); + ap->s_in = *(const struct sockaddr_in *)sa; return 1; } #ifdef AF_INET6 if (sa->sa_family == AF_INET6) { - memcpy(&(ap->s_in6), sa, sizeof(struct sockaddr_in6)); + ap->s_in6 = *(const struct sockaddr_in6 *)sa; return 1; } #endif #ifdef AF_UNIX if (sa->sa_family == AF_UNIX) { - memcpy(&(ap->s_un), sa, sizeof(struct sockaddr_un)); + ap->s_un = *(const struct sockaddr_un *)sa; return 1; } #endif @@ -604,8 +604,7 @@ static int addrinfo_wrap(int family, int socktype, DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init) { - if (!OPENSSL_init_crypto(0, NULL)) - return 0; + OPENSSL_init_crypto(0, NULL); bio_lookup_lock = CRYPTO_THREAD_lock_new(); return bio_lookup_lock != NULL; } diff --git a/worker/deps/openssl/openssl/crypto/bio/b_print.c b/worker/deps/openssl/openssl/crypto/bio/b_print.c index 8f50cb8c14..cdfe05f93c 100644 --- a/worker/deps/openssl/openssl/crypto/bio/b_print.c +++ b/worker/deps/openssl/openssl/crypto/bio/b_print.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -10,9 +10,9 @@ #include #include #include -#include -#include "internal/cryptlib.h" #include "internal/numbers.h" +#include "internal/cryptlib.h" +#include /* * Copyright Patrick Powell 1995 diff --git a/worker/deps/openssl/openssl/crypto/bio/b_sock.c b/worker/deps/openssl/openssl/crypto/bio/b_sock.c index fac1432787..97dcc7005e 100644 --- a/worker/deps/openssl/openssl/crypto/bio/b_sock.c +++ b/worker/deps/openssl/openssl/crypto/bio/b_sock.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -317,7 +317,7 @@ int BIO_socket_nbio(int s, int mode) l = fcntl(s, F_GETFL, 0); if (l == -1) { - SYSerr(SYS_F_FCNTL, get_last_sys_error()); + SYSerr(SYS_F_FCNTL, get_last_rtl_error()); ret = -1; } else { # if defined(O_NONBLOCK) @@ -335,7 +335,7 @@ int BIO_socket_nbio(int s, int mode) ret = fcntl(s, F_SETFL, l); if (ret < 0) { - SYSerr(SYS_F_FCNTL, get_last_sys_error()); + SYSerr(SYS_F_FCNTL, get_last_rtl_error()); } } # else diff --git a/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h b/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h index 39178cf50a..5f4b94f40b 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h +++ b/worker/deps/openssl/openssl/crypto/bio/bio_lcl.h @@ -185,4 +185,3 @@ void bio_sock_cleanup_int(void); # endif #endif - diff --git a/worker/deps/openssl/openssl/crypto/bio/bio_meth.c b/worker/deps/openssl/openssl/crypto/bio/bio_meth.c index 63a7cccc82..1e785d348f 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bio_meth.c +++ b/worker/deps/openssl/openssl/crypto/bio/bio_meth.c @@ -43,7 +43,6 @@ BIO_METHOD *BIO_meth_new(int type, const char *name) BIOerr(BIO_F_BIO_METH_NEW, ERR_R_MALLOC_FAILURE); return NULL; } - biom->type = type; return biom; } @@ -55,7 +54,7 @@ void BIO_meth_free(BIO_METHOD *biom) } } -int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int) +int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int) { return biom->bwrite; } @@ -67,7 +66,7 @@ int BIO_meth_set_write(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int) +int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int) { return biom->bread; } @@ -79,7 +78,7 @@ int BIO_meth_set_read(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *) +int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *) { return biom->bputs; } @@ -91,7 +90,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int) +int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int) { return biom->bgets; } @@ -103,7 +102,7 @@ int BIO_meth_set_gets(BIO_METHOD *biom, return 1; } -long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *) +long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *) { return biom->ctrl; } @@ -115,7 +114,7 @@ int BIO_meth_set_ctrl(BIO_METHOD *biom, return 1; } -int (*BIO_meth_get_create(const BIO_METHOD *biom)) (BIO *) +int (*BIO_meth_get_create(BIO_METHOD *biom)) (BIO *) { return biom->create; } @@ -126,7 +125,7 @@ int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)) return 1; } -int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *) +int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *) { return biom->destroy; } @@ -137,7 +136,7 @@ int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)) return 1; } -long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *) +long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *) { return biom->callback_ctrl; } diff --git a/worker/deps/openssl/openssl/crypto/bio/bss_log.c b/worker/deps/openssl/openssl/crypto/bio/bss_log.c index f090e8214b..5221acc2e3 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bss_log.c +++ b/worker/deps/openssl/openssl/crypto/bio/bss_log.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -196,7 +196,7 @@ static int slg_write(BIO *b, const char *in, int inl) if ((buf = OPENSSL_malloc(inl + 1)) == NULL) { return (0); } - memcpy(buf, in, inl); + strncpy(buf, in, inl); buf[inl] = '\0'; i = 0; @@ -404,9 +404,4 @@ static void xcloselog(BIO *bp) # endif /* Unix */ -#else /* NO_SYSLOG */ -const BIO_METHOD *BIO_s_log(void) -{ - return NULL; -} #endif /* NO_SYSLOG */ diff --git a/worker/deps/openssl/openssl/crypto/bio/bss_mem.c b/worker/deps/openssl/openssl/crypto/bio/bss_mem.c index 4c0e4d7412..ff9a3ebb41 100644 --- a/worker/deps/openssl/openssl/crypto/bio/bss_mem.c +++ b/worker/deps/openssl/openssl/crypto/bio/bss_mem.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -212,8 +212,6 @@ static int mem_write(BIO *b, const char *in, int inl) goto end; } BIO_clear_retry_flags(b); - if (inl == 0) - return 0; blen = bbm->readp->length; mem_buf_sync(b); if (BUF_MEM_grow_clean(bbm->buf, blen + inl) == 0) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl index 9632133090..1d68d6d072 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/alpha-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -297,12 +297,15 @@ mov sp,$tp mov $bp,$rp # restore rp + and sp,$hi0,$ap + bic $bp,$hi0,$bp + bis $bp,$ap,$ap # ap=borrow?tp:rp + .align 4 -.Lcopy: ldq $aj,0($tp) # conditional copy - ldq $nj,0($rp) +.Lcopy: ldq $aj,0($ap) # copy or in-place refresh lda $tp,8($tp) lda $rp,8($rp) - cmoveq $hi0,$nj,$aj + lda $ap,8($ap) stq zero,-8($tp) # zap tp cmpult $tp,$tj,AT stq $aj,-8($rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl index ddee8b7fa1..0dc4fe95e4 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/armv4-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -262,15 +262,14 @@ mov $tp,sp @ "rewind" $tp sub $rp,$rp,$aj @ "rewind" $rp -.Lcopy: ldr $tj,[$tp] @ conditional copy - ldr $aj,[$rp] + and $ap,$tp,$nhi + bic $np,$rp,$nhi + orr $ap,$ap,$np @ ap=borrow?tp:rp + +.Lcopy: ldr $tj,[$ap],#4 @ copy or in-place refresh str sp,[$tp],#4 @ zap tp -#ifdef __thumb2__ - it cc -#endif - movcc $aj,$tj - str $aj,[$rp],#4 - teq $tp,$num @ preserve carry + str $tj,[$rp],#4 + cmp $tp,$num bne .Lcopy mov sp,$num diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl index 0df1fad115..5cc5c599f9 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/ia64-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -341,19 +341,19 @@ { .mmb; sub rptr=rptr,len // rewind sub tptr=tptr,len clrrrb.pr };; -{ .mmi; mov aptr=rptr - mov bptr=tptr +{ .mmi; and aptr=tptr,topbit + andcm bptr=rptr,topbit mov pr.rot=1<<16 };; -{ .mii; cmp.eq p0,p6=topbit,r0 +{ .mii; or nptr=aptr,bptr mov ar.lc=lc - mov ar.ec=2 };; + mov ar.ec=3 };; .Lcopy_ctop: -{ .mmi; (p16) ld8 a[0]=[aptr],8 - (p16) ld8 t[0]=[bptr],8 - (p6) mov a[1]=t[1] };; // (p17) -{ .mmb; (p17) st8 [rptr]=a[1],8 - (p17) st8 [tptr]=r0,8 +{ .mmb; (p16) ld8 n[0]=[nptr],8 + (p18) st8 [tptr]=r0,8 + (p16) nop.b 0 } +{ .mmb; (p16) nop.m 0 + (p18) st8 [rptr]=n[2],8 br.ctop.sptk .Lcopy_ctop };; .Lcopy_cend: diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl index e141e1a925..a907571bec 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/mips-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -384,13 +384,15 @@ $PTR_SUB $rp,$num # restore rp not $hi1,$hi0 -.Lcopy: $LD $nj,($tp) # conditional move - $LD $aj,($rp) + and $ap,$hi0,$sp + and $bp,$hi1,$rp + or $ap,$ap,$bp # ap=borrow?tp:rp + +.align 4 +.Lcopy: $LD $aj,($ap) + $PTR_ADD $ap,$BNSZ $ST $zero,($tp) $PTR_ADD $tp,$BNSZ - and $nj,$hi0 - and $aj,$hi1 - or $aj,$nj sltu $at,$tp,$tj $ST $aj,($rp) bnez $at,.Lcopy diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl index cd9926a25f..8aa94e8511 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/parisc-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2009-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2009-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -517,6 +517,7 @@ stws,ma $hi1,4($rp) subb $ti0,%r0,$hi1 + ldo -4($tp),$tp ___ $code.=<<___ if ($BN_SZ==8); ldd,ma 8($tp),$ti0 @@ -531,19 +532,21 @@ extrd,u $ti0,31,32,$ti0 ; carry in flipped word order sub,db $ti0,%r0,$hi1 + ldo -8($tp),$tp ___ $code.=<<___; - ldo `$LOCALS+32`($fp),$tp + and $tp,$hi1,$ap + andcm $rp,$hi1,$bp + or $ap,$bp,$np + sub $rp,$arrsz,$rp ; rewind rp subi 0,$arrsz,$idx + ldo `$LOCALS+32`($fp),$tp L\$copy - ldd 0($tp),$ti0 - ldd 0($rp),$hi0 + ldd $idx($np),$hi0 std,ma %r0,8($tp) - comiclr,= 0,$hi1,%r0 - copy $ti0,$hi0 - addib,<> 8,$idx,L\$copy - std,ma $hi0,8($rp) + addib,<> 8,$idx,.-8 ; L\$copy + std,ma $hi0,8($rp) ___ if ($BN_SZ==4) { # PA-RISC 1.1 code-path @@ -853,16 +856,17 @@ stws,ma $hi1,4($rp) subb $ti0,%r0,$hi1 + ldo -4($tp),$tp + and $tp,$hi1,$ap + andcm $rp,$hi1,$bp + or $ap,$bp,$np - ldo `$LOCALS+32`($fp),$tp sub $rp,$arrsz,$rp ; rewind rp subi 0,$arrsz,$idx + ldo `$LOCALS+32`($fp),$tp L\$copy_pa11 - ldw 0($tp),$ti0 - ldw 0($rp),$hi0 + ldwx $idx($np),$hi0 stws,ma %r0,4($tp) - comiclr,= 0,$hi1,%r0 - copy $ti0,$hi0 addib,<> 4,$idx,L\$copy_pa11 stws,ma $hi0,4($rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl index 9d14a12156..5802260ca6 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/ppc-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -301,16 +301,15 @@ li $j,0 mtctr $num subfe $ovf,$j,$ovf ; handle upmost overflow bit + and $ap,$tp,$ovf + andc $np,$rp,$ovf + or $ap,$ap,$np ; ap=borrow?tp:rp .align 4 -Lcopy: ; conditional copy - $LDX $tj,$tp,$j - $LDX $aj,$rp,$j - and $tj,$tj,$ovf - andc $aj,$aj,$ovf +Lcopy: ; copy or in-place refresh + $LDX $tj,$ap,$j + $STX $tj,$rp,$j $STX $j,$tp,$j ; zap at once - or $aj,$aj,$tj - $STX $aj,$rp,$j addi $j,$j,$BNSZ bdnz Lcopy diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl index 5d9f43aa5d..1e19c958a1 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -1501,14 +1501,16 @@ li $i,0 subfe $ovf,$i,$ovf ; handle upmost overflow bit + and $ap,$tp,$ovf + andc $np,$rp,$ovf + or $ap,$ap,$np ; ap=borrow?tp:rp + addi $t7,$ap,8 mtctr $j .align 4 -Lcopy: ; conditional copy - ldx $t0,$tp,$i - ldx $t1,$t4,$i - ldx $t2,$rp,$i - ldx $t3,$t6,$i +Lcopy: ; copy or in-place refresh + ldx $t0,$ap,$i + ldx $t1,$t7,$i std $i,8($nap_d) ; zap nap_d std $i,16($nap_d) std $i,24($nap_d) @@ -1517,12 +1519,6 @@ std $i,48($nap_d) std $i,56($nap_d) stdu $i,64($nap_d) - and $t0,$t0,$ovf - and $t1,$t1,$ovf - andc $t2,$t2,$ovf - andc $t3,$t3,$ovf - or $t0,$t0,$t2 - or $t1,$t1,$t3 stdx $t0,$rp,$i stdx $t1,$t6,$i stdx $i,$tp,$i ; zap tp at once @@ -1565,21 +1561,20 @@ li $i,0 subfe $ovf,$i,$ovf ; handle upmost overflow bit - addi $ap,$sp,`$FRAME+$TRANSFER+4` + addi $tp,$sp,`$FRAME+$TRANSFER+4` subf $rp,$num,$rp ; rewind rp + and $ap,$tp,$ovf + andc $np,$rp,$ovf + or $ap,$ap,$np ; ap=borrow?tp:rp addi $tp,$sp,`$FRAME+$TRANSFER` mtctr $j .align 4 -Lcopy: ; conditional copy +Lcopy: ; copy or in-place refresh lwz $t0,4($ap) lwz $t1,8($ap) lwz $t2,12($ap) lwzu $t3,16($ap) - lwz $t4,4($rp) - lwz $t5,8($rp) - lwz $t6,12($rp) - lwz $t7,16($rp) std $i,8($nap_d) ; zap nap_d std $i,16($nap_d) std $i,24($nap_d) @@ -1588,18 +1583,6 @@ std $i,48($nap_d) std $i,56($nap_d) stdu $i,64($nap_d) - and $t0,$t0,$ovf - and $t1,$t1,$ovf - and $t2,$t2,$ovf - and $t3,$t3,$ovf - andc $t4,$t4,$ovf - andc $t5,$t5,$ovf - andc $t6,$t6,$ovf - andc $t7,$t7,$ovf - or $t0,$t0,$t4 - or $t1,$t1,$t5 - or $t2,$t2,$t6 - or $t3,$t3,$t7 stw $t0,4($rp) stw $t1,8($rp) stw $t2,12($rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl b/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl index 0466e11a25..46d746b7d0 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/rsaz-avx2.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2013-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -104,7 +104,7 @@ $addx = ($1>=11); } -if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) { +if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) { my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10 $avx = ($ver>=3.0) + ($ver>=3.01); $addx = ($ver>=3.03); diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl index 66780cdf80..2205bc2ca0 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/s390x-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -252,16 +252,16 @@ brct $count,.Lsub lghi $ahi,0 slbgr $AHI,$ahi # handle upmost carry - lghi $NHI,-1 - xgr $NHI,$AHI + + ngr $ap,$AHI + lghi $np,-1 + xgr $np,$AHI + ngr $np,$rp + ogr $ap,$np # ap=borrow?tp:rp la $j,0(%r0) lgr $count,$num -.Lcopy: lg $ahi,$stdframe($j,$sp) # conditional copy - lg $alo,0($j,$rp) - ngr $ahi,$AHI - ngr $alo,$NHI - ogr $alo,$ahi +.Lcopy: lg $alo,0($j,$ap) # copy or in-place refresh _dswap $alo stg $j,$stdframe($j,$sp) # zap tp stg $alo,0($j,$rp) diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl index 4f339b2279..4faf66f10a 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/sparct4-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -888,17 +888,19 @@ () sub $tp, $num, $tp sub $rp, $num, $rp - subccc $ovf, %g0, $ovf ! handle upmost overflow bit + subc $ovf, %g0, $ovf ! handle upmost overflow bit + and $tp, $ovf, $ap + andn $rp, $ovf, $np + or $np, $ap, $ap ! ap=borrow?tp:rp ba .Lcopy sub $num, 8, $cnt .align 16 -.Lcopy: ! conditional copy - ldx [$tp], $tj - ldx [$rp+0], $t2 +.Lcopy: ! copy or in-place refresh + ldx [$ap+0], $t2 + add $ap, 8, $ap stx %g0, [$tp] ! zap add $tp, 8, $tp - movcs %icc, $tj, $t2 stx $t2, [$rp+0] add $rp, 8, $rp brnz $cnt, .Lcopy @@ -1134,17 +1136,19 @@ () sub $tp, $num, $tp sub $rp, $num, $rp - subccc $ovf, %g0, $ovf ! handle upmost overflow bit + subc $ovf, %g0, $ovf ! handle upmost overflow bit + and $tp, $ovf, $ap + andn $rp, $ovf, $np + or $np, $ap, $ap ! ap=borrow?tp:rp ba .Lcopy_g5 sub $num, 8, $cnt .align 16 -.Lcopy_g5: ! conditional copy - ldx [$tp], $tj - ldx [$rp+0], $t2 +.Lcopy_g5: ! copy or in-place refresh + ldx [$ap+0], $t2 + add $ap, 8, $ap stx %g0, [$tp] ! zap add $tp, 8, $tp - movcs %icc, $tj, $t2 stx $t2, [$rp+0] add $rp, 8, $rp brnz $cnt, .Lcopy_g5 diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl index 074f9df14b..6807c8b6e0 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/sparcv9-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -265,6 +265,7 @@ .Ltail: add $np,$num,$np add $rp,$num,$rp + mov $tp,$ap sub %g0,$num,%o7 ! k=-num ba .Lsub subcc %g0,%g0,%g0 ! clear %icc.c @@ -277,14 +278,15 @@ add %o7,4,%o7 brnz %o7,.Lsub st %o1,[$i] - subccc $car2,0,$car2 ! handle upmost overflow bit + subc $car2,0,$car2 ! handle upmost overflow bit + and $tp,$car2,$ap + andn $rp,$car2,$np + or $ap,$np,$ap sub %g0,$num,%o7 .Lcopy: - ld [$tp+%o7],%o1 ! conditional copy - ld [$rp+%o7],%o0 + ld [$ap+%o7],%o0 ! copy or in-place refresh st %g0,[$tp+%o7] ! zap tp - movcs %icc,%o1,%o0 st %o0,[$rp+%o7] add %o7,4,%o7 brnz %o7,.Lcopy @@ -493,9 +495,6 @@ mulx $npj,$mul1,$acc1 add $tpj,$car1,$car1 ld [$np+$j],$npj ! np[j] - srlx $car1,32,$tmp0 - and $car1,$mask,$car1 - add $tmp0,$sbit,$sbit add $acc0,$car1,$car1 ld [$tp+8],$tpj ! tp[j] add $acc1,$car1,$car1 diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl index 9d65a146a2..9f81bc822e 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/via-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -213,15 +213,18 @@ &mov ("eax",&DWP(0,"esi","edx",4)); # upmost overflow bit &sbb ("eax",0); + &and ("esi","eax"); + ¬ ("eax"); + &mov ("ebp","edi"); + &and ("ebp","eax"); + &or ("esi","ebp"); # tp=carry?tp:rp &mov ("ecx","edx"); # num - &mov ("edx",0); # i=0 + &xor ("edx","edx"); # i=0 &set_label("copy",8); - &mov ("ebx",&DWP(0,"esi","edx",4)); - &mov ("eax",&DWP(0,"edi","edx",4)); - &mov (&DWP(0,"esi","edx",4),"ecx"); # zap tp - &cmovc ("eax","ebx"); + &mov ("eax",&DWP(0,"esi","edx",4)); + &mov (&DWP(64,"esp","edx",4),"ecx"); # zap tp &mov (&DWP(0,"edi","edx",4),"eax"); &lea ("edx",&DWP(1,"edx")); # i++ &loop (&label("copy")); diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl index ba34b36a81..64dba4480f 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/vis3-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -310,23 +310,23 @@ sub $anp, $num, $anp sub $rp, $num, $rp - subccc $ovf, %g0, $ovf ! handle upmost overflow bit + subc $ovf, %g0, $ovf ! handle upmost overflow bit + and $tp, $ovf, $ap + andn $rp, $ovf, $np + or $np, $ap, $ap ! ap=borrow?tp:rp ba .Lcopy sub $num, 8, $cnt .align 16 -.Lcopy: ! conditional copy - ld [$tp+0], $t0 - ld [$tp+4], $t1 - ld [$rp+0], $t2 - ld [$rp+4], $t3 +.Lcopy: ! copy or in-place refresh + ld [$ap+0], $t2 + ld [$ap+4], $t3 + add $ap, 8, $ap stx %g0, [$tp] ! zap add $tp, 8, $tp stx %g0, [$anp] ! zap stx %g0, [$anp+8] add $anp, 16, $anp - movcs %icc, $t0, $t2 - movcs %icc, $t1, $t3 st $t3, [$rp+0] ! flip order st $t2, [$rp+4] add $rp, 8, $rp diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl index f1abcc5b4c..a8b402d59b 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -39,7 +39,7 @@ $output = pop; open STDOUT,">$output"; - + &asm_init($ARGV[0],$0); $sse2=0; @@ -604,18 +604,16 @@ &jge (&label("sub")); &sbb ("eax",0); # handle upmost overflow bit - &mov ("edx",-1); - &xor ("edx","eax"); - &jmp (&label("copy")); - -&set_label("copy",16); # conditional copy - &mov ($tp,&DWP($frame,"esp",$num,4)); - &mov ($np,&DWP(0,$rp,$num,4)); - &mov (&DWP($frame,"esp",$num,4),$j); # zap temporary vector &and ($tp,"eax"); - &and ($np,"edx"); - &or ($np,$tp); - &mov (&DWP(0,$rp,$num,4),$np); + ¬ ("eax"); + &mov ($np,$rp); + &and ($np,"eax"); + &or ($tp,$np); # tp=carry?tp:rp + +&set_label("copy",16); # copy or in-place refresh + &mov ("eax",&DWP(0,$tp,$num,4)); + &mov (&DWP(0,$rp,$num,4),"eax"); # rp[i]=tp[i] + &mov (&DWP($frame,"esp",$num,4),$j); # zap temporary vector &dec ($num); &jge (&label("copy")); diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c index 621be33054..0ff3805a61 100644 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -64,6 +64,12 @@ * machine. */ +# if defined(_WIN64) || !defined(__LP64__) +# define BN_ULONG unsigned long long +# else +# define BN_ULONG unsigned long +# endif + # undef mul # undef mul_add diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl index 8d2fb2cebb..df4cca5bfe 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -302,30 +302,30 @@ xor $i,$i # i=0 and clear CF! mov (%rsp),%rax # tp[0] + lea (%rsp),$ap # borrow ap for tp mov $num,$j # j=num - + jmp .Lsub .align 16 .Lsub: sbb ($np,$i,8),%rax mov %rax,($rp,$i,8) # rp[i]=tp[i]-np[i] - mov 8(%rsp,$i,8),%rax # tp[i+1] + mov 8($ap,$i,8),%rax # tp[i+1] lea 1($i),$i # i++ dec $j # doesnn't affect CF! jnz .Lsub sbb \$0,%rax # handle upmost overflow bit - mov \$-1,%rbx - xor %rax,%rbx # not %rax xor $i,$i + and %rax,$ap + not %rax + mov $rp,$np + and %rax,$np mov $num,$j # j=num - -.Lcopy: # conditional copy - mov ($rp,$i,8),%rcx - mov (%rsp,$i,8),%rdx - and %rbx,%rcx - and %rax,%rdx - mov $num,(%rsp,$i,8) # zap temporary vector - or %rcx,%rdx - mov %rdx,($rp,$i,8) # rp[i]=tp[i] + or $np,$ap # ap=borrow?tp:rp +.align 16 +.Lcopy: # copy or in-place refresh + mov ($ap,$i,8),%rax + mov $i,(%rsp,$i,8) # zap temporary vector + mov %rax,($rp,$i,8) # rp[i]=tp[i] lea 1($i),$i sub \$1,$j jnz .Lcopy @@ -695,10 +695,10 @@ my @ri=("%rax","%rdx",$m0,$m1); $code.=<<___; mov 16(%rsp,$num,8),$rp # restore $rp - lea -4($num),$j mov 0(%rsp),@ri[0] # tp[0] + pxor %xmm0,%xmm0 mov 8(%rsp),@ri[1] # tp[1] - shr \$2,$j # j=num/4-1 + shr \$2,$num # num/=4 lea (%rsp),$ap # borrow ap for tp xor $i,$i # i=0 and clear CF! @@ -706,7 +706,9 @@ mov 16($ap),@ri[2] # tp[2] mov 24($ap),@ri[3] # tp[3] sbb 8($np),@ri[1] - + lea -1($num),$j # j=num/4-1 + jmp .Lsub4x +.align 16 .Lsub4x: mov @ri[0],0($rp,$i,8) # rp[i]=tp[i]-np[i] mov @ri[1],8($rp,$i,8) # rp[i]=tp[i]-np[i] @@ -733,35 +735,34 @@ sbb \$0,@ri[0] # handle upmost overflow bit mov @ri[3],24($rp,$i,8) # rp[i]=tp[i]-np[i] - pxor %xmm0,%xmm0 - movq @ri[0],%xmm4 - pcmpeqd %xmm5,%xmm5 - pshufd \$0,%xmm4,%xmm4 - mov $num,$j - pxor %xmm4,%xmm5 - shr \$2,$j # j=num/4 - xor %eax,%eax # i=0 - + xor $i,$i # i=0 + and @ri[0],$ap + not @ri[0] + mov $rp,$np + and @ri[0],$np + lea -1($num),$j + or $np,$ap # ap=borrow?tp:rp + + movdqu ($ap),%xmm1 + movdqa %xmm0,(%rsp) + movdqu %xmm1,($rp) jmp .Lcopy4x .align 16 -.Lcopy4x: # conditional copy - movdqa (%rsp,%rax),%xmm1 - movdqu ($rp,%rax),%xmm2 - pand %xmm4,%xmm1 - pand %xmm5,%xmm2 - movdqa 16(%rsp,%rax),%xmm3 - movdqa %xmm0,(%rsp,%rax) - por %xmm2,%xmm1 - movdqu 16($rp,%rax),%xmm2 - movdqu %xmm1,($rp,%rax) - pand %xmm4,%xmm3 - pand %xmm5,%xmm2 - movdqa %xmm0,16(%rsp,%rax) - por %xmm2,%xmm3 - movdqu %xmm3,16($rp,%rax) - lea 32(%rax),%rax +.Lcopy4x: # copy or in-place refresh + movdqu 16($ap,$i),%xmm2 + movdqu 32($ap,$i),%xmm1 + movdqa %xmm0,16(%rsp,$i) + movdqu %xmm2,16($rp,$i) + movdqa %xmm0,32(%rsp,$i) + movdqu %xmm1,32($rp,$i) + lea 32($i),$i dec $j jnz .Lcopy4x + + shl \$2,$num + movdqu 16($ap,$i),%xmm2 + movdqa %xmm0,16(%rsp,$i) + movdqu %xmm2,16($rp,$i) ___ } $code.=<<___; diff --git a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl index 97d8eee700..5779059ea2 100755 --- a/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl +++ b/worker/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -414,19 +414,18 @@ jnz .Lsub sbb \$0,%rax # handle upmost overflow bit - mov \$-1,%rbx - xor %rax,%rbx xor $i,$i + and %rax,$ap + not %rax + mov $rp,$np + and %rax,$np mov $num,$j # j=num - -.Lcopy: # conditional copy - mov ($rp,$i,8),%rcx - mov (%rsp,$i,8),%rdx - and %rbx,%rcx - and %rax,%rdx + or $np,$ap # ap=borrow?tp:rp +.align 16 +.Lcopy: # copy or in-place refresh + mov ($ap,$i,8),%rax mov $i,(%rsp,$i,8) # zap temporary vector - or %rcx,%rdx - mov %rdx,($rp,$i,8) # rp[i]=tp[i] + mov %rax,($rp,$i,8) # rp[i]=tp[i] lea 1($i),$i sub \$1,$j jnz .Lcopy diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_blind.c b/worker/deps/openssl/openssl/crypto/bn/bn_blind.c index 9474e21e4c..24d138309d 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_blind.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_blind.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -109,15 +109,10 @@ int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx) if (!BN_BLINDING_create_param(b, NULL, NULL, ctx, NULL, NULL)) goto err; } else if (!(b->flags & BN_BLINDING_NO_UPDATE)) { - if (b->m_ctx != NULL) { - if (!bn_mul_mont_fixed_top(b->Ai, b->Ai, b->Ai, b->m_ctx, ctx) - || !bn_mul_mont_fixed_top(b->A, b->A, b->A, b->m_ctx, ctx)) - goto err; - } else { - if (!BN_mod_mul(b->Ai, b->Ai, b->Ai, b->mod, ctx) - || !BN_mod_mul(b->A, b->A, b->A, b->mod, ctx)) - goto err; - } + if (!BN_mod_mul(b->A, b->A, b->A, b->mod, ctx)) + goto err; + if (!BN_mod_mul(b->Ai, b->Ai, b->Ai, b->mod, ctx)) + goto err; } ret = 1; @@ -149,13 +144,13 @@ int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) else if (!BN_BLINDING_update(b, ctx)) return (0); - if (r != NULL && (BN_copy(r, b->Ai) == NULL)) - return 0; + if (r != NULL) { + if (!BN_copy(r, b->Ai)) + ret = 0; + } - if (b->m_ctx != NULL) - ret = BN_mod_mul_montgomery(n, n, b->A, b->m_ctx, ctx); - else - ret = BN_mod_mul(n, n, b->A, b->mod, ctx); + if (!BN_mod_mul(n, n, b->A, b->mod, ctx)) + ret = 0; return ret; } @@ -172,29 +167,14 @@ int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, bn_check_top(n); - if (r == NULL && (r = b->Ai) == NULL) { - BNerr(BN_F_BN_BLINDING_INVERT_EX, BN_R_NOT_INITIALIZED); - return 0; - } - - if (b->m_ctx != NULL) { - /* ensure that BN_mod_mul_montgomery takes pre-defined path */ - if (n->dmax >= r->top) { - size_t i, rtop = r->top, ntop = n->top; - BN_ULONG mask; - - for (i = 0; i < rtop; i++) { - mask = (BN_ULONG)0 - ((i - ntop) >> (8 * sizeof(i) - 1)); - n->d[i] &= mask; - } - mask = (BN_ULONG)0 - ((rtop - ntop) >> (8 * sizeof(ntop) - 1)); - /* always true, if (rtop >= ntop) n->top = r->top; */ - n->top = (int)(rtop & ~mask) | (ntop & mask); - n->flags |= (BN_FLG_FIXED_TOP & ~mask); - } - ret = BN_mod_mul_montgomery(n, n, r, b->m_ctx, ctx); - } else { + if (r != NULL) ret = BN_mod_mul(n, n, r, b->mod, ctx); + else { + if (b->Ai == NULL) { + BNerr(BN_F_BN_BLINDING_INVERT_EX, BN_R_NOT_INITIALIZED); + return (0); + } + ret = BN_mod_mul(n, n, b->Ai, b->mod, ctx); } bn_check_top(n); @@ -273,35 +253,31 @@ BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b, int rv; if (!BN_rand_range(ret->A, ret->mod)) goto err; - if (int_bn_mod_inverse(ret->Ai, ret->A, ret->mod, ctx, &rv)) + if (!int_bn_mod_inverse(ret->Ai, ret->A, ret->mod, ctx, &rv)) { + /* + * this should almost never happen for good RSA keys + */ + if (rv) { + if (retry_counter-- == 0) { + BNerr(BN_F_BN_BLINDING_CREATE_PARAM, + BN_R_TOO_MANY_ITERATIONS); + goto err; + } + } else + goto err; + } else break; - - /* - * this should almost never happen for good RSA keys - */ - if (!rv) - goto err; - - if (retry_counter-- == 0) { - BNerr(BN_F_BN_BLINDING_CREATE_PARAM, BN_R_TOO_MANY_ITERATIONS); - goto err; - } } while (1); if (ret->bn_mod_exp != NULL && ret->m_ctx != NULL) { - if (!ret->bn_mod_exp(ret->A, ret->A, ret->e, ret->mod, ctx, ret->m_ctx)) + if (!ret->bn_mod_exp + (ret->A, ret->A, ret->e, ret->mod, ctx, ret->m_ctx)) goto err; } else { if (!BN_mod_exp(ret->A, ret->A, ret->e, ret->mod, ctx)) goto err; } - if (ret->m_ctx != NULL) { - if (!bn_to_mont_fixed_top(ret->Ai, ret->Ai, ret->m_ctx, ctx) - || !bn_to_mont_fixed_top(ret->A, ret->A, ret->m_ctx, ctx)) - goto err; - } - return ret; err: if (b == NULL) { diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_div.c b/worker/deps/openssl/openssl/crypto/bn/bn_div.c index 884ff29917..5e620b2096 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_div.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_div.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -240,7 +240,6 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor, wnum.neg = 0; wnum.d = &(snum->d[loop]); wnum.top = div_n; - wnum.flags = BN_FLG_STATIC_DATA; /* * only needed when BN_ucmp messes up the values between top and max */ diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_exp.c b/worker/deps/openssl/openssl/crypto/bn/bn_exp.c index a6ad475a0b..0d2d1eca6b 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_exp.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_exp.c @@ -188,8 +188,8 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, bits = BN_num_bits(p); if (bits == 0) { - /* x**0 mod 1, or x**0 mod -1 is still zero. */ - if (BN_abs_is_word(m, 1)) { + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) { ret = 1; BN_zero(r); } else { @@ -330,8 +330,8 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, } bits = BN_num_bits(p); if (bits == 0) { - /* x**0 mod 1, or x**0 mod -1 is still zero. */ - if (BN_abs_is_word(m, 1)) { + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) { ret = 1; BN_zero(rr); } else { @@ -371,17 +371,17 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, ret = 1; goto err; } - if (!bn_to_mont_fixed_top(val[0], aa, mont, ctx)) + if (!BN_to_montgomery(val[0], aa, mont, ctx)) goto err; /* 1 */ window = BN_window_bits_for_exponent_size(bits); if (window > 1) { - if (!bn_mul_mont_fixed_top(d, val[0], val[0], mont, ctx)) + if (!BN_mod_mul_montgomery(d, val[0], val[0], mont, ctx)) goto err; /* 2 */ j = 1 << (window - 1); for (i = 1; i < j; i++) { if (((val[i] = BN_CTX_get(ctx)) == NULL) || - !bn_mul_mont_fixed_top(val[i], val[i - 1], d, mont, ctx)) + !BN_mod_mul_montgomery(val[i], val[i - 1], d, mont, ctx)) goto err; } } @@ -403,15 +403,19 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, for (i = 1; i < j; i++) r->d[i] = (~m->d[i]) & BN_MASK2; r->top = j; - r->flags |= BN_FLG_FIXED_TOP; + /* + * Upper words will be zero if the corresponding words of 'm' were + * 0xfff[...], so decrement r->top accordingly. + */ + bn_correct_top(r); } else #endif - if (!bn_to_mont_fixed_top(r, BN_value_one(), mont, ctx)) + if (!BN_to_montgomery(r, BN_value_one(), mont, ctx)) goto err; for (;;) { if (BN_is_bit_set(p, wstart) == 0) { if (!start) { - if (!bn_mul_mont_fixed_top(r, r, r, mont, ctx)) + if (!BN_mod_mul_montgomery(r, r, r, mont, ctx)) goto err; } if (wstart == 0) @@ -442,12 +446,12 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, /* add the 'bytes above' */ if (!start) for (i = 0; i < j; i++) { - if (!bn_mul_mont_fixed_top(r, r, r, mont, ctx)) + if (!BN_mod_mul_montgomery(r, r, r, mont, ctx)) goto err; } /* wvalue will be an odd number < 2^window */ - if (!bn_mul_mont_fixed_top(r, r, val[wvalue >> 1], mont, ctx)) + if (!BN_mod_mul_montgomery(r, r, val[wvalue >> 1], mont, ctx)) goto err; /* move the 'window' down further */ @@ -457,11 +461,6 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, if (wstart < 0) break; } - /* - * Done with zero-padded intermediate BIGNUMs. Final BN_from_montgomery - * removes padding [if any] and makes return value suitable for public - * API consumer. - */ #if defined(SPARC_T4_MONT) if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) { j = mont->N.top; /* borrow j */ @@ -588,7 +587,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, } b->top = top; - b->flags |= BN_FLG_FIXED_TOP; + bn_correct_top(b); return 1; } @@ -640,8 +639,8 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, */ bits = p->top * BN_BITS2; if (bits == 0) { - /* x**0 mod 1, or x**0 mod -1 is still zero. */ - if (BN_abs_is_word(m, 1)) { + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) { ret = 1; BN_zero(rr); } else { @@ -758,16 +757,16 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, tmp.top = top; } else #endif - if (!bn_to_mont_fixed_top(&tmp, BN_value_one(), mont, ctx)) + if (!BN_to_montgomery(&tmp, BN_value_one(), mont, ctx)) goto err; /* prepare a^1 in Montgomery domain */ if (a->neg || BN_ucmp(a, m) >= 0) { if (!BN_mod(&am, a, m, ctx)) goto err; - if (!bn_to_mont_fixed_top(&am, &am, mont, ctx)) + if (!BN_to_montgomery(&am, &am, mont, ctx)) goto err; - } else if (!bn_to_mont_fixed_top(&am, a, mont, ctx)) + } else if (!BN_to_montgomery(&am, a, mont, ctx)) goto err; #if defined(SPARC_T4_MONT) @@ -1034,14 +1033,14 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, * performance advantage of sqr over mul). */ if (window > 1) { - if (!bn_mul_mont_fixed_top(&tmp, &am, &am, mont, ctx)) + if (!BN_mod_mul_montgomery(&tmp, &am, &am, mont, ctx)) goto err; if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 2, window)) goto err; for (i = 3; i < numPowers; i++) { /* Calculate a^i = a^(i-1) * a */ - if (!bn_mul_mont_fixed_top(&tmp, &am, &tmp, mont, ctx)) + if (!BN_mod_mul_montgomery(&tmp, &am, &tmp, mont, ctx)) goto err; if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, i, window)) @@ -1065,7 +1064,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, /* Scan the window, squaring the result as we go */ for (i = 0; i < window; i++, bits--) { - if (!bn_mul_mont_fixed_top(&tmp, &tmp, &tmp, mont, ctx)) + if (!BN_mod_mul_montgomery(&tmp, &tmp, &tmp, mont, ctx)) goto err; wvalue = (wvalue << 1) + BN_is_bit_set(p, bits); } @@ -1078,16 +1077,12 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, goto err; /* Multiply the result into the intermediate result */ - if (!bn_mul_mont_fixed_top(&tmp, &tmp, &am, mont, ctx)) + if (!BN_mod_mul_montgomery(&tmp, &tmp, &am, mont, ctx)) goto err; } } - /* - * Done with zero-padded intermediate BIGNUMs. Final BN_from_montgomery - * removes padding [if any] and makes return value suitable for public - * API consumer. - */ + /* Convert the final result from montgomery to standard format */ #if defined(SPARC_T4_MONT) if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) { am.d[0] = 1; /* borrow am */ @@ -1156,8 +1151,8 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, bits = BN_num_bits(p); if (bits == 0) { - /* x**0 mod 1, or x**0 mod -1 is still zero. */ - if (BN_abs_is_word(m, 1)) { + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) { ret = 1; BN_zero(rr); } else { @@ -1278,9 +1273,9 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, } bits = BN_num_bits(p); - if (bits == 0) { - /* x**0 mod 1, or x**0 mod -1 is still zero. */ - if (BN_abs_is_word(m, 1)) { + if (bits == 0) { + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) { ret = 1; BN_zero(r); } else { diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c b/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c index bed231c8fa..067642644e 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_gcd.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -140,14 +140,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in, BIGNUM *ret = NULL; int sign; - /* This is invalid input so we don't worry about constant time here */ - if (BN_abs_is_word(n, 1) || BN_is_zero(n)) { - if (pnoinv != NULL) - *pnoinv = 1; - return NULL; - } - - if (pnoinv != NULL) + if (pnoinv) *pnoinv = 0; if ((BN_get_flags(a, BN_FLG_CONSTTIME) != 0) diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c b/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c index d80f3ec940..b1987f55dd 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_gf2m.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -32,32 +32,30 @@ */ # define MAX_ITERATIONS 50 -# define SQR_nibble(w) ((((w) & 8) << 3) \ - | (((w) & 4) << 2) \ - | (((w) & 2) << 1) \ - | ((w) & 1)) - +static const BN_ULONG SQR_tb[16] = { 0, 1, 4, 5, 16, 17, 20, 21, + 64, 65, 68, 69, 80, 81, 84, 85 +}; /* Platform-specific macros to accelerate squaring. */ # if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG) # define SQR1(w) \ - SQR_nibble((w) >> 60) << 56 | SQR_nibble((w) >> 56) << 48 | \ - SQR_nibble((w) >> 52) << 40 | SQR_nibble((w) >> 48) << 32 | \ - SQR_nibble((w) >> 44) << 24 | SQR_nibble((w) >> 40) << 16 | \ - SQR_nibble((w) >> 36) << 8 | SQR_nibble((w) >> 32) + SQR_tb[(w) >> 60 & 0xF] << 56 | SQR_tb[(w) >> 56 & 0xF] << 48 | \ + SQR_tb[(w) >> 52 & 0xF] << 40 | SQR_tb[(w) >> 48 & 0xF] << 32 | \ + SQR_tb[(w) >> 44 & 0xF] << 24 | SQR_tb[(w) >> 40 & 0xF] << 16 | \ + SQR_tb[(w) >> 36 & 0xF] << 8 | SQR_tb[(w) >> 32 & 0xF] # define SQR0(w) \ - SQR_nibble((w) >> 28) << 56 | SQR_nibble((w) >> 24) << 48 | \ - SQR_nibble((w) >> 20) << 40 | SQR_nibble((w) >> 16) << 32 | \ - SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | \ - SQR_nibble((w) >> 4) << 8 | SQR_nibble((w) ) + SQR_tb[(w) >> 28 & 0xF] << 56 | SQR_tb[(w) >> 24 & 0xF] << 48 | \ + SQR_tb[(w) >> 20 & 0xF] << 40 | SQR_tb[(w) >> 16 & 0xF] << 32 | \ + SQR_tb[(w) >> 12 & 0xF] << 24 | SQR_tb[(w) >> 8 & 0xF] << 16 | \ + SQR_tb[(w) >> 4 & 0xF] << 8 | SQR_tb[(w) & 0xF] # endif # ifdef THIRTY_TWO_BIT # define SQR1(w) \ - SQR_nibble((w) >> 28) << 24 | SQR_nibble((w) >> 24) << 16 | \ - SQR_nibble((w) >> 20) << 8 | SQR_nibble((w) >> 16) + SQR_tb[(w) >> 28 & 0xF] << 24 | SQR_tb[(w) >> 24 & 0xF] << 16 | \ + SQR_tb[(w) >> 20 & 0xF] << 8 | SQR_tb[(w) >> 16 & 0xF] # define SQR0(w) \ - SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | \ - SQR_nibble((w) >> 4) << 8 | SQR_nibble((w) ) + SQR_tb[(w) >> 12 & 0xF] << 24 | SQR_tb[(w) >> 8 & 0xF] << 16 | \ + SQR_tb[(w) >> 4 & 0xF] << 8 | SQR_tb[(w) & 0xF] # endif # if !defined(OPENSSL_BN_ASM_GF2m) diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_intern.c b/worker/deps/openssl/openssl/crypto/bn/bn_intern.c index 7b25927f9b..2c970647de 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_intern.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_intern.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -177,20 +177,16 @@ BN_ULONG *bn_get_words(const BIGNUM *a) return a->d; } -void bn_set_static_words(BIGNUM *a, const BN_ULONG *words, int size) +void bn_set_static_words(BIGNUM *a, BN_ULONG *words, int size) { - /* - * |const| qualifier omission is compensated by BN_FLG_STATIC_DATA - * flag, which effectively means "read-only data". - */ - a->d = (BN_ULONG *)words; + a->d = words; a->dmax = a->top = size; a->neg = 0; a->flags |= BN_FLG_STATIC_DATA; bn_correct_top(a); } -int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words) +int bn_set_words(BIGNUM *a, BN_ULONG *words, int num_words) { if (bn_wexpand(a, num_words) == NULL) { BNerr(BN_F_BN_SET_WORDS, ERR_R_MALLOC_FAILURE); diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h b/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h index 4d9808f5b8..5fb3814554 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h +++ b/worker/deps/openssl/openssl/crypto/bn/bn_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -145,16 +145,7 @@ extern "C" { */ # ifdef BN_DEBUG -/* - * The new BN_FLG_FIXED_TOP flag marks vectors that were not treated with - * bn_correct_top, in other words such vectors are permitted to have zeros - * in most significant limbs. Such vectors are used internally to achieve - * execution time invariance for critical operations with private keys. - * It's BN_DEBUG-only flag, because user application is not supposed to - * observe it anyway. Moreover, optimizing compiler would actually remove - * all operations manipulating the bit in question in non-BN_DEBUG build. - */ -# define BN_FLG_FIXED_TOP 0x10000 + # ifdef BN_DEBUG_RAND /* To avoid "make update" cvs wars due to BN_DEBUG, use some tricks */ # ifndef RAND_bytes @@ -186,10 +177,8 @@ int RAND_bytes(unsigned char *buf, int num); do { \ const BIGNUM *_bnum2 = (a); \ if (_bnum2 != NULL) { \ - int _top = _bnum2->top; \ - OPENSSL_assert((_top == 0 && !_bnum2->neg) || \ - (_top && ((_bnum2->flags & BN_FLG_FIXED_TOP) \ - || _bnum2->d[_top - 1] != 0))); \ + OPENSSL_assert(((_bnum2->top == 0) && !_bnum2->neg) || \ + (_bnum2->top && (_bnum2->d[_bnum2->top - 1] != 0))); \ bn_pollute(_bnum2); \ } \ } while(0) @@ -208,7 +197,6 @@ int RAND_bytes(unsigned char *buf, int num); # else /* !BN_DEBUG */ -# define BN_FLG_FIXED_TOP 0 # define bn_pollute(a) # define bn_check_top(a) # define bn_fix_top(a) bn_correct_top(a) @@ -240,8 +228,7 @@ struct bignum_st { /* Used for montgomery multiplication */ struct bn_mont_ctx_st { int ri; /* number of bits in R */ - BIGNUM RR; /* used to convert to montgomery form, - possibly zero-padded */ + BIGNUM RR; /* used to convert to montgomery form */ BIGNUM N; /* The modulus */ BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1 (Ni is only * stored for bignum algorithm) */ diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_lib.c b/worker/deps/openssl/openssl/crypto/bn/bn_lib.c index 3f3c7bbb2f..7058494092 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_lib.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_lib.c @@ -12,7 +12,6 @@ #include "internal/cryptlib.h" #include "bn_lcl.h" #include -#include "internal/constant_time_locl.h" /* This stuff appears to be completely unused, so is deprecated */ #if OPENSSL_API_COMPAT < 0x00908000L @@ -223,6 +222,8 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) const BN_ULONG *B; int i; + bn_check_top(b); + if (words > (INT_MAX / (4 * BN_BITS2))) { BNerr(BN_F_BN_EXPAND_INTERNAL, BN_R_BIGNUM_TOO_LONG); return NULL; @@ -297,6 +298,8 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) BIGNUM *bn_expand2(BIGNUM *b, int words) { + bn_check_top(b); + if (words > b->dmax) { BN_ULONG *a = bn_expand_internal(b, words); if (!a) @@ -309,6 +312,7 @@ BIGNUM *bn_expand2(BIGNUM *b, int words) b->dmax = words; } + bn_check_top(b); return b; } @@ -375,19 +379,12 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b) memcpy(a->d, b->d, sizeof(b->d[0]) * b->top); #endif - a->neg = b->neg; a->top = b->top; - a->flags |= b->flags & BN_FLG_FIXED_TOP; + a->neg = b->neg; bn_check_top(a); return (a); } -#define FLAGS_DATA(flags) ((flags) & (BN_FLG_STATIC_DATA \ - | BN_FLG_CONSTTIME \ - | BN_FLG_SECURE \ - | BN_FLG_FIXED_TOP)) -#define FLAGS_STRUCT(flags) ((flags) & (BN_FLG_MALLOCED)) - void BN_swap(BIGNUM *a, BIGNUM *b) { int flags_old_a, flags_old_b; @@ -415,8 +412,10 @@ void BN_swap(BIGNUM *a, BIGNUM *b) b->dmax = tmp_dmax; b->neg = tmp_neg; - a->flags = FLAGS_STRUCT(flags_old_a) | FLAGS_DATA(flags_old_b); - b->flags = FLAGS_STRUCT(flags_old_b) | FLAGS_DATA(flags_old_a); + a->flags = + (flags_old_a & BN_FLG_MALLOCED) | (flags_old_b & BN_FLG_STATIC_DATA); + b->flags = + (flags_old_b & BN_FLG_MALLOCED) | (flags_old_a & BN_FLG_STATIC_DATA); bn_check_top(a); bn_check_top(b); } @@ -426,9 +425,8 @@ void BN_clear(BIGNUM *a) bn_check_top(a); if (a->d != NULL) OPENSSL_cleanse(a->d, sizeof(*a->d) * a->dmax); - a->neg = 0; a->top = 0; - a->flags &= ~BN_FLG_FIXED_TOP; + a->neg = 0; } BN_ULONG BN_get_word(const BIGNUM *a) @@ -449,7 +447,6 @@ int BN_set_word(BIGNUM *a, BN_ULONG w) a->neg = 0; a->d[0] = w; a->top = (w ? 1 : 0); - a->flags &= ~BN_FLG_FIXED_TOP; bn_check_top(a); return (1); } @@ -502,43 +499,24 @@ BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret) /* ignore negative */ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) { - int n; - size_t i, lasti, j, atop, mask; + int i; BN_ULONG l; - /* - * In case |a| is fixed-top, BN_num_bytes can return bogus length, - * but it's assumed that fixed-top inputs ought to be "nominated" - * even for padded output, so it works out... - */ - n = BN_num_bytes(a); - if (tolen == -1) { - tolen = n; - } else if (tolen < n) { /* uncommon/unlike case */ - BIGNUM temp = *a; - - bn_correct_top(&temp); - n = BN_num_bytes(&temp); - if (tolen < n) - return -1; - } - - /* Swipe through whole available data and don't give away padded zero. */ - atop = a->dmax * BN_BYTES; - if (atop == 0) { - OPENSSL_cleanse(to, tolen); - return tolen; + bn_check_top(a); + i = BN_num_bytes(a); + if (tolen == -1) + tolen = i; + else if (tolen < i) + return -1; + /* Add leading zeroes if necessary */ + if (tolen > i) { + memset(to, 0, tolen - i); + to += tolen - i; } - - lasti = atop - 1; - atop = a->top * BN_BYTES; - for (i = 0, j = 0, to += tolen; j < (size_t)tolen; j++) { + while (i--) { l = a->d[i / BN_BYTES]; - mask = 0 - ((j - atop) >> (8 * sizeof(i) - 1)); - *--to = (unsigned char)(l >> (8 * (i % BN_BYTES)) & mask); - i += (i - lasti) >> (8 * sizeof(i) - 1); /* stay on last limb */ + *(to++) = (unsigned char)(l >> (8 * (i % BN_BYTES))) & 0xff; } - return tolen; } @@ -705,7 +683,6 @@ int BN_set_bit(BIGNUM *a, int n) for (k = a->top; k < i + 1; k++) a->d[k] = 0; a->top = i + 1; - a->flags &= ~BN_FLG_FIXED_TOP; } a->d[i] |= (((BN_ULONG)1) << j); @@ -847,38 +824,6 @@ void BN_consttime_swap(BN_ULONG condition, BIGNUM *a, BIGNUM *b, int nwords) a->top ^= t; b->top ^= t; - t = (a->neg ^ b->neg) & condition; - a->neg ^= t; - b->neg ^= t; - - /*- - * BN_FLG_STATIC_DATA: indicates that data may not be written to. Intention - * is actually to treat it as it's read-only data, and some (if not most) - * of it does reside in read-only segment. In other words observation of - * BN_FLG_STATIC_DATA in BN_consttime_swap should be treated as fatal - * condition. It would either cause SEGV or effectively cause data - * corruption. - * - * BN_FLG_MALLOCED: refers to BN structure itself, and hence must be - * preserved. - * - * BN_FLG_SECURE: must be preserved, because it determines how x->d was - * allocated and hence how to free it. - * - * BN_FLG_CONSTTIME: sufficient to mask and swap - * - * BN_FLG_FIXED_TOP: indicates that we haven't called bn_correct_top() on - * the data, so the d array may be padded with additional 0 values (i.e. - * top could be greater than the minimal value that it could be). We should - * be swapping it - */ - -#define BN_CONSTTIME_SWAP_FLAGS (BN_FLG_CONSTTIME | BN_FLG_FIXED_TOP) - - t = ((a->flags ^ b->flags) & BN_CONSTTIME_SWAP_FLAGS) & condition; - a->flags ^= t; - b->flags ^= t; - #define BN_CONSTTIME_SWAP(ind) \ do { \ t = (a->d[ind] ^ b->d[ind]) & condition; \ @@ -942,9 +887,8 @@ int BN_security_bits(int L, int N) void BN_zero_ex(BIGNUM *a) { - a->neg = 0; a->top = 0; - a->flags &= ~BN_FLG_FIXED_TOP; + a->neg = 0; } int BN_abs_is_word(const BIGNUM *a, const BN_ULONG w) @@ -1068,6 +1012,5 @@ void bn_correct_top(BIGNUM *a) } if (a->top == 0) a->neg = 0; - a->flags &= ~BN_FLG_FIXED_TOP; bn_pollute(a); } diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_mod.c b/worker/deps/openssl/openssl/crypto/bn/bn_mod.c index 2e98035bd8..13b583f76c 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_mod.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_mod.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -35,72 +35,16 @@ int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, /* * BN_mod_add variant that may be used if both a and b are non-negative and - * less than m. The original algorithm was - * - * if (!BN_uadd(r, a, b)) - * return 0; - * if (BN_ucmp(r, m) >= 0) - * return BN_usub(r, r, m); - * - * which is replaced with addition, subtracting modulus, and conditional - * move depending on whether or not subtraction borrowed. + * less than m */ -int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - const BIGNUM *m) -{ - size_t i, ai, bi, mtop = m->top; - BN_ULONG storage[1024 / BN_BITS2]; - BN_ULONG carry, temp, mask, *rp, *tp = storage; - const BN_ULONG *ap, *bp; - - if (bn_wexpand(r, mtop) == NULL) - return 0; - - if (mtop > sizeof(storage) / sizeof(storage[0]) - && (tp = OPENSSL_malloc(mtop * sizeof(BN_ULONG))) == NULL) - return 0; - - ap = a->d != NULL ? a->d : tp; - bp = b->d != NULL ? b->d : tp; - - for (i = 0, ai = 0, bi = 0, carry = 0; i < mtop;) { - mask = (BN_ULONG)0 - ((i - a->top) >> (8 * sizeof(i) - 1)); - temp = ((ap[ai] & mask) + carry) & BN_MASK2; - carry = (temp < carry); - - mask = (BN_ULONG)0 - ((i - b->top) >> (8 * sizeof(i) - 1)); - tp[i] = ((bp[bi] & mask) + temp) & BN_MASK2; - carry += (tp[i] < temp); - - i++; - ai += (i - a->dmax) >> (8 * sizeof(i) - 1); - bi += (i - b->dmax) >> (8 * sizeof(i) - 1); - } - rp = r->d; - carry -= bn_sub_words(rp, tp, m->d, mtop); - for (i = 0; i < mtop; i++) { - rp[i] = (carry & tp[i]) | (~carry & rp[i]); - ((volatile BN_ULONG *)tp)[i] = 0; - } - r->top = mtop; - r->flags |= BN_FLG_FIXED_TOP; - r->neg = 0; - - if (tp != storage) - OPENSSL_free(tp); - - return 1; -} - int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m) { - int ret = bn_mod_add_fixed_top(r, a, b, m); - - if (ret) - bn_correct_top(r); - - return ret; + if (!BN_uadd(r, a, b)) + return 0; + if (BN_ucmp(r, m) >= 0) + return BN_usub(r, r, m); + return 1; } int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, @@ -111,70 +55,6 @@ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, return BN_nnmod(r, r, m, ctx); } -/* - * BN_mod_sub variant that may be used if both a and b are non-negative, - * a is less than m, while b is of same bit width as m. It's implemented - * as subtraction followed by two conditional additions. - * - * 0 <= a < m - * 0 <= b < 2^w < 2*m - * - * after subtraction - * - * -2*m < r = a - b < m - * - * Thus it takes up to two conditional additions to make |r| positive. - */ -int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - const BIGNUM *m) -{ - size_t i, ai, bi, mtop = m->top; - BN_ULONG borrow, carry, ta, tb, mask, *rp; - const BN_ULONG *ap, *bp; - - if (bn_wexpand(r, mtop) == NULL) - return 0; - - rp = r->d; - ap = a->d != NULL ? a->d : rp; - bp = b->d != NULL ? b->d : rp; - - for (i = 0, ai = 0, bi = 0, borrow = 0; i < mtop;) { - mask = (BN_ULONG)0 - ((i - a->top) >> (8 * sizeof(i) - 1)); - ta = ap[ai] & mask; - - mask = (BN_ULONG)0 - ((i - b->top) >> (8 * sizeof(i) - 1)); - tb = bp[bi] & mask; - rp[i] = ta - tb - borrow; - if (ta != tb) - borrow = (ta < tb); - - i++; - ai += (i - a->dmax) >> (8 * sizeof(i) - 1); - bi += (i - b->dmax) >> (8 * sizeof(i) - 1); - } - ap = m->d; - for (i = 0, mask = 0 - borrow, carry = 0; i < mtop; i++) { - ta = ((ap[i] & mask) + carry) & BN_MASK2; - carry = (ta < carry); - rp[i] = (rp[i] + ta) & BN_MASK2; - carry += (rp[i] < ta); - } - borrow -= carry; - for (i = 0, mask = 0 - borrow, carry = 0; i < mtop; i++) { - ta = ((ap[i] & mask) + carry) & BN_MASK2; - carry = (ta < carry); - rp[i] = (rp[i] + ta) & BN_MASK2; - carry += (rp[i] < ta); - } - - r->top = mtop; - r->flags |= BN_FLG_FIXED_TOP; - r->neg = 0; - - return 1; -} - /* * BN_mod_sub variant that may be used if both a and b are non-negative and * less than m diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_mont.c b/worker/deps/openssl/openssl/crypto/bn/bn_mont.c index 41214334b8..faef581571 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_mont.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_mont.c @@ -20,43 +20,29 @@ #define MONT_WORD /* use the faster word-based algorithm */ #ifdef MONT_WORD -static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont); +static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont); #endif int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_MONT_CTX *mont, BN_CTX *ctx) -{ - int ret = bn_mul_mont_fixed_top(r, a, b, mont, ctx); - - bn_correct_top(r); - bn_check_top(r); - - return ret; -} - -int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - BN_MONT_CTX *mont, BN_CTX *ctx) { BIGNUM *tmp; int ret = 0; +#if defined(OPENSSL_BN_ASM_MONT) && defined(MONT_WORD) int num = mont->N.top; -#if defined(OPENSSL_BN_ASM_MONT) && defined(MONT_WORD) if (num > 1 && a->top == num && b->top == num) { if (bn_wexpand(r, num) == NULL) return (0); if (bn_mul_mont(r->d, a->d, b->d, mont->N.d, mont->n0, num)) { r->neg = a->neg ^ b->neg; r->top = num; - r->flags |= BN_FLG_FIXED_TOP; + bn_correct_top(r); return (1); } } #endif - if ((a->top + b->top) > 2 * num) - return 0; - BN_CTX_start(ctx); tmp = BN_CTX_get(ctx); if (tmp == NULL) @@ -64,20 +50,21 @@ int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, bn_check_top(tmp); if (a == b) { - if (!bn_sqr_fixed_top(tmp, a, ctx)) + if (!BN_sqr(tmp, a, ctx)) goto err; } else { - if (!bn_mul_fixed_top(tmp, a, b, ctx)) + if (!BN_mul(tmp, a, b, ctx)) goto err; } /* reduce from aRR to aR */ #ifdef MONT_WORD - if (!bn_from_montgomery_word(r, tmp, mont)) + if (!BN_from_montgomery_word(r, tmp, mont)) goto err; #else if (!BN_from_montgomery(r, tmp, mont, ctx)) goto err; #endif + bn_check_top(r); ret = 1; err: BN_CTX_end(ctx); @@ -85,12 +72,11 @@ int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, } #ifdef MONT_WORD -static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) +static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) { BIGNUM *n; BN_ULONG *ap, *np, *rp, n0, v, carry; int nl, max, i; - unsigned int rtop; n = &(mont->N); nl = n->top; @@ -107,13 +93,12 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) np = n->d; rp = r->d; - for (rtop = r->top, i = 0; i < max; i++) { - v = (BN_ULONG)0 - ((i - rtop) >> (8 * sizeof(rtop) - 1)); - rp[i] &= v; - } + /* clear the top words of T */ + i = max - r->top; + if (i) + memset(&rp[r->top], 0, sizeof(*rp) * i); r->top = max; - r->flags |= BN_FLG_FIXED_TOP; n0 = mont->n0[0]; /* @@ -132,7 +117,6 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) if (bn_wexpand(ret, nl) == NULL) return (0); ret->top = nl; - ret->flags |= BN_FLG_FIXED_TOP; ret->neg = r->neg; rp = ret->d; @@ -143,16 +127,20 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) */ ap = &(r->d[nl]); - carry -= bn_sub_words(rp, ap, np, nl); /* - * |carry| is -1 if |ap| - |np| underflowed or zero if it did not. Note - * |carry| cannot be 1. That would imply the subtraction did not fit in - * |nl| words, and we know at most one subtraction is needed. + * |v| is one if |ap| - |np| underflowed or zero if it did not. Note |v| + * cannot be -1. That would imply the subtraction did not fit in |nl| words, + * and we know at most one subtraction is needed. */ + v = bn_sub_words(rp, ap, np, nl) - carry; + v = 0 - v; for (i = 0; i < nl; i++) { - rp[i] = (carry & ap[i]) | (~carry & rp[i]); + rp[i] = (v & ap[i]) | (~v & rp[i]); ap[i] = 0; } + bn_correct_top(r); + bn_correct_top(ret); + bn_check_top(ret); return (1); } @@ -160,27 +148,14 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont, BN_CTX *ctx) -{ - int retn; - - retn = bn_from_mont_fixed_top(ret, a, mont, ctx); - bn_correct_top(ret); - bn_check_top(ret); - - return retn; -} - -int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont, - BN_CTX *ctx) { int retn = 0; #ifdef MONT_WORD BIGNUM *t; BN_CTX_start(ctx); - if ((t = BN_CTX_get(ctx)) && BN_copy(t, a)) { - retn = bn_from_montgomery_word(ret, t, mont); - } + if ((t = BN_CTX_get(ctx)) && BN_copy(t, a)) + retn = BN_from_montgomery_word(ret, t, mont); BN_CTX_end(ctx); #else /* !MONT_WORD */ BIGNUM *t1, *t2; @@ -218,12 +193,6 @@ int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont, return (retn); } -int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, - BN_CTX *ctx) -{ - return bn_mul_mont_fixed_top(r, a, &(mont->RR), mont, ctx); -} - BN_MONT_CTX *BN_MONT_CTX_new(void) { BN_MONT_CTX *ret; @@ -260,7 +229,7 @@ void BN_MONT_CTX_free(BN_MONT_CTX *mont) int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) { - int i, ret = 0; + int ret = 0; BIGNUM *Ri, *R; if (BN_is_zero(mod)) @@ -309,9 +278,7 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) if ((buf[1] = mod->top > 1 ? mod->d[1] : 0)) tmod.top = 2; - if (BN_is_one(&tmod)) - BN_zero(Ri); - else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) + if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) goto err; if (!BN_lshift(Ri, Ri, 2 * BN_BITS2)) goto err; /* R*Ri */ @@ -344,9 +311,7 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) buf[1] = 0; tmod.top = buf[0] != 0 ? 1 : 0; /* Ri = R^-1 mod N */ - if (BN_is_one(&tmod)) - BN_zero(Ri); - else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) + if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL) goto err; if (!BN_lshift(Ri, Ri, BN_BITS2)) goto err; /* R*Ri */ @@ -395,11 +360,6 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) if (!BN_mod(&(mont->RR), &(mont->RR), &(mont->N), ctx)) goto err; - for (i = mont->RR.top, ret = mont->N.top; i < ret; i++) - mont->RR.d[i] = 0; - mont->RR.top = ret; - mont->RR.flags |= BN_FLG_FIXED_TOP; - ret = 1; err: BN_CTX_end(ctx); diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_mul.c b/worker/deps/openssl/openssl/crypto/bn/bn_mul.c index 237d7df106..a1abc5b05a 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_mul.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_mul.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -832,16 +832,6 @@ void bn_mul_high(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, BN_ULONG *l, int n2, #endif /* BN_RECURSION */ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) -{ - int ret = bn_mul_fixed_top(r, a, b, ctx); - - bn_correct_top(r); - bn_check_top(r); - - return ret; -} - -int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) { int ret = 0; int top, al, bl; @@ -945,7 +935,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) end: #endif rr->neg = a->neg ^ b->neg; - rr->flags |= BN_FLG_FIXED_TOP; + bn_correct_top(rr); if (r != rr && BN_copy(r, rr) == NULL) goto err; diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_prime.h b/worker/deps/openssl/openssl/crypto/bn/bn_prime.h index 41440fa4e1..5f5cc4f580 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_prime.h +++ b/worker/deps/openssl/openssl/crypto/bn/bn_prime.h @@ -15,260 +15,260 @@ typedef unsigned short prime_t; static const prime_t primes[2048] = { - 2, 3, 5, 7, 11, 13, 17, 19, - 23, 29, 31, 37, 41, 43, 47, 53, - 59, 61, 67, 71, 73, 79, 83, 89, - 97, 101, 103, 107, 109, 113, 127, 131, - 137, 139, 149, 151, 157, 163, 167, 173, - 179, 181, 191, 193, 197, 199, 211, 223, - 227, 229, 233, 239, 241, 251, 257, 263, - 269, 271, 277, 281, 283, 293, 307, 311, - 313, 317, 331, 337, 347, 349, 353, 359, - 367, 373, 379, 383, 389, 397, 401, 409, - 419, 421, 431, 433, 439, 443, 449, 457, - 461, 463, 467, 479, 487, 491, 499, 503, - 509, 521, 523, 541, 547, 557, 563, 569, - 571, 577, 587, 593, 599, 601, 607, 613, - 617, 619, 631, 641, 643, 647, 653, 659, - 661, 673, 677, 683, 691, 701, 709, 719, - 727, 733, 739, 743, 751, 757, 761, 769, - 773, 787, 797, 809, 811, 821, 823, 827, - 829, 839, 853, 857, 859, 863, 877, 881, - 883, 887, 907, 911, 919, 929, 937, 941, - 947, 953, 967, 971, 977, 983, 991, 997, - 1009, 1013, 1019, 1021, 1031, 1033, 1039, 1049, - 1051, 1061, 1063, 1069, 1087, 1091, 1093, 1097, - 1103, 1109, 1117, 1123, 1129, 1151, 1153, 1163, - 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, - 1229, 1231, 1237, 1249, 1259, 1277, 1279, 1283, - 1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, - 1327, 1361, 1367, 1373, 1381, 1399, 1409, 1423, - 1427, 1429, 1433, 1439, 1447, 1451, 1453, 1459, - 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511, - 1523, 1531, 1543, 1549, 1553, 1559, 1567, 1571, - 1579, 1583, 1597, 1601, 1607, 1609, 1613, 1619, - 1621, 1627, 1637, 1657, 1663, 1667, 1669, 1693, - 1697, 1699, 1709, 1721, 1723, 1733, 1741, 1747, - 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811, - 1823, 1831, 1847, 1861, 1867, 1871, 1873, 1877, - 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, - 1951, 1973, 1979, 1987, 1993, 1997, 1999, 2003, - 2011, 2017, 2027, 2029, 2039, 2053, 2063, 2069, - 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129, - 2131, 2137, 2141, 2143, 2153, 2161, 2179, 2203, - 2207, 2213, 2221, 2237, 2239, 2243, 2251, 2267, - 2269, 2273, 2281, 2287, 2293, 2297, 2309, 2311, - 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377, - 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, - 2437, 2441, 2447, 2459, 2467, 2473, 2477, 2503, - 2521, 2531, 2539, 2543, 2549, 2551, 2557, 2579, - 2591, 2593, 2609, 2617, 2621, 2633, 2647, 2657, - 2659, 2663, 2671, 2677, 2683, 2687, 2689, 2693, - 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741, - 2749, 2753, 2767, 2777, 2789, 2791, 2797, 2801, - 2803, 2819, 2833, 2837, 2843, 2851, 2857, 2861, - 2879, 2887, 2897, 2903, 2909, 2917, 2927, 2939, - 2953, 2957, 2963, 2969, 2971, 2999, 3001, 3011, - 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079, - 3083, 3089, 3109, 3119, 3121, 3137, 3163, 3167, - 3169, 3181, 3187, 3191, 3203, 3209, 3217, 3221, - 3229, 3251, 3253, 3257, 3259, 3271, 3299, 3301, - 3307, 3313, 3319, 3323, 3329, 3331, 3343, 3347, - 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413, - 3433, 3449, 3457, 3461, 3463, 3467, 3469, 3491, - 3499, 3511, 3517, 3527, 3529, 3533, 3539, 3541, - 3547, 3557, 3559, 3571, 3581, 3583, 3593, 3607, - 3613, 3617, 3623, 3631, 3637, 3643, 3659, 3671, - 3673, 3677, 3691, 3697, 3701, 3709, 3719, 3727, - 3733, 3739, 3761, 3767, 3769, 3779, 3793, 3797, - 3803, 3821, 3823, 3833, 3847, 3851, 3853, 3863, - 3877, 3881, 3889, 3907, 3911, 3917, 3919, 3923, - 3929, 3931, 3943, 3947, 3967, 3989, 4001, 4003, - 4007, 4013, 4019, 4021, 4027, 4049, 4051, 4057, - 4073, 4079, 4091, 4093, 4099, 4111, 4127, 4129, - 4133, 4139, 4153, 4157, 4159, 4177, 4201, 4211, - 4217, 4219, 4229, 4231, 4241, 4243, 4253, 4259, - 4261, 4271, 4273, 4283, 4289, 4297, 4327, 4337, - 4339, 4349, 4357, 4363, 4373, 4391, 4397, 4409, - 4421, 4423, 4441, 4447, 4451, 4457, 4463, 4481, - 4483, 4493, 4507, 4513, 4517, 4519, 4523, 4547, - 4549, 4561, 4567, 4583, 4591, 4597, 4603, 4621, - 4637, 4639, 4643, 4649, 4651, 4657, 4663, 4673, - 4679, 4691, 4703, 4721, 4723, 4729, 4733, 4751, - 4759, 4783, 4787, 4789, 4793, 4799, 4801, 4813, - 4817, 4831, 4861, 4871, 4877, 4889, 4903, 4909, - 4919, 4931, 4933, 4937, 4943, 4951, 4957, 4967, - 4969, 4973, 4987, 4993, 4999, 5003, 5009, 5011, - 5021, 5023, 5039, 5051, 5059, 5077, 5081, 5087, - 5099, 5101, 5107, 5113, 5119, 5147, 5153, 5167, - 5171, 5179, 5189, 5197, 5209, 5227, 5231, 5233, - 5237, 5261, 5273, 5279, 5281, 5297, 5303, 5309, - 5323, 5333, 5347, 5351, 5381, 5387, 5393, 5399, - 5407, 5413, 5417, 5419, 5431, 5437, 5441, 5443, - 5449, 5471, 5477, 5479, 5483, 5501, 5503, 5507, - 5519, 5521, 5527, 5531, 5557, 5563, 5569, 5573, - 5581, 5591, 5623, 5639, 5641, 5647, 5651, 5653, - 5657, 5659, 5669, 5683, 5689, 5693, 5701, 5711, - 5717, 5737, 5741, 5743, 5749, 5779, 5783, 5791, - 5801, 5807, 5813, 5821, 5827, 5839, 5843, 5849, - 5851, 5857, 5861, 5867, 5869, 5879, 5881, 5897, - 5903, 5923, 5927, 5939, 5953, 5981, 5987, 6007, - 6011, 6029, 6037, 6043, 6047, 6053, 6067, 6073, - 6079, 6089, 6091, 6101, 6113, 6121, 6131, 6133, - 6143, 6151, 6163, 6173, 6197, 6199, 6203, 6211, - 6217, 6221, 6229, 6247, 6257, 6263, 6269, 6271, - 6277, 6287, 6299, 6301, 6311, 6317, 6323, 6329, - 6337, 6343, 6353, 6359, 6361, 6367, 6373, 6379, - 6389, 6397, 6421, 6427, 6449, 6451, 6469, 6473, - 6481, 6491, 6521, 6529, 6547, 6551, 6553, 6563, - 6569, 6571, 6577, 6581, 6599, 6607, 6619, 6637, - 6653, 6659, 6661, 6673, 6679, 6689, 6691, 6701, - 6703, 6709, 6719, 6733, 6737, 6761, 6763, 6779, - 6781, 6791, 6793, 6803, 6823, 6827, 6829, 6833, - 6841, 6857, 6863, 6869, 6871, 6883, 6899, 6907, - 6911, 6917, 6947, 6949, 6959, 6961, 6967, 6971, - 6977, 6983, 6991, 6997, 7001, 7013, 7019, 7027, - 7039, 7043, 7057, 7069, 7079, 7103, 7109, 7121, - 7127, 7129, 7151, 7159, 7177, 7187, 7193, 7207, - 7211, 7213, 7219, 7229, 7237, 7243, 7247, 7253, - 7283, 7297, 7307, 7309, 7321, 7331, 7333, 7349, - 7351, 7369, 7393, 7411, 7417, 7433, 7451, 7457, - 7459, 7477, 7481, 7487, 7489, 7499, 7507, 7517, - 7523, 7529, 7537, 7541, 7547, 7549, 7559, 7561, - 7573, 7577, 7583, 7589, 7591, 7603, 7607, 7621, - 7639, 7643, 7649, 7669, 7673, 7681, 7687, 7691, - 7699, 7703, 7717, 7723, 7727, 7741, 7753, 7757, - 7759, 7789, 7793, 7817, 7823, 7829, 7841, 7853, - 7867, 7873, 7877, 7879, 7883, 7901, 7907, 7919, - 7927, 7933, 7937, 7949, 7951, 7963, 7993, 8009, - 8011, 8017, 8039, 8053, 8059, 8069, 8081, 8087, - 8089, 8093, 8101, 8111, 8117, 8123, 8147, 8161, - 8167, 8171, 8179, 8191, 8209, 8219, 8221, 8231, - 8233, 8237, 8243, 8263, 8269, 8273, 8287, 8291, - 8293, 8297, 8311, 8317, 8329, 8353, 8363, 8369, - 8377, 8387, 8389, 8419, 8423, 8429, 8431, 8443, - 8447, 8461, 8467, 8501, 8513, 8521, 8527, 8537, - 8539, 8543, 8563, 8573, 8581, 8597, 8599, 8609, - 8623, 8627, 8629, 8641, 8647, 8663, 8669, 8677, - 8681, 8689, 8693, 8699, 8707, 8713, 8719, 8731, - 8737, 8741, 8747, 8753, 8761, 8779, 8783, 8803, - 8807, 8819, 8821, 8831, 8837, 8839, 8849, 8861, - 8863, 8867, 8887, 8893, 8923, 8929, 8933, 8941, - 8951, 8963, 8969, 8971, 8999, 9001, 9007, 9011, - 9013, 9029, 9041, 9043, 9049, 9059, 9067, 9091, - 9103, 9109, 9127, 9133, 9137, 9151, 9157, 9161, - 9173, 9181, 9187, 9199, 9203, 9209, 9221, 9227, - 9239, 9241, 9257, 9277, 9281, 9283, 9293, 9311, - 9319, 9323, 9337, 9341, 9343, 9349, 9371, 9377, - 9391, 9397, 9403, 9413, 9419, 9421, 9431, 9433, - 9437, 9439, 9461, 9463, 9467, 9473, 9479, 9491, - 9497, 9511, 9521, 9533, 9539, 9547, 9551, 9587, - 9601, 9613, 9619, 9623, 9629, 9631, 9643, 9649, - 9661, 9677, 9679, 9689, 9697, 9719, 9721, 9733, - 9739, 9743, 9749, 9767, 9769, 9781, 9787, 9791, - 9803, 9811, 9817, 9829, 9833, 9839, 9851, 9857, - 9859, 9871, 9883, 9887, 9901, 9907, 9923, 9929, - 9931, 9941, 9949, 9967, 9973, 10007, 10009, 10037, - 10039, 10061, 10067, 10069, 10079, 10091, 10093, 10099, - 10103, 10111, 10133, 10139, 10141, 10151, 10159, 10163, - 10169, 10177, 10181, 10193, 10211, 10223, 10243, 10247, - 10253, 10259, 10267, 10271, 10273, 10289, 10301, 10303, - 10313, 10321, 10331, 10333, 10337, 10343, 10357, 10369, - 10391, 10399, 10427, 10429, 10433, 10453, 10457, 10459, - 10463, 10477, 10487, 10499, 10501, 10513, 10529, 10531, - 10559, 10567, 10589, 10597, 10601, 10607, 10613, 10627, - 10631, 10639, 10651, 10657, 10663, 10667, 10687, 10691, - 10709, 10711, 10723, 10729, 10733, 10739, 10753, 10771, - 10781, 10789, 10799, 10831, 10837, 10847, 10853, 10859, - 10861, 10867, 10883, 10889, 10891, 10903, 10909, 10937, - 10939, 10949, 10957, 10973, 10979, 10987, 10993, 11003, - 11027, 11047, 11057, 11059, 11069, 11071, 11083, 11087, - 11093, 11113, 11117, 11119, 11131, 11149, 11159, 11161, - 11171, 11173, 11177, 11197, 11213, 11239, 11243, 11251, - 11257, 11261, 11273, 11279, 11287, 11299, 11311, 11317, - 11321, 11329, 11351, 11353, 11369, 11383, 11393, 11399, - 11411, 11423, 11437, 11443, 11447, 11467, 11471, 11483, - 11489, 11491, 11497, 11503, 11519, 11527, 11549, 11551, - 11579, 11587, 11593, 11597, 11617, 11621, 11633, 11657, - 11677, 11681, 11689, 11699, 11701, 11717, 11719, 11731, - 11743, 11777, 11779, 11783, 11789, 11801, 11807, 11813, - 11821, 11827, 11831, 11833, 11839, 11863, 11867, 11887, - 11897, 11903, 11909, 11923, 11927, 11933, 11939, 11941, - 11953, 11959, 11969, 11971, 11981, 11987, 12007, 12011, - 12037, 12041, 12043, 12049, 12071, 12073, 12097, 12101, - 12107, 12109, 12113, 12119, 12143, 12149, 12157, 12161, - 12163, 12197, 12203, 12211, 12227, 12239, 12241, 12251, - 12253, 12263, 12269, 12277, 12281, 12289, 12301, 12323, - 12329, 12343, 12347, 12373, 12377, 12379, 12391, 12401, - 12409, 12413, 12421, 12433, 12437, 12451, 12457, 12473, - 12479, 12487, 12491, 12497, 12503, 12511, 12517, 12527, - 12539, 12541, 12547, 12553, 12569, 12577, 12583, 12589, - 12601, 12611, 12613, 12619, 12637, 12641, 12647, 12653, - 12659, 12671, 12689, 12697, 12703, 12713, 12721, 12739, - 12743, 12757, 12763, 12781, 12791, 12799, 12809, 12821, - 12823, 12829, 12841, 12853, 12889, 12893, 12899, 12907, - 12911, 12917, 12919, 12923, 12941, 12953, 12959, 12967, - 12973, 12979, 12983, 13001, 13003, 13007, 13009, 13033, - 13037, 13043, 13049, 13063, 13093, 13099, 13103, 13109, - 13121, 13127, 13147, 13151, 13159, 13163, 13171, 13177, - 13183, 13187, 13217, 13219, 13229, 13241, 13249, 13259, - 13267, 13291, 13297, 13309, 13313, 13327, 13331, 13337, - 13339, 13367, 13381, 13397, 13399, 13411, 13417, 13421, - 13441, 13451, 13457, 13463, 13469, 13477, 13487, 13499, - 13513, 13523, 13537, 13553, 13567, 13577, 13591, 13597, - 13613, 13619, 13627, 13633, 13649, 13669, 13679, 13681, - 13687, 13691, 13693, 13697, 13709, 13711, 13721, 13723, - 13729, 13751, 13757, 13759, 13763, 13781, 13789, 13799, - 13807, 13829, 13831, 13841, 13859, 13873, 13877, 13879, - 13883, 13901, 13903, 13907, 13913, 13921, 13931, 13933, - 13963, 13967, 13997, 13999, 14009, 14011, 14029, 14033, - 14051, 14057, 14071, 14081, 14083, 14087, 14107, 14143, - 14149, 14153, 14159, 14173, 14177, 14197, 14207, 14221, - 14243, 14249, 14251, 14281, 14293, 14303, 14321, 14323, - 14327, 14341, 14347, 14369, 14387, 14389, 14401, 14407, - 14411, 14419, 14423, 14431, 14437, 14447, 14449, 14461, - 14479, 14489, 14503, 14519, 14533, 14537, 14543, 14549, - 14551, 14557, 14561, 14563, 14591, 14593, 14621, 14627, - 14629, 14633, 14639, 14653, 14657, 14669, 14683, 14699, - 14713, 14717, 14723, 14731, 14737, 14741, 14747, 14753, - 14759, 14767, 14771, 14779, 14783, 14797, 14813, 14821, - 14827, 14831, 14843, 14851, 14867, 14869, 14879, 14887, - 14891, 14897, 14923, 14929, 14939, 14947, 14951, 14957, - 14969, 14983, 15013, 15017, 15031, 15053, 15061, 15073, - 15077, 15083, 15091, 15101, 15107, 15121, 15131, 15137, - 15139, 15149, 15161, 15173, 15187, 15193, 15199, 15217, - 15227, 15233, 15241, 15259, 15263, 15269, 15271, 15277, - 15287, 15289, 15299, 15307, 15313, 15319, 15329, 15331, - 15349, 15359, 15361, 15373, 15377, 15383, 15391, 15401, - 15413, 15427, 15439, 15443, 15451, 15461, 15467, 15473, - 15493, 15497, 15511, 15527, 15541, 15551, 15559, 15569, - 15581, 15583, 15601, 15607, 15619, 15629, 15641, 15643, - 15647, 15649, 15661, 15667, 15671, 15679, 15683, 15727, - 15731, 15733, 15737, 15739, 15749, 15761, 15767, 15773, - 15787, 15791, 15797, 15803, 15809, 15817, 15823, 15859, - 15877, 15881, 15887, 15889, 15901, 15907, 15913, 15919, - 15923, 15937, 15959, 15971, 15973, 15991, 16001, 16007, - 16033, 16057, 16061, 16063, 16067, 16069, 16073, 16087, - 16091, 16097, 16103, 16111, 16127, 16139, 16141, 16183, - 16187, 16189, 16193, 16217, 16223, 16229, 16231, 16249, - 16253, 16267, 16273, 16301, 16319, 16333, 16339, 16349, - 16361, 16363, 16369, 16381, 16411, 16417, 16421, 16427, - 16433, 16447, 16451, 16453, 16477, 16481, 16487, 16493, - 16519, 16529, 16547, 16553, 16561, 16567, 16573, 16603, - 16607, 16619, 16631, 16633, 16649, 16651, 16657, 16661, - 16673, 16691, 16693, 16699, 16703, 16729, 16741, 16747, - 16759, 16763, 16787, 16811, 16823, 16829, 16831, 16843, - 16871, 16879, 16883, 16889, 16901, 16903, 16921, 16927, - 16931, 16937, 16943, 16963, 16979, 16981, 16987, 16993, - 17011, 17021, 17027, 17029, 17033, 17041, 17047, 17053, - 17077, 17093, 17099, 17107, 17117, 17123, 17137, 17159, - 17167, 17183, 17189, 17191, 17203, 17207, 17209, 17231, - 17239, 17257, 17291, 17293, 17299, 17317, 17321, 17327, - 17333, 17341, 17351, 17359, 17377, 17383, 17387, 17389, - 17393, 17401, 17417, 17419, 17431, 17443, 17449, 17467, - 17471, 17477, 17483, 17489, 17491, 17497, 17509, 17519, - 17539, 17551, 17569, 17573, 17579, 17581, 17597, 17599, - 17609, 17623, 17627, 17657, 17659, 17669, 17681, 17683, - 17707, 17713, 17729, 17737, 17747, 17749, 17761, 17783, - 17789, 17791, 17807, 17827, 17837, 17839, 17851, 17863, + 2, 3, 5, 7, 11, 13, 17, 19, + 23, 29, 31, 37, 41, 43, 47, 53, + 59, 61, 67, 71, 73, 79, 83, 89, + 97, 101, 103, 107, 109, 113, 127, 131, + 137, 139, 149, 151, 157, 163, 167, 173, + 179, 181, 191, 193, 197, 199, 211, 223, + 227, 229, 233, 239, 241, 251, 257, 263, + 269, 271, 277, 281, 283, 293, 307, 311, + 313, 317, 331, 337, 347, 349, 353, 359, + 367, 373, 379, 383, 389, 397, 401, 409, + 419, 421, 431, 433, 439, 443, 449, 457, + 461, 463, 467, 479, 487, 491, 499, 503, + 509, 521, 523, 541, 547, 557, 563, 569, + 571, 577, 587, 593, 599, 601, 607, 613, + 617, 619, 631, 641, 643, 647, 653, 659, + 661, 673, 677, 683, 691, 701, 709, 719, + 727, 733, 739, 743, 751, 757, 761, 769, + 773, 787, 797, 809, 811, 821, 823, 827, + 829, 839, 853, 857, 859, 863, 877, 881, + 883, 887, 907, 911, 919, 929, 937, 941, + 947, 953, 967, 971, 977, 983, 991, 997, + 1009, 1013, 1019, 1021, 1031, 1033, 1039, 1049, + 1051, 1061, 1063, 1069, 1087, 1091, 1093, 1097, + 1103, 1109, 1117, 1123, 1129, 1151, 1153, 1163, + 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, + 1229, 1231, 1237, 1249, 1259, 1277, 1279, 1283, + 1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, + 1327, 1361, 1367, 1373, 1381, 1399, 1409, 1423, + 1427, 1429, 1433, 1439, 1447, 1451, 1453, 1459, + 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511, + 1523, 1531, 1543, 1549, 1553, 1559, 1567, 1571, + 1579, 1583, 1597, 1601, 1607, 1609, 1613, 1619, + 1621, 1627, 1637, 1657, 1663, 1667, 1669, 1693, + 1697, 1699, 1709, 1721, 1723, 1733, 1741, 1747, + 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811, + 1823, 1831, 1847, 1861, 1867, 1871, 1873, 1877, + 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, + 1951, 1973, 1979, 1987, 1993, 1997, 1999, 2003, + 2011, 2017, 2027, 2029, 2039, 2053, 2063, 2069, + 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129, + 2131, 2137, 2141, 2143, 2153, 2161, 2179, 2203, + 2207, 2213, 2221, 2237, 2239, 2243, 2251, 2267, + 2269, 2273, 2281, 2287, 2293, 2297, 2309, 2311, + 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377, + 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, + 2437, 2441, 2447, 2459, 2467, 2473, 2477, 2503, + 2521, 2531, 2539, 2543, 2549, 2551, 2557, 2579, + 2591, 2593, 2609, 2617, 2621, 2633, 2647, 2657, + 2659, 2663, 2671, 2677, 2683, 2687, 2689, 2693, + 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741, + 2749, 2753, 2767, 2777, 2789, 2791, 2797, 2801, + 2803, 2819, 2833, 2837, 2843, 2851, 2857, 2861, + 2879, 2887, 2897, 2903, 2909, 2917, 2927, 2939, + 2953, 2957, 2963, 2969, 2971, 2999, 3001, 3011, + 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079, + 3083, 3089, 3109, 3119, 3121, 3137, 3163, 3167, + 3169, 3181, 3187, 3191, 3203, 3209, 3217, 3221, + 3229, 3251, 3253, 3257, 3259, 3271, 3299, 3301, + 3307, 3313, 3319, 3323, 3329, 3331, 3343, 3347, + 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413, + 3433, 3449, 3457, 3461, 3463, 3467, 3469, 3491, + 3499, 3511, 3517, 3527, 3529, 3533, 3539, 3541, + 3547, 3557, 3559, 3571, 3581, 3583, 3593, 3607, + 3613, 3617, 3623, 3631, 3637, 3643, 3659, 3671, + 3673, 3677, 3691, 3697, 3701, 3709, 3719, 3727, + 3733, 3739, 3761, 3767, 3769, 3779, 3793, 3797, + 3803, 3821, 3823, 3833, 3847, 3851, 3853, 3863, + 3877, 3881, 3889, 3907, 3911, 3917, 3919, 3923, + 3929, 3931, 3943, 3947, 3967, 3989, 4001, 4003, + 4007, 4013, 4019, 4021, 4027, 4049, 4051, 4057, + 4073, 4079, 4091, 4093, 4099, 4111, 4127, 4129, + 4133, 4139, 4153, 4157, 4159, 4177, 4201, 4211, + 4217, 4219, 4229, 4231, 4241, 4243, 4253, 4259, + 4261, 4271, 4273, 4283, 4289, 4297, 4327, 4337, + 4339, 4349, 4357, 4363, 4373, 4391, 4397, 4409, + 4421, 4423, 4441, 4447, 4451, 4457, 4463, 4481, + 4483, 4493, 4507, 4513, 4517, 4519, 4523, 4547, + 4549, 4561, 4567, 4583, 4591, 4597, 4603, 4621, + 4637, 4639, 4643, 4649, 4651, 4657, 4663, 4673, + 4679, 4691, 4703, 4721, 4723, 4729, 4733, 4751, + 4759, 4783, 4787, 4789, 4793, 4799, 4801, 4813, + 4817, 4831, 4861, 4871, 4877, 4889, 4903, 4909, + 4919, 4931, 4933, 4937, 4943, 4951, 4957, 4967, + 4969, 4973, 4987, 4993, 4999, 5003, 5009, 5011, + 5021, 5023, 5039, 5051, 5059, 5077, 5081, 5087, + 5099, 5101, 5107, 5113, 5119, 5147, 5153, 5167, + 5171, 5179, 5189, 5197, 5209, 5227, 5231, 5233, + 5237, 5261, 5273, 5279, 5281, 5297, 5303, 5309, + 5323, 5333, 5347, 5351, 5381, 5387, 5393, 5399, + 5407, 5413, 5417, 5419, 5431, 5437, 5441, 5443, + 5449, 5471, 5477, 5479, 5483, 5501, 5503, 5507, + 5519, 5521, 5527, 5531, 5557, 5563, 5569, 5573, + 5581, 5591, 5623, 5639, 5641, 5647, 5651, 5653, + 5657, 5659, 5669, 5683, 5689, 5693, 5701, 5711, + 5717, 5737, 5741, 5743, 5749, 5779, 5783, 5791, + 5801, 5807, 5813, 5821, 5827, 5839, 5843, 5849, + 5851, 5857, 5861, 5867, 5869, 5879, 5881, 5897, + 5903, 5923, 5927, 5939, 5953, 5981, 5987, 6007, + 6011, 6029, 6037, 6043, 6047, 6053, 6067, 6073, + 6079, 6089, 6091, 6101, 6113, 6121, 6131, 6133, + 6143, 6151, 6163, 6173, 6197, 6199, 6203, 6211, + 6217, 6221, 6229, 6247, 6257, 6263, 6269, 6271, + 6277, 6287, 6299, 6301, 6311, 6317, 6323, 6329, + 6337, 6343, 6353, 6359, 6361, 6367, 6373, 6379, + 6389, 6397, 6421, 6427, 6449, 6451, 6469, 6473, + 6481, 6491, 6521, 6529, 6547, 6551, 6553, 6563, + 6569, 6571, 6577, 6581, 6599, 6607, 6619, 6637, + 6653, 6659, 6661, 6673, 6679, 6689, 6691, 6701, + 6703, 6709, 6719, 6733, 6737, 6761, 6763, 6779, + 6781, 6791, 6793, 6803, 6823, 6827, 6829, 6833, + 6841, 6857, 6863, 6869, 6871, 6883, 6899, 6907, + 6911, 6917, 6947, 6949, 6959, 6961, 6967, 6971, + 6977, 6983, 6991, 6997, 7001, 7013, 7019, 7027, + 7039, 7043, 7057, 7069, 7079, 7103, 7109, 7121, + 7127, 7129, 7151, 7159, 7177, 7187, 7193, 7207, + 7211, 7213, 7219, 7229, 7237, 7243, 7247, 7253, + 7283, 7297, 7307, 7309, 7321, 7331, 7333, 7349, + 7351, 7369, 7393, 7411, 7417, 7433, 7451, 7457, + 7459, 7477, 7481, 7487, 7489, 7499, 7507, 7517, + 7523, 7529, 7537, 7541, 7547, 7549, 7559, 7561, + 7573, 7577, 7583, 7589, 7591, 7603, 7607, 7621, + 7639, 7643, 7649, 7669, 7673, 7681, 7687, 7691, + 7699, 7703, 7717, 7723, 7727, 7741, 7753, 7757, + 7759, 7789, 7793, 7817, 7823, 7829, 7841, 7853, + 7867, 7873, 7877, 7879, 7883, 7901, 7907, 7919, + 7927, 7933, 7937, 7949, 7951, 7963, 7993, 8009, + 8011, 8017, 8039, 8053, 8059, 8069, 8081, 8087, + 8089, 8093, 8101, 8111, 8117, 8123, 8147, 8161, + 8167, 8171, 8179, 8191, 8209, 8219, 8221, 8231, + 8233, 8237, 8243, 8263, 8269, 8273, 8287, 8291, + 8293, 8297, 8311, 8317, 8329, 8353, 8363, 8369, + 8377, 8387, 8389, 8419, 8423, 8429, 8431, 8443, + 8447, 8461, 8467, 8501, 8513, 8521, 8527, 8537, + 8539, 8543, 8563, 8573, 8581, 8597, 8599, 8609, + 8623, 8627, 8629, 8641, 8647, 8663, 8669, 8677, + 8681, 8689, 8693, 8699, 8707, 8713, 8719, 8731, + 8737, 8741, 8747, 8753, 8761, 8779, 8783, 8803, + 8807, 8819, 8821, 8831, 8837, 8839, 8849, 8861, + 8863, 8867, 8887, 8893, 8923, 8929, 8933, 8941, + 8951, 8963, 8969, 8971, 8999, 9001, 9007, 9011, + 9013, 9029, 9041, 9043, 9049, 9059, 9067, 9091, + 9103, 9109, 9127, 9133, 9137, 9151, 9157, 9161, + 9173, 9181, 9187, 9199, 9203, 9209, 9221, 9227, + 9239, 9241, 9257, 9277, 9281, 9283, 9293, 9311, + 9319, 9323, 9337, 9341, 9343, 9349, 9371, 9377, + 9391, 9397, 9403, 9413, 9419, 9421, 9431, 9433, + 9437, 9439, 9461, 9463, 9467, 9473, 9479, 9491, + 9497, 9511, 9521, 9533, 9539, 9547, 9551, 9587, + 9601, 9613, 9619, 9623, 9629, 9631, 9643, 9649, + 9661, 9677, 9679, 9689, 9697, 9719, 9721, 9733, + 9739, 9743, 9749, 9767, 9769, 9781, 9787, 9791, + 9803, 9811, 9817, 9829, 9833, 9839, 9851, 9857, + 9859, 9871, 9883, 9887, 9901, 9907, 9923, 9929, + 9931, 9941, 9949, 9967, 9973, 10007, 10009, 10037, + 10039, 10061, 10067, 10069, 10079, 10091, 10093, 10099, + 10103, 10111, 10133, 10139, 10141, 10151, 10159, 10163, + 10169, 10177, 10181, 10193, 10211, 10223, 10243, 10247, + 10253, 10259, 10267, 10271, 10273, 10289, 10301, 10303, + 10313, 10321, 10331, 10333, 10337, 10343, 10357, 10369, + 10391, 10399, 10427, 10429, 10433, 10453, 10457, 10459, + 10463, 10477, 10487, 10499, 10501, 10513, 10529, 10531, + 10559, 10567, 10589, 10597, 10601, 10607, 10613, 10627, + 10631, 10639, 10651, 10657, 10663, 10667, 10687, 10691, + 10709, 10711, 10723, 10729, 10733, 10739, 10753, 10771, + 10781, 10789, 10799, 10831, 10837, 10847, 10853, 10859, + 10861, 10867, 10883, 10889, 10891, 10903, 10909, 10937, + 10939, 10949, 10957, 10973, 10979, 10987, 10993, 11003, + 11027, 11047, 11057, 11059, 11069, 11071, 11083, 11087, + 11093, 11113, 11117, 11119, 11131, 11149, 11159, 11161, + 11171, 11173, 11177, 11197, 11213, 11239, 11243, 11251, + 11257, 11261, 11273, 11279, 11287, 11299, 11311, 11317, + 11321, 11329, 11351, 11353, 11369, 11383, 11393, 11399, + 11411, 11423, 11437, 11443, 11447, 11467, 11471, 11483, + 11489, 11491, 11497, 11503, 11519, 11527, 11549, 11551, + 11579, 11587, 11593, 11597, 11617, 11621, 11633, 11657, + 11677, 11681, 11689, 11699, 11701, 11717, 11719, 11731, + 11743, 11777, 11779, 11783, 11789, 11801, 11807, 11813, + 11821, 11827, 11831, 11833, 11839, 11863, 11867, 11887, + 11897, 11903, 11909, 11923, 11927, 11933, 11939, 11941, + 11953, 11959, 11969, 11971, 11981, 11987, 12007, 12011, + 12037, 12041, 12043, 12049, 12071, 12073, 12097, 12101, + 12107, 12109, 12113, 12119, 12143, 12149, 12157, 12161, + 12163, 12197, 12203, 12211, 12227, 12239, 12241, 12251, + 12253, 12263, 12269, 12277, 12281, 12289, 12301, 12323, + 12329, 12343, 12347, 12373, 12377, 12379, 12391, 12401, + 12409, 12413, 12421, 12433, 12437, 12451, 12457, 12473, + 12479, 12487, 12491, 12497, 12503, 12511, 12517, 12527, + 12539, 12541, 12547, 12553, 12569, 12577, 12583, 12589, + 12601, 12611, 12613, 12619, 12637, 12641, 12647, 12653, + 12659, 12671, 12689, 12697, 12703, 12713, 12721, 12739, + 12743, 12757, 12763, 12781, 12791, 12799, 12809, 12821, + 12823, 12829, 12841, 12853, 12889, 12893, 12899, 12907, + 12911, 12917, 12919, 12923, 12941, 12953, 12959, 12967, + 12973, 12979, 12983, 13001, 13003, 13007, 13009, 13033, + 13037, 13043, 13049, 13063, 13093, 13099, 13103, 13109, + 13121, 13127, 13147, 13151, 13159, 13163, 13171, 13177, + 13183, 13187, 13217, 13219, 13229, 13241, 13249, 13259, + 13267, 13291, 13297, 13309, 13313, 13327, 13331, 13337, + 13339, 13367, 13381, 13397, 13399, 13411, 13417, 13421, + 13441, 13451, 13457, 13463, 13469, 13477, 13487, 13499, + 13513, 13523, 13537, 13553, 13567, 13577, 13591, 13597, + 13613, 13619, 13627, 13633, 13649, 13669, 13679, 13681, + 13687, 13691, 13693, 13697, 13709, 13711, 13721, 13723, + 13729, 13751, 13757, 13759, 13763, 13781, 13789, 13799, + 13807, 13829, 13831, 13841, 13859, 13873, 13877, 13879, + 13883, 13901, 13903, 13907, 13913, 13921, 13931, 13933, + 13963, 13967, 13997, 13999, 14009, 14011, 14029, 14033, + 14051, 14057, 14071, 14081, 14083, 14087, 14107, 14143, + 14149, 14153, 14159, 14173, 14177, 14197, 14207, 14221, + 14243, 14249, 14251, 14281, 14293, 14303, 14321, 14323, + 14327, 14341, 14347, 14369, 14387, 14389, 14401, 14407, + 14411, 14419, 14423, 14431, 14437, 14447, 14449, 14461, + 14479, 14489, 14503, 14519, 14533, 14537, 14543, 14549, + 14551, 14557, 14561, 14563, 14591, 14593, 14621, 14627, + 14629, 14633, 14639, 14653, 14657, 14669, 14683, 14699, + 14713, 14717, 14723, 14731, 14737, 14741, 14747, 14753, + 14759, 14767, 14771, 14779, 14783, 14797, 14813, 14821, + 14827, 14831, 14843, 14851, 14867, 14869, 14879, 14887, + 14891, 14897, 14923, 14929, 14939, 14947, 14951, 14957, + 14969, 14983, 15013, 15017, 15031, 15053, 15061, 15073, + 15077, 15083, 15091, 15101, 15107, 15121, 15131, 15137, + 15139, 15149, 15161, 15173, 15187, 15193, 15199, 15217, + 15227, 15233, 15241, 15259, 15263, 15269, 15271, 15277, + 15287, 15289, 15299, 15307, 15313, 15319, 15329, 15331, + 15349, 15359, 15361, 15373, 15377, 15383, 15391, 15401, + 15413, 15427, 15439, 15443, 15451, 15461, 15467, 15473, + 15493, 15497, 15511, 15527, 15541, 15551, 15559, 15569, + 15581, 15583, 15601, 15607, 15619, 15629, 15641, 15643, + 15647, 15649, 15661, 15667, 15671, 15679, 15683, 15727, + 15731, 15733, 15737, 15739, 15749, 15761, 15767, 15773, + 15787, 15791, 15797, 15803, 15809, 15817, 15823, 15859, + 15877, 15881, 15887, 15889, 15901, 15907, 15913, 15919, + 15923, 15937, 15959, 15971, 15973, 15991, 16001, 16007, + 16033, 16057, 16061, 16063, 16067, 16069, 16073, 16087, + 16091, 16097, 16103, 16111, 16127, 16139, 16141, 16183, + 16187, 16189, 16193, 16217, 16223, 16229, 16231, 16249, + 16253, 16267, 16273, 16301, 16319, 16333, 16339, 16349, + 16361, 16363, 16369, 16381, 16411, 16417, 16421, 16427, + 16433, 16447, 16451, 16453, 16477, 16481, 16487, 16493, + 16519, 16529, 16547, 16553, 16561, 16567, 16573, 16603, + 16607, 16619, 16631, 16633, 16649, 16651, 16657, 16661, + 16673, 16691, 16693, 16699, 16703, 16729, 16741, 16747, + 16759, 16763, 16787, 16811, 16823, 16829, 16831, 16843, + 16871, 16879, 16883, 16889, 16901, 16903, 16921, 16927, + 16931, 16937, 16943, 16963, 16979, 16981, 16987, 16993, + 17011, 17021, 17027, 17029, 17033, 17041, 17047, 17053, + 17077, 17093, 17099, 17107, 17117, 17123, 17137, 17159, + 17167, 17183, 17189, 17191, 17203, 17207, 17209, 17231, + 17239, 17257, 17291, 17293, 17299, 17317, 17321, 17327, + 17333, 17341, 17351, 17359, 17377, 17383, 17387, 17389, + 17393, 17401, 17417, 17419, 17431, 17443, 17449, 17467, + 17471, 17477, 17483, 17489, 17491, 17497, 17509, 17519, + 17539, 17551, 17569, 17573, 17579, 17581, 17597, 17599, + 17609, 17623, 17627, 17657, 17659, 17669, 17681, 17683, + 17707, 17713, 17729, 17737, 17747, 17749, 17761, 17783, + 17789, 17791, 17807, 17827, 17837, 17839, 17851, 17863, }; diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c b/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c index db72bf28a6..44e7332acf 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_sqr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -15,16 +15,6 @@ * I've just gone over this and it is now %20 faster on x86 - eay - 27 Jun 96 */ int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) -{ - int ret = bn_sqr_fixed_top(r, a, ctx); - - bn_correct_top(r); - bn_check_top(r); - - return ret; -} - -int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) { int max, al; int ret = 0; @@ -92,8 +82,14 @@ int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) } rr->neg = 0; - rr->top = max; - rr->flags |= BN_FLG_FIXED_TOP; + /* + * If the most-significant half of the top word of 'a' is zero, then the + * square of 'a' will max-1 words. + */ + if (a->d[al - 1] == (a->d[al - 1] & BN_MASK2l)) + rr->top = max - 1; + else + rr->top = max; if (r != rr && BN_copy(r, rr) == NULL) goto err; diff --git a/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c b/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c index d01f12cadc..8bfbcac6a4 100644 --- a/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c +++ b/worker/deps/openssl/openssl/crypto/bn/bn_x931p.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -184,10 +184,8 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx) for (i = 0; i < 1000; i++) { if (!BN_rand(Xq, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY)) goto err; - /* Check that |Xp - Xq| > 2^(nbits - 100) */ - if (!BN_sub(t, Xp, Xq)) - goto err; + BN_sub(t, Xp, Xq); if (BN_num_bits(t) > (nbits - 100)) break; } diff --git a/worker/deps/openssl/openssl/crypto/build.info b/worker/deps/openssl/openssl/crypto/build.info index 8e15379700..916d24f66e 100644 --- a/worker/deps/openssl/openssl/crypto/build.info +++ b/worker/deps/openssl/openssl/crypto/build.info @@ -1,8 +1,9 @@ +{- use File::Spec::Functions qw/catdir catfile/; -} LIBS=../libcrypto SOURCE[../libcrypto]=\ cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fopen.c \ - threads_pthread.c threads_win.c threads_none.c getenv.c \ + threads_pthread.c threads_win.c threads_none.c \ o_init.c o_fips.c mem_sec.c init.c {- $target{cpuid_asm_src} -} \ {- $target{uplink_aux_src} -} EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ diff --git a/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl b/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl index 6beb9c5f25..9024b67e32 100644 --- a/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl +++ b/worker/deps/openssl/openssl/crypto/cast/asm/cast-586.pl @@ -7,7 +7,7 @@ # https://www.openssl.org/source/license.html -# This flag makes the inner loop one cycle longer, but generates +# This flag makes the inner loop one cycle longer, but generates # code that runs %30 faster on the pentium pro/II, 44% faster # of PIII, while only %7 slower on the pentium. # By default, this flag is on. diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl index b5e21e4938..c90306e45c 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv4.pl @@ -15,7 +15,7 @@ # ==================================================================== # # December 2014 -# +# # ChaCha20 for ARMv4. # # Performance in cycles per byte out of large buffer. @@ -720,7 +720,7 @@ sub NEONROUND { vadd.i32 $d2,$d1,$t0 @ counter+2 str @t[3], [sp,#4*(16+15)] mov @t[3],#10 - add @x[12],@x[12],#3 @ counter+3 + add @x[12],@x[12],#3 @ counter+3 b .Loop_neon .align 4 diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl index f7e1074714..db3776a2fc 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-armv8.pl @@ -15,7 +15,7 @@ # ==================================================================== # # June 2015 -# +# # ChaCha20 for ARMv8. # # Performance in cycles per byte out of large buffer. @@ -201,7 +201,7 @@ sub ROUND { mov $ctr,#10 subs $len,$len,#64 .Loop: - sub $ctr,$ctr,#1 + sub $ctr,$ctr,#1 ___ foreach (&ROUND(0, 4, 8,12)) { eval; } foreach (&ROUND(0, 5,10,15)) { eval; } diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl index 181decdad9..f972ee471a 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-ppc.pl @@ -15,7 +15,7 @@ # ==================================================================== # # October 2015 -# +# # ChaCha20 for PowerPC/AltiVec. # # Performance in cycles per byte out of large buffer. @@ -525,7 +525,7 @@ sub VMXROUND { lwz @d[3],12($ctr) vadduwm @K[5],@K[4],@K[5] - vspltisw $twenty,-12 # synthesize constants + vspltisw $twenty,-12 # synthesize constants vspltisw $twelve,12 vspltisw $twenty5,-7 #vspltisw $seven,7 # synthesized in the loop diff --git a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl index 932dec67e4..61b328612b 100755 --- a/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl +++ b/worker/deps/openssl/openssl/crypto/chacha/asm/chacha-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -61,7 +61,7 @@ $1>=10); # first version supporting AVX $ymm=1 if ($xmm && !$ymm && - `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && + `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0); # first version supporting AVX $a="eax"; diff --git a/worker/deps/openssl/openssl/crypto/cms/cms_env.c b/worker/deps/openssl/openssl/crypto/cms/cms_env.c index fe5076ec02..8d45943530 100644 --- a/worker/deps/openssl/openssl/crypto/cms/cms_env.c +++ b/worker/deps/openssl/openssl/crypto/cms/cms_env.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -282,7 +282,6 @@ int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey) CMSerr(CMS_F_CMS_RECIPIENTINFO_SET0_PKEY, CMS_R_NOT_KEY_TRANSPORT); return 0; } - EVP_PKEY_free(ri->d.ktri->pkey); ri->d.ktri->pkey = pkey; return 1; } diff --git a/worker/deps/openssl/openssl/crypto/cms/cms_smime.c b/worker/deps/openssl/openssl/crypto/cms/cms_smime.c index 5dcf803f4b..7e7b6e5d4f 100644 --- a/worker/deps/openssl/openssl/crypto/cms/cms_smime.c +++ b/worker/deps/openssl/openssl/crypto/cms/cms_smime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -631,7 +631,6 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert) * all. */ else if (!cert || !CMS_RecipientInfo_ktri_cert_cmp(ri, cert)) { - EVP_PKEY_up_ref(pk); CMS_RecipientInfo_set0_pkey(ri, pk); r = CMS_RecipientInfo_decrypt(cms, ri); CMS_RecipientInfo_set0_pkey(ri, NULL); diff --git a/worker/deps/openssl/openssl/crypto/conf/build.info b/worker/deps/openssl/openssl/crypto/conf/build.info index ff367994ea..4438eb4262 100644 --- a/worker/deps/openssl/openssl/crypto/conf/build.info +++ b/worker/deps/openssl/openssl/crypto/conf/build.info @@ -1,4 +1,4 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]= \ conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \ - conf_mall.c conf_sap.c conf_ssl.c + conf_mall.c conf_sap.c diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_api.c b/worker/deps/openssl/openssl/crypto/conf/conf_api.c index 36c91b1663..5535416ab3 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_api.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_api.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -9,12 +9,11 @@ /* Part of the code in here was originally in conf.c, which is now removed */ -#include "e_os.h" -#include "internal/cryptlib.h" #include #include #include #include +#include "e_os.h" static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf); static void value_free_stack_doall(CONF_VALUE *a); @@ -83,7 +82,7 @@ char *_CONF_get_string(const CONF *conf, const char *section, if (v != NULL) return (v->value); if (strcmp(section, "ENV") == 0) { - p = ossl_safe_getenv(name); + p = getenv(name); if (p != NULL) return (p); } @@ -96,7 +95,7 @@ char *_CONF_get_string(const CONF *conf, const char *section, else return (NULL); } else - return ossl_safe_getenv(name); + return (getenv(name)); } static unsigned long conf_value_hash(const CONF_VALUE *v) @@ -206,14 +205,10 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section) vv = lh_CONF_VALUE_insert(conf->data, v); OPENSSL_assert(vv == NULL); - if (lh_CONF_VALUE_error(conf->data) > 0) - goto err; return v; err: sk_CONF_VALUE_free(sk); - if (v != NULL) - OPENSSL_free(v->section); OPENSSL_free(v); return NULL; } diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_err.c b/worker/deps/openssl/openssl/crypto/conf/conf_err.c index 19f480d5b3..0863bc4d36 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_err.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -37,7 +37,6 @@ static ERR_STRING_DATA CONF_str_functs[] = { {ERR_FUNC(CONF_F_NCONF_LOAD_BIO), "NCONF_load_bio"}, {ERR_FUNC(CONF_F_NCONF_LOAD_FP), "NCONF_load_fp"}, {ERR_FUNC(CONF_F_NCONF_NEW), "NCONF_new"}, - {ERR_FUNC(CONF_F_SSL_MODULE_INIT), "ssl_module_init"}, {ERR_FUNC(CONF_F_STR_COPY), "str_copy"}, {0, NULL} }; @@ -58,12 +57,6 @@ static ERR_STRING_DATA CONF_str_reasons[] = { {ERR_REASON(CONF_R_NO_SECTION), "no section"}, {ERR_REASON(CONF_R_NO_SUCH_FILE), "no such file"}, {ERR_REASON(CONF_R_NO_VALUE), "no value"}, - {ERR_REASON(CONF_R_SSL_COMMAND_SECTION_EMPTY), - "ssl command section empty"}, - {ERR_REASON(CONF_R_SSL_COMMAND_SECTION_NOT_FOUND), - "ssl command section not found"}, - {ERR_REASON(CONF_R_SSL_SECTION_EMPTY), "ssl section empty"}, - {ERR_REASON(CONF_R_SSL_SECTION_NOT_FOUND), "ssl section not found"}, {ERR_REASON(CONF_R_UNABLE_TO_CREATE_NEW_SECTION), "unable to create new section"}, {ERR_REASON(CONF_R_UNKNOWN_MODULE_NAME), "unknown module name"}, diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_mall.c b/worker/deps/openssl/openssl/crypto/conf/conf_mall.c index 7e86948e89..4e7a434e0e 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_mall.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_mall.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -14,7 +14,6 @@ #include #include #include -#include "conf_lcl.h" /* Load all OpenSSL builtin modules */ @@ -27,5 +26,4 @@ void OPENSSL_load_builtin_modules(void) ENGINE_add_conf_module(); #endif EVP_add_alg_module(); - conf_add_ssl_module(); } diff --git a/worker/deps/openssl/openssl/crypto/conf/conf_mod.c b/worker/deps/openssl/openssl/crypto/conf/conf_mod.c index 722fe46061..543a8ea4ed 100644 --- a/worker/deps/openssl/openssl/crypto/conf/conf_mod.c +++ b/worker/deps/openssl/openssl/crypto/conf/conf_mod.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -478,7 +478,8 @@ char *CONF_get1_default_config_file(void) char *file; int len; - if ((file = ossl_safe_getenv("OPENSSL_CONF")) != NULL) + file = getenv("OPENSSL_CONF"); + if (file) return OPENSSL_strdup(file); len = strlen(X509_get_default_cert_area()); diff --git a/worker/deps/openssl/openssl/crypto/cryptlib.c b/worker/deps/openssl/openssl/crypto/cryptlib.c index 9e59e03ef6..d93bcd357b 100644 --- a/worker/deps/openssl/openssl/crypto/cryptlib.c +++ b/worker/deps/openssl/openssl/crypto/cryptlib.c @@ -23,97 +23,29 @@ extern unsigned int OPENSSL_ia32cap_P[4]; # if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) - -/* - * Purpose of these minimalistic and character-type-agnostic subroutines - * is to break dependency on MSVCRT (on Windows) and locale. This makes - * OPENSSL_cpuid_setup safe to use as "constructor". "Character-type- - * agnostic" means that they work with either wide or 8-bit characters, - * exploiting the fact that first 127 characters can be simply casted - * between the sets, while the rest would be simply rejected by ossl_is* - * subroutines. - */ -# ifdef _WIN32 -typedef WCHAR variant_char; - -static variant_char *ossl_getenv(const char *name) -{ - /* - * Since we pull only one environment variable, it's simpler to - * to just ignore |name| and use equivalent wide-char L-literal. - * As well as to ignore excessively long values... - */ - static WCHAR value[48]; - DWORD len = GetEnvironmentVariableW(L"OPENSSL_ia32cap", value, 48); - - return (len > 0 && len < 48) ? value : NULL; -} -# else -typedef char variant_char; -# define ossl_getenv getenv -# endif - -static int todigit(variant_char c) -{ - if (c >= '0' && c <= '9') - return c - '0'; - else if (c >= 'A' && c <= 'F') - return c - 'A' + 10; - else if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - - /* return largest base value to make caller terminate the loop */ - return 16; -} - -static uint64_t ossl_strtouint64(const variant_char *str) -{ - uint64_t ret = 0; - unsigned int digit, base = 10; - - if (*str == '0') { - base = 8, str++; - if (*str == 'x' || *str == 'X') - base = 16, str++; - } - - while((digit = todigit(*str++)) < base) - ret = ret * base + digit; - - return ret; -} - -static variant_char *ossl_strchr(const variant_char *str, char srch) -{ variant_char c; - - while((c = *str)) { - if (c == srch) - return (variant_char *)str; - str++; - } - - return NULL; -} - +#include # define OPENSSL_CPUID_SETUP typedef uint64_t IA32CAP; - void OPENSSL_cpuid_setup(void) { static int trigger = 0; IA32CAP OPENSSL_ia32_cpuid(unsigned int *); IA32CAP vec; - const variant_char *env; + char *env; if (trigger) return; trigger = 1; - if ((env = ossl_getenv("OPENSSL_ia32cap")) != NULL) { + if ((env = getenv("OPENSSL_ia32cap"))) { int off = (env[0] == '~') ? 1 : 0; - - vec = ossl_strtouint64(env + off); - +# if defined(_WIN32) + if (!sscanf(env + off, "%I64i", &vec)) + vec = strtoul(env + off, NULL, 0); +# else + if (!sscanf(env + off, "%lli", (long long *)&vec)) + vec = strtoul(env + off, NULL, 0); +# endif if (off) { IA32CAP mask = vec; vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~mask; @@ -132,17 +64,15 @@ void OPENSSL_cpuid_setup(void) vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); } - if ((env = ossl_strchr(env, ':')) != NULL) { - IA32CAP vecx; - + if ((env = strchr(env, ':'))) { + unsigned int vecx; env++; off = (env[0] == '~') ? 1 : 0; - vecx = ossl_strtouint64(env + off); - if (off) { - OPENSSL_ia32cap_P[2] &= ~(unsigned int)vecx; - } else { - OPENSSL_ia32cap_P[2] = (unsigned int)vecx; - } + vecx = strtoul(env + off, NULL, 0); + if (off) + OPENSSL_ia32cap_P[2] &= ~vecx; + else + OPENSSL_ia32cap_P[2] = vecx; } else { OPENSSL_ia32cap_P[2] = 0; } @@ -198,14 +128,10 @@ int OPENSSL_isservice(void) if (_OPENSSL_isservice.p == NULL) { HANDLE mod = GetModuleHandle(NULL); - FARPROC f = NULL; - if (mod != NULL) - f = GetProcAddress(mod, "_OPENSSL_isservice"); - if (f == NULL) + _OPENSSL_isservice.f = GetProcAddress(mod, "_OPENSSL_isservice"); + if (_OPENSSL_isservice.p == NULL) _OPENSSL_isservice.p = (void *)-1; - else - _OPENSSL_isservice.f = f; } if (_OPENSSL_isservice.p != (void *)-1) diff --git a/worker/deps/openssl/openssl/crypto/ct/ct_log.c b/worker/deps/openssl/openssl/crypto/ct/ct_log.c index 973bf4ddbd..d442322e26 100644 --- a/worker/deps/openssl/openssl/crypto/ct/ct_log.c +++ b/worker/deps/openssl/openssl/crypto/ct/ct_log.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -137,7 +137,7 @@ static int ctlog_new_from_conf(CTLOG **ct_log, const CONF *conf, const char *sec int CTLOG_STORE_load_default_file(CTLOG_STORE *store) { - const char *fpath = ossl_safe_getenv(CTLOG_FILE_EVP); + const char *fpath = getenv(CTLOG_FILE_EVP); if (fpath == NULL) fpath = CTLOG_FILE; diff --git a/worker/deps/openssl/openssl/crypto/dh/dh_key.c b/worker/deps/openssl/openssl/crypto/dh/dh_key.c index b53a063244..58003d7087 100644 --- a/worker/deps/openssl/openssl/crypto/dh/dh_key.c +++ b/worker/deps/openssl/openssl/crypto/dh/dh_key.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/crypto/dh/dh_lib.c b/worker/deps/openssl/openssl/crypto/dh/dh_lib.c index 2e727df897..716f4a4b0a 100644 --- a/worker/deps/openssl/openssl/crypto/dh/dh_lib.c +++ b/worker/deps/openssl/openssl/crypto/dh/dh_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -82,14 +82,12 @@ DH *DH_new_method(ENGINE *engine) if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { DHerr(DH_F_DH_NEW_METHOD, ERR_R_INIT_FAIL); - goto err; +err: + DH_free(ret); + ret = NULL; } return ret; - - err: - DH_free(ret); - return NULL; } void DH_free(DH *r) @@ -105,7 +103,7 @@ void DH_free(DH *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth != NULL && r->meth->finish != NULL) + if (r->meth->finish) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE ENGINE_finish(r->engine); diff --git a/worker/deps/openssl/openssl/crypto/dh/dh_meth.c b/worker/deps/openssl/openssl/crypto/dh/dh_meth.c index 59c4d7e967..ce6114c133 100644 --- a/worker/deps/openssl/openssl/crypto/dh/dh_meth.c +++ b/worker/deps/openssl/openssl/crypto/dh/dh_meth.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -75,7 +75,7 @@ int DH_meth_set1_name(DH_METHOD *dhm, const char *name) return 1; } -int DH_meth_get_flags(const DH_METHOD *dhm) +int DH_meth_get_flags(DH_METHOD *dhm) { return dhm->flags; } diff --git a/worker/deps/openssl/openssl/crypto/dllmain.c b/worker/deps/openssl/openssl/crypto/dllmain.c index 91904aad98..2d96787025 100644 --- a/worker/deps/openssl/openssl/crypto/dllmain.c +++ b/worker/deps/openssl/openssl/crypto/dllmain.c @@ -57,4 +57,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return (TRUE); } #endif - diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c index 132008803e..b8f0af4662 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -40,7 +40,6 @@ static ERR_STRING_DATA DSA_str_functs[] = { {ERR_FUNC(DSA_F_DSA_SIG_NEW), "DSA_SIG_new"}, {ERR_FUNC(DSA_F_OLD_DSA_PRIV_DECODE), "old_dsa_priv_decode"}, {ERR_FUNC(DSA_F_PKEY_DSA_CTRL), "pkey_dsa_ctrl"}, - {ERR_FUNC(DSA_F_PKEY_DSA_CTRL_STR), "pkey_dsa_ctrl_str"}, {ERR_FUNC(DSA_F_PKEY_DSA_KEYGEN), "pkey_dsa_keygen"}, {0, NULL} }; diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c index 46f4f01ee0..e58ad8d70d 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_gen.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -64,16 +64,9 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, /* invalid q size */ return 0; - if (evpmd == NULL) { - if (qsize == SHA_DIGEST_LENGTH) - evpmd = EVP_sha1(); - else if (qsize == SHA224_DIGEST_LENGTH) - evpmd = EVP_sha224(); - else - evpmd = EVP_sha256(); - } else { - qsize = EVP_MD_size(evpmd); - } + if (evpmd == NULL) + /* use SHA1 as default */ + evpmd = EVP_sha1(); if (bits < 512) bits = 512; diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c index 08956b9e3d..9598846e3b 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -91,14 +91,12 @@ DSA *DSA_new_method(ENGINE *engine) if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_INIT_FAIL); - goto err; +err: + DSA_free(ret); + ret = NULL; } return ret; - - err: - DSA_free(ret); - return NULL; } void DSA_free(DSA *r) @@ -114,7 +112,7 @@ void DSA_free(DSA *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth != NULL && r->meth->finish != NULL) + if (r->meth->finish) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE ENGINE_finish(r->engine); diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c index 04203780c4..f0188f2007 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_meth.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -83,7 +83,7 @@ int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name) return 1; } -int DSA_meth_get_flags(const DSA_METHOD *dsam) +int DSA_meth_get_flags(DSA_METHOD *dsam) { return dsam->flags; } diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c index 868283ac63..7f48cf2e33 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_ossl.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,6 @@ #include #include "internal/cryptlib.h" -#include "internal/bn_int.h" #include #include #include "dsa_locl.h" @@ -26,8 +25,6 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa); static int dsa_init(DSA *dsa); static int dsa_finish(DSA *dsa); -static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q, - BN_CTX *ctx); static DSA_METHOD openssl_dsa_meth = { "OpenSSL DSA method", @@ -64,13 +61,19 @@ const DSA_METHOD *DSA_OpenSSL(void) static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) { BIGNUM *kinv = NULL; - BIGNUM *m, *blind, *blindm, *tmp; + BIGNUM *m; + BIGNUM *xr; BN_CTX *ctx = NULL; int reason = ERR_R_BN_LIB; DSA_SIG *ret = NULL; int rv = 0; - if (dsa->p == NULL || dsa->q == NULL || dsa->g == NULL) { + m = BN_new(); + xr = BN_new(); + if (m == NULL || xr == NULL) + goto err; + + if (!dsa->p || !dsa->q || !dsa->g) { reason = DSA_R_MISSING_PARAMETERS; goto err; } @@ -86,13 +89,6 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) ctx = BN_CTX_new(); if (ctx == NULL) goto err; - m = BN_CTX_get(ctx); - blind = BN_CTX_get(ctx); - blindm = BN_CTX_get(ctx); - tmp = BN_CTX_get(ctx); - if (tmp == NULL) - goto err; - redo: if (!dsa_sign_setup(dsa, ctx, &kinv, &ret->r, dgst, dlen)) goto err; @@ -107,50 +103,17 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) if (BN_bin2bn(dgst, dlen, m) == NULL) goto err; - /* - * The normal signature calculation is: - * - * s := k^-1 * (m + r * priv_key) mod q - * - * We will blind this to protect against side channel attacks - * - * s := blind^-1 * k^-1 * (blind * m + blind * r * priv_key) mod q - */ - - /* Generate a blinding value */ - do { - if (!BN_rand(blind, BN_num_bits(dsa->q) - 1, BN_RAND_TOP_ANY, - BN_RAND_BOTTOM_ANY)) + /* Compute s = inv(k) (m + xr) mod q */ + if (!BN_mod_mul(xr, dsa->priv_key, ret->r, dsa->q, ctx)) + goto err; /* s = xr */ + if (!BN_add(ret->s, xr, m)) + goto err; /* s = m + xr */ + if (BN_cmp(ret->s, dsa->q) > 0) + if (!BN_sub(ret->s, ret->s, dsa->q)) goto err; - } while (BN_is_zero(blind)); - BN_set_flags(blind, BN_FLG_CONSTTIME); - BN_set_flags(blindm, BN_FLG_CONSTTIME); - BN_set_flags(tmp, BN_FLG_CONSTTIME); - - /* tmp := blind * priv_key * r mod q */ - if (!BN_mod_mul(tmp, blind, dsa->priv_key, dsa->q, ctx)) - goto err; - if (!BN_mod_mul(tmp, tmp, ret->r, dsa->q, ctx)) - goto err; - - /* blindm := blind * m mod q */ - if (!BN_mod_mul(blindm, blind, m, dsa->q, ctx)) - goto err; - - /* s : = (blind * priv_key * r) + (blind * m) mod q */ - if (!BN_mod_add_quick(ret->s, tmp, blindm, dsa->q)) - goto err; - - /* s := s * k^-1 mod q */ if (!BN_mod_mul(ret->s, ret->s, kinv, dsa->q, ctx)) goto err; - /* s:= s * blind^-1 mod q */ - if (BN_mod_inverse(blind, blind, dsa->q, ctx) == NULL) - goto err; - if (!BN_mod_mul(ret->s, ret->s, blind, dsa->q, ctx)) - goto err; - /* * Redo if r or s is zero as required by FIPS 186-3: this is very * unlikely. @@ -167,6 +130,8 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) ret = NULL; } BN_CTX_free(ctx); + BN_clear_free(m); + BN_clear_free(xr); BN_clear_free(kinv); return ret; } @@ -183,9 +148,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, { BN_CTX *ctx = NULL; BIGNUM *k, *kinv = NULL, *r = *rp; - BIGNUM *l; + BIGNUM *l, *m; int ret = 0; - int q_bits, q_words; + int q_bits; if (!dsa->p || !dsa->q || !dsa->g) { DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); @@ -194,7 +159,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, k = BN_new(); l = BN_new(); - if (k == NULL || l == NULL) + m = BN_new(); + if (k == NULL || l == NULL || m == NULL) goto err; if (ctx_in == NULL) { @@ -205,9 +171,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, /* Preallocate space */ q_bits = BN_num_bits(dsa->q); - q_words = bn_get_top(dsa->q); - if (!bn_wexpand(k, q_words + 2) - || !bn_wexpand(l, q_words + 2)) + if (!BN_set_bit(k, q_bits) + || !BN_set_bit(l, q_bits) + || !BN_set_bit(m, q_bits)) goto err; /* Get random k */ @@ -225,7 +191,6 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, } while (BN_is_zero(k)); BN_set_flags(k, BN_FLG_CONSTTIME); - BN_set_flags(l, BN_FLG_CONSTTIME); if (dsa->flags & DSA_FLAG_CACHE_MONT_P) { if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p, @@ -243,17 +208,14 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, * small timing information leakage. We then choose the sum that is * one bit longer than the modulus. * - * There are some concerns about the efficacy of doing this. More - * specificly refer to the discussion starting with: - * https://github.com/openssl/openssl/pull/7486#discussion_r228323705 - * The fix is to rework BN so these gymnastics aren't required. + * TODO: revisit the BN_copy aiming for a memory access agnostic + * conditional copy. */ if (!BN_add(l, k, dsa->q) - || !BN_add(k, l, dsa->q)) + || !BN_add(m, l, dsa->q) + || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m)) goto err; - BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2); - if ((dsa)->meth->bn_mod_exp != NULL) { if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx, dsa->method_mont_p)) @@ -266,8 +228,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, if (!BN_mod(r, r, dsa->q, ctx)) goto err; - /* Compute part of 's = inv(k) (m + xr) mod q' */ - if ((kinv = dsa_mod_inverse_fermat(k, dsa->q, ctx)) == NULL) + /* Compute part of 's = inv(k) (m + xr) mod q' */ + if ((kinv = BN_mod_inverse(NULL, k, dsa->q, ctx)) == NULL) goto err; BN_clear_free(*kinvp); @@ -281,6 +243,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BN_CTX_free(ctx); BN_clear_free(k); BN_clear_free(l); + BN_clear_free(m); return ret; } @@ -400,31 +363,3 @@ static int dsa_finish(DSA *dsa) BN_MONT_CTX_free(dsa->method_mont_p); return (1); } - -/* - * Compute the inverse of k modulo q. - * Since q is prime, Fermat's Little Theorem applies, which reduces this to - * mod-exp operation. Both the exponent and modulus are public information - * so a mod-exp that doesn't leak the base is sufficient. A newly allocated - * BIGNUM is returned which the caller must free. - */ -static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q, - BN_CTX *ctx) -{ - BIGNUM *res = NULL; - BIGNUM *r, *e; - - if ((r = BN_new()) == NULL) - return NULL; - - BN_CTX_start(ctx); - if ((e = BN_CTX_get(ctx)) != NULL - && BN_set_word(r, 2) - && BN_sub(e, q, r) - && BN_mod_exp_mont(r, k, e, q, ctx, NULL)) - res = r; - else - BN_free(r); - BN_CTX_end(ctx); - return res; -} diff --git a/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c b/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c index d606316954..95f088a5ec 100644 --- a/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c +++ b/worker/deps/openssl/openssl/crypto/dsa/dsa_pmeth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -76,8 +76,13 @@ static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, DSA_PKEY_CTX *dctx = ctx->data; DSA *dsa = ctx->pkey->pkey.dsa; - if (dctx->md != NULL && tbslen != (size_t)EVP_MD_size(dctx->md)) - return 0; + if (dctx->md) { + if (tbslen != (size_t)EVP_MD_size(dctx->md)) + return 0; + } else { + if (tbslen != SHA_DIGEST_LENGTH) + return 0; + } ret = DSA_sign(0, tbs, tbslen, sig, &sltmp, dsa); @@ -95,8 +100,13 @@ static int pkey_dsa_verify(EVP_PKEY_CTX *ctx, DSA_PKEY_CTX *dctx = ctx->data; DSA *dsa = ctx->pkey->pkey.dsa; - if (dctx->md != NULL && tbslen != (size_t)EVP_MD_size(dctx->md)) - return 0; + if (dctx->md) { + if (tbslen != (size_t)EVP_MD_size(dctx->md)) + return 0; + } else { + if (tbslen != SHA_DIGEST_LENGTH) + return 0; + } ret = DSA_verify(0, tbs, tbslen, sig, siglen, dsa); @@ -177,15 +187,9 @@ static int pkey_dsa_ctrl_str(EVP_PKEY_CTX *ctx, NULL); } if (strcmp(type, "dsa_paramgen_md") == 0) { - const EVP_MD *md = EVP_get_digestbyname(value); - - if (md == NULL) { - DSAerr(DSA_F_PKEY_DSA_CTRL_STR, DSA_R_INVALID_DIGEST_TYPE); - return 0; - } return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, EVP_PKEY_CTRL_DSA_PARAMGEN_MD, 0, - (void *)md); + (void *)EVP_get_digestbyname(value)); } return -2; } diff --git a/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c b/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c index e01425bc75..a4b0cdd95b 100644 --- a/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c +++ b/worker/deps/openssl/openssl/crypto/dso/dso_dlfcn.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -26,7 +26,7 @@ # endif # include # define HAVE_DLINFO 1 -# if defined(__CYGWIN__) || \ +# if defined(_AIX) || defined(__CYGWIN__) || \ defined(__SCO_VERSION__) || defined(_SCO_ELF) || \ (defined(__osf__) && !defined(RTLD_NEXT)) || \ (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \ @@ -308,76 +308,6 @@ static int dladdr(void *address, Dl_info *dl) } # endif /* __sgi */ -# ifdef _AIX -/*- - * See IBM's AIX Version 7.2, Technical Reference: - * Base Operating System and Extensions, Volume 1 and 2 - * https://www.ibm.com/support/knowledgecenter/ssw_aix_72/com.ibm.aix.base/technicalreferences.htm - */ -# include -# include -/* ~ 64 * (sizeof(struct ld_info) + _XOPEN_PATH_MAX + _XOPEN_NAME_MAX) */ -# define DLFCN_LDINFO_SIZE 86976 -typedef struct Dl_info { - const char *dli_fname; -} Dl_info; -/* - * This dladdr()-implementation will also find the ptrgl (Pointer Glue) virtual - * address of a function, which is just located in the DATA segment instead of - * the TEXT segment. - */ -static int dladdr(void *ptr, Dl_info *dl) -{ - uintptr_t addr = (uintptr_t)ptr; - unsigned int found = 0; - struct ld_info *ldinfos, *next_ldi, *this_ldi; - - if ((ldinfos = (struct ld_info *)OPENSSL_malloc(DLFCN_LDINFO_SIZE)) == NULL) { - errno = ENOMEM; - dl->dli_fname = NULL; - return 0; - } - - if ((loadquery(L_GETINFO, (void *)ldinfos, DLFCN_LDINFO_SIZE)) < 0) { - /*- - * Error handling is done through errno and dlerror() reading errno: - * ENOMEM (ldinfos buffer is too small), - * EINVAL (invalid flags), - * EFAULT (invalid ldinfos ptr) - */ - OPENSSL_free((void *)ldinfos); - dl->dli_fname = NULL; - return 0; - } - next_ldi = ldinfos; - - do { - this_ldi = next_ldi; - if (((addr >= (uintptr_t)this_ldi->ldinfo_textorg) - && (addr < ((uintptr_t)this_ldi->ldinfo_textorg + - this_ldi->ldinfo_textsize))) - || ((addr >= (uintptr_t)this_ldi->ldinfo_dataorg) - && (addr < ((uintptr_t)this_ldi->ldinfo_dataorg + - this_ldi->ldinfo_datasize)))) { - found = 1; - /* - * Ignoring the possibility of a member name and just returning - * the path name. See docs: sys/ldr.h, loadquery() and - * dlopen()/RTLD_MEMBER. - */ - if ((dl->dli_fname = - OPENSSL_strdup(this_ldi->ldinfo_filename)) == NULL) - errno = ENOMEM; - } else { - next_ldi = - (struct ld_info *)((uintptr_t)this_ldi + this_ldi->ldinfo_next); - } - } while (this_ldi->ldinfo_next && !found); - OPENSSL_free((void *)ldinfos); - return (found && dl->dli_fname != NULL); -} -# endif /* _AIX */ - static int dlfcn_pathbyaddr(void *addr, char *path, int sz) { # ifdef HAVE_DLINFO @@ -396,19 +326,12 @@ static int dlfcn_pathbyaddr(void *addr, char *path, int sz) if (dladdr(addr, &dli)) { len = (int)strlen(dli.dli_fname); - if (sz <= 0) { -# ifdef _AIX - OPENSSL_free((void *)dli.dli_fname); -# endif + if (sz <= 0) return len + 1; - } if (len >= sz) len = sz - 1; memcpy(path, dli.dli_fname, len); path[len++] = 0; -# ifdef _AIX - OPENSSL_free((void *)dli.dli_fname); -# endif return len; } diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl index 4eb4c68977..2314b75244 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -894,13 +894,13 @@ .Loop_scatter_w7: ldr $mask,[$inp],#4 subs $index,$index,#1 - strb $mask,[$out,#64*0] + strb $mask,[$out,#64*0-1] mov $mask,$mask,lsr#8 - strb $mask,[$out,#64*1] + strb $mask,[$out,#64*1-1] mov $mask,$mask,lsr#8 - strb $mask,[$out,#64*2] + strb $mask,[$out,#64*2-1] mov $mask,$mask,lsr#8 - strb $mask,[$out,#64*3] + strb $mask,[$out,#64*3-1] add $out,$out,#64*4 bne .Loop_scatter_w7 @@ -1633,7 +1633,7 @@ $code.=<<___; .Ladd_done: add sp,sp,#32*18+16+16 @ +16 means "skip even over saved r0-r3" -#if __ARM_ARCH__>=5 || !defined(__thumb__) +#if __ARM_ARCH__>=5 || defined(__thumb__) ldmia sp!,{r4-r12,pc} #else ldmia sp!,{r4-r12,lr} diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl index 2a39675bfd..d93c4fe957 100644 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -660,7 +660,7 @@ adc $ap,xzr,xzr // zap $ap tst $acc0,#1 // is a even? - csel $acc0,$acc0,$t0,eq // ret = even ? a : a+modulus + csel $acc0,$acc0,$t0,eq // ret = even ? a : a+modulus csel $acc1,$acc1,$t1,eq csel $acc2,$acc2,$t2,eq csel $acc3,$acc3,$t3,eq @@ -1477,21 +1477,21 @@ prfm pstl1strm,[$out,#4096+64*5] prfm pstl1strm,[$out,#4096+64*6] prfm pstl1strm,[$out,#4096+64*7] - strb w3,[$out,#64*0] + strb w3,[$out,#64*0-1] lsr x3,x3,#8 - strb w3,[$out,#64*1] + strb w3,[$out,#64*1-1] lsr x3,x3,#8 - strb w3,[$out,#64*2] + strb w3,[$out,#64*2-1] lsr x3,x3,#8 - strb w3,[$out,#64*3] + strb w3,[$out,#64*3-1] lsr x3,x3,#8 - strb w3,[$out,#64*4] + strb w3,[$out,#64*4-1] lsr x3,x3,#8 - strb w3,[$out,#64*5] + strb w3,[$out,#64*5-1] lsr x3,x3,#8 - strb w3,[$out,#64*6] + strb w3,[$out,#64*6-1] lsr x3,x3,#8 - strb w3,[$out,#64*7] + strb w3,[$out,#64*7-1] add $out,$out,#64*8 b.ne .Loop_scatter_w7 diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl index edd7d01281..3bdd2cf13f 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -67,7 +67,7 @@ $addx = ($1>=12); } -if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) { +if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) { my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10 $avx = ($ver>=3.0) + ($ver>=3.01); $addx = ($ver>=3.03); diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl index 0c1af95b13..ee11069459 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -1531,13 +1531,13 @@ ld [$inp],%l0 add $inp,4,$inp subcc $index,1,$index - stb %l0,[$out+64*0] + stb %l0,[$out+64*0-1] srl %l0,8,%l1 - stb %l1,[$out+64*1] + stb %l1,[$out+64*1-1] srl %l0,16,%l2 - stb %l2,[$out+64*2] + stb %l2,[$out+64*2-1] srl %l0,24,%l3 - stb %l3,[$out+64*3] + stb %l3,[$out+64*3-1] bne .Loop_scatter_w7 add $out,64*4,$out @@ -1874,7 +1874,7 @@ ldx [$bp+8*($i+1)],$bi ! bp[$i+1] ___ $code.=<<___; - addcc $acc1,$t0,$acc1 ! accumulate high parts of multiplication + addcc $acc1,$t0,$acc1 ! accumulate high parts of multiplication sllx $acc0,32,$t0 addxccc $acc2,$t1,$acc2 srlx $acc0,32,$t1 diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl index b3bec23228..f637c844c4 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -443,7 +443,7 @@ &mov (&DWP(20,"esp"),"eax"); &mov (&DWP(24,"esp"),"eax"); &mov (&DWP(28,"esp"),"eax"); - + &call ("_ecp_nistz256_sub"); &stack_pop(8); @@ -1179,7 +1179,7 @@ &mov ("esi",&wparam(1)); &mov ("ebp",&wparam(2)); - &lea ("edi",&DWP(0,"edi","ebp")); + &lea ("edi",&DWP(-1,"edi","ebp")); &mov ("ebp",64/4); &set_label("scatter_w7_loop"); &mov ("eax",&DWP(0,"esi")); diff --git a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl index 714e852a18..183137e5f0 100755 --- a/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl +++ b/worker/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl @@ -3051,8 +3051,8 @@ () ######################################################################## # Convert ecp_nistz256_table.c to layout expected by ecp_nistz_gather_w7 # -open TABLE,"Z, src->Z)) return 0; dest->Z_is_one = src->Z_is_one; - dest->curve_name = src->curve_name; return 1; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c b/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c index f8f1e2c842..b66adf2bbc 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -92,19 +92,19 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) static EC_KEY *eckey_type2param(int ptype, const void *pval) { EC_KEY *eckey = NULL; - EC_GROUP *group = NULL; - if (ptype == V_ASN1_SEQUENCE) { const ASN1_STRING *pstr = pval; - const unsigned char *pm = pstr->data; - int pmlen = pstr->length; - + const unsigned char *pm = NULL; + int pmlen; + pm = pstr->data; + pmlen = pstr->length; if ((eckey = d2i_ECParameters(NULL, &pm, pmlen)) == NULL) { ECerr(EC_F_ECKEY_TYPE2PARAM, EC_R_DECODE_ERROR); goto ecerr; } } else if (ptype == V_ASN1_OBJECT) { const ASN1_OBJECT *poid = pval; + EC_GROUP *group; /* * type == V_ASN1_OBJECT => the parameters are given by an asn1 OID @@ -129,7 +129,6 @@ static EC_KEY *eckey_type2param(int ptype, const void *pval) ecerr: EC_KEY_free(eckey); - EC_GROUP_free(group); return NULL; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_curve.c b/worker/deps/openssl/openssl/crypto/ec/ec_curve.c index b022528be2..f8a3846fd5 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_curve.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_curve.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -3036,8 +3036,6 @@ static EC_GROUP *ec_group_new_from_data(const ec_list_element curve) } #endif - EC_GROUP_set_curve_name(group, curve.nid); - if ((P = EC_POINT_new(group)) == NULL) { ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB); goto err; @@ -3103,6 +3101,8 @@ EC_GROUP *EC_GROUP_new_by_curve_name(int nid) return NULL; } + EC_GROUP_set_curve_name(ret, nid); + return ret; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_err.c b/worker/deps/openssl/openssl/crypto/ec/ec_err.c index 717c92e984..e4c2c1c1a4 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_err.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -97,8 +97,6 @@ static ERR_STRING_DATA EC_str_functs[] = { {ERR_FUNC(EC_F_EC_GFP_NIST_FIELD_SQR), "ec_GFp_nist_field_sqr"}, {ERR_FUNC(EC_F_EC_GFP_NIST_GROUP_SET_CURVE), "ec_GFp_nist_group_set_curve"}, - {ERR_FUNC(EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES), - "ec_GFp_simple_blind_coordinates"}, {ERR_FUNC(EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT), "ec_GFp_simple_group_check_discriminant"}, {ERR_FUNC(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE), diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_key.c b/worker/deps/openssl/openssl/crypto/ec/ec_key.c index 462156f204..f1f0afb466 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_key.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_key.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -55,7 +55,7 @@ void EC_KEY_free(EC_KEY *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth != NULL && r->meth->finish != NULL) + if (r->meth->finish != NULL) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c b/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c index 64a5d20872..5e5d1ae1cf 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_kmeth.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -119,7 +119,7 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine) } return ret; - err: +err: EC_KEY_free(ret); return NULL; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h b/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h index ca1776efdb..ded35a72a0 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h +++ b/worker/deps/openssl/openssl/crypto/ec/ec_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -169,7 +169,6 @@ struct ec_method_st { /* custom ECDH operation */ int (*ecdh_compute_key)(unsigned char **pout, size_t *poutlen, const EC_POINT *pub_key, const EC_KEY *ecdh); - int (*blind_coordinates)(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx); }; /* @@ -270,8 +269,6 @@ struct ec_key_st { struct ec_point_st { const EC_METHOD *meth; - /* NID for the curve if known */ - int curve_name; /* * All members except 'meth' are handled by the method functions, even if * they appear generic @@ -284,20 +281,6 @@ struct ec_point_st { * special case */ }; - -static ossl_inline int ec_point_is_compat(const EC_POINT *point, - const EC_GROUP *group) -{ - if (group->meth != point->meth - || (group->curve_name != 0 - && point->curve_name != 0 - && group->curve_name != point->curve_name)) - return 0; - - return 1; -} - - NISTP224_PRE_COMP *EC_nistp224_pre_comp_dup(NISTP224_PRE_COMP *); NISTP256_PRE_COMP *EC_nistp256_pre_comp_dup(NISTP256_PRE_COMP *); NISTP521_PRE_COMP *EC_nistp521_pre_comp_dup(NISTP521_PRE_COMP *); @@ -376,8 +359,6 @@ int ec_GFp_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *); int ec_GFp_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); -int ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p, - BN_CTX *ctx); /* method functions in ecp_mont.c */ int ec_GFp_mont_group_init(EC_GROUP *); @@ -630,5 +611,3 @@ int X25519(uint8_t out_shared_key[32], const uint8_t private_key[32], const uint8_t peer_public_value[32]); void X25519_public_from_private(uint8_t out_public_value[32], const uint8_t private_key[32]); - -int ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx); diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_lib.c b/worker/deps/openssl/openssl/crypto/ec/ec_lib.c index a7be03b627..7cb4bfee28 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_lib.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -140,8 +140,6 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src) if (dest == src) return 1; - dest->curve_name = src->curve_name; - /* Copy precomputed */ dest->pre_comp_type = src->pre_comp_type; switch (src->pre_comp_type) { @@ -204,6 +202,7 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src) return 0; } + dest->curve_name = src->curve_name; dest->asn1_flag = src->asn1_flag; dest->asn1_form = src->asn1_form; @@ -564,7 +563,6 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group) } ret->meth = group->meth; - ret->curve_name = group->curve_name; if (!ret->meth->point_init(ret)) { OPENSSL_free(ret); @@ -602,10 +600,7 @@ int EC_POINT_copy(EC_POINT *dest, const EC_POINT *src) ECerr(EC_F_EC_POINT_COPY, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (dest->meth != src->meth - || (dest->curve_name != src->curve_name - && dest->curve_name != 0 - && src->curve_name != 0)) { + if (dest->meth != src->meth) { ECerr(EC_F_EC_POINT_COPY, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -662,7 +657,7 @@ int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -681,7 +676,7 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -699,7 +694,7 @@ int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -725,7 +720,7 @@ int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -751,16 +746,11 @@ int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; } - if (EC_POINT_is_at_infinity(group, point)) { - ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP, - EC_R_POINT_AT_INFINITY); - return 0; - } return group->meth->point_get_affine_coordinates(group, point, x, y, ctx); } @@ -774,16 +764,11 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS); return 0; } - if (EC_POINT_is_at_infinity(group, point)) { - ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M, - EC_R_POINT_AT_INFINITY); - return 0; - } return group->meth->point_get_affine_coordinates(group, point, x, y, ctx); } #endif @@ -795,8 +780,8 @@ int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, ECerr(EC_F_EC_POINT_ADD, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(r, group) || !ec_point_is_compat(a, group) - || !ec_point_is_compat(b, group)) { + if ((group->meth != r->meth) || (r->meth != a->meth) + || (a->meth != b->meth)) { ECerr(EC_F_EC_POINT_ADD, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -810,7 +795,7 @@ int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, ECerr(EC_F_EC_POINT_DBL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(r, group) || !ec_point_is_compat(a, group)) { + if ((group->meth != r->meth) || (r->meth != a->meth)) { ECerr(EC_F_EC_POINT_DBL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -823,7 +808,7 @@ int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx) ECerr(EC_F_EC_POINT_INVERT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(a, group)) { + if (group->meth != a->meth) { ECerr(EC_F_EC_POINT_INVERT, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -837,7 +822,7 @@ int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *point) ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_IS_AT_INFINITY, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -858,7 +843,7 @@ int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point, ECerr(EC_F_EC_POINT_IS_ON_CURVE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_IS_ON_CURVE, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -872,7 +857,7 @@ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, ECerr(EC_F_EC_POINT_CMP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; } - if (!ec_point_is_compat(a, group) || !ec_point_is_compat(b, group)) { + if ((group->meth != a->meth) || (a->meth != b->meth)) { ECerr(EC_F_EC_POINT_CMP, EC_R_INCOMPATIBLE_OBJECTS); return -1; } @@ -885,7 +870,7 @@ int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx) ECerr(EC_F_EC_POINT_MAKE_AFFINE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_MAKE_AFFINE, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -902,7 +887,7 @@ int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, return 0; } for (i = 0; i < num; i++) { - if (!ec_point_is_compat(points[i], group)) { + if (group->meth != points[i]->meth) { ECerr(EC_F_EC_POINTS_MAKE_AFFINE, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -1017,21 +1002,3 @@ int ec_group_simple_order_bits(const EC_GROUP *group) return 0; return BN_num_bits(group->order); } - -/*- - * Coordinate blinding for EC_POINT. - * - * The underlying EC_METHOD can optionally implement this function: - * underlying implementations should return 0 on errors, or 1 on - * success. - * - * This wrapper returns 1 in case the underlying EC_METHOD does not - * support coordinate blinding. - */ -int ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx) -{ - if (group->meth->blind_coordinates == NULL) - return 1; /* ignore if not implemented */ - - return group->meth->blind_coordinates(group, p, ctx); -} diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_mult.c b/worker/deps/openssl/openssl/crypto/ec/ec_mult.c index 8350082eb4..b39777fbf2 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_mult.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_mult.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -105,235 +105,6 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *pre) OPENSSL_free(pre); } -#define EC_POINT_BN_set_flags(P, flags) do { \ - BN_set_flags((P)->X, (flags)); \ - BN_set_flags((P)->Y, (flags)); \ - BN_set_flags((P)->Z, (flags)); \ -} while(0) - -/*- - * This functions computes (in constant time) a point multiplication over the - * EC group. - * - * At a high level, it is Montgomery ladder with conditional swaps. - * - * It performs either a fixed scalar point multiplication - * (scalar * generator) - * when point is NULL, or a generic scalar point multiplication - * (scalar * point) - * when point is not NULL. - * - * scalar should be in the range [0,n) otherwise all constant time bets are off. - * - * NB: This says nothing about EC_POINT_add and EC_POINT_dbl, - * which of course are not constant time themselves. - * - * The product is stored in r. - * - * Returns 1 on success, 0 otherwise. - */ -static int ec_mul_consttime(const EC_GROUP *group, EC_POINT *r, - const BIGNUM *scalar, const EC_POINT *point, - BN_CTX *ctx) -{ - int i, cardinality_bits, group_top, kbit, pbit, Z_is_one; - EC_POINT *s = NULL; - BIGNUM *k = NULL; - BIGNUM *lambda = NULL; - BIGNUM *cardinality = NULL; - BN_CTX *new_ctx = NULL; - int ret = 0; - - if (ctx == NULL && (ctx = new_ctx = BN_CTX_secure_new()) == NULL) - return 0; - - BN_CTX_start(ctx); - - s = EC_POINT_new(group); - if (s == NULL) - goto err; - - if (point == NULL) { - if (!EC_POINT_copy(s, group->generator)) - goto err; - } else { - if (!EC_POINT_copy(s, point)) - goto err; - } - - EC_POINT_BN_set_flags(s, BN_FLG_CONSTTIME); - - cardinality = BN_CTX_get(ctx); - lambda = BN_CTX_get(ctx); - k = BN_CTX_get(ctx); - if (k == NULL || !BN_mul(cardinality, group->order, group->cofactor, ctx)) - goto err; - - /* - * Group cardinalities are often on a word boundary. - * So when we pad the scalar, some timing diff might - * pop if it needs to be expanded due to carries. - * So expand ahead of time. - */ - cardinality_bits = BN_num_bits(cardinality); - group_top = bn_get_top(cardinality); - if ((bn_wexpand(k, group_top + 2) == NULL) - || (bn_wexpand(lambda, group_top + 2) == NULL)) - goto err; - - if (!BN_copy(k, scalar)) - goto err; - - BN_set_flags(k, BN_FLG_CONSTTIME); - - if ((BN_num_bits(k) > cardinality_bits) || (BN_is_negative(k))) { - /*- - * this is an unusual input, and we don't guarantee - * constant-timeness - */ - if (!BN_nnmod(k, k, cardinality, ctx)) - goto err; - } - - if (!BN_add(lambda, k, cardinality)) - goto err; - BN_set_flags(lambda, BN_FLG_CONSTTIME); - if (!BN_add(k, lambda, cardinality)) - goto err; - /* - * lambda := scalar + cardinality - * k := scalar + 2*cardinality - */ - kbit = BN_is_bit_set(lambda, cardinality_bits); - BN_consttime_swap(kbit, k, lambda, group_top + 2); - - group_top = bn_get_top(group->field); - if ((bn_wexpand(s->X, group_top) == NULL) - || (bn_wexpand(s->Y, group_top) == NULL) - || (bn_wexpand(s->Z, group_top) == NULL) - || (bn_wexpand(r->X, group_top) == NULL) - || (bn_wexpand(r->Y, group_top) == NULL) - || (bn_wexpand(r->Z, group_top) == NULL)) - goto err; - - /*- - * Apply coordinate blinding for EC_POINT. - * - * The underlying EC_METHOD can optionally implement this function: - * ec_point_blind_coordinates() returns 0 in case of errors or 1 on - * success or if coordinate blinding is not implemented for this - * group. - */ - if (!ec_point_blind_coordinates(group, s, ctx)) - goto err; - - /* top bit is a 1, in a fixed pos */ - if (!EC_POINT_copy(r, s)) - goto err; - - EC_POINT_BN_set_flags(r, BN_FLG_CONSTTIME); - - if (!EC_POINT_dbl(group, s, s, ctx)) - goto err; - - pbit = 0; - -#define EC_POINT_CSWAP(c, a, b, w, t) do { \ - BN_consttime_swap(c, (a)->X, (b)->X, w); \ - BN_consttime_swap(c, (a)->Y, (b)->Y, w); \ - BN_consttime_swap(c, (a)->Z, (b)->Z, w); \ - t = ((a)->Z_is_one ^ (b)->Z_is_one) & (c); \ - (a)->Z_is_one ^= (t); \ - (b)->Z_is_one ^= (t); \ -} while(0) - - /*- - * The ladder step, with branches, is - * - * k[i] == 0: S = add(R, S), R = dbl(R) - * k[i] == 1: R = add(S, R), S = dbl(S) - * - * Swapping R, S conditionally on k[i] leaves you with state - * - * k[i] == 0: T, U = R, S - * k[i] == 1: T, U = S, R - * - * Then perform the ECC ops. - * - * U = add(T, U) - * T = dbl(T) - * - * Which leaves you with state - * - * k[i] == 0: U = add(R, S), T = dbl(R) - * k[i] == 1: U = add(S, R), T = dbl(S) - * - * Swapping T, U conditionally on k[i] leaves you with state - * - * k[i] == 0: R, S = T, U - * k[i] == 1: R, S = U, T - * - * Which leaves you with state - * - * k[i] == 0: S = add(R, S), R = dbl(R) - * k[i] == 1: R = add(S, R), S = dbl(S) - * - * So we get the same logic, but instead of a branch it's a - * conditional swap, followed by ECC ops, then another conditional swap. - * - * Optimization: The end of iteration i and start of i-1 looks like - * - * ... - * CSWAP(k[i], R, S) - * ECC - * CSWAP(k[i], R, S) - * (next iteration) - * CSWAP(k[i-1], R, S) - * ECC - * CSWAP(k[i-1], R, S) - * ... - * - * So instead of two contiguous swaps, you can merge the condition - * bits and do a single swap. - * - * k[i] k[i-1] Outcome - * 0 0 No Swap - * 0 1 Swap - * 1 0 Swap - * 1 1 No Swap - * - * This is XOR. pbit tracks the previous bit of k. - */ - - for (i = cardinality_bits - 1; i >= 0; i--) { - kbit = BN_is_bit_set(k, i) ^ pbit; - EC_POINT_CSWAP(kbit, r, s, group_top, Z_is_one); - if (!EC_POINT_add(group, s, r, s, ctx)) - goto err; - if (!EC_POINT_dbl(group, r, r, ctx)) - goto err; - /* - * pbit logic merges this cswap with that of the - * next iteration - */ - pbit ^= kbit; - } - /* one final cswap to move the right value into r */ - EC_POINT_CSWAP(pbit, r, s, group_top, Z_is_one); -#undef EC_POINT_CSWAP - - ret = 1; - - err: - EC_POINT_free(s); - BN_CTX_end(ctx); - BN_CTX_free(new_ctx); - - return ret; -} - -#undef EC_POINT_BN_set_flags - /* * TODO: table should be optimised for the wNAF-based implementation, * sometimes smaller windows will give better performance (thus the @@ -384,7 +155,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, * precomputation is not available */ int ret = 0; - if (!ec_point_is_compat(r, group)) { + if (group->meth != r->meth) { ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -393,36 +164,8 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, return EC_POINT_set_to_infinity(group, r); } - if (!BN_is_zero(group->order) && !BN_is_zero(group->cofactor)) { - /*- - * Handle the common cases where the scalar is secret, enforcing a constant - * time scalar multiplication algorithm. - */ - if ((scalar != NULL) && (num == 0)) { - /*- - * In this case we want to compute scalar * GeneratorPoint: this - * codepath is reached most prominently by (ephemeral) key generation - * of EC cryptosystems (i.e. ECDSA keygen and sign setup, ECDH - * keygen/first half), where the scalar is always secret. This is why - * we ignore if BN_FLG_CONSTTIME is actually set and we always call the - * constant time version. - */ - return ec_mul_consttime(group, r, scalar, NULL, ctx); - } - if ((scalar == NULL) && (num == 1)) { - /*- - * In this case we want to compute scalar * GenericPoint: this codepath - * is reached most prominently by the second half of ECDH, where the - * secret scalar is multiplied by the peer's public point. To protect - * the secret scalar, we ignore if BN_FLG_CONSTTIME is actually set and - * we always call the constant time version. - */ - return ec_mul_consttime(group, r, scalars[0], points[0], ctx); - } - } - for (i = 0; i < num; i++) { - if (!ec_point_is_compat(points[i], group)) { + if (group->meth != points[i]->meth) { ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ec_oct.c b/worker/deps/openssl/openssl/crypto/ec/ec_oct.c index e185df6edf..effc42a344 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ec_oct.c +++ b/worker/deps/openssl/openssl/crypto/ec/ec_oct.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -30,7 +30,7 @@ int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -66,7 +66,7 @@ int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS); return 0; @@ -93,7 +93,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, ECerr(EC_F_EC_POINT_POINT2OCT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -123,7 +123,7 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point, ECerr(EC_F_EC_POINT_OCT2POINT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } - if (!ec_point_is_compat(point, group)) { + if (group->meth != point->meth) { ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_INCOMPATIBLE_OBJECTS); return 0; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c b/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c index 9e4a68d9ca..449be0e92a 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecdsa_ossl.c @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -10,8 +10,9 @@ #include #include #include +#include #include -#include "internal/bn_int.h" +#include #include "ec_lcl.h" int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen, @@ -52,12 +53,13 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, return 0; } - if ((ctx = ctx_in) == NULL) { + if (ctx_in == NULL) { if ((ctx = BN_CTX_new()) == NULL) { ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_MALLOC_FAILURE); return 0; } - } + } else + ctx = ctx_in; k = BN_new(); /* this value is later returned in *kinvp */ r = BN_new(); /* this value is later returned in *rp */ @@ -71,6 +73,10 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, goto err; } order = EC_GROUP_get0_order(group); + if (order == NULL) { + ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); + goto err; + } /* Preallocate space */ order_bits = BN_num_bits(order); @@ -81,23 +87,23 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, do { /* get random k */ - do { + do if (dgst != NULL) { - if (!BN_generate_dsa_nonce(k, order, - EC_KEY_get0_private_key(eckey), - dgst, dlen, ctx)) { + if (!BN_generate_dsa_nonce + (k, order, EC_KEY_get0_private_key(eckey), dgst, dlen, + ctx)) { ECerr(EC_F_ECDSA_SIGN_SETUP, - EC_R_RANDOM_NUMBER_GENERATION_FAILED); + EC_R_RANDOM_NUMBER_GENERATION_FAILED); goto err; } } else { if (!BN_rand_range(k, order)) { ECerr(EC_F_ECDSA_SIGN_SETUP, - EC_R_RANDOM_NUMBER_GENERATION_FAILED); + EC_R_RANDOM_NUMBER_GENERATION_FAILED); goto err; } } - } while (BN_is_zero(k)); + while (BN_is_zero(k)); /* * We do not want timing information to leak the length of k, so we @@ -123,16 +129,18 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, } if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) { - if (!EC_POINT_get_affine_coordinates_GFp(group, tmp_point, X, - NULL, ctx)) { + if (!EC_POINT_get_affine_coordinates_GFp + (group, tmp_point, X, NULL, ctx)) { ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); goto err; } } #ifndef OPENSSL_NO_EC2M else { /* NID_X9_62_characteristic_two_field */ - if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp_point, X, - NULL, ctx)) { + + if (!EC_POINT_get_affine_coordinates_GF2m(group, + tmp_point, X, NULL, + ctx)) { ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); goto err; } @@ -142,7 +150,8 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, ECerr(EC_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB); goto err; } - } while (BN_is_zero(r)); + } + while (BN_is_zero(r)); /* compute the inverse of k */ if (EC_GROUP_get_mont_data(group) != NULL) { @@ -201,7 +210,8 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, EC_KEY *eckey) { int ok = 0, i; - BIGNUM *kinv = NULL, *s, *m = NULL; + BIGNUM *kinv = NULL, *s, *m = NULL, *tmp = NULL, *blind = NULL; + BIGNUM *blindm = NULL; const BIGNUM *order, *ckinv; BN_CTX *ctx = NULL; const EC_GROUP *group; @@ -234,13 +244,27 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, } s = ret->s; - if ((ctx = BN_CTX_new()) == NULL - || (m = BN_new()) == NULL) { + ctx = BN_CTX_secure_new(); + if (ctx == NULL) { + ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_MALLOC_FAILURE); + goto err; + } + + BN_CTX_start(ctx); + tmp = BN_CTX_get(ctx); + m = BN_CTX_get(ctx); + blind = BN_CTX_get(ctx); + blindm = BN_CTX_get(ctx); + if (blindm == NULL) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_MALLOC_FAILURE); goto err; } order = EC_GROUP_get0_order(group); + if (order == NULL) { + ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_EC_LIB); + goto err; + } i = BN_num_bits(order); /* * Need to truncate digest if it is too long: first truncate whole bytes. @@ -251,7 +275,7 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } - /* If still too long, truncate remaining bits with a shift */ + /* If still too long truncate remaining bits with a shift */ if ((8 * dgst_len > i) && !BN_rshift(m, m, 8 - (i & 0x7))) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; @@ -272,27 +296,59 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, } /* - * With only one multiplicant being in Montgomery domain - * multiplication yields real result without post-conversion. - * Also note that all operations but last are performed with - * zero-padded vectors. Last operation, BN_mod_mul_montgomery - * below, returns user-visible value with removed zero padding. + * The normal signature calculation is: + * + * s := k^-1 * (m + r * priv_key) mod order + * + * We will blind this to protect against side channel attacks + * + * s := k^-1 * blind^-1 * (blind * m + blind * r * priv_key) mod order */ - if (!bn_to_mont_fixed_top(s, ret->r, group->mont_data, ctx) - || !bn_mul_mont_fixed_top(s, s, priv_key, group->mont_data, ctx)) { + + /* Generate a blinding value */ + do { + if (!BN_rand(blind, BN_num_bits(order) - 1, BN_RAND_TOP_ANY, + BN_RAND_BOTTOM_ANY)) + goto err; + } while (BN_is_zero(blind)); + BN_set_flags(blind, BN_FLG_CONSTTIME); + BN_set_flags(blindm, BN_FLG_CONSTTIME); + BN_set_flags(tmp, BN_FLG_CONSTTIME); + + /* tmp := blind * priv_key * r mod order */ + if (!BN_mod_mul(tmp, blind, priv_key, order, ctx)) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } - if (!bn_mod_add_fixed_top(s, s, m, order)) { + if (!BN_mod_mul(tmp, tmp, ret->r, order, ctx)) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } - /* - * |s| can still be larger than modulus, because |m| can be. In - * such case we count on Montgomery reduction to tie it up. - */ - if (!bn_to_mont_fixed_top(s, s, group->mont_data, ctx) - || !BN_mod_mul_montgomery(s, s, ckinv, group->mont_data, ctx)) { + + /* blindm := blind * m mod order */ + if (!BN_mod_mul(blindm, blind, m, order, ctx)) { + ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); + goto err; + } + + /* s : = (blind * priv_key * r) + (blind * m) mod order */ + if (!BN_mod_add_quick(s, tmp, blindm, order)) { + ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); + goto err; + } + + /* s:= s * blind^-1 mod order */ + if (BN_mod_inverse(blind, blind, order, ctx) == NULL) { + ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); + goto err; + } + if (!BN_mod_mul(s, s, blind, order, ctx)) { + ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); + goto err; + } + + /* s := s * k^-1 mod order */ + if (!BN_mod_mul(s, s, ckinv, order, ctx)) { ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, ERR_R_BN_LIB); goto err; } @@ -306,11 +362,11 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, ECerr(EC_F_OSSL_ECDSA_SIGN_SIG, EC_R_NEED_NEW_SETUP_VALUES); goto err; } - } else { + } else /* s != 0 => we have a valid signature */ break; - } - } while (1); + } + while (1); ok = 1; err: @@ -318,8 +374,8 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, ECDSA_SIG_free(ret); ret = NULL; } + BN_CTX_end(ctx); BN_CTX_free(ctx); - BN_clear_free(m); BN_clear_free(kinv); return ret; } diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c b/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c index d837d4d465..994cc1d0ff 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_mont.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -66,8 +66,7 @@ const EC_METHOD *EC_GFp_mont_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key, - ec_GFp_simple_blind_coordinates + ecdh_simple_compute_key }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c index 143f21f3f9..615563bc38 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nist.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -68,8 +68,7 @@ const EC_METHOD *EC_GFp_nist_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key, - ec_GFp_simple_blind_coordinates + ecdh_simple_compute_key }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c index 52056ff591..0cd994fc23 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp224.c @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -290,8 +290,7 @@ const EC_METHOD *EC_GFp_nistp224_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key, - 0 /* blind_coordinates */ + ecdh_simple_compute_key }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c index 0a82abca1b..133f089fd2 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nistp521.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1642,8 +1642,7 @@ const EC_METHOD *EC_GFp_nistp521_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key, - 0 /* blind_coordinates */ + ecdh_simple_compute_key }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c b/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c index 7eafce649b..246189833e 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_nistz256.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1110,12 +1110,28 @@ __owur static int ecp_nistz256_set_from_affine(EC_POINT *out, const EC_GROUP *gr const P256_POINT_AFFINE *in, BN_CTX *ctx) { + BIGNUM *x, *y; + BN_ULONG d_x[P256_LIMBS], d_y[P256_LIMBS]; int ret = 0; - if ((ret = bn_set_words(out->X, in->X, P256_LIMBS)) - && (ret = bn_set_words(out->Y, in->Y, P256_LIMBS)) - && (ret = bn_set_words(out->Z, ONE, P256_LIMBS))) - out->Z_is_one = 1; + x = BN_new(); + if (x == NULL) + return 0; + y = BN_new(); + if (y == NULL) { + BN_free(x); + return 0; + } + memcpy(d_x, in->X, sizeof(d_x)); + bn_set_static_words(x, d_x, P256_LIMBS); + + memcpy(d_y, in->Y, sizeof(d_y)); + bn_set_static_words(y, d_y, P256_LIMBS); + + ret = EC_POINT_set_affine_coordinates_GFp(group, out, x, y, ctx); + + BN_free(x); + BN_free(y); return ret; } @@ -1152,7 +1168,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group, return 0; } - if (!ec_point_is_compat(r, group)) { + if (group->meth != r->meth) { ECerr(EC_F_ECP_NISTZ256_POINTS_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -1161,7 +1177,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group, return EC_POINT_set_to_infinity(group, r); for (j = 0; j < num; j++) { - if (!ec_point_is_compat(points[j], group)) { + if (group->meth != points[j]->meth) { ECerr(EC_F_ECP_NISTZ256_POINTS_MUL, EC_R_INCOMPATIBLE_OBJECTS); return 0; } @@ -1194,9 +1210,9 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group, if (pre_comp_generator == NULL) goto err; - ecp_nistz256_gather_w7(&p.a, pre_comp->precomp[0], 1); if (!ecp_nistz256_set_from_affine(pre_comp_generator, - group, &p.a, ctx)) { + group, pre_comp->precomp[0], + ctx)) { EC_POINT_free(pre_comp_generator); goto err; } @@ -1536,8 +1552,7 @@ const EC_METHOD *EC_GFp_nistz256_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key, - 0 /* blind_coordinates */ + ecdh_simple_compute_key }; return &ret; diff --git a/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c b/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c index adfb194576..abd3795046 100644 --- a/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c +++ b/worker/deps/openssl/openssl/crypto/ec/ecp_smpl.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -67,8 +67,7 @@ const EC_METHOD *EC_GFp_simple_method(void) ec_key_simple_generate_public_key, 0, /* keycopy */ 0, /* keyfinish */ - ecdh_simple_compute_key, - ec_GFp_simple_blind_coordinates + ecdh_simple_compute_key }; return &ret; @@ -353,7 +352,6 @@ int ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src) if (!BN_copy(dest->Z, src->Z)) return 0; dest->Z_is_one = src->Z_is_one; - dest->curve_name = src->curve_name; return 1; } @@ -1369,56 +1367,3 @@ int ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, { return BN_mod_sqr(r, a, group->field, ctx); } - -/*- - * Apply randomization of EC point projective coordinates: - * - * (X, Y ,Z ) = (lambda^2*X, lambda^3*Y, lambda*Z) - * lambda = [1,group->field) - * - */ -int ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p, - BN_CTX *ctx) -{ - int ret = 0; - BIGNUM *lambda = NULL; - BIGNUM *temp = NULL; - - BN_CTX_start(ctx); - lambda = BN_CTX_get(ctx); - temp = BN_CTX_get(ctx); - if (temp == NULL) { - ECerr(EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES, ERR_R_MALLOC_FAILURE); - goto err; - } - - /* make sure lambda is not zero */ - do { - if (!BN_rand_range(lambda, group->field)) { - ECerr(EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES, ERR_R_BN_LIB); - goto err; - } - } while (BN_is_zero(lambda)); - - /* if field_encode defined convert between representations */ - if (group->meth->field_encode != NULL - && !group->meth->field_encode(group, lambda, lambda, ctx)) - goto err; - if (!group->meth->field_mul(group, p->Z, p->Z, lambda, ctx)) - goto err; - if (!group->meth->field_sqr(group, temp, lambda, ctx)) - goto err; - if (!group->meth->field_mul(group, p->X, p->X, temp, ctx)) - goto err; - if (!group->meth->field_mul(group, temp, temp, lambda, ctx)) - goto err; - if (!group->meth->field_mul(group, p->Y, p->Y, temp, ctx)) - goto err; - p->Z_is_one = 0; - - ret = 1; - - err: - BN_CTX_end(ctx); - return ret; -} diff --git a/worker/deps/openssl/openssl/crypto/engine/eng_lib.c b/worker/deps/openssl/openssl/crypto/engine/eng_lib.c index ef8e995503..cbefc7eb6c 100644 --- a/worker/deps/openssl/openssl/crypto/engine/eng_lib.c +++ b/worker/deps/openssl/openssl/crypto/engine/eng_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -18,8 +18,7 @@ CRYPTO_ONCE engine_lock_init = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE(do_engine_lock_init) { - if (!OPENSSL_init_crypto(0, NULL)) - return 0; + OPENSSL_init_crypto(0, NULL); global_engine_lock = CRYPTO_THREAD_lock_new(); return global_engine_lock != NULL; } @@ -144,10 +143,8 @@ void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb) if (!int_cleanup_check(1)) return; item = int_cleanup_item(cb); - if (item != NULL) { - if (sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item) <= 0) - OPENSSL_free(item); - } + if (item) + sk_ENGINE_CLEANUP_ITEM_push(cleanup_stack, item); } /* The API function that performs all cleanup */ diff --git a/worker/deps/openssl/openssl/crypto/engine/eng_list.c b/worker/deps/openssl/openssl/crypto/engine/eng_list.c index f8d74c1d33..934389f74e 100644 --- a/worker/deps/openssl/openssl/crypto/engine/eng_list.c +++ b/worker/deps/openssl/openssl/crypto/engine/eng_list.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -322,7 +322,7 @@ ENGINE *ENGINE_by_id(const char *id) * Prevent infinite recursion if we're looking for the dynamic engine. */ if (strcmp(id, "dynamic")) { - if ((load_dir = ossl_safe_getenv("OPENSSL_ENGINES")) == NULL) + if ((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR; iterator = ENGINE_by_id("dynamic"); if (!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || diff --git a/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c b/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c index 9208f7eafc..0e53c4d1fd 100644 --- a/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c +++ b/worker/deps/openssl/openssl/crypto/engine/eng_openssl.c @@ -649,4 +649,3 @@ int openssl_destroy(ENGINE *e) #endif return 1; } - diff --git a/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c b/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c index 5c7b161703..480267daab 100644 --- a/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c +++ b/worker/deps/openssl/openssl/crypto/engine/tb_asnmth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -170,8 +170,7 @@ static void look_str_cb(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg) ENGINE *e = sk_ENGINE_value(sk, i); EVP_PKEY_ASN1_METHOD *ameth; e->pkey_asn1_meths(e, &ameth, NULL, nid); - if (ameth != NULL - && ((int)strlen(ameth->pem_str) == lk->len) + if (((int)strlen(ameth->pem_str) == lk->len) && strncasecmp(ameth->pem_str, lk->str, lk->len) == 0) { lk->e = e; lk->ameth = ameth; diff --git a/worker/deps/openssl/openssl/crypto/err/err.c b/worker/deps/openssl/openssl/crypto/err/err.c index 08c27a3e83..c4399285fe 100644 --- a/worker/deps/openssl/openssl/crypto/err/err.c +++ b/worker/deps/openssl/openssl/crypto/err/err.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -254,8 +254,7 @@ static void ERR_STATE_free(ERR_STATE *s) DEFINE_RUN_ONCE_STATIC(do_err_strings_init) { - if (!OPENSSL_init_crypto(0, NULL)) - return 0; + OPENSSL_init_crypto(0, NULL); err_string_lock = CRYPTO_THREAD_lock_new(); return err_string_lock != NULL; } @@ -654,31 +653,29 @@ DEFINE_RUN_ONCE_STATIC(err_do_init) ERR_STATE *ERR_get_state(void) { - ERR_STATE *state; + ERR_STATE *state = NULL; - if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL)) + if (!RUN_ONCE(&err_init, err_do_init)) return NULL; - if (!RUN_ONCE(&err_init, err_do_init)) + /* + * If base OPENSSL_init_crypto() hasn't been called yet, be sure to call + * it now to avoid state to be doubly allocated and thereby leak memory. + * Needed on any platform that doesn't define OPENSSL_USE_NODELETE. + */ + if (!OPENSSL_init_crypto(0, NULL)) return NULL; state = CRYPTO_THREAD_get_local(&err_thread_local); - if (state == (ERR_STATE*)-1) - return NULL; if (state == NULL) { - if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1)) + state = OPENSSL_zalloc(sizeof(*state)); + if (state == NULL) return NULL; - if ((state = OPENSSL_zalloc(sizeof(*state))) == NULL) { - CRYPTO_THREAD_set_local(&err_thread_local, NULL); - return NULL; - } - if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE) - || !CRYPTO_THREAD_set_local(&err_thread_local, state)) { + || !CRYPTO_THREAD_set_local(&err_thread_local, state)) { ERR_STATE_free(state); - CRYPTO_THREAD_set_local(&err_thread_local, NULL); return NULL; } @@ -689,41 +686,13 @@ ERR_STATE *ERR_get_state(void) return state; } -/* - * err_shelve_state returns the current thread local error state - * and freezes the error module until err_unshelve_state is called. - */ -int err_shelve_state(void **state) -{ - if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL)) - return 0; - - if (!RUN_ONCE(&err_init, err_do_init)) - return 0; - - *state = CRYPTO_THREAD_get_local(&err_thread_local); - if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1)) - return 0; - - return 1; -} - -/* - * err_unshelve_state restores the error state that was returned - * by err_shelve_state previously. - */ -void err_unshelve_state(void* state) -{ - if (state != (void*)-1) - CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)state); -} - int ERR_get_next_error_library(void) { int ret; - if (!RUN_ONCE(&err_string_init, do_err_strings_init)) + if (!RUN_ONCE(&err_string_init, do_err_strings_init)) { return 0; + } CRYPTO_THREAD_write_lock(err_string_lock); ret = int_err_library_number++; diff --git a/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c b/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c index e2295c4dc5..5769e0a554 100644 --- a/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c +++ b/worker/deps/openssl/openssl/crypto/evp/cmeth_lib.c @@ -148,4 +148,3 @@ int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, { return cipher->ctrl; } - diff --git a/worker/deps/openssl/openssl/crypto/evp/evp_err.c b/worker/deps/openssl/openssl/crypto/evp/evp_err.c index 3543d44cb4..c4b163f0ba 100644 --- a/worker/deps/openssl/openssl/crypto/evp/evp_err.c +++ b/worker/deps/openssl/openssl/crypto/evp/evp_err.c @@ -70,8 +70,6 @@ static ERR_STRING_DATA EVP_str_functs[] = { {ERR_FUNC(EVP_F_EVP_PKEY_GET0_RSA), "EVP_PKEY_get0_RSA"}, {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN), "EVP_PKEY_keygen"}, {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN_INIT), "EVP_PKEY_keygen_init"}, - {ERR_FUNC(EVP_F_EVP_PKEY_METH_ADD0), "EVP_PKEY_meth_add0"}, - {ERR_FUNC(EVP_F_EVP_PKEY_METH_NEW), "EVP_PKEY_meth_new"}, {ERR_FUNC(EVP_F_EVP_PKEY_NEW), "EVP_PKEY_new"}, {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN), "EVP_PKEY_paramgen"}, {ERR_FUNC(EVP_F_EVP_PKEY_PARAMGEN_INIT), "EVP_PKEY_paramgen_init"}, @@ -145,7 +143,6 @@ static ERR_STRING_DATA EVP_str_reasons[] = { {ERR_REASON(EVP_R_OPERATON_NOT_INITIALIZED), "operaton not initialized"}, {ERR_REASON(EVP_R_PARTIALLY_OVERLAPPING), "partially overlapping buffers"}, - {ERR_REASON(EVP_R_PBKDF2_ERROR), "pbkdf2 error"}, {ERR_REASON(EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED), "pkey application asn1 method already registered"}, {ERR_REASON(EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED), diff --git a/worker/deps/openssl/openssl/crypto/evp/p_seal.c b/worker/deps/openssl/openssl/crypto/evp/p_seal.c index 6f026e7c4f..faa246483b 100644 --- a/worker/deps/openssl/openssl/crypto/evp/p_seal.c +++ b/worker/deps/openssl/openssl/crypto/evp/p_seal.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -21,7 +21,6 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, { unsigned char key[EVP_MAX_KEY_LENGTH]; int i; - int rv = 0; if (type) { EVP_CIPHER_CTX_reset(ctx); @@ -32,27 +31,21 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, return 1; if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0) return 0; - if (EVP_CIPHER_CTX_iv_length(ctx) - && RAND_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx)) <= 0) - goto err; + && RAND_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx)) <= 0) + return 0; if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv)) - goto err; + return 0; for (i = 0; i < npubk; i++) { ekl[i] = EVP_PKEY_encrypt_old(ek[i], key, EVP_CIPHER_CTX_key_length(ctx), pubk[i]); - if (ekl[i] <= 0) { - rv = -1; - goto err; - } + if (ekl[i] <= 0) + return (-1); } - rv = npubk; -err: - OPENSSL_cleanse(key, sizeof(key)); - return rv; + return (npubk); } /*- MACRO diff --git a/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c b/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c index f623db3483..5e650a9db3 100644 --- a/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c +++ b/worker/deps/openssl/openssl/crypto/evp/pmeth_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -151,10 +151,8 @@ EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags) EVP_PKEY_METHOD *pmeth; pmeth = OPENSSL_zalloc(sizeof(*pmeth)); - if (pmeth == NULL) { - EVPerr(EVP_F_EVP_PKEY_METH_NEW, ERR_R_MALLOC_FAILURE); + if (pmeth == NULL) return NULL; - } pmeth->pkey_id = id; pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC; @@ -240,10 +238,8 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx) } #endif rctx = OPENSSL_malloc(sizeof(*rctx)); - if (rctx == NULL) { - EVPerr(EVP_F_EVP_PKEY_CTX_DUP, ERR_R_MALLOC_FAILURE); + if (rctx == NULL) return NULL; - } rctx->pmeth = pctx->pmeth; #ifndef OPENSSL_NO_ENGINE @@ -277,15 +273,11 @@ int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth) { if (app_pkey_methods == NULL) { app_pkey_methods = sk_EVP_PKEY_METHOD_new(pmeth_cmp); - if (app_pkey_methods == NULL) { - EVPerr(EVP_F_EVP_PKEY_METH_ADD0, ERR_R_MALLOC_FAILURE); + if (app_pkey_methods == NULL) return 0; - } } - if (!sk_EVP_PKEY_METHOD_push(app_pkey_methods, pmeth)) { - EVPerr(EVP_F_EVP_PKEY_METH_ADD0, ERR_R_MALLOC_FAILURE); + if (!sk_EVP_PKEY_METHOD_push(app_pkey_methods, pmeth)) return 0; - } sk_EVP_PKEY_METHOD_sort(app_pkey_methods); return 1; } @@ -565,26 +557,26 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, pmeth->ctrl_str = ctrl_str; } -void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth, int (**pinit) (EVP_PKEY_CTX *ctx)) { *pinit = pmeth->init; } -void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth, int (**pcopy) (EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)) { *pcopy = pmeth->copy; } -void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth, void (**pcleanup) (EVP_PKEY_CTX *ctx)) { *pcleanup = pmeth->cleanup; } -void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth, int (**pparamgen_init) (EVP_PKEY_CTX *ctx), int (**pparamgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)) @@ -595,7 +587,7 @@ void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth, *pparamgen = pmeth->paramgen; } -void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth, int (**pkeygen_init) (EVP_PKEY_CTX *ctx), int (**pkeygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)) @@ -606,7 +598,7 @@ void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth, *pkeygen = pmeth->keygen; } -void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, int (**psign_init) (EVP_PKEY_CTX *ctx), int (**psign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, @@ -619,7 +611,7 @@ void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth, *psign = pmeth->sign; } -void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth, int (**pverify_init) (EVP_PKEY_CTX *ctx), int (**pverify) (EVP_PKEY_CTX *ctx, const unsigned char *sig, @@ -633,7 +625,7 @@ void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth, *pverify = pmeth->verify; } -void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth, int (**pverify_recover_init) (EVP_PKEY_CTX *ctx), int (**pverify_recover) (EVP_PKEY_CTX @@ -651,7 +643,7 @@ void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth, *pverify_recover = pmeth->verify_recover; } -void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth, int (**psignctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**psignctx) (EVP_PKEY_CTX *ctx, @@ -665,7 +657,7 @@ void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth, *psignctx = pmeth->signctx; } -void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth, int (**pverifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**pverifyctx) (EVP_PKEY_CTX *ctx, @@ -679,7 +671,7 @@ void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth, *pverifyctx = pmeth->verifyctx; } -void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth, int (**pencrypt_init) (EVP_PKEY_CTX *ctx), int (**pencryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -693,7 +685,7 @@ void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth, *pencryptfn = pmeth->encrypt; } -void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, int (**pdecrypt_init) (EVP_PKEY_CTX *ctx), int (**pdecrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -707,7 +699,7 @@ void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth, *pdecrypt = pmeth->decrypt; } -void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth, int (**pderive_init) (EVP_PKEY_CTX *ctx), int (**pderive) (EVP_PKEY_CTX *ctx, unsigned char *key, @@ -719,7 +711,7 @@ void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth, *pderive = pmeth->derive; } -void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth, int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2), int (**pctrl_str) (EVP_PKEY_CTX *ctx, diff --git a/worker/deps/openssl/openssl/crypto/evp/scrypt.c b/worker/deps/openssl/openssl/crypto/evp/scrypt.c index 3543df5403..101bb1edbd 100644 --- a/worker/deps/openssl/openssl/crypto/evp/scrypt.c +++ b/worker/deps/openssl/openssl/crypto/evp/scrypt.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -171,10 +171,8 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, if (r == 0 || p == 0 || N < 2 || (N & (N - 1))) return 0; /* Check p * r < SCRYPT_PR_MAX avoiding overflow */ - if (p > SCRYPT_PR_MAX / r) { - EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); + if (p > SCRYPT_PR_MAX / r) return 0; - } /* * Need to check N: if 2^(128 * r / 8) overflows limit this is @@ -182,10 +180,8 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, */ if (16 * r <= LOG2_UINT64_MAX) { - if (N >= (((uint64_t)1) << (16 * r))) { - EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); + if (N >= (((uint64_t)1) << (16 * r))) return 0; - } } /* Memory checks: check total allocated buffer size fits in uint64_t */ @@ -203,17 +199,13 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, * This is combined size V, X and T (section 4) */ i = UINT64_MAX / (32 * sizeof(uint32_t)); - if (N + 2 > i / r) { - EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); + if (N + 2 > i / r) return 0; - } Vlen = 32 * r * (N + 2) * sizeof(uint32_t); /* check total allocated size fits in uint64_t */ - if (Blen > UINT64_MAX - Vlen) { - EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED); + if (Blen > UINT64_MAX - Vlen) return 0; - } /* check total allocated size fits in size_t */ if (Blen > SIZE_MAX - Vlen) return 0; @@ -233,10 +225,8 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, return 1; B = OPENSSL_malloc(allocsize); - if (B == NULL) { - EVPerr(EVP_F_EVP_PBE_SCRYPT, ERR_R_MALLOC_FAILURE); + if (B == NULL) return 0; - } X = (uint32_t *)(B + Blen); T = X + 32 * r; V = T + 32 * r; @@ -252,9 +242,6 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, goto err; rv = 1; err: - if (rv == 0) - EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_PBKDF2_ERROR); - OPENSSL_clear_free(B, allocsize); return rv; } diff --git a/worker/deps/openssl/openssl/crypto/ex_data.c b/worker/deps/openssl/openssl/crypto/ex_data.c index 6e3072f2a9..22c4d3d9b9 100644 --- a/worker/deps/openssl/openssl/crypto/ex_data.c +++ b/worker/deps/openssl/openssl/crypto/ex_data.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -38,8 +38,7 @@ static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE_STATIC(do_ex_data_init) { - if (!OPENSSL_init_crypto(0, NULL)) - return 0; + OPENSSL_init_crypto(0, NULL); ex_data_lock = CRYPTO_THREAD_lock_new(); return ex_data_lock != NULL; } diff --git a/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h b/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h index ba9c062702..f70e3b47ba 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/asn1_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -90,3 +90,5 @@ struct asn1_pctx_st { unsigned long oid_flags; unsigned long str_flags; } /* ASN1_PCTX */ ; + +int asn1_valid_host(const ASN1_STRING *host); diff --git a/worker/deps/openssl/openssl/crypto/include/internal/async.h b/worker/deps/openssl/openssl/crypto/include/internal/async.h index dc8e937b0c..16a12a6371 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/async.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/async.h @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,5 +11,3 @@ int async_init(void); void async_deinit(void); -void async_delete_thread_state(void); - diff --git a/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h b/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h index 2be7fdd0d3..9c984ba781 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/bn_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -53,7 +53,7 @@ BN_ULONG *bn_get_words(const BIGNUM *a); * Set the internal data words in a to point to words which contains size * elements. The BN_FLG_STATIC_DATA flag is set */ -void bn_set_static_words(BIGNUM *a, const BN_ULONG *words, int size); +void bn_set_static_words(BIGNUM *a, BN_ULONG *words, int size); /* * Copy words into the BIGNUM |a|, reallocating space as necessary. @@ -64,7 +64,7 @@ void bn_set_static_words(BIGNUM *a, const BN_ULONG *words, int size); * |num_words| is int because bn_expand2 takes an int. This is an internal * function so we simply trust callers not to pass negative values. */ -int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words); +int bn_set_words(BIGNUM *a, BN_ULONG *words, int num_words); size_t bn_sizeof_BIGNUM(void); @@ -74,25 +74,6 @@ size_t bn_sizeof_BIGNUM(void); */ BIGNUM *bn_array_el(BIGNUM *base, int el); -/* - * Some BIGNUM functions assume most significant limb to be non-zero, which - * is customarily arranged by bn_correct_top. Output from below functions - * is not processed with bn_correct_top, and for this reason it may not be - * returned out of public API. It may only be passed internally into other - * functions known to support non-minimal or zero-padded BIGNUMs. - */ -int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - BN_MONT_CTX *mont, BN_CTX *ctx); -int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, - BN_CTX *ctx); -int bn_from_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont, - BN_CTX *ctx); -int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - const BIGNUM *m); -int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, - const BIGNUM *m); -int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx); -int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx); #ifdef __cplusplus } diff --git a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h index d42a134bdf..f3ec9b67b8 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -67,8 +67,6 @@ void OPENSSL_showfatal(const char *fmta, ...); extern int OPENSSL_NONPIC_relocated; void crypto_cleanup_all_ex_data_int(void); -char *ossl_safe_getenv(const char *name); - int openssl_strerror_r(int errnum, char *buf, size_t buflen); # if !defined(OPENSSL_NO_STDIO) FILE *openssl_fopen(const char *filename, const char *mode); @@ -76,8 +74,6 @@ FILE *openssl_fopen(const char *filename, const char *mode); void *openssl_fopen(const char *filename, const char *mode); # endif -unsigned long OPENSSL_rdtsc(void); - #ifdef __cplusplus } #endif diff --git a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h index ceeb63ddd0..ab86e1e53d 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/cryptlib_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -24,9 +24,7 @@ int ossl_init_thread_start(uint64_t opts); * use". */ # define OPENSSL_INIT_ZLIB 0x00010000L -# define OPENSSL_INIT_BASE_ONLY 0x00040000L /* OPENSSL_INIT_THREAD flags */ # define OPENSSL_INIT_THREAD_ASYNC 0x01 # define OPENSSL_INIT_THREAD_ERR_STATE 0x02 - diff --git a/worker/deps/openssl/openssl/crypto/include/internal/err_int.h b/worker/deps/openssl/openssl/crypto/include/internal/err_int.h index 44ac944627..7fec3ed767 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/err_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/err_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -13,7 +13,5 @@ int err_load_crypto_strings_int(void); void err_cleanup(void); void err_delete_thread_state(void); -int err_shelve_state(void **); -void err_unshelve_state(void *); #endif diff --git a/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h b/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h index eb43997704..2845026dd8 100644 --- a/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h +++ b/worker/deps/openssl/openssl/crypto/include/internal/x509_int.h @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -166,7 +166,6 @@ struct x509_st { unsigned char sha1_hash[SHA_DIGEST_LENGTH]; X509_CERT_AUX *aux; CRYPTO_RWLOCK *lock; - volatile int ex_cached; } /* X509 */ ; /* diff --git a/worker/deps/openssl/openssl/crypto/init.c b/worker/deps/openssl/openssl/crypto/init.c index 2ad946c5bf..2d16c41bc6 100644 --- a/worker/deps/openssl/openssl/crypto/init.c +++ b/worker/deps/openssl/openssl/crypto/init.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -27,28 +27,11 @@ static int stopped = 0; -/* - * Since per-thread-specific-data destructors are not universally - * available, i.e. not on Windows, only below CRYPTO_THREAD_LOCAL key - * is assumed to have destructor associated. And then an effort is made - * to call this single destructor on non-pthread platform[s]. - * - * Initial value is "impossible". It is used as guard value to shortcut - * destructor for threads terminating before libcrypto is initialized or - * after it's de-initialized. Access to the key doesn't have to be - * serialized for the said threads, because they didn't use libcrypto - * and it doesn't matter if they pick "impossible" or derefernce real - * key value and pull NULL past initialization in the first thread that - * intends to use libcrypto. - */ -static union { - long sane; - CRYPTO_THREAD_LOCAL value; -} destructor_key = { -1 }; - static void ossl_init_thread_stop(struct thread_local_inits_st *locals); -static void ossl_init_thread_destructor(void *local) +static CRYPTO_THREAD_LOCAL threadstopkey; + +static void ossl_init_thread_stop_wrap(void *local) { ossl_init_thread_stop((struct thread_local_inits_st *)local); } @@ -56,17 +39,17 @@ static void ossl_init_thread_destructor(void *local) static struct thread_local_inits_st *ossl_init_get_thread_local(int alloc) { struct thread_local_inits_st *local = - CRYPTO_THREAD_get_local(&destructor_key.value); + CRYPTO_THREAD_get_local(&threadstopkey); - if (alloc) { - if (local == NULL - && (local = OPENSSL_zalloc(sizeof(*local))) != NULL - && !CRYPTO_THREAD_set_local(&destructor_key.value, local)) { + if (local == NULL && alloc) { + local = OPENSSL_zalloc(sizeof(*local)); + if (local != NULL && !CRYPTO_THREAD_set_local(&threadstopkey, local)) { OPENSSL_free(local); return NULL; } - } else { - CRYPTO_THREAD_set_local(&destructor_key.value, NULL); + } + if (!alloc) { + CRYPTO_THREAD_set_local(&threadstopkey, NULL); } return local; @@ -85,42 +68,29 @@ static CRYPTO_ONCE base = CRYPTO_ONCE_STATIC_INIT; static int base_inited = 0; DEFINE_RUN_ONCE_STATIC(ossl_init_base) { - CRYPTO_THREAD_LOCAL key; - #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n"); #endif - if (!CRYPTO_THREAD_init_local(&key, ossl_init_thread_destructor)) - return 0; - if ((init_lock = CRYPTO_THREAD_lock_new()) == NULL) - goto err; + /* + * We use a dummy thread local key here. We use the destructor to detect + * when the thread is going to stop (where that feature is available) + */ + CRYPTO_THREAD_init_local(&threadstopkey, ossl_init_thread_stop_wrap); #ifndef OPENSSL_SYS_UEFI - if (atexit(OPENSSL_cleanup) != 0) - goto err; + atexit(OPENSSL_cleanup); #endif + if ((init_lock = CRYPTO_THREAD_lock_new()) == NULL) + return 0; OPENSSL_cpuid_setup(); - destructor_key.value = key; + /* + * BIG FAT WARNING! + * Everything needed to be initialized in this function before threads + * come along MUST happen before base_inited is set to 1, or we will + * see race conditions. + */ base_inited = 1; - return 1; - -err: -#ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: ossl_init_base not ok!\n"); -#endif - CRYPTO_THREAD_lock_free(init_lock); - init_lock = NULL; - - CRYPTO_THREAD_cleanup_local(&key); - return 0; -} -static CRYPTO_ONCE load_crypto_nodelete = CRYPTO_ONCE_STATIC_INIT; -DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete) -{ -#ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_nodelete()\n"); -#endif #if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE) # ifdef DSO_WIN32 { @@ -132,10 +102,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete) | GET_MODULE_HANDLE_EX_FLAG_PIN, (void *)&base_inited, &handle); -# ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: obtained DSO reference? %s\n", - (ret == TRUE ? "No!" : "Yes.")); -# endif return (ret == TRUE) ? 1 : 0; } # else @@ -144,24 +110,12 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete) * to remain loaded until the atexit() handler is run at process exit. */ { - DSO *dso; - void *err; - - if (!err_shelve_state(&err)) - return 0; + DSO *dso = NULL; + ERR_set_mark(); dso = DSO_dsobyaddr(&base_inited, DSO_FLAG_NO_UNLOAD_ON_FREE); -# ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: obtained DSO reference? %s\n", - (dso == NULL ? "No!" : "Yes.")); - /* - * In case of No!, it is uncertain our exit()-handlers can still be - * called. After dlclose() the whole library might have been unloaded - * already. - */ -# endif DSO_free(dso); - err_unshelve_state(err); + ERR_pop_to_mark(); } # endif #endif @@ -191,7 +145,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_strings) # endif ret = err_load_crypto_strings_int(); load_crypto_strings_inited = 1; -#endif +#endif return ret; } @@ -381,9 +335,9 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals) if (locals->async) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_thread_stop: " - "async_delete_thread_state()\n"); + "ASYNC_cleanup_thread()\n"); #endif - async_delete_thread_state(); + ASYNC_cleanup_thread(); } if (locals->err_state) { @@ -399,8 +353,8 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals) void OPENSSL_thread_stop(void) { - if (destructor_key.sane != -1) - ossl_init_thread_stop(ossl_init_get_thread_local(0)); + ossl_init_thread_stop( + (struct thread_local_inits_st *)ossl_init_get_thread_local(0)); } int ossl_init_thread_start(uint64_t opts) @@ -437,7 +391,6 @@ int ossl_init_thread_start(uint64_t opts) void OPENSSL_cleanup(void) { OPENSSL_INIT_STOP *currhandler, *lasthandler; - CRYPTO_THREAD_LOCAL key; /* If we've not been inited then no need to deinit */ if (!base_inited) @@ -496,9 +449,7 @@ void OPENSSL_cleanup(void) err_free_strings_int(); } - key = destructor_key.value; - destructor_key.sane = -1; - CRYPTO_THREAD_cleanup_local(&key); + CRYPTO_THREAD_cleanup_local(&threadstopkey); #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " @@ -554,18 +505,22 @@ void OPENSSL_cleanup(void) */ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) { + static int stoperrset = 0; + if (stopped) { - if (!(opts & OPENSSL_INIT_BASE_ONLY)) + if (!stoperrset) { + /* + * We only ever set this once to avoid getting into an infinite + * loop where the error system keeps trying to init and fails so + * sets an error etc + */ + stoperrset = 1; CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL); + } return 0; } - if (!RUN_ONCE(&base, ossl_init_base)) - return 0; - - if (!(opts & OPENSSL_INIT_BASE_ONLY) - && !RUN_ONCE(&load_crypto_nodelete, - ossl_init_load_crypto_nodelete)) + if (!base_inited && !RUN_ONCE(&base, ossl_init_base)) return 0; if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS) @@ -702,12 +657,6 @@ int OPENSSL_atexit(void (*handler)(void)) ERR_set_mark(); dso = DSO_dsobyaddr(handlersym.sym, DSO_FLAG_NO_UNLOAD_ON_FREE); -# ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, - "OPENSSL_INIT: OPENSSL_atexit: obtained DSO reference? %s\n", - (dso == NULL ? "No!" : "Yes.")); - /* See same code above in ossl_init_base() for an explanation. */ -# endif DSO_free(dso); ERR_pop_to_mark(); } diff --git a/worker/deps/openssl/openssl/crypto/kdf/hkdf.c b/worker/deps/openssl/openssl/crypto/kdf/hkdf.c index 0fb55e9c65..00b95b5a88 100644 --- a/worker/deps/openssl/openssl/crypto/kdf/hkdf.c +++ b/worker/deps/openssl/openssl/crypto/kdf/hkdf.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -234,7 +234,6 @@ static unsigned char *HKDF_Expand(const EVP_MD *evp_md, unsigned char *okm, size_t okm_len) { HMAC_CTX *hmac; - unsigned char *ret = NULL; unsigned int i; @@ -284,10 +283,11 @@ static unsigned char *HKDF_Expand(const EVP_MD *evp_md, done_len += copy_len; } - ret = okm; + + HMAC_CTX_free(hmac); + return okm; err: - OPENSSL_cleanse(prev, sizeof(prev)); HMAC_CTX_free(hmac); - return ret; + return NULL; } diff --git a/worker/deps/openssl/openssl/crypto/lhash/lhash.c b/worker/deps/openssl/openssl/crypto/lhash/lhash.c index ea83bf900f..7777935182 100644 --- a/worker/deps/openssl/openssl/crypto/lhash/lhash.c +++ b/worker/deps/openssl/openssl/crypto/lhash/lhash.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -12,8 +12,6 @@ #include #include #include -#include -#include "internal/lhash.h" #include "lhash_lcl.h" /* @@ -51,7 +49,7 @@ OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c) return NULL; if ((ret->b = OPENSSL_zalloc(sizeof(*ret->b) * MIN_NODES)) == NULL) goto err; - if ((ret->retrieve_stats_lock = CRYPTO_THREAD_lock_new()) == NULL) + if ((ret->retrieve_stats_lock = CRYPTO_THREAD_lock_new()) == NULL) goto err; ret->comp = ((c == NULL) ? (OPENSSL_LH_COMPFUNC)strcmp : c); ret->hash = ((h == NULL) ? (OPENSSL_LH_HASHFUNC)OPENSSL_LH_strhash : h); @@ -353,27 +351,6 @@ unsigned long OPENSSL_LH_strhash(const char *c) return ((ret >> 16) ^ ret); } -unsigned long openssl_lh_strcasehash(const char *c) -{ - unsigned long ret = 0; - long n; - unsigned long v; - int r; - - if (c == NULL || *c == '\0') - return ret; - - for (n = 0x100; *c != '\0'; n += 0x100) { - v = n | tolower(*c); - r = (int)((v >> 2) ^ v) & 0x0f; - ret = (ret << r) | (ret >> (32 - r)); - ret &= 0xFFFFFFFFL; - ret ^= v * v; - c++; - } - return (ret >> 16) ^ ret; -} - unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh) { return lh ? lh->num_items : 0; diff --git a/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h b/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h index 01d463fb36..64d3134fc1 100644 --- a/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h +++ b/worker/deps/openssl/openssl/crypto/lhash/lhash_lcl.h @@ -21,7 +21,7 @@ struct lhash_st { /* * some stats are updated on lookup, which callers aren't expecting to have * to take an exclusive lock around. This lock protects them on platforms - * without atomics, and their types are int rather than unsigned long below + * without atomics, and their types are int rather than unsigned long below * so they can be adjusted with CRYPTO_atomic_add. */ CRYPTO_RWLOCK *retrieve_stats_lock; diff --git a/worker/deps/openssl/openssl/crypto/mem_sec.c b/worker/deps/openssl/openssl/crypto/mem_sec.c index 1ccf68cc93..25cdb47d56 100644 --- a/worker/deps/openssl/openssl/crypto/mem_sec.c +++ b/worker/deps/openssl/openssl/crypto/mem_sec.c @@ -134,12 +134,11 @@ void *CRYPTO_secure_malloc(size_t num, const char *file, int line) void *CRYPTO_secure_zalloc(size_t num, const char *file, int line) { -#ifdef IMPLEMENTED - if (secure_mem_initialized) - /* CRYPTO_secure_malloc() zeroes allocations when it is implemented */ - return CRYPTO_secure_malloc(num, file, line); -#endif - return CRYPTO_zalloc(num, file, line); + void *ret = CRYPTO_secure_malloc(num, file, line); + + if (ret != NULL) + memset(ret, 0, num); + return ret; } void CRYPTO_secure_free(void *ptr, const char *file, int line) @@ -575,9 +574,6 @@ static char *sh_malloc(size_t size) OPENSSL_assert(WITHIN_ARENA(chunk)); - /* zero the free list header as a precaution against information leakage */ - memset(chunk, 0, sizeof(SH_LIST)); - return chunk; } @@ -610,8 +606,6 @@ static void sh_free(char *ptr) list--; - /* Zero the higher addressed block's free list pointers */ - memset(ptr > buddy ? ptr : buddy, 0, sizeof(SH_LIST)); if (ptr > buddy) ptr = buddy; diff --git a/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl b/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl index 1cf14a6c9f..7d880c94a7 100644 --- a/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -145,8 +145,6 @@ () .text #if defined(__thumb2__) || defined(__clang__) .syntax unified -#define ldrplb ldrbpl -#define ldrneb ldrbne #endif #if defined(__thumb2__) .thumb @@ -154,6 +152,11 @@ () .code 32 #endif +#ifdef __clang__ +#define ldrplb ldrbpl +#define ldrneb ldrbne +#endif + .type rem_4bit,%object .align 5 rem_4bit: diff --git a/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl b/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl index e13c709019..dcd5f595d2 100644 --- a/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl +++ b/worker/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -64,7 +64,6 @@ $code=<<___; #include "arm_arch.h" -#if __ARM_MAX_ARCH__>=7 .text ___ $code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/); @@ -352,7 +351,6 @@ $code.=<<___; .asciz "GHASH for ARMv8, CRYPTOGAMS by " .align 2 -#endif ___ if ($flavour =~ /64/) { ######## 64-bit code diff --git a/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h b/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h index 4fc32e190f..7a1603bf90 100644 --- a/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h +++ b/worker/deps/openssl/openssl/crypto/modes/modes_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -174,13 +174,12 @@ struct ocb128_context { OCB_BLOCK l_dollar; OCB_BLOCK *l; /* Must be reset for each session */ - struct { - u64 blocks_hashed; - u64 blocks_processed; - OCB_BLOCK offset_aad; - OCB_BLOCK sum; - OCB_BLOCK offset; - OCB_BLOCK checksum; - } sess; + u64 blocks_hashed; + u64 blocks_processed; + OCB_BLOCK tag; + OCB_BLOCK offset_aad; + OCB_BLOCK sum; + OCB_BLOCK offset; + OCB_BLOCK checksum; }; #endif /* OPENSSL_NO_OCB */ diff --git a/worker/deps/openssl/openssl/crypto/modes/ocb128.c b/worker/deps/openssl/openssl/crypto/modes/ocb128.c index fc92b246bd..db794d0854 100644 --- a/worker/deps/openssl/openssl/crypto/modes/ocb128.c +++ b/worker/deps/openssl/openssl/crypto/modes/ocb128.c @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -236,9 +236,6 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv, return -1; } - /* Reset nonce-dependent variables */ - memset(&ctx->sess, 0, sizeof(ctx->sess)); - /* Nonce = num2str(TAGLEN mod 128,7) || zeros(120-bitlen(N)) || 1 || N */ nonce[0] = ((taglen * 8) % 128) << 1; memset(nonce + 1, 0, 15); @@ -259,10 +256,10 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv, /* Offset_0 = Stretch[1+bottom..128+bottom] */ shift = bottom % 8; - ocb_block_lshift(stretch + (bottom / 8), shift, ctx->sess.offset.c); + ocb_block_lshift(stretch + (bottom / 8), shift, ctx->offset.c); mask = 0xff; mask <<= 8 - shift; - ctx->sess.offset.c[15] |= + ctx->offset.c[15] |= (*(stretch + (bottom / 8) + 16) & mask) >> (8 - shift); return 1; @@ -281,25 +278,25 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad, /* Calculate the number of blocks of AAD provided now, and so far */ num_blocks = len / 16; - all_num_blocks = num_blocks + ctx->sess.blocks_hashed; + all_num_blocks = num_blocks + ctx->blocks_hashed; /* Loop through all full blocks of AAD */ - for (i = ctx->sess.blocks_hashed + 1; i <= all_num_blocks; i++) { + for (i = ctx->blocks_hashed + 1; i <= all_num_blocks; i++) { OCB_BLOCK *lookup; /* Offset_i = Offset_{i-1} xor L_{ntz(i)} */ lookup = ocb_lookup_l(ctx, ocb_ntz(i)); if (lookup == NULL) return 0; - ocb_block16_xor(&ctx->sess.offset_aad, lookup, &ctx->sess.offset_aad); + ocb_block16_xor(&ctx->offset_aad, lookup, &ctx->offset_aad); memcpy(tmp.c, aad, 16); aad += 16; /* Sum_i = Sum_{i-1} xor ENCIPHER(K, A_i xor Offset_i) */ - ocb_block16_xor(&ctx->sess.offset_aad, &tmp, &tmp); + ocb_block16_xor(&ctx->offset_aad, &tmp, &tmp); ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&tmp, &ctx->sess.sum, &ctx->sess.sum); + ocb_block16_xor(&tmp, &ctx->sum, &ctx->sum); } /* @@ -310,21 +307,20 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad, if (last_len > 0) { /* Offset_* = Offset_m xor L_* */ - ocb_block16_xor(&ctx->sess.offset_aad, &ctx->l_star, - &ctx->sess.offset_aad); + ocb_block16_xor(&ctx->offset_aad, &ctx->l_star, &ctx->offset_aad); /* CipherInput = (A_* || 1 || zeros(127-bitlen(A_*))) xor Offset_* */ memset(tmp.c, 0, 16); memcpy(tmp.c, aad, last_len); tmp.c[last_len] = 0x80; - ocb_block16_xor(&ctx->sess.offset_aad, &tmp, &tmp); + ocb_block16_xor(&ctx->offset_aad, &tmp, &tmp); /* Sum = Sum_m xor ENCIPHER(K, CipherInput) */ ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&tmp, &ctx->sess.sum, &ctx->sess.sum); + ocb_block16_xor(&tmp, &ctx->sum, &ctx->sum); } - ctx->sess.blocks_hashed = all_num_blocks; + ctx->blocks_hashed = all_num_blocks; return 1; } @@ -345,7 +341,7 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, * so far */ num_blocks = len / 16; - all_num_blocks = num_blocks + ctx->sess.blocks_processed; + all_num_blocks = num_blocks + ctx->blocks_processed; if (num_blocks && all_num_blocks == (size_t)all_num_blocks && ctx->stream != NULL) { @@ -361,11 +357,11 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, return 0; ctx->stream(in, out, num_blocks, ctx->keyenc, - (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c, - (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c); + (size_t)ctx->blocks_processed + 1, ctx->offset.c, + (const unsigned char (*)[16])ctx->l, ctx->checksum.c); } else { /* Loop through all full blocks to be encrypted */ - for (i = ctx->sess.blocks_processed + 1; i <= all_num_blocks; i++) { + for (i = ctx->blocks_processed + 1; i <= all_num_blocks; i++) { OCB_BLOCK *lookup; OCB_BLOCK tmp; @@ -373,18 +369,18 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, lookup = ocb_lookup_l(ctx, ocb_ntz(i)); if (lookup == NULL) return 0; - ocb_block16_xor(&ctx->sess.offset, lookup, &ctx->sess.offset); + ocb_block16_xor(&ctx->offset, lookup, &ctx->offset); memcpy(tmp.c, in, 16); in += 16; /* Checksum_i = Checksum_{i-1} xor P_i */ - ocb_block16_xor(&tmp, &ctx->sess.checksum, &ctx->sess.checksum); + ocb_block16_xor(&tmp, &ctx->checksum, &ctx->checksum); /* C_i = Offset_i xor ENCIPHER(K, P_i xor Offset_i) */ - ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); + ocb_block16_xor(&ctx->offset, &tmp, &tmp); ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); + ocb_block16_xor(&ctx->offset, &tmp, &tmp); memcpy(out, tmp.c, 16); out += 16; @@ -401,10 +397,10 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, OCB_BLOCK pad; /* Offset_* = Offset_m xor L_* */ - ocb_block16_xor(&ctx->sess.offset, &ctx->l_star, &ctx->sess.offset); + ocb_block16_xor(&ctx->offset, &ctx->l_star, &ctx->offset); /* Pad = ENCIPHER(K, Offset_*) */ - ctx->encrypt(ctx->sess.offset.c, pad.c, ctx->keyenc); + ctx->encrypt(ctx->offset.c, pad.c, ctx->keyenc); /* C_* = P_* xor Pad[1..bitlen(P_*)] */ ocb_block_xor(in, pad.c, last_len, out); @@ -413,10 +409,10 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, memset(pad.c, 0, 16); /* borrow pad */ memcpy(pad.c, in, last_len); pad.c[last_len] = 0x80; - ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum); + ocb_block16_xor(&pad, &ctx->checksum, &ctx->checksum); } - ctx->sess.blocks_processed = all_num_blocks; + ctx->blocks_processed = all_num_blocks; return 1; } @@ -437,7 +433,7 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, * so far */ num_blocks = len / 16; - all_num_blocks = num_blocks + ctx->sess.blocks_processed; + all_num_blocks = num_blocks + ctx->blocks_processed; if (num_blocks && all_num_blocks == (size_t)all_num_blocks && ctx->stream != NULL) { @@ -453,30 +449,30 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, return 0; ctx->stream(in, out, num_blocks, ctx->keydec, - (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c, - (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c); + (size_t)ctx->blocks_processed + 1, ctx->offset.c, + (const unsigned char (*)[16])ctx->l, ctx->checksum.c); } else { OCB_BLOCK tmp; /* Loop through all full blocks to be decrypted */ - for (i = ctx->sess.blocks_processed + 1; i <= all_num_blocks; i++) { + for (i = ctx->blocks_processed + 1; i <= all_num_blocks; i++) { /* Offset_i = Offset_{i-1} xor L_{ntz(i)} */ OCB_BLOCK *lookup = ocb_lookup_l(ctx, ocb_ntz(i)); if (lookup == NULL) return 0; - ocb_block16_xor(&ctx->sess.offset, lookup, &ctx->sess.offset); + ocb_block16_xor(&ctx->offset, lookup, &ctx->offset); memcpy(tmp.c, in, 16); in += 16; /* P_i = Offset_i xor DECIPHER(K, C_i xor Offset_i) */ - ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); + ocb_block16_xor(&ctx->offset, &tmp, &tmp); ctx->decrypt(tmp.c, tmp.c, ctx->keydec); - ocb_block16_xor(&ctx->sess.offset, &tmp, &tmp); + ocb_block16_xor(&ctx->offset, &tmp, &tmp); /* Checksum_i = Checksum_{i-1} xor P_i */ - ocb_block16_xor(&tmp, &ctx->sess.checksum, &ctx->sess.checksum); + ocb_block16_xor(&tmp, &ctx->checksum, &ctx->checksum); memcpy(out, tmp.c, 16); out += 16; @@ -493,10 +489,10 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, OCB_BLOCK pad; /* Offset_* = Offset_m xor L_* */ - ocb_block16_xor(&ctx->sess.offset, &ctx->l_star, &ctx->sess.offset); + ocb_block16_xor(&ctx->offset, &ctx->l_star, &ctx->offset); /* Pad = ENCIPHER(K, Offset_*) */ - ctx->encrypt(ctx->sess.offset.c, pad.c, ctx->keyenc); + ctx->encrypt(ctx->offset.c, pad.c, ctx->keyenc); /* P_* = C_* xor Pad[1..bitlen(C_*)] */ ocb_block_xor(in, pad.c, last_len, out); @@ -505,46 +501,39 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, memset(pad.c, 0, 16); /* borrow pad */ memcpy(pad.c, out, last_len); pad.c[last_len] = 0x80; - ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum); + ocb_block16_xor(&pad, &ctx->checksum, &ctx->checksum); } - ctx->sess.blocks_processed = all_num_blocks; + ctx->blocks_processed = all_num_blocks; return 1; } -static int ocb_finish(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len, - int write) +/* + * Calculate the tag and verify it against the supplied tag + */ +int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag, + size_t len) { OCB_BLOCK tmp; - if (len > 16 || len < 1) { - return -1; - } - /* * Tag = ENCIPHER(K, Checksum_* xor Offset_* xor L_$) xor HASH(K,A) */ - ocb_block16_xor(&ctx->sess.checksum, &ctx->sess.offset, &tmp); + ocb_block16_xor(&ctx->checksum, &ctx->offset, &tmp); ocb_block16_xor(&ctx->l_dollar, &tmp, &tmp); ctx->encrypt(tmp.c, tmp.c, ctx->keyenc); - ocb_block16_xor(&tmp, &ctx->sess.sum, &tmp); + ocb_block16_xor(&tmp, &ctx->sum, &ctx->tag); - if (write) { - memcpy(tag, &tmp, len); - return 1; - } else { - return CRYPTO_memcmp(&tmp, tag, len); + if (len > 16 || len < 1) { + return -1; } -} -/* - * Calculate the tag and verify it against the supplied tag - */ -int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag, - size_t len) -{ - return ocb_finish(ctx, (unsigned char*)tag, len, 0); + /* Compare the tag if we've been given one */ + if (tag) + return CRYPTO_memcmp(&ctx->tag, tag, len); + else + return -1; } /* @@ -552,7 +541,17 @@ int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag, */ int CRYPTO_ocb128_tag(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len) { - return ocb_finish(ctx, tag, len, 1); + if (len > 16 || len < 1) { + return -1; + } + + /* Calculate the tag */ + CRYPTO_ocb128_finish(ctx, NULL, 0); + + /* Copy the tag into the supplied buffer */ + memcpy(tag, ctx->tag.c, len); + + return 1; } /* diff --git a/worker/deps/openssl/openssl/crypto/o_fopen.c b/worker/deps/openssl/openssl/crypto/o_fopen.c index bfd5af1151..a3a006574d 100644 --- a/worker/deps/openssl/openssl/crypto/o_fopen.c +++ b/worker/deps/openssl/openssl/crypto/o_fopen.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,24 +7,6 @@ * https://www.openssl.org/source/license.html */ -# if defined(__linux) || defined(__sun) || defined(__hpux) -/* - * Following definition aliases fopen to fopen64 on above mentioned - * platforms. This makes it possible to open and sequentially access files - * larger than 2GB from 32-bit application. It does not allow to traverse - * them beyond 2GB with fseek/ftell, but on the other hand *no* 32-bit - * platform permits that, not with fseek/ftell. Not to mention that breaking - * 2GB limit for seeking would require surgery to *our* API. But sequential - * access suffices for practical cases when you can run into large files, - * such as fingerprinting, so we can let API alone. For reference, the list - * of 32-bit platforms which allow for sequential access of large files - * without extra "magic" comprise *BSD, Darwin, IRIX... - */ -# ifndef _FILE_OFFSET_BITS -# define _FILE_OFFSET_BITS 64 -# endif -# endif - #include "internal/cryptlib.h" #if !defined(OPENSSL_NO_STDIO) diff --git a/worker/deps/openssl/openssl/crypto/o_time.c b/worker/deps/openssl/openssl/crypto/o_time.c index 6d764f55e2..b2fb38a541 100644 --- a/worker/deps/openssl/openssl/crypto/o_time.c +++ b/worker/deps/openssl/openssl/crypto/o_time.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -41,10 +41,6 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result) if (gmtime_r(timer, result) == NULL) return NULL; ts = result; -#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400 - if (gmtime_s(result, timer)) - return NULL; - ts = result; #else ts = gmtime(timer); if (ts == NULL) diff --git a/worker/deps/openssl/openssl/crypto/objects/o_names.c b/worker/deps/openssl/openssl/crypto/objects/o_names.c index 7fb0136c58..e06d5439f2 100644 --- a/worker/deps/openssl/openssl/crypto/objects/o_names.c +++ b/worker/deps/openssl/openssl/crypto/objects/o_names.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -16,26 +16,27 @@ #include #include #include -#include "internal/thread_once.h" -#include "internal/lhash.h" +#include #include "obj_lcl.h" -#include "e_os.h" /* * We define this wrapper for two reasons. Firstly, later versions of * DEC C add linkage information to certain functions, which makes it * tricky to use them as values to regular function pointers. - * Secondly, in the EDK2 build environment, the strcasecmp function is - * actually an external function with the Microsoft ABI, so we can't - * transparently assign function pointers to it. + * Secondly, in the EDK2 build environment, the strcmp function is + * actually an external function (AsciiStrCmp) with the Microsoft ABI, + * so we can't transparently assign function pointers to it. + * Arguably the latter is a stupidity of the UEFI environment, but + * since the wrapper solves the DEC C issue too, let's just use the + * same solution. */ #if defined(OPENSSL_SYS_VMS_DECC) || defined(OPENSSL_SYS_UEFI) -static int obj_strcasecmp(const char *a, const char *b) +static int obj_strcmp(const char *a, const char *b) { - return strcasecmp(a, b); + return strcmp(a, b); } #else -#define obj_strcasecmp strcasecmp +#define obj_strcmp strcmp #endif /* @@ -110,8 +111,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), ret = 0; goto out; } - name_funcs->hash_func = openssl_lh_strcasehash; - name_funcs->cmp_func = obj_strcasecmp; + name_funcs->hash_func = OPENSSL_LH_strhash; + name_funcs->cmp_func = obj_strcmp; CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); push = sk_NAME_FUNCS_push(name_funcs_stack, name_funcs); @@ -148,7 +149,7 @@ static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b) ret = sk_NAME_FUNCS_value(name_funcs_stack, a->type)->cmp_func(a->name, b->name); } else - ret = strcasecmp(a->name, b->name); + ret = strcmp(a->name, b->name); } return ret; } @@ -163,7 +164,7 @@ static unsigned long obj_name_hash(const OBJ_NAME *a) sk_NAME_FUNCS_value(name_funcs_stack, a->type)->hash_func(a->name); } else { - ret = openssl_lh_strcasehash(a->name); + ret = OPENSSL_LH_strhash(a->name); } ret ^= a->type; return ret; @@ -201,7 +202,7 @@ const char *OBJ_NAME_get(const char *name, int type) } } - CRYPTO_THREAD_unlock(lock); + CRYPTO_THREAD_unlock(lock); return value; } @@ -211,7 +212,9 @@ int OBJ_NAME_add(const char *name, int type, const char *data) int alias, ok = 0; if (!OBJ_NAME_init()) - return 0; + return 0; + + CRYPTO_THREAD_write_lock(lock); alias = type & OBJ_NAME_ALIAS; type &= ~OBJ_NAME_ALIAS; @@ -227,8 +230,6 @@ int OBJ_NAME_add(const char *name, int type, const char *data) onp->type = type; onp->data = data; - CRYPTO_THREAD_write_lock(lock); - ret = lh_OBJ_NAME_insert(names_lh, onp); if (ret != NULL) { /* free things */ diff --git a/worker/deps/openssl/openssl/crypto/objects/objects.txt b/worker/deps/openssl/openssl/crypto/objects/objects.txt index fc0781d1c9..f1da8071ad 100644 --- a/worker/deps/openssl/openssl/crypto/objects/objects.txt +++ b/worker/deps/openssl/openssl/crypto/objects/objects.txt @@ -1482,4 +1482,3 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : AuthGOST12 : auth-gost12 : AuthSRP : auth-srp : AuthNULL : auth-null - diff --git a/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c b/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c index b638694e2d..a42b80fa5b 100644 --- a/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c +++ b/worker/deps/openssl/openssl/crypto/ocsp/ocsp_cl.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -166,16 +166,6 @@ const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs) return bs->signature; } -const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs) -{ - return &bs->signatureAlgorithm; -} - -const OCSP_RESPDATA *OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs) -{ - return &bs->tbsResponseData; -} - /* * Return number of OCSP_SINGLERESP responses present in a basic response. */ diff --git a/worker/deps/openssl/openssl/crypto/pem/pem_lib.c b/worker/deps/openssl/openssl/crypto/pem/pem_lib.c index 6f06c5291f..e9202f44ae 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pem_lib.c +++ b/worker/deps/openssl/openssl/crypto/pem/pem_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -28,23 +28,23 @@ static int load_iv(char **fromp, unsigned char *to, int num); static int check_pem(const char *nm, const char *name); int pem_check_suffix(const char *pem_str, const char *suffix); -int PEM_def_callback(char *buf, int num, int rwflag, void *userdata) +int PEM_def_callback(char *buf, int num, int w, void *key) { +#if defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_UI) int i; -#ifndef OPENSSL_NO_UI - int min_len; +#else + int i, j; const char *prompt; #endif - /* We assume that the user passes a default password as userdata */ - if (userdata) { - i = strlen(userdata); + if (key) { + i = strlen(key); i = (i > num) ? num : i; - memcpy(buf, userdata, i); + memcpy(buf, key, i); return i; } -#ifdef OPENSSL_NO_UI +#if defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_UI) PEMerr(PEM_F_PEM_DEF_CALLBACK, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return -1; #else @@ -52,22 +52,28 @@ int PEM_def_callback(char *buf, int num, int rwflag, void *userdata) if (prompt == NULL) prompt = "Enter PEM pass phrase:"; - /* - * rwflag == 0 means decryption - * rwflag == 1 means encryption - * - * We assume that for encryption, we want a minimum length, while for - * decryption, we cannot know any minimum length, so we assume zero. - */ - min_len = rwflag ? MIN_LENGTH : 0; + for (;;) { + /* + * We assume that w == 0 means decryption, + * while w == 1 means encryption + */ + int min_len = w ? MIN_LENGTH : 0; - i = EVP_read_pw_string_min(buf, min_len, num, prompt, rwflag); - if (i != 0) { - PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD); - memset(buf, 0, (unsigned int)num); - return -1; + i = EVP_read_pw_string_min(buf, min_len, num, prompt, w); + if (i != 0) { + PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD); + memset(buf, 0, (unsigned int)num); + return -1; + } + j = strlen(buf); + if (min_len && j < min_len) { + fprintf(stderr, + "phrase is too short, needs to be at least %d chars\n", + min_len); + } else + break; } - return strlen(buf); + return j; #endif } @@ -408,7 +414,7 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, keylen = PEM_def_callback(buf, PEM_BUFSIZE, 0, u); else keylen = callback(buf, PEM_BUFSIZE, 0, u); - if (keylen < 0) { + if (keylen <= 0) { PEMerr(PEM_F_PEM_DO_HEADER, PEM_R_BAD_PASSWORD_READ); return 0; } @@ -466,7 +472,6 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) char *dekinfostart, c; cipher->cipher = NULL; - memset(cipher->iv, 0, sizeof(cipher->iv)); if ((header == NULL) || (*header == '\0') || (*header == '\n')) return 1; diff --git a/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c b/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c index a8363b39b9..5caad9faab 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c +++ b/worker/deps/openssl/openssl/crypto/pem/pem_pk8.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -124,7 +124,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, klen = cb(psbuf, PEM_BUFSIZE, 0, u); else klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); - if (klen < 0) { + if (klen <= 0) { PEMerr(PEM_F_D2I_PKCS8PRIVATEKEY_BIO, PEM_R_BAD_PASSWORD_READ); X509_SIG_free(p8); return NULL; diff --git a/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c b/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c index 7dadc1391c..671b374f36 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c +++ b/worker/deps/openssl/openssl/crypto/pem/pem_pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -59,7 +59,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, klen = cb(psbuf, PEM_BUFSIZE, 0, u); else klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); - if (klen < 0) { + if (klen <= 0) { PEMerr(PEM_F_PEM_READ_BIO_PRIVATEKEY, PEM_R_BAD_PASSWORD_READ); X509_SIG_free(p8); goto err; diff --git a/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c b/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c index 96a82eb520..d0a423957c 100644 --- a/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c +++ b/worker/deps/openssl/openssl/crypto/pem/pvkfmt.c @@ -675,17 +675,17 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, const unsigned char *p = *in; unsigned int magic; unsigned char *enctmp = NULL, *q; - unsigned char keybuf[20]; EVP_CIPHER_CTX *cctx = EVP_CIPHER_CTX_new(); if (saltlen) { char psbuf[PEM_BUFSIZE]; + unsigned char keybuf[20]; int enctmplen, inlen; if (cb) inlen = cb(psbuf, PEM_BUFSIZE, 0, u); else inlen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u); - if (inlen < 0) { + if (inlen <= 0) { PEMerr(PEM_F_DO_PVK_BODY, PEM_R_BAD_PASSWORD_READ); goto err; } @@ -719,6 +719,7 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, memset(keybuf + 5, 0, 11); if (!EVP_DecryptInit_ex(cctx, EVP_rc4(), NULL, keybuf, NULL)) goto err; + OPENSSL_cleanse(keybuf, 20); if (!EVP_DecryptUpdate(cctx, q, &enctmplen, p, inlen)) goto err; if (!EVP_DecryptFinal_ex(cctx, q + enctmplen, &enctmplen)) @@ -728,17 +729,15 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, PEMerr(PEM_F_DO_PVK_BODY, PEM_R_BAD_DECRYPT); goto err; } - } + } else + OPENSSL_cleanse(keybuf, 20); p = enctmp; } ret = b2i_PrivateKey(&p, keylen); err: EVP_CIPHER_CTX_free(cctx); - if (enctmp != NULL) { - OPENSSL_cleanse(keybuf, sizeof(keybuf)); - OPENSSL_free(enctmp); - } + OPENSSL_free(enctmp); return ret; } diff --git a/worker/deps/openssl/openssl/crypto/perlasm/readme b/worker/deps/openssl/openssl/crypto/perlasm/readme index e90bd8e014..15f139d354 100644 --- a/worker/deps/openssl/openssl/crypto/perlasm/readme +++ b/worker/deps/openssl/openssl/crypto/perlasm/readme @@ -61,7 +61,7 @@ So a very simple version of this function could be coded as push(@INC,"perlasm","../../perlasm"); require "x86asm.pl"; - + &asm_init($ARGV[0],"cacl.pl"); &external_label("other"); @@ -121,4 +121,3 @@ void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length, &cbc("des_ncbc_encrypt","des_encrypt","des_encrypt",0,4,5,3,5,-1); &cbc("des_ede3_cbc_encrypt","des_encrypt3","des_decrypt3",0,6,7,3,4,5); - diff --git a/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c b/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c index 422dfc398f..f2bfe32ebd 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c +++ b/worker/deps/openssl/openssl/crypto/pkcs12/p12_asn.c @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,7 +51,7 @@ ASN1_ADB_TEMPLATE(safebag_default) = ASN1_EXP(PKCS12_SAFEBAG, value.other, ASN1_ ASN1_ADB(PKCS12_SAFEBAG) = { ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)), ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)), - ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SEQUENCE_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)), + ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SET_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)), ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)), ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)), ADB_ENTRY(NID_secretBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)) diff --git a/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c b/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c index 88db0f2dc4..a78e183c95 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c +++ b/worker/deps/openssl/openssl/crypto/pkcs12/p12_init.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -22,8 +22,7 @@ PKCS12 *PKCS12_init(int mode) PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE); return NULL; } - if (!ASN1_INTEGER_set(pkcs12->version, 3)) - goto err; + ASN1_INTEGER_set(pkcs12->version, 3); pkcs12->authsafes->type = OBJ_nid2obj(mode); switch (mode) { case NID_pkcs7_data: diff --git a/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c b/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c index 0cbbed364a..a9e22026c3 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c +++ b/worker/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,13 +7,13 @@ * https://www.openssl.org/source/license.html */ -#include -#include "internal/cryptlib.h" -#include -#include -#include -#include -#include "p12_lcl.h" +# include +# include "internal/cryptlib.h" +# include +# include +# include +# include +# include "p12_lcl.h" int PKCS12_mac_present(const PKCS12 *p12) { @@ -44,7 +44,7 @@ void PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac, } } -#define TK26_MAC_KEY_LEN 32 +# define TK26_MAC_KEY_LEN 32 static int pkcs12_gen_gost_mac_key(const char *pass, int passlen, const unsigned char *salt, int saltlen, @@ -75,7 +75,6 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *out, const EVP_MD *md_type)) { - int ret = 0; const EVP_MD *md_type; HMAC_CTX *hmac = NULL; unsigned char key[EVP_MAX_MD_SIZE], *salt; @@ -112,32 +111,29 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen, if ((md_type_nid == NID_id_GostR3411_94 || md_type_nid == NID_id_GostR3411_2012_256 || md_type_nid == NID_id_GostR3411_2012_512) - && ossl_safe_getenv("LEGACY_GOST_PKCS12") == NULL) { + && !getenv("LEGACY_GOST_PKCS12")) { md_size = TK26_MAC_KEY_LEN; if (!pkcs12_gen_gost_mac_key(pass, passlen, salt, saltlen, iter, md_size, key, md_type)) { PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR); - goto err; + return 0; } } else if (!(*pkcs12_key_gen)(pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter, md_size, key, md_type)) { PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR); - goto err; + return 0; } if ((hmac = HMAC_CTX_new()) == NULL || !HMAC_Init_ex(hmac, key, md_size, md_type, NULL) || !HMAC_Update(hmac, p12->authsafes->d.data->data, p12->authsafes->d.data->length) || !HMAC_Final(hmac, mac, maclen)) { - goto err; + HMAC_CTX_free(hmac); + return 0; } - ret = 1; - -err: - OPENSSL_cleanse(key, sizeof(key)); HMAC_CTX_free(hmac); - return ret; + return 1; } int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, diff --git a/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c b/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c index 371b9c99ff..69c68cf5f3 100644 --- a/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c +++ b/worker/deps/openssl/openssl/crypto/pkcs7/pk7_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -134,6 +134,7 @@ int PKCS7_set_type(PKCS7 *p7, int type) if ((p7->d.signed_and_enveloped = PKCS7_SIGN_ENVELOPE_new()) == NULL) goto err; + ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1); if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version, 1)) goto err; p7->d.signed_and_enveloped->enc_data->content_type diff --git a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl index 5cdb6be059..fc899ced86 100755 --- a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -186,7 +186,6 @@ .type poly1305_blocks,%function .align 5 poly1305_blocks: -.Lpoly1305_blocks: stmdb sp!,{r3-r11,lr} ands $len,$len,#-16 @@ -678,7 +677,7 @@ cmp $len,#64 bhs .Lenter_neon tst ip,ip @ is_base2_26? - beq .Lpoly1305_blocks + beq poly1305_blocks .Lenter_neon: stmdb sp!,{r4-r7} diff --git a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl index d2b3e90d93..024696a599 100755 --- a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl +++ b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-mips.pl @@ -422,4 +422,3 @@ $output=pop and open STDOUT,">$output"; print $code; close STDOUT; - diff --git a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl index 93179e37d5..ab24dfcfad 100755 --- a/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl +++ b/worker/deps/openssl/openssl/crypto/poly1305/asm/poly1305-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -70,7 +70,7 @@ $avx = ($1>=2.09) + ($1>=2.10); } - if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) { + if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) { $avx = ($2>=3.0) + ($2>3.0); } } diff --git a/worker/deps/openssl/openssl/crypto/rand/md_rand.c b/worker/deps/openssl/openssl/crypto/rand/md_rand.c index eb6a14b14f..7d5fcb7f67 100644 --- a/worker/deps/openssl/openssl/crypto/rand/md_rand.c +++ b/worker/deps/openssl/openssl/crypto/rand/md_rand.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -275,6 +275,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) static volatile int stirred_pool = 0; int i, j, k; size_t num_ceil, st_idx, st_num; + int ok; long md_c[2]; unsigned char local_md[MD_DIGEST_LENGTH]; EVP_MD_CTX *m; @@ -361,13 +362,14 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) if (!initialized) { RAND_poll(); - initialized = (entropy >= ENTROPY_NEEDED); + initialized = 1; } if (!stirred_pool) do_stir_pool = 1; - if (!initialized) { + ok = (entropy >= ENTROPY_NEEDED); + if (!ok) { /* * If the PRNG state is not yet unpredictable, then seeing the PRNG * output may help attackers to determine the new state; thus we have @@ -406,7 +408,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) rand_add(DUMMY_SEED, MD_DIGEST_LENGTH, 0.0); n -= MD_DIGEST_LENGTH; } - if (initialized) + if (ok) stirred_pool = 1; } @@ -498,7 +500,7 @@ static int rand_bytes(unsigned char *buf, int num, int pseudo) CRYPTO_THREAD_unlock(rand_lock); EVP_MD_CTX_free(m); - if (initialized) + if (ok) return (1); else if (pseudo) return 0; diff --git a/worker/deps/openssl/openssl/crypto/rand/randfile.c b/worker/deps/openssl/openssl/crypto/rand/randfile.c index c827407705..dbd03ff2bd 100644 --- a/worker/deps/openssl/openssl/crypto/rand/randfile.c +++ b/worker/deps/openssl/openssl/crypto/rand/randfile.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -314,9 +314,14 @@ const char *RAND_file_name(char *buf, size_t size) } } #else - if ((s = ossl_safe_getenv("RANDFILE")) == NULL || *s == '\0') { + if (OPENSSL_issetugid() != 0) { use_randfile = 0; - s = ossl_safe_getenv("HOME"); + } else { + s = getenv("RANDFILE"); + if (s == NULL || *s == '\0') { + use_randfile = 0; + s = getenv("HOME"); + } } #endif #ifdef DEFAULT_HOME diff --git a/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl b/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl index 184922c128..1354d18214 100644 --- a/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl +++ b/worker/deps/openssl/openssl/crypto/rc4/asm/rc4-c64xplus.pl @@ -89,7 +89,7 @@ || NOP 5 STB $XX,*${KEYA}[-2] ; key->x || SUB4 $YY,$TX,$YY -|| BNOP B3 +|| BNOP B3 STB $YY,*${KEYB}[-1] ; key->y || NOP 5 .endasmfunc diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c index 79f77e3eaf..9af43e0586 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_gen.c @@ -89,8 +89,6 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, if (BN_copy(rsa->e, e_value) == NULL) goto err; - BN_set_flags(rsa->p, BN_FLG_CONSTTIME); - BN_set_flags(rsa->q, BN_FLG_CONSTTIME); BN_set_flags(r2, BN_FLG_CONSTTIME); /* generate p and q */ for (;;) { diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c index d99d04916d..e1377a0690 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -94,7 +94,7 @@ RSA *RSA_new_method(ENGINE *engine) return ret; - err: +err: RSA_free(ret); return NULL; } @@ -112,7 +112,7 @@ void RSA_free(RSA *r) return; REF_ASSERT_ISNT(i < 0); - if (r->meth != NULL && r->meth->finish != NULL) + if (r->meth->finish) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE ENGINE_finish(r->engine); diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c index ba40cff287..be84923b34 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_meth.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -75,7 +75,7 @@ int RSA_meth_set1_name(RSA_METHOD *meth, const char *name) return 1; } -int RSA_meth_get_flags(const RSA_METHOD *meth) +int RSA_meth_get_flags(RSA_METHOD *meth) { return meth->flags; } @@ -163,13 +163,13 @@ int RSA_meth_set_priv_dec(RSA_METHOD *meth, /* Can be null */ int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) - (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx) + (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) { return meth->rsa_mod_exp; } int RSA_meth_set_mod_exp(RSA_METHOD *meth, - int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa, + int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)) { meth->rsa_mod_exp = mod_exp; @@ -270,4 +270,3 @@ int RSA_meth_set_keygen(RSA_METHOD *meth, meth->rsa_keygen = keygen; return 1; } - diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c index df08a2f53e..4878d495fe 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_oaep.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -43,12 +43,10 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, const unsigned char *param, int plen, const EVP_MD *md, const EVP_MD *mgf1md) { - int rv = 0; int i, emlen = tlen - 1; unsigned char *db, *seed; - unsigned char *dbmask = NULL; - unsigned char seedmask[EVP_MAX_MD_SIZE]; - int mdlen, dbmask_len = 0; + unsigned char *dbmask, seedmask[EVP_MAX_MD_SIZE]; + int mdlen; if (md == NULL) md = EVP_sha1(); @@ -74,41 +72,40 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, db = to + mdlen + 1; if (!EVP_Digest((void *)param, plen, db, NULL, md, NULL)) - goto err; + return 0; memset(db + mdlen, 0, emlen - flen - 2 * mdlen - 1); db[emlen - flen - mdlen - 1] = 0x01; memcpy(db + emlen - flen - mdlen, from, (unsigned int)flen); if (RAND_bytes(seed, mdlen) <= 0) - goto err; - + return 0; #ifdef PKCS_TESTVECT memcpy(seed, "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f", 20); #endif - dbmask_len = emlen - mdlen; - dbmask = OPENSSL_malloc(dbmask_len); + dbmask = OPENSSL_malloc(emlen - mdlen); if (dbmask == NULL) { RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1, ERR_R_MALLOC_FAILURE); - goto err; + return 0; } - if (PKCS1_MGF1(dbmask, dbmask_len, seed, mdlen, mgf1md) < 0) + if (PKCS1_MGF1(dbmask, emlen - mdlen, seed, mdlen, mgf1md) < 0) goto err; - for (i = 0; i < dbmask_len; i++) + for (i = 0; i < emlen - mdlen; i++) db[i] ^= dbmask[i]; - if (PKCS1_MGF1(seedmask, mdlen, db, dbmask_len, mgf1md) < 0) + if (PKCS1_MGF1(seedmask, mdlen, db, emlen - mdlen, mgf1md) < 0) goto err; for (i = 0; i < mdlen; i++) seed[i] ^= seedmask[i]; - rv = 1; + + OPENSSL_free(dbmask); + return 1; err: - OPENSSL_cleanse(seedmask, sizeof(seedmask)); - OPENSSL_clear_free(dbmask, dbmask_len); - return rv; + OPENSSL_free(dbmask); + return 0; } int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen, @@ -158,40 +155,32 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, dblen = num - mdlen - 1; db = OPENSSL_malloc(dblen); - if (db == NULL) { + em = OPENSSL_malloc(num); + if (db == NULL || em == NULL) { RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1, ERR_R_MALLOC_FAILURE); goto cleanup; } - if (flen != num) { - em = OPENSSL_zalloc(num); - if (em == NULL) { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1, - ERR_R_MALLOC_FAILURE); - goto cleanup; - } - - /* - * Caller is encouraged to pass zero-padded message created with - * BN_bn2binpad, but if it doesn't, we do this zero-padding copy - * to avoid leaking that information. The copy still leaks some - * side-channel information, but it's impossible to have a fixed - * memory access pattern since we can't read out of the bounds of - * |from|. - */ - memcpy(em + num - flen, from, flen); - from = em; - } + /* + * Always do this zero-padding copy (even when num == flen) to avoid + * leaking that information. The copy still leaks some side-channel + * information, but it's impossible to have a fixed memory access + * pattern since we can't read out of the bounds of |from|. + * + * TODO(emilia): Consider porting BN_bn2bin_padded from BoringSSL. + */ + memset(em, 0, num); + memcpy(em + num - flen, from, flen); /* * The first byte must be zero, however we must not leak if this is * true. See James H. Manger, "A Chosen Ciphertext Attack on RSA * Optimal Asymmetric Encryption Padding (OAEP) [...]", CRYPTO 2001). */ - good = constant_time_is_zero(from[0]); + good = constant_time_is_zero(em[0]); - maskedseed = from + 1; - maskeddb = from + 1 + mdlen; + maskedseed = em + 1; + maskeddb = em + 1 + mdlen; if (PKCS1_MGF1(seed, mdlen, maskeddb, dblen, mgf1md)) goto cleanup; @@ -250,7 +239,6 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1, RSA_R_OAEP_DECODING_ERROR); cleanup: - OPENSSL_cleanse(seed, sizeof(seed)); OPENSSL_clear_free(db, dblen); OPENSSL_clear_free(em, num); return mlen; @@ -293,7 +281,6 @@ int PKCS1_MGF1(unsigned char *mask, long len, } rv = 0; err: - OPENSSL_cleanse(md, sizeof(md)); EVP_MD_CTX_free(c); return rv; } diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c index 23f948fbbb..62a88959fa 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_ossl.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -62,7 +62,7 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { BIGNUM *f, *ret; - int i, num = 0, r = -1; + int i, j, k, num = 0, r = -1; unsigned char *buf = NULL; BN_CTX *ctx = NULL; @@ -127,8 +127,8 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, } if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, - rsa->n, ctx)) + if (!BN_MONT_CTX_set_locked + (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) goto err; if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx, @@ -136,10 +136,15 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, goto err; /* - * BN_bn2binpad puts in leading 0 bytes if the number is less than - * the length of the modulus. + * put in leading 0 bytes if the number is less than the length of the + * modulus */ - r = BN_bn2binpad(ret, to, num); + j = BN_num_bytes(ret); + i = BN_bn2bin(ret, &(to[num - j])); + for (k = 0; k < (num - i); k++) + to[k] = 0; + + r = num; err: if (ctx != NULL) BN_CTX_end(ctx); @@ -228,7 +233,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) { BIGNUM *f, *ret, *res; - int i, num = 0, r = -1; + int i, j, k, num = 0, r = -1; unsigned char *buf = NULL; BN_CTX *ctx = NULL; int local_blinding = 0; @@ -312,8 +317,8 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME); if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, - rsa->n, ctx)) { + if (!BN_MONT_CTX_set_locked + (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) { BN_free(d); goto err; } @@ -332,8 +337,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, goto err; if (padding == RSA_X931_PADDING) { - if (!BN_sub(f, rsa->n, ret)) - goto err; + BN_sub(f, rsa->n, ret); if (BN_cmp(ret, f) > 0) res = f; else @@ -342,10 +346,15 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, res = ret; /* - * BN_bn2binpad puts in leading 0 bytes if the number is less than - * the length of the modulus. + * put in leading 0 bytes if the number is less than the length of the + * modulus */ - r = BN_bn2binpad(res, to, num); + j = BN_num_bytes(res); + i = BN_bn2bin(res, &(to[num - j])); + for (k = 0; k < (num - i); k++) + to[k] = 0; + + r = num; err: if (ctx != NULL) BN_CTX_end(ctx); @@ -359,6 +368,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, { BIGNUM *f, *ret; int j, num = 0, r = -1; + unsigned char *p; unsigned char *buf = NULL; BN_CTX *ctx = NULL; int local_blinding = 0; @@ -435,8 +445,8 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME); if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, - rsa->n, ctx)) { + if (!BN_MONT_CTX_set_locked + (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) { BN_free(d); goto err; } @@ -453,7 +463,8 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, if (!rsa_blinding_invert(blinding, ret, unblind, ctx)) goto err; - j = BN_bn2binpad(ret, buf, num); + p = buf; + j = BN_bn2bin(ret, p); /* j is only used with no-padding mode */ switch (padding) { case RSA_PKCS1_PADDING: @@ -466,7 +477,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, r = RSA_padding_check_SSLv23(to, num, buf, j, num); break; case RSA_NO_PADDING: - memcpy(to, buf, (r = j)); + r = RSA_padding_check_none(to, num, buf, j, num); break; default: RSAerr(RSA_F_RSA_OSSL_PRIVATE_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); @@ -489,6 +500,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, { BIGNUM *f, *ret; int i, num = 0, r = -1; + unsigned char *p; unsigned char *buf = NULL; BN_CTX *ctx = NULL; @@ -541,8 +553,8 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, } if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, - rsa->n, ctx)) + if (!BN_MONT_CTX_set_locked + (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) goto err; if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx, @@ -553,7 +565,8 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, if (!BN_sub(ret, rsa->n, ret)) goto err; - i = BN_bn2binpad(ret, buf, num); + p = buf; + i = BN_bn2bin(ret, p); switch (padding) { case RSA_PKCS1_PADDING: @@ -563,7 +576,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, r = RSA_padding_check_X931(to, num, buf, i, num); break; case RSA_NO_PADDING: - memcpy(to, buf, (r = i)); + r = RSA_padding_check_none(to, num, buf, i, num); break; default: RSAerr(RSA_F_RSA_OSSL_PUBLIC_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); @@ -583,7 +596,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) { BIGNUM *r1, *m1, *vrfy; - int ret = 0, smooth = 0; + int ret = 0; BN_CTX_start(ctx); @@ -593,80 +606,43 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) if (vrfy == NULL) goto err; - if (rsa->flags & RSA_FLAG_CACHE_PRIVATE) { - BIGNUM *factor = BN_new(); - - if (factor == NULL) - goto err; + { + BIGNUM *p = BN_new(), *q = BN_new(); /* * Make sure BN_mod_inverse in Montgomery initialization uses the * BN_FLG_CONSTTIME flag */ - if (!(BN_with_flags(factor, rsa->p, BN_FLG_CONSTTIME), - BN_MONT_CTX_set_locked(&rsa->_method_mod_p, rsa->lock, - factor, ctx)) - || !(BN_with_flags(factor, rsa->q, BN_FLG_CONSTTIME), - BN_MONT_CTX_set_locked(&rsa->_method_mod_q, rsa->lock, - factor, ctx))) { - BN_free(factor); + if (p == NULL || q == NULL) { + BN_free(p); + BN_free(q); goto err; } + BN_with_flags(p, rsa->p, BN_FLG_CONSTTIME); + BN_with_flags(q, rsa->q, BN_FLG_CONSTTIME); + + if (rsa->flags & RSA_FLAG_CACHE_PRIVATE) { + if (!BN_MONT_CTX_set_locked + (&rsa->_method_mod_p, rsa->lock, p, ctx) + || !BN_MONT_CTX_set_locked(&rsa->_method_mod_q, + rsa->lock, q, ctx)) { + BN_free(p); + BN_free(q); + goto err; + } + } /* - * We MUST free |factor| before any further use of the prime factors + * We MUST free p and q before any further use of rsa->p and rsa->q */ - BN_free(factor); - - smooth = (rsa->meth->bn_mod_exp == BN_mod_exp_mont) - && (BN_num_bits(rsa->q) == BN_num_bits(rsa->p)); + BN_free(p); + BN_free(q); } if (rsa->flags & RSA_FLAG_CACHE_PUBLIC) - if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock, - rsa->n, ctx)) + if (!BN_MONT_CTX_set_locked + (&rsa->_method_mod_n, rsa->lock, rsa->n, ctx)) goto err; - if (smooth) { - /* - * Conversion from Montgomery domain, a.k.a. Montgomery reduction, - * accepts values in [0-m*2^w) range. w is m's bit width rounded up - * to limb width. So that at the very least if |I| is fully reduced, - * i.e. less than p*q, we can count on from-to round to perform - * below modulo operations on |I|. Unlike BN_mod it's constant time. - */ - if (/* m1 = I moq q */ - !bn_from_mont_fixed_top(m1, I, rsa->_method_mod_q, ctx) - || !bn_to_mont_fixed_top(m1, m1, rsa->_method_mod_q, ctx) - /* m1 = m1^dmq1 mod q */ - || !BN_mod_exp_mont_consttime(m1, m1, rsa->dmq1, rsa->q, ctx, - rsa->_method_mod_q) - /* r1 = I mod p */ - || !bn_from_mont_fixed_top(r1, I, rsa->_method_mod_p, ctx) - || !bn_to_mont_fixed_top(r1, r1, rsa->_method_mod_p, ctx) - /* r1 = r1^dmp1 mod p */ - || !BN_mod_exp_mont_consttime(r1, r1, rsa->dmp1, rsa->p, ctx, - rsa->_method_mod_p) - /* r1 = (r1 - m1) mod p */ - /* - * bn_mod_sub_fixed_top is not regular modular subtraction, - * it can tolerate subtrahend to be larger than modulus, but - * not bit-wise wider. This makes up for uncommon q>p case, - * when |m1| can be larger than |rsa->p|. - */ - || !bn_mod_sub_fixed_top(r1, r1, m1, rsa->p) - - /* r1 = r1 * iqmp mod p */ - || !bn_to_mont_fixed_top(r1, r1, rsa->_method_mod_p, ctx) - || !bn_mul_mont_fixed_top(r1, r1, rsa->iqmp, rsa->_method_mod_p, - ctx) - /* r0 = r1 * q + m1 */ - || !bn_mul_fixed_top(r0, r1, rsa->q, ctx) - || !bn_mod_add_fixed_top(r0, r0, m1, rsa->n)) - goto err; - - goto tail; - } - /* compute I mod q */ { BIGNUM *c = BN_new(); @@ -689,7 +665,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) /* compute r1^dmq1 mod q */ if (!rsa->meth->bn_mod_exp(m1, r1, dmq1, rsa->q, ctx, - rsa->_method_mod_q)) { + rsa->_method_mod_q)) { BN_free(c); BN_free(dmq1); goto err; @@ -765,18 +741,10 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) if (!BN_add(r0, r1, m1)) goto err; - tail: if (rsa->e && rsa->n) { - if (rsa->meth->bn_mod_exp == BN_mod_exp_mont) { - if (!BN_mod_exp_mont(vrfy, r0, rsa->e, rsa->n, ctx, - rsa->_method_mod_n)) - goto err; - } else { - bn_correct_top(r0); - if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, - rsa->_method_mod_n)) - goto err; - } + if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, + rsa->_method_mod_n)) + goto err; /* * If 'I' was greater than (or equal to) rsa->n, the operation will * be equivalent to using 'I mod n'. However, the result of the @@ -785,11 +753,6 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) */ if (!BN_sub(vrfy, vrfy, I)) goto err; - if (BN_is_zero(vrfy)) { - bn_correct_top(r0); - ret = 1; - goto err; /* not actually error */ - } if (!BN_mod(vrfy, vrfy, rsa->n, ctx)) goto err; if (BN_is_negative(vrfy)) @@ -816,15 +779,6 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) BN_free(d); } } - /* - * It's unfortunate that we have to bn_correct_top(r0). What hopefully - * saves the day is that correction is highly unlike, and private key - * operations are customarily performed on blinded message. Which means - * that attacker won't observe correlation with chosen plaintext. - * Secondly, remaining code would still handle it in same computational - * time and even conceal memory access pattern around corrected top. - */ - bn_correct_top(r0); ret = 1; err: BN_CTX_end(ctx); diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c index 63d6c3a3b8..aeeb32c2dc 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_pk1.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -175,30 +175,27 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, if (num < 11) goto err; - if (flen != num) { - em = OPENSSL_zalloc(num); - if (em == NULL) { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2, ERR_R_MALLOC_FAILURE); - return -1; - } - /* - * Caller is encouraged to pass zero-padded message created with - * BN_bn2binpad, but if it doesn't, we do this zero-padding copy - * to avoid leaking that information. The copy still leaks some - * side-channel information, but it's impossible to have a fixed - * memory access pattern since we can't read out of the bounds of - * |from|. - */ - memcpy(em + num - flen, from, flen); - from = em; + em = OPENSSL_zalloc(num); + if (em == NULL) { + RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2, ERR_R_MALLOC_FAILURE); + return -1; } + /* + * Always do this zero-padding copy (even when num == flen) to avoid + * leaking that information. The copy still leaks some side-channel + * information, but it's impossible to have a fixed memory access + * pattern since we can't read out of the bounds of |from|. + * + * TODO(emilia): Consider porting BN_bn2bin_padded from BoringSSL. + */ + memcpy(em + num - flen, from, flen); - good = constant_time_is_zero(from[0]); - good &= constant_time_eq(from[1], 2); + good = constant_time_is_zero(em[0]); + good &= constant_time_eq(em[1], 2); found_zero_byte = 0; for (i = 2; i < num; i++) { - unsigned int equals0 = constant_time_is_zero(from[i]); + unsigned int equals0 = constant_time_is_zero(em[i]); zero_index = constant_time_select_int(~found_zero_byte & equals0, i, zero_index); @@ -206,7 +203,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, } /* - * PS must be at least 8 bytes long, and it starts two bytes into |from|. + * PS must be at least 8 bytes long, and it starts two bytes into |em|. * If we never found a 0-byte, then |zero_index| is 0 and the check * also fails. */ @@ -235,7 +232,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, goto err; } - memcpy(to, from + msg_index, mlen); + memcpy(to, em + msg_index, mlen); err: OPENSSL_clear_free(em, num); diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c index 4a1e599ed5..f8143387c8 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_pss.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -242,7 +242,7 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM, err: EVP_MD_CTX_free(ctx); - OPENSSL_clear_free(salt, sLen); + OPENSSL_free(salt); return ret; diff --git a/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c b/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c index 77b28b46f2..9ef6b80ea8 100644 --- a/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c +++ b/worker/deps/openssl/openssl/crypto/rsa/rsa_ssl.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -63,14 +63,6 @@ int RSA_padding_check_SSLv23(unsigned char *to, int tlen, RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_DATA_TOO_SMALL); return (-1); } - /* Accept even zero-padded input */ - if (flen == num) { - if (*(p++) != 0) { - RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_BLOCK_TYPE_IS_NOT_02); - return -1; - } - flen--; - } if ((num != (flen + 1)) || (*(p++) != 02)) { RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_BLOCK_TYPE_IS_NOT_02); return (-1); diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl index cf34b2c293..5adca23404 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -141,7 +141,7 @@ `ml 2>&1` =~ /Version ([0-9]+)\./ && $1>=10); # first version supporting AVX -$ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && +$ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0); # first version supporting AVX $shaext=$xmm; ### set to zero if compiling for 1.0.1 diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl index 72ee0c7b83..6af1d84beb 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -93,7 +93,7 @@ $avx = ($1>=10) + ($1>=11); } -if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) { +if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) { $avx = ($2>=3.0) + ($2>3.0); } diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl index edcfc31278..55d30cba3a 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha256-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -254,7 +254,7 @@ sub BODY_16_XX { $code.=".Lrounds_16_xx:\n"; for (;$i<32;$i++) { &BODY_16_XX($i,@V); unshift(@V,pop(@V)); } $code.=<<___; -#ifdef __thumb2__ +#if __ARM_ARCH__>=7 ite eq @ Thumb2 thing, sanity check in ARM #endif ldreq $t3,[sp,#16*4] @ pull ctx diff --git a/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl b/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl index 0b4c5674d9..22b5a9d0b1 100644 --- a/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl +++ b/worker/deps/openssl/openssl/crypto/sha/asm/sha512-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -157,7 +157,7 @@ () teq $t0,#$magic ldr $t3,[sp,#$Coff+0] @ c.lo -#ifdef __thumb2__ +#if __ARM_ARCH__>=7 it eq @ Thumb2 thing, sanity check in ARM #endif orreq $Ktbl,$Ktbl,#1 @@ -411,7 +411,7 @@ () ___ &BODY_00_15(0x17); $code.=<<___; -#ifdef __thumb2__ +#if __ARM_ARCH__>=7 ittt eq @ Thumb2 thing, sanity check in ARM #endif ldreq $t0,[sp,#`$Xoff+8*(16-1)`+0] diff --git a/worker/deps/openssl/openssl/crypto/threads_win.c b/worker/deps/openssl/openssl/crypto/threads_win.c index 27334e13f3..4e0de908ee 100644 --- a/worker/deps/openssl/openssl/crypto/threads_win.c +++ b/worker/deps/openssl/openssl/crypto/threads_win.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -98,26 +98,7 @@ int CRYPTO_THREAD_init_local(CRYPTO_THREAD_LOCAL *key, void (*cleanup)(void *)) void *CRYPTO_THREAD_get_local(CRYPTO_THREAD_LOCAL *key) { - DWORD last_error; - void *ret; - - /* - * TlsGetValue clears the last error even on success, so that callers may - * distinguish it successfully returning NULL or failing. It is documented - * to never fail if the argument is a valid index from TlsAlloc, so we do - * not need to handle this. - * - * However, this error-mangling behavior interferes with the caller's use of - * GetLastError. In particular SSL_get_error queries the error queue to - * determine whether the caller should look at the OS's errors. To avoid - * destroying state, save and restore the Windows error. - * - * https://msdn.microsoft.com/en-us/library/windows/desktop/ms686812(v=vs.85).aspx - */ - last_error = GetLastError(); - ret = TlsGetValue(*key); - SetLastError(last_error); - return ret; + return TlsGetValue(*key); } int CRYPTO_THREAD_set_local(CRYPTO_THREAD_LOCAL *key, void *val) diff --git a/worker/deps/openssl/openssl/crypto/ts/ts_lib.c b/worker/deps/openssl/openssl/crypto/ts/ts_lib.c index ce2e12c593..de36e0e084 100644 --- a/worker/deps/openssl/openssl/crypto/ts/ts_lib.c +++ b/worker/deps/openssl/openssl/crypto/ts/ts_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -22,9 +22,10 @@ int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num) int result = 0; char *hex; - num_bn = ASN1_INTEGER_to_BN(num, NULL); + num_bn = BN_new(); if (num_bn == NULL) return -1; + ASN1_INTEGER_to_BN(num, num_bn); if ((hex = BN_bn2hex(num_bn))) { result = BIO_write(bio, "0x", 2) > 0; result = result && BIO_write(bio, hex, strlen(hex)) > 0; diff --git a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c index 0d714a71b7..aea7b922a3 100644 --- a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c +++ b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_sign.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -16,7 +16,6 @@ #include #include #include -#include #include "ts_lcl.h" static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *); @@ -841,7 +840,7 @@ static ASN1_GENERALIZEDTIME long sec, long usec, unsigned precision) { time_t time_sec = (time_t)sec; - struct tm *tm = NULL, tm_result; + struct tm *tm = NULL; char genTime_str[17 + TS_MAX_CLOCK_PRECISION_DIGITS]; char *p = genTime_str; char *p_end = genTime_str + sizeof(genTime_str); @@ -849,7 +848,7 @@ static ASN1_GENERALIZEDTIME if (precision > TS_MAX_CLOCK_PRECISION_DIGITS) goto err; - if ((tm = OPENSSL_gmtime(&time_sec, &tm_result)) == NULL) + if ((tm = gmtime(&time_sec)) == NULL) goto err; /* diff --git a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c index 2755dd0ef3..66f5be6f69 100644 --- a/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c +++ b/worker/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c @@ -480,7 +480,7 @@ static char *ts_get_status_text(STACK_OF(ASN1_UTF8STRING) *text) return result; } -static int ts_check_policy(const ASN1_OBJECT *req_oid, +static int ts_check_policy(const ASN1_OBJECT *req_oid, const TS_TST_INFO *tst_info) { const ASN1_OBJECT *resp_oid = tst_info->policy_id; diff --git a/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c b/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c index a25934ccd1..8fa8deca66 100644 --- a/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c +++ b/worker/deps/openssl/openssl/crypto/ui/ui_openssl.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -436,24 +436,6 @@ static int open_console(UI *ui) is_a_tty = 0; else # endif -# ifdef ENXIO - /* - * Solaris can return ENXIO. - * This should be ok - */ - if (errno == ENXIO) - is_a_tty = 0; - else -# endif -# ifdef EIO - /* - * Linux can return EIO. - * This should be ok - */ - if (errno == EIO) - is_a_tty = 0; - else -# endif # ifdef ENODEV /* * MacOS X returns ENODEV (Operation not supported by device), @@ -542,13 +524,17 @@ static int echo_console(UI *ui) { #if defined(TTY_set) && !defined(OPENSSL_SYS_VMS) memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig)); + tty_new.TTY_FLAGS |= ECHO; +#endif + +#if defined(TTY_set) && !defined(OPENSSL_SYS_VMS) if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1)) return 0; #endif #ifdef OPENSSL_SYS_VMS if (is_a_tty) { tty_new[0] = tty_orig[0]; - tty_new[1] = tty_orig[1]; + tty_new[1] = tty_orig[1] & ~TT$M_NOECHO; tty_new[2] = tty_orig[2]; status = sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_new, 12, 0, 0, 0, 0); @@ -569,6 +555,7 @@ static int echo_console(UI *ui) #if defined(_WIN32) && !defined(_WIN32_WCE) if (is_a_tty) { tty_new = tty_orig; + tty_new |= ENABLE_ECHO_INPUT; SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), tty_new); } #endif diff --git a/worker/deps/openssl/openssl/crypto/x509/build.info b/worker/deps/openssl/openssl/crypto/x509/build.info index afd0b6134e..7fc4b45048 100644 --- a/worker/deps/openssl/openssl/crypto/x509/build.info +++ b/worker/deps/openssl/openssl/crypto/x509/build.info @@ -4,7 +4,7 @@ SOURCE[../../libcrypto]=\ x509_obj.c x509_req.c x509spki.c x509_vfy.c \ x509_set.c x509cset.c x509rset.c x509_err.c \ x509name.c x509_v3.c x509_ext.c x509_att.c \ - x509type.c x509_meth.c x509_lu.c x_all.c x509_txt.c \ + x509type.c x509_lu.c x_all.c x509_txt.c \ x509_trs.c by_file.c by_dir.c x509_vpm.c \ x_crl.c t_crl.c x_req.c t_req.c x_x509.c t_x509.c \ x_pubkey.c x_x509a.c x_attrib.c x_exten.c x_name.c diff --git a/worker/deps/openssl/openssl/crypto/x509/by_dir.c b/worker/deps/openssl/openssl/crypto/x509/by_dir.c index 4fa1dd37b9..21672a7ef5 100644 --- a/worker/deps/openssl/openssl/crypto/x509/by_dir.c +++ b/worker/deps/openssl/openssl/crypto/x509/by_dir.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -78,8 +78,7 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, switch (cmd) { case X509_L_ADD_DIR: if (argl == X509_FILETYPE_DEFAULT) { - dir = (char *)ossl_safe_getenv(X509_get_default_cert_dir_env()); - + dir = (char *)getenv(X509_get_default_cert_dir_env()); if (dir) ret = add_cert_dir(ld, dir, X509_FILETYPE_PEM); else @@ -112,7 +111,7 @@ static int new_dir(X509_LOOKUP *lu) OPENSSL_free(a); return 0; } - lu->method_data = a; + lu->method_data = (char *)a; return 1; } diff --git a/worker/deps/openssl/openssl/crypto/x509/by_file.c b/worker/deps/openssl/openssl/crypto/x509/by_file.c index 77a7c4a2a6..0bcc6af30e 100644 --- a/worker/deps/openssl/openssl/crypto/x509/by_file.c +++ b/worker/deps/openssl/openssl/crypto/x509/by_file.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -47,7 +47,7 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, switch (cmd) { case X509_L_FILE_LOAD: if (argl == X509_FILETYPE_DEFAULT) { - file = ossl_safe_getenv(X509_get_default_cert_file_env()); + file = getenv(X509_get_default_cert_file_env()); if (file) ok = (X509_load_cert_crl_file(ctx, file, X509_FILETYPE_PEM) != 0); diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c b/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c index 49b0368dfc..01056356c5 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_cmp.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -174,7 +174,7 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) ret = a->canon_enclen - b->canon_enclen; - if (ret != 0 || a->canon_enclen == 0) + if (ret) return ret; return memcmp(a->canon_enc, b->canon_enc, a->canon_enclen); diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_err.c b/worker/deps/openssl/openssl/crypto/x509/x509_err.c index 9f91188a76..3f4b8ef0bc 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_err.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,7 +51,6 @@ static ERR_STRING_DATA X509_str_functs[] = { {ERR_FUNC(X509_F_X509_LOAD_CERT_CRL_FILE), "X509_load_cert_crl_file"}, {ERR_FUNC(X509_F_X509_LOAD_CERT_FILE), "X509_load_cert_file"}, {ERR_FUNC(X509_F_X509_LOAD_CRL_FILE), "X509_load_crl_file"}, - {ERR_FUNC(X509_F_X509_LOOKUP_METH_NEW), "X509_LOOKUP_meth_new"}, {ERR_FUNC(X509_F_X509_NAME_ADD_ENTRY), "X509_NAME_add_entry"}, {ERR_FUNC(X509_F_X509_NAME_ENTRY_CREATE_BY_NID), "X509_NAME_ENTRY_create_by_NID"}, diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h b/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h index 8a47da4fef..40bd102f70 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h +++ b/worker/deps/openssl/openssl/crypto/x509/x509_lcl.h @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -67,7 +67,7 @@ struct x509_crl_method_st { }; struct x509_lookup_method_st { - char *name; + const char *name; int (*new_item) (X509_LOOKUP *ctx); void (*free) (X509_LOOKUP *ctx); int (*init) (X509_LOOKUP *ctx); @@ -91,7 +91,7 @@ struct x509_lookup_st { int init; /* have we been started */ int skip; /* don't use us. */ X509_LOOKUP_METHOD *method; /* the functions */ - void *method_data; /* method data */ + char *method_data; /* method data */ X509_STORE *store_ctx; /* who owns us */ }; diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_lu.c b/worker/deps/openssl/openssl/crypto/x509/x509_lu.c index e5bea5b276..90f23520f4 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_lu.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_lu.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -117,23 +117,6 @@ int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, return ctx->method->get_by_alias(ctx, type, str, len, ret); } -int X509_LOOKUP_set_method_data(X509_LOOKUP *ctx, void *data) -{ - ctx->method_data = data; - return 1; -} - -void *X509_LOOKUP_get_method_data(const X509_LOOKUP *ctx) -{ - return ctx->method_data; -} - -X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx) -{ - return ctx->store_ctx; -} - - static int x509_object_cmp(const X509_OBJECT *const *a, const X509_OBJECT *const *b) { @@ -282,9 +265,6 @@ int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type, X509_OBJECT stmp, *tmp; int i, j; - if (ctx == NULL) - return 0; - CRYPTO_THREAD_write_lock(ctx->lock); tmp = X509_OBJECT_retrieve_by_subject(ctx->objs, type, name); CRYPTO_THREAD_unlock(ctx->lock); @@ -310,30 +290,26 @@ int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type, return 1; } -static int x509_store_add(X509_STORE *ctx, void *x, int crl) +int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) { X509_OBJECT *obj; - int ret = 0, added = 0; + int ret = 1, added = 1; if (x == NULL) return 0; obj = X509_OBJECT_new(); if (obj == NULL) return 0; - - if (crl) { - obj->type = X509_LU_CRL; - obj->data.crl = (X509_CRL *)x; - } else { - obj->type = X509_LU_X509; - obj->data.x509 = (X509 *)x; - } + obj->type = X509_LU_X509; + obj->data.x509 = x; X509_OBJECT_up_ref_count(obj); CRYPTO_THREAD_write_lock(ctx->lock); if (X509_OBJECT_retrieve_match(ctx->objs, obj)) { - ret = 1; + X509err(X509_F_X509_STORE_ADD_CERT, + X509_R_CERT_ALREADY_IN_HASH_TABLE); + ret = 0; } else { added = sk_X509_OBJECT_push(ctx->objs, obj); ret = added != 0; @@ -341,28 +317,46 @@ static int x509_store_add(X509_STORE *ctx, void *x, int crl) CRYPTO_THREAD_unlock(ctx->lock); - if (added == 0) /* obj not pushed */ + if (!ret) /* obj not pushed */ X509_OBJECT_free(obj); + if (!added) /* on push failure */ + X509err(X509_F_X509_STORE_ADD_CERT, ERR_R_MALLOC_FAILURE); return ret; } -int X509_STORE_add_cert(X509_STORE *ctx, X509 *x) +int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) { - if (!x509_store_add(ctx, x, 0)) { - X509err(X509_F_X509_STORE_ADD_CERT, ERR_R_MALLOC_FAILURE); + X509_OBJECT *obj; + int ret = 1, added = 1; + + if (x == NULL) return 0; + obj = X509_OBJECT_new(); + if (obj == NULL) + return 0; + obj->type = X509_LU_CRL; + obj->data.crl = x; + X509_OBJECT_up_ref_count(obj); + + CRYPTO_THREAD_write_lock(ctx->lock); + + if (X509_OBJECT_retrieve_match(ctx->objs, obj)) { + X509err(X509_F_X509_STORE_ADD_CRL, X509_R_CERT_ALREADY_IN_HASH_TABLE); + ret = 0; + } else { + added = sk_X509_OBJECT_push(ctx->objs, obj); + ret = added != 0; } - return 1; -} -int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) -{ - if (!x509_store_add(ctx, x, 1)) { + CRYPTO_THREAD_unlock(ctx->lock); + + if (!ret) /* obj not pushed */ + X509_OBJECT_free(obj); + if (!added) /* on push failure */ X509err(X509_F_X509_STORE_ADD_CRL, ERR_R_MALLOC_FAILURE); - return 0; - } - return 1; + + return ret; } int X509_OBJECT_up_ref_count(X509_OBJECT *a) @@ -409,7 +403,8 @@ X509_OBJECT *X509_OBJECT_new() return ret; } -static void x509_object_free_internal(X509_OBJECT *a) + +void X509_OBJECT_free(X509_OBJECT *a) { if (a == NULL) return; @@ -423,33 +418,6 @@ static void x509_object_free_internal(X509_OBJECT *a) X509_CRL_free(a->data.crl); break; } -} - -int X509_OBJECT_set1_X509(X509_OBJECT *a, X509 *obj) -{ - if (a == NULL || !X509_up_ref(obj)) - return 0; - - x509_object_free_internal(a); - a->type = X509_LU_X509; - a->data.x509 = obj; - return 1; -} - -int X509_OBJECT_set1_X509_CRL(X509_OBJECT *a, X509_CRL *obj) -{ - if (a == NULL || !X509_CRL_up_ref(obj)) - return 0; - - x509_object_free_internal(a); - a->type = X509_LU_CRL; - a->data.crl = obj; - return 1; -} - -void X509_OBJECT_free(X509_OBJECT *a) -{ - x509_object_free_internal(a); OPENSSL_free(a); } @@ -521,9 +489,6 @@ STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *nm) X509 *x; X509_OBJECT *obj; - if (ctx->ctx == NULL) - return NULL; - CRYPTO_THREAD_write_lock(ctx->ctx->lock); idx = x509_object_idx_cnt(ctx->ctx->objs, X509_LU_X509, nm, &cnt); if (idx < 0) { @@ -573,10 +538,8 @@ STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *ctx, X509_NAME *nm) X509_OBJECT *obj, *xobj = X509_OBJECT_new(); /* Always do lookup to possibly add new CRLs to cache */ - if (sk == NULL - || xobj == NULL - || ctx->ctx == NULL - || !X509_STORE_CTX_get_by_subject(ctx, X509_LU_CRL, nm, xobj)) { + if (sk == NULL || xobj == NULL || + !X509_STORE_CTX_get_by_subject(ctx, X509_LU_CRL, nm, xobj)) { X509_OBJECT_free(xobj); sk_X509_CRL_free(sk); return NULL; @@ -670,9 +633,6 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) } X509_OBJECT_free(obj); - if (ctx->ctx == NULL) - return 0; - /* Else find index of first cert accepted by 'check_issued' */ ret = 0; CRYPTO_THREAD_write_lock(ctx->ctx->lock); diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c b/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c index ba186d30b0..3018c69ae4 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_vfy.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,7 +7,6 @@ * https://www.openssl.org/source/license.html */ -#include #include #include #include @@ -515,14 +514,15 @@ static int check_chain_extensions(X509_STORE_CTX *ctx) /* check_purpose() makes the callback as needed */ if (purpose > 0 && !check_purpose(ctx, x, purpose, i, must_be_ca)) return 0; - /* Check pathlen */ - if ((i > 1) && (x->ex_pathlen != -1) - && (plen > (x->ex_pathlen + proxy_path_length))) { + /* Check pathlen if not self issued */ + if ((i > 1) && !(x->ex_flags & EXFLAG_SI) + && (x->ex_pathlen != -1) + && (plen > (x->ex_pathlen + proxy_path_length + 1))) { if (!verify_cb_cert(ctx, x, i, X509_V_ERR_PATH_LENGTH_EXCEEDED)) return 0; } - /* Increment path length if not a self issued intermediate CA */ - if (i > 0 && (x->ex_flags & EXFLAG_SI) == 0) + /* Increment path length if not self issued */ + if (!(x->ex_flags & EXFLAG_SI)) plen++; /* * If this certificate is a proxy certificate, the next certificate @@ -557,27 +557,6 @@ static int check_chain_extensions(X509_STORE_CTX *ctx) return 1; } -static int has_san_id(X509 *x, int gtype) -{ - int i; - int ret = 0; - GENERAL_NAMES *gs = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL); - - if (gs == NULL) - return 0; - - for (i = 0; i < sk_GENERAL_NAME_num(gs); i++) { - GENERAL_NAME *g = sk_GENERAL_NAME_value(gs, i); - - if (g->type == gtype) { - ret = 1; - break; - } - } - GENERAL_NAMES_free(gs); - return ret; -} - static int check_name_constraints(X509_STORE_CTX *ctx) { int i; @@ -676,12 +655,7 @@ static int check_name_constraints(X509_STORE_CTX *ctx) int rv = NAME_CONSTRAINTS_check(x, nc); /* If EE certificate check commonName too */ - if (rv == X509_V_OK && i == 0 - && (ctx->param->hostflags - & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT) == 0 - && ((ctx->param->hostflags - & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT) != 0 - || !has_san_id(x, GEN_DNS))) + if (rv == X509_V_OK && i == 0) rv = NAME_CONSTRAINTS_check_CN(x, nc); switch (rv) { @@ -1782,67 +1756,119 @@ int X509_cmp_current_time(const ASN1_TIME *ctm) int X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time) { - static const size_t utctime_length = sizeof("YYMMDDHHMMSSZ") - 1; - static const size_t generalizedtime_length = sizeof("YYYYMMDDHHMMSSZ") - 1; - ASN1_TIME *asn1_cmp_time = NULL; - int i, day, sec, ret = 0; + char *str; + ASN1_TIME atm; + long offset; + char buff1[24], buff2[24], *p; + int i, j, remaining; + p = buff1; + remaining = ctm->length; + str = (char *)ctm->data; /* - * Note that ASN.1 allows much more slack in the time format than RFC5280. - * In RFC5280, the representation is fixed: + * Note that the following (historical) code allows much more slack in the + * time format than RFC5280. In RFC5280, the representation is fixed: * UTCTime: YYMMDDHHMMSSZ * GeneralizedTime: YYYYMMDDHHMMSSZ - * - * We do NOT currently enforce the following RFC 5280 requirement: - * "CAs conforming to this profile MUST always encode certificate - * validity dates through the year 2049 as UTCTime; certificate validity - * dates in 2050 or later MUST be encoded as GeneralizedTime." */ - switch (ctm->type) { - case V_ASN1_UTCTIME: - if (ctm->length != (int)(utctime_length)) + if (ctm->type == V_ASN1_UTCTIME) { + /* YYMMDDHHMM[SS]Z or YYMMDDHHMM[SS](+-)hhmm */ + int min_length = sizeof("YYMMDDHHMMZ") - 1; + int max_length = sizeof("YYMMDDHHMMSS+hhmm") - 1; + if (remaining < min_length || remaining > max_length) return 0; - break; - case V_ASN1_GENERALIZEDTIME: - if (ctm->length != (int)(generalizedtime_length)) + memcpy(p, str, 10); + p += 10; + str += 10; + remaining -= 10; + } else { + /* YYYYMMDDHHMM[SS[.fff]]Z or YYYYMMDDHHMM[SS[.f[f[f]]]](+-)hhmm */ + int min_length = sizeof("YYYYMMDDHHMMZ") - 1; + int max_length = sizeof("YYYYMMDDHHMMSS.fff+hhmm") - 1; + if (remaining < min_length || remaining > max_length) return 0; - break; - default: - return 0; + memcpy(p, str, 12); + p += 12; + str += 12; + remaining -= 12; } - /** - * Verify the format: the ASN.1 functions we use below allow a more - * flexible format than what's mandated by RFC 5280. - * Digit and date ranges will be verified in the conversion methods. - */ - for (i = 0; i < ctm->length - 1; i++) { - if (!isdigit(ctm->data[i])) + if ((*str == 'Z') || (*str == '-') || (*str == '+')) { + *(p++) = '0'; + *(p++) = '0'; + } else { + /* SS (seconds) */ + if (remaining < 2) return 0; + *(p++) = *(str++); + *(p++) = *(str++); + remaining -= 2; + /* + * Skip any (up to three) fractional seconds... + * TODO(emilia): in RFC5280, fractional seconds are forbidden. + * Can we just kill them altogether? + */ + if (remaining && *str == '.') { + str++; + remaining--; + for (i = 0; i < 3 && remaining; i++, str++, remaining--) { + if (*str < '0' || *str > '9') + break; + } + } + } - if (ctm->data[ctm->length - 1] != 'Z') - return 0; + *(p++) = 'Z'; + *(p++) = '\0'; - /* - * There is ASN1_UTCTIME_cmp_time_t but no - * ASN1_GENERALIZEDTIME_cmp_time_t or ASN1_TIME_cmp_time_t, - * so we go through ASN.1 - */ - asn1_cmp_time = X509_time_adj(NULL, 0, cmp_time); - if (asn1_cmp_time == NULL) - goto err; - if (!ASN1_TIME_diff(&day, &sec, ctm, asn1_cmp_time)) - goto err; + /* We now need either a terminating 'Z' or an offset. */ + if (!remaining) + return 0; + if (*str == 'Z') { + if (remaining != 1) + return 0; + offset = 0; + } else { + /* (+-)HHMM */ + if ((*str != '+') && (*str != '-')) + return 0; + /* Historical behaviour: the (+-)hhmm offset is forbidden in RFC5280. */ + if (remaining != 5) + return 0; + if (str[1] < '0' || str[1] > '9' || str[2] < '0' || str[2] > '9' || + str[3] < '0' || str[3] > '9' || str[4] < '0' || str[4] > '9') + return 0; + offset = ((str[1] - '0') * 10 + (str[2] - '0')) * 60; + offset += (str[3] - '0') * 10 + (str[4] - '0'); + if (*str == '-') + offset = -offset; + } + atm.type = ctm->type; + atm.flags = 0; + atm.length = sizeof(buff2); + atm.data = (unsigned char *)buff2; - /* - * X509_cmp_time comparison is <=. - * The return value 0 is reserved for errors. - */ - ret = (day >= 0 && sec >= 0) ? -1 : 1; + if (X509_time_adj(&atm, offset * 60, cmp_time) == NULL) + return 0; - err: - ASN1_TIME_free(asn1_cmp_time); - return ret; + if (ctm->type == V_ASN1_UTCTIME) { + i = (buff1[0] - '0') * 10 + (buff1[1] - '0'); + if (i < 50) + i += 100; /* cf. RFC 2459 */ + j = (buff2[0] - '0') * 10 + (buff2[1] - '0'); + if (j < 50) + j += 100; + + if (i < j) + return -1; + if (i > j) + return 1; + } + i = strcmp(buff1, buff2); + if (i == 0) /* wait a second then return younger :-) */ + return -1; + else + return i; } ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj) @@ -3238,10 +3264,6 @@ static int check_sig_level(X509_STORE_CTX *ctx, X509 *cert) if (level > NUM_AUTH_LEVELS) level = NUM_AUTH_LEVELS; - /* We are not able to look up the CA MD for RSA PSS in this version */ - if (nid == NID_rsassaPss) - return 1; - /* Lookup signature algorithm digest */ if (nid && OBJ_find_sigid_algs(nid, &mdnid, NULL)) { const EVP_MD *md; diff --git a/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c b/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c index 9bc4c61101..b5067220ad 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509_vpm.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -412,11 +412,6 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, param->hostflags = flags; } -unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param) -{ - return param->hostflags; -} - char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param) { return param->peername; diff --git a/worker/deps/openssl/openssl/crypto/x509/x509name.c b/worker/deps/openssl/openssl/crypto/x509/x509name.c index 81dce376f8..f87dc7db99 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x509name.c +++ b/worker/deps/openssl/openssl/crypto/x509/x509name.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -191,7 +191,7 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, loc = n; else if (loc < 0) loc = n; - inc = (set == 0); + name->modified = 1; if (set == -1) { @@ -200,6 +200,7 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, inc = 1; } else { set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set; + inc = 0; } } else { /* if (set >= 0) */ @@ -210,11 +211,12 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, set = 0; } else set = sk_X509_NAME_ENTRY_value(sk, loc)->set; + inc = (set == 0) ? 1 : 0; } /* * X509_NAME_ENTRY_dup is ASN1 generated code, that can't be easily - * const'ified; harmless cast since dup() don't modify its input. + * const'ified; harmless cast as dup() don't modify its input. */ if ((new_name = X509_NAME_ENTRY_dup((X509_NAME_ENTRY *)ne)) == NULL) goto err; @@ -226,7 +228,7 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, if (inc) { n = sk_X509_NAME_ENTRY_num(sk); for (i = loc + 1; i < n; i++) - sk_X509_NAME_ENTRY_value(sk, i)->set += 1; + sk_X509_NAME_ENTRY_value(sk, i - 1)->set += 1; } return (1); err: diff --git a/worker/deps/openssl/openssl/crypto/x509/x_name.c b/worker/deps/openssl/openssl/crypto/x509/x_name.c index 1a33dc1daa..0af5df5cfc 100644 --- a/worker/deps/openssl/openssl/crypto/x509/x_name.c +++ b/worker/deps/openssl/openssl/crypto/x509/x_name.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -472,8 +472,6 @@ static int i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ENTRY) * _intname, int X509_NAME_set(X509_NAME **xn, X509_NAME *name) { - if (*xn == name) - return *xn != NULL; if ((name = X509_NAME_dup(name)) == NULL) return 0; X509_NAME_free(*xn); diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c index f39cb5ac2a..3b0f197444 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_enum.c @@ -38,7 +38,7 @@ const X509V3_EXT_METHOD v3_crl_reason = { crl_reasons }; -char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, +char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, const ASN1_ENUMERATED *e) { ENUMERATED_NAMES *enam; diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c index bd7301e455..2eec405a36 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_ncons.c @@ -1,5 +1,5 @@ /* - * Copyright 2003-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2003-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -297,140 +297,47 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc) } -static int cn2dnsid(ASN1_STRING *cn, unsigned char **dnsid, size_t *idlen) -{ - int utf8_length; - unsigned char *utf8_value; - int i; - int isdnsname = 0; - - /* Don't leave outputs uninitialized */ - *dnsid = NULL; - *idlen = 0; - - /*- - * Per RFC 6125, DNS-IDs representing internationalized domain names appear - * in certificates in A-label encoded form: - * - * https://tools.ietf.org/html/rfc6125#section-6.4.2 - * - * The same applies to CNs which are intended to represent DNS names. - * However, while in the SAN DNS-IDs are IA5Strings, as CNs they may be - * needlessly encoded in 16-bit Unicode. We perform a conversion to UTF-8 - * to ensure that we get an ASCII representation of any CNs that are - * representable as ASCII, but just not encoded as ASCII. The UTF-8 form - * may contain some non-ASCII octets, and that's fine, such CNs are not - * valid legacy DNS names. - * - * Note, 'int' is the return type of ASN1_STRING_to_UTF8() so that's what - * we must use for 'utf8_length'. - */ - if ((utf8_length = ASN1_STRING_to_UTF8(&utf8_value, cn)) < 0) - return X509_V_ERR_OUT_OF_MEM; - - /* - * Some certificates have had names that include a *trailing* NUL byte. - * Remove these harmless NUL characters. They would otherwise yield false - * alarms with the following embedded NUL check. - */ - while (utf8_length > 0 && utf8_value[utf8_length - 1] == '\0') - --utf8_length; - - /* Reject *embedded* NULs */ - if ((size_t)utf8_length != strlen((char *)utf8_value)) { - OPENSSL_free(utf8_value); - return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX; - } - - /* - * XXX: Deviation from strict DNS name syntax, also check names with '_' - * Check DNS name syntax, any '-' or '.' must be internal, - * and on either side of each '.' we can't have a '-' or '.'. - * - * If the name has just one label, we don't consider it a DNS name. This - * means that "CN=sometld" cannot be precluded by DNS name constraints, but - * that is not a problem. - */ - for (i = 0; i < utf8_length; ++i) { - unsigned char c = utf8_value[i]; - - if ((c >= 'a' && c <= 'z') - || (c >= 'A' && c <= 'Z') - || (c >= '0' && c <= '9') - || c == '_') - continue; - - /* Dot and hyphen cannot be first or last. */ - if (i > 0 && i < utf8_length - 1) { - if (c == '-') - continue; - /* - * Next to a dot the preceding and following characters must not be - * another dot or a hyphen. Otherwise, record that the name is - * plausible, since it has two or more labels. - */ - if (c == '.' - && utf8_value[i + 1] != '.' - && utf8_value[i - 1] != '-' - && utf8_value[i + 1] != '-') { - isdnsname = 1; - continue; - } - } - isdnsname = 0; - break; - } - - if (isdnsname) { - *dnsid = utf8_value; - *idlen = (size_t)utf8_length; - return X509_V_OK; - } - OPENSSL_free(utf8_value); - return X509_V_OK; -} - -/* - * Check CN against DNS-ID name constraints. - */ int NAME_CONSTRAINTS_check_CN(X509 *x, NAME_CONSTRAINTS *nc) { int r, i; - X509_NAME *nm = X509_get_subject_name(x); + X509_NAME *nm; + ASN1_STRING stmp; GENERAL_NAME gntmp; - stmp.flags = 0; stmp.type = V_ASN1_IA5STRING; gntmp.type = GEN_DNS; gntmp.d.dNSName = &stmp; + nm = X509_get_subject_name(x); + /* Process any commonName attributes in subject name */ for (i = -1;;) { X509_NAME_ENTRY *ne; - ASN1_STRING *cn; - unsigned char *idval; - size_t idlen; - + ASN1_STRING *hn; i = X509_NAME_get_index_by_NID(nm, NID_commonName, i); if (i == -1) break; ne = X509_NAME_get_entry(nm, i); - cn = X509_NAME_ENTRY_get_data(ne); - + hn = X509_NAME_ENTRY_get_data(ne); /* Only process attributes that look like host names */ - if ((r = cn2dnsid(cn, &idval, &idlen)) != X509_V_OK) - return r; - if (idlen == 0) - continue; + if (asn1_valid_host(hn)) { + unsigned char *h; + int hlen = ASN1_STRING_to_UTF8(&h, hn); + if (hlen <= 0) + return X509_V_ERR_OUT_OF_MEM; - stmp.length = idlen; - stmp.data = idval; - r = nc_match(&gntmp, nc); - OPENSSL_free(idval); - if (r != X509_V_OK) - return r; + stmp.length = hlen; + stmp.data = h; + + r = nc_match(&gntmp, nc); + + OPENSSL_free(h); + + if (r != X509_V_OK) + return r; + } } return X509_V_OK; } diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c index 7ac067229f..6d2f354d70 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_purp.c @@ -78,9 +78,11 @@ int X509_check_purpose(X509 *x, int id, int ca) { int idx; const X509_PURPOSE *pt; - - x509v3_cache_extensions(x); - + if (!(x->ex_flags & EXFLAG_SET)) { + CRYPTO_THREAD_write_lock(x->lock); + x509v3_cache_extensions(x); + CRYPTO_THREAD_unlock(x->lock); + } /* Return if side-effect only call */ if (id == -1) return 1; @@ -350,18 +352,10 @@ static void x509v3_cache_extensions(X509 *x) ASN1_BIT_STRING *ns; EXTENDED_KEY_USAGE *extusage; X509_EXTENSION *ex; - int i; - - /* fast lock-free check, see end of the function for details. */ - if (x->ex_cached) - return; - CRYPTO_THREAD_write_lock(x->lock); - if (x->ex_flags & EXFLAG_SET) { - CRYPTO_THREAD_unlock(x->lock); + int i; + if (x->ex_flags & EXFLAG_SET) return; - } - X509_digest(x, EVP_sha1(), x->sha1_hash, NULL); /* V1 should mean no extensions ... */ if (!X509_get_version(x)) @@ -495,13 +489,6 @@ static void x509v3_cache_extensions(X509 *x) } } x->ex_flags |= EXFLAG_SET; - CRYPTO_THREAD_unlock(x->lock); - /* - * It has to be placed after memory barrier, which is implied by unlock. - * Worst thing that can happen is that another thread proceeds to lock - * and checks x->ex_flags & EXFLAGS_SET. See beginning of the function. - */ - x->ex_cached = 1; } /*- @@ -554,7 +541,11 @@ void X509_set_proxy_pathlen(X509 *x, long l) int X509_check_ca(X509 *x) { - x509v3_cache_extensions(x); + if (!(x->ex_flags & EXFLAG_SET)) { + CRYPTO_THREAD_write_lock(x->lock); + x509v3_cache_extensions(x); + CRYPTO_THREAD_unlock(x->lock); + } return check_ca(x); } @@ -768,7 +759,6 @@ int X509_check_issued(X509 *issuer, X509 *subject) if (X509_NAME_cmp(X509_get_subject_name(issuer), X509_get_issuer_name(subject))) return X509_V_ERR_SUBJECT_ISSUER_MISMATCH; - x509v3_cache_extensions(issuer); x509v3_cache_extensions(subject); diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c index 39597dc41d..749f51b2f0 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_skey.c @@ -24,7 +24,7 @@ const X509V3_EXT_METHOD v3_skey_id = { NULL }; -char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, +char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, const ASN1_OCTET_STRING *oct) { return OPENSSL_buf2hexstr(oct->data, oct->length); diff --git a/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c b/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c index d93781e1b7..fec67243f8 100644 --- a/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c +++ b/worker/deps/openssl/openssl/crypto/x509v3/v3_tlsf.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -121,12 +121,13 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method, } } - if ((ai = ASN1_INTEGER_new()) == NULL - || !ASN1_INTEGER_set(ai, tlsextid) - || sk_ASN1_INTEGER_push(tlsf, ai) <= 0) { + ai = ASN1_INTEGER_new(); + if (ai == NULL) { X509V3err(X509V3_F_V2I_TLS_FEATURE, ERR_R_MALLOC_FAILURE); goto err; } + ASN1_INTEGER_set(ai, tlsextid); + sk_ASN1_INTEGER_push(tlsf, ai); } return tlsf; diff --git a/worker/deps/openssl/openssl/demos/bio/descrip.mms b/worker/deps/openssl/openssl/demos/bio/descrip.mms index 8e127b079a..d49725ffd1 100644 --- a/worker/deps/openssl/openssl/demos/bio/descrip.mms +++ b/worker/deps/openssl/openssl/demos/bio/descrip.mms @@ -23,7 +23,7 @@ SHARED = TRUE @ ! # Because we use an option file, we need to redefine this -.obj.exe : +.obj.exe : $(LINK) $(LINKFLAGS) $<,OPT:/OPT all : client-arg.exe client-conf.exe saccept.exe sconnect.exe - diff --git a/worker/deps/openssl/openssl/demos/certs/README b/worker/deps/openssl/openssl/demos/certs/README index 126663a1d8..88cf56b1f8 100644 --- a/worker/deps/openssl/openssl/demos/certs/README +++ b/worker/deps/openssl/openssl/demos/certs/README @@ -8,7 +8,7 @@ automatically using scripts. Example creates a root CA, an intermediate CA signed by the root and several certificates signed by the intermediate CA. The script then creates an empty index.txt file and adds entries for the -certificates and generates a CRL. Then one certificate is revoked and a +certificates and generates a CRL. Then one certificate is revoked and a second CRL generated. The script ocsprun.sh runs the test responder on port 8888 covering the @@ -16,6 +16,3 @@ client certificates. The script ocspquery.sh queries the status of the certificates using the test responder. - - - diff --git a/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf b/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf index 531afe64b2..f02d43bad0 100644 --- a/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf +++ b/worker/deps/openssl/openssl/demos/certs/apps/apps.cnf @@ -65,5 +65,3 @@ subjectKeyIdentifier=hash authorityKeyIdentifier=keyid:always basicConstraints = critical,CA:true keyUsage = critical, cRLSign, keyCertSign - - diff --git a/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh b/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh index 0f88a48fb8..ebe1920432 100644 --- a/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh +++ b/worker/deps/openssl/openssl/demos/certs/apps/mkxcerts.sh @@ -13,7 +13,7 @@ CN="OpenSSL Test RSA SHA-512 cert" $OPENSSL req \ -config apps.cnf -extensions usr_cert -x509 -nodes \ -keyout tsha512.pem -out tsha512.pem -new -days 3650 -sha512 -# Create EC parameters +# Create EC parameters $OPENSSL ecparam -name P-256 -out ecp256.pem $OPENSSL ecparam -name P-384 -out ecp384.pem diff --git a/worker/deps/openssl/openssl/demos/certs/mkcerts.sh b/worker/deps/openssl/openssl/demos/certs/mkcerts.sh index 18daa6bcfb..498595d28c 100644 --- a/worker/deps/openssl/openssl/demos/certs/mkcerts.sh +++ b/worker/deps/openssl/openssl/demos/certs/mkcerts.sh @@ -42,7 +42,7 @@ CN="Test OCSP Responder Cert" $OPENSSL req -config ca.cnf -nodes \ $OPENSSL x509 -req -in respreq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \ -extfile ca.cnf -extensions ocsp_cert -CAcreateserial -out resp.pem -# Example creating a PKCS#3 DH certificate. +# Example creating a PKCS#3 DH certificate. # First DH parameters @@ -93,4 +93,3 @@ openssl ca -revoke rev.pem -crl_reason superseded \ # Generate another CRL $OPENSSL ca -gencrl -keyfile root.pem -cert root.pem -config ca.cnf \ -md sha1 -crldays 1 -out crl2.pem - diff --git a/worker/deps/openssl/openssl/demos/evp/Makefile b/worker/deps/openssl/openssl/demos/evp/Makefile index 72c6e81d7a..4a753e9247 100644 --- a/worker/deps/openssl/openssl/demos/evp/Makefile +++ b/worker/deps/openssl/openssl/demos/evp/Makefile @@ -11,7 +11,7 @@ CFLAGS = $(OPENSSL_INCS_LOCATION) LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto -all: aesccm aesgcm +all: aesccm aesgcm aesccm: aesccm.o aesgcm: aesgcm.o diff --git a/worker/deps/openssl/openssl/demos/evp/aesgcm.c b/worker/deps/openssl/openssl/demos/evp/aesgcm.c index df59f469fd..46d9a5639b 100644 --- a/worker/deps/openssl/openssl/demos/evp/aesgcm.c +++ b/worker/deps/openssl/openssl/demos/evp/aesgcm.c @@ -102,7 +102,7 @@ void aes_gcm_decrypt(void) printf("Plaintext:\n"); BIO_dump_fp(stdout, outbuf, outlen); /* Set expected tag value. */ - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(gcm_tag), + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(gcm_tag), (void *)gcm_tag); /* Finalise: note get no output for GCM */ rv = EVP_DecryptFinal_ex(ctx, outbuf, &outlen); diff --git a/worker/deps/openssl/openssl/doc/apps/ca.pod b/worker/deps/openssl/openssl/doc/apps/ca.pod index 9885bb2392..9918a1364a 100644 --- a/worker/deps/openssl/openssl/doc/apps/ca.pod +++ b/worker/deps/openssl/openssl/doc/apps/ca.pod @@ -243,10 +243,8 @@ for all available algorithms. =item B<-subj arg> supersedes subject name given in the request. -The arg must be formatted as I. -Keyword characters may be escaped by \ (backslash), and whitespace is retained. -Empty values are permitted, but the corresponding type will not be included -in the resulting certificate. +The arg must be formatted as I, +characters may be escaped by \ (backslash), no spaces are skipped. =item B<-utf8> diff --git a/worker/deps/openssl/openssl/doc/apps/cms.pod b/worker/deps/openssl/openssl/doc/apps/cms.pod index 64ec106b09..96acd315d4 100644 --- a/worker/deps/openssl/openssl/doc/apps/cms.pod +++ b/worker/deps/openssl/openssl/doc/apps/cms.pod @@ -393,9 +393,6 @@ When encrypting a message this option may be used multiple times to specify each recipient. This form B be used if customised parameters are required (for example to specify RSA-OAEP). -Only certificates carrying RSA, Diffie-Hellman or EC keys are supported by this -option. - =item B<-keyid> use subject key identifier to identify certificates instead of issuer name and @@ -715,20 +712,23 @@ No revocation checking is done on the signer's certificate. =head1 HISTORY The use of multiple B<-signer> options and the B<-resign> command were first -added in OpenSSL 1.0.0. +added in OpenSSL 1.0.0 + +The B option was first added in OpenSSL 1.1.0 -The B option was first added in OpenSSL 1.0.2 +The use of B<-recip> to specify the recipient when encrypting mail was first +added to OpenSSL 1.1.0 -Support for RSA-OAEP and RSA-PSS was first added to OpenSSL 1.0.2. +Support for RSA-OAEP and RSA-PSS was first added to OpenSSL 1.1.0. The use of non-RSA keys with B<-encrypt> and B<-decrypt> was first added -to OpenSSL 1.0.2. +to OpenSSL 1.1.0. -The -no_alt_chains options was first added to OpenSSL 1.0.2b. +The -no_alt_chains options was first added to OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/config.pod b/worker/deps/openssl/openssl/doc/apps/config.pod index a5153a65f1..76f282f28c 100644 --- a/worker/deps/openssl/openssl/doc/apps/config.pod +++ b/worker/deps/openssl/openssl/doc/apps/config.pod @@ -20,7 +20,7 @@ started or end of file is reached. A section name can consist of alphanumeric characters and underscores. The first section of a configuration file is special and is referred -to as the B section. This section is usually unnamed and spans from the +to as the B section this is usually unnamed and is from the start of file until the first named section. When a name is being looked up it is first looked up in a named section (if any) and then the default section. @@ -377,7 +377,7 @@ L, L, L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/crl.pod b/worker/deps/openssl/openssl/doc/apps/crl.pod index 82c77d60d5..fded3972dd 100644 --- a/worker/deps/openssl/openssl/doc/apps/crl.pod +++ b/worker/deps/openssl/openssl/doc/apps/crl.pod @@ -120,7 +120,7 @@ Convert a CRL file from PEM to DER: Output the text form of a DER encoded certificate: - openssl crl -in crl.der -inform DER -text -noout + openssl crl -in crl.der -text -noout =head1 BUGS @@ -133,7 +133,7 @@ L, L, L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/genpkey.pod b/worker/deps/openssl/openssl/doc/apps/genpkey.pod index 91b12e249b..d48695200b 100644 --- a/worker/deps/openssl/openssl/doc/apps/genpkey.pod +++ b/worker/deps/openssl/openssl/doc/apps/genpkey.pod @@ -12,7 +12,7 @@ B B [B<-out filename>] [B<-outform PEM|DER>] [B<-pass arg>] -[B<-I>] +[B<-cipher>] [B<-engine id>] [B<-paramfile file>] [B<-algorithm alg>] @@ -39,21 +39,21 @@ standard output is used. =item B<-outform DER|PEM> -This specifies the output format DER or PEM. The default format is PEM. +This specifies the output format DER or PEM. =item B<-pass arg> -The output file password source. For more information about the format of B +the output file password source. For more information about the format of B see the B section in L. -=item B<-I> +=item B<-cipher> This option encrypts the private key with the supplied cipher. Any algorithm name accepted by EVP_get_cipherbyname() is acceptable such as B. =item B<-engine id> -Specifying an engine (by its unique B string) will cause B +specifying an engine (by its unique B string) will cause B to attempt to obtain a functional reference to the specified engine, thus initialising it if needed. The engine will then be set as the default for all available algorithms. If used this option should precede all other @@ -61,32 +61,19 @@ options. =item B<-algorithm alg> -Public key algorithm to use such as RSA, DSA or DH. If used this option must +public key algorithm to use such as RSA, DSA or DH. If used this option must precede any B<-pkeyopt> options. The options B<-paramfile> and B<-algorithm> -are mutually exclusive. Engines may add algorithms in addition to the standard -built-in ones. - -Valid built-in algorithm names for private key generation are RSA and EC. - -Valid built-in algorithm names for parameter generation (see the B<-genparam> -option) are DH, DSA and EC. - -Note that the algorithm name X9.42 DH may be used as a synonym for the DH -algorithm. These are identical and do not indicate the type of parameters that -will be generated. Use the B option to indicate whether PKCS#3 -or X9.42 DH parameters are required. See L -below for more details. +are mutually exclusive. =item B<-pkeyopt opt:value> -Set the public key algorithm option B to B. The precise set of +set the public key algorithm option B to B. The precise set of options supported depends on the public key algorithm used and its -implementation. See L and -L below for more details. +implementation. See B below for more details. =item B<-genparam> -Generate a set of parameters instead of a private key. If used this option must +generate a set of parameters instead of a private key. If used this option must precede any B<-algorithm>, B<-paramfile> or B<-pkeyopt> options. =item B<-paramfile filename> @@ -110,7 +97,7 @@ The options supported by each algorithm and indeed each implementation of an algorithm can vary. The options for the OpenSSL implementations are detailed below. -=head2 RSA Key Generation Options +=head1 RSA KEY GENERATION OPTIONS =over 4 @@ -125,92 +112,91 @@ hexadecimal value if preceded by B<0x>. Default value is 65537. =back -=head2 EC Key Generation Options - -The EC key generation options can also be used for parameter generation. +=head1 DSA PARAMETER GENERATION OPTIONS =over 4 -=item B - -The EC curve to use. OpenSSL supports NIST curve names such as "P-256". - -=item B +=item B -The encoding to use for parameters. The "encoding" parameter must be either -"named_curve" or "explicit". The default value is "named_curve". +The number of bits in the generated parameters. If not specified 1024 is used. =back -=head1 PARAMETER GENERATION OPTIONS - -The options supported by each algorithm and indeed each implementation of an -algorithm can vary. The options for the OpenSSL implementations are detailed -below. - -=head2 DSA Parameter Generation Options +=head1 DH PARAMETER GENERATION OPTIONS =over 4 -=item B +=item B -The number of bits in the generated prime. If not specified 1024 is used. +The number of bits in the prime parameter B

. -=item B +=item B -The number of bits in the q parameter. Must be one of 160, 224 or 256. If not -specified 160 is used. +The value to use for the generator B. -=item B +=item B -The digest to use during parameter generation. Must be one of B, B -or B. If set, then the number of bits in B will match the output size -of the specified digest and the B parameter will be -ignored. If not set, then a digest will be used that gives an output matching -the number of bits in B, i.e. B if q length is 160, B if it 224 -or B if it is 256. +If this option is set then the appropriate RFC5114 parameters are used +instead of generating new parameters. The value B can take the +values 1, 2 or 3 corresponding to RFC5114 DH parameters consisting of +1024 bit group with 160 bit subgroup, 2048 bit group with 224 bit subgroup +and 2048 bit group with 256 bit subgroup as mentioned in RFC5114 sections +2.1, 2.2 and 2.3 respectively. =back -=head2 DH Parameter Generation Options +=head1 EC PARAMETER GENERATION OPTIONS + +The EC parameter generation options below can also +be supplied as EC key generation options. This can (for example) generate a +key from a named curve without the need to use an explicit parameter file. =over 4 -=item B +=item B -The number of bits in the prime parameter B

. The default is 1024. +the EC curve to use. OpenSSL supports NIST curve names such as "P-256". -=item B +=item B -The number of bits in the sub prime parameter B. The default is 256 if the -prime is at least 2048 bits long or 160 otherwise. Only relevant if used in -conjunction with the B option to generate X9.42 DH parameters. +the encoding to use for parameters. The "encoding" parameter must be either +"named_curve" or "explicit". -=item B +=back -The value to use for the generator B. The default is 2. +=head1 GOST2001 KEY GENERATION AND PARAMETER OPTIONS -=item B +Gost 2001 support is not enabled by default. To enable this algorithm, +one should load the ccgost engine in the OpenSSL configuration file. +See README.gost file in the engines/ccgost directory of the source +distribution for more details. -The type of DH parameters to generate. Use 0 for PKCS#3 DH and 1 for X9.42 DH. -The default is 0. +Use of a parameter file for the GOST R 34.10 algorithm is optional. +Parameters can be specified during key generation directly as well as +during generation of parameter file. -=item B +=over 4 -If this option is set, then the appropriate RFC5114 parameters are used -instead of generating new parameters. The value B can take the -values 1, 2 or 3 corresponding to RFC5114 DH parameters consisting of -1024 bit group with 160 bit subgroup, 2048 bit group with 224 bit subgroup -and 2048 bit group with 256 bit subgroup as mentioned in RFC5114 sections -2.1, 2.2 and 2.3 respectively. If present this overrides all other DH parameter -options. +=item B + +Specifies GOST R 34.10-2001 parameter set according to RFC 4357. +Parameter set can be specified using abbreviated name, object short name or +numeric OID. Following parameter sets are supported: + + paramset OID Usage + A 1.2.643.2.2.35.1 Signature + B 1.2.643.2.2.35.2 Signature + C 1.2.643.2.2.35.3 Signature + XA 1.2.643.2.2.36.0 Key exchange + XB 1.2.643.2.2.36.1 Key exchange + test 1.2.643.2.2.35.0 Test purposes =back -=head2 EC Parameter Generation Options +=head1 X25519 KEY GENERATION OPTIONS + +The X25519 algorithm does not currently support any key generation options. -The EC parameter generation options are the same as for key generation. See -L above. =head1 NOTES @@ -233,25 +219,19 @@ Generate a 2048 bit RSA key using 3 as the public exponent: openssl genpkey -algorithm RSA -out key.pem -pkeyopt rsa_keygen_bits:2048 \ -pkeyopt rsa_keygen_pubexp:3 -Generate 2048 bit DSA parameters: +Generate 1024 bit DSA parameters: openssl genpkey -genparam -algorithm DSA -out dsap.pem \ - -pkeyopt dsa_paramgen_bits:2048 + -pkeyopt dsa_paramgen_bits:1024 Generate DSA key from parameters: openssl genpkey -paramfile dsap.pem -out dsakey.pem -Generate 2048 bit DH parameters: +Generate 1024 bit DH parameters: openssl genpkey -genparam -algorithm DH -out dhp.pem \ - -pkeyopt dh_paramgen_prime_len:2048 - -Generate 2048 bit X9.42 DH parameters: - - openssl genpkey -genparam -algorithm DH -out dhpx.pem \ - -pkeyopt dh_paramgen_prime_len:2048 \ - -pkeyopt dh_paramgen_type:1 + -pkeyopt dh_paramgen_prime_len:1024 Output RFC5114 2048 bit DH parameters with 224 bit subgroup: @@ -284,12 +264,11 @@ Generate an X25519 private key: =head1 HISTORY The ability to use NIST curve names, and to generate an EC key directly, -were added in OpenSSL 1.0.2. The ability to generate X25519 keys was added in -OpenSSL 1.1.0. +were added in OpenSSL 1.0.2. =head1 COPYRIGHT -Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/rehash.pod b/worker/deps/openssl/openssl/doc/apps/rehash.pod index 22f3b7a40a..79268d4792 100644 --- a/worker/deps/openssl/openssl/doc/apps/rehash.pod +++ b/worker/deps/openssl/openssl/doc/apps/rehash.pod @@ -99,12 +99,6 @@ Note that current versions will not use the old style. Do not remove existing links. This is needed when keeping new and old-style links in the same directory. -=item B<-compat> - -Generate links for both old-style (MD5) and new-style (SHA1) hashing. -This allows releases before 1.0.0 to use these links along-side newer -releases. - =item B<-v> Print messages about old links removed and new links created. @@ -136,7 +130,7 @@ L. =head1 COPYRIGHT -Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/req.pod b/worker/deps/openssl/openssl/doc/apps/req.pod index 291b1dac83..c5b5260c20 100644 --- a/worker/deps/openssl/openssl/doc/apps/req.pod +++ b/worker/deps/openssl/openssl/doc/apps/req.pod @@ -213,10 +213,8 @@ see L. sets subject name for new request or supersedes the subject name when processing a request. -The arg must be formatted as I. -Keyword characters may be escaped by \ (backslash), and whitespace is retained. -Empty values are permitted, but the corresponding type will not be included -in the request. +The arg must be formatted as I, +characters may be escaped by \ (backslash), no spaces are skipped. =item B<-multivalue-rdn> @@ -371,6 +369,7 @@ option. For compatibility B is an equivalent option. This option specifies the digest algorithm to use. Any digest supported by the OpenSSL B command can be used. +If not present then MD5 is used. This option can be overridden on the command line. =item B @@ -653,7 +652,7 @@ L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/apps/s_client.pod b/worker/deps/openssl/openssl/doc/apps/s_client.pod index 9c17075337..01a6c5f7fc 100644 --- a/worker/deps/openssl/openssl/doc/apps/s_client.pod +++ b/worker/deps/openssl/openssl/doc/apps/s_client.pod @@ -281,9 +281,8 @@ be used as a test that session caching is working. =item B<-showcerts> -Displays the server certificate list as sent by the server: it only consists of -certificates the server has sent (in the order the server has sent them). It is -B a verified chain. +display the whole server certificate chain: normally only the server +certificate itself is displayed. =item B<-prexit> @@ -580,8 +579,7 @@ a client certificate. Therefor merely including a client certificate on the command line is no guarantee that the certificate works. If there are problems verifying a server certificate then the -B<-showcerts> option can be used to show all the certificates sent by the -server. +B<-showcerts> option can be used to show the whole chain. The B utility is a test tool and is designed to continue the handshake after any certificate verification errors. As a result it will @@ -611,7 +609,7 @@ The -no_alt_chains options was first added to OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod b/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod index d0a6a3c810..f61268d6ac 100644 --- a/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod +++ b/worker/deps/openssl/openssl/doc/crypto/ASN1_INTEGER_get_int64.pod @@ -11,10 +11,10 @@ ASN1_INTEGER_get_int64, ASN1_INTEGER_get, ASN1_INTEGER_set_int64, ASN1_INTEGER_s #include int ASN1_INTEGER_get_int64(int64_t *pr, const ASN1_INTEGER *a); - long ASN1_INTEGER_get(const ASN1_INTEGER *a); + int ASN1_INTEGER_get(const ASN1_INTEGER *a, long v); int ASN1_INTEGER_set_int64(ASN1_INTEGER *a, int64_t r); - int ASN1_INTEGER_set(const ASN1_INTEGER *a, long v); + long ASN1_INTEGER_set(const ASN1_INTEGER *a); int ASN1_INTEGER_get_uint64(uint64_t *pr, const ASN1_INTEGER *a); int ASN1_INTEGER_set_uint64(ASN1_INTEGER *a, uint64_t r); @@ -123,7 +123,7 @@ were added to OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod index 89179a46e7..f682c37d17 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BIO_meth_new.pod @@ -17,26 +17,26 @@ BIO_meth_set_callback_ctrl - Routines to build up BIO methods int BIO_get_new_index(void); BIO_METHOD *BIO_meth_new(int type, const char *name); void BIO_meth_free(BIO_METHOD *biom); - int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int); + int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int); int BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int)); - int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int); + int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int)); - int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *); + int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *); int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); - int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); + int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int)); - long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); + long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); - int (*BIO_meth_get_create(const BIO_METHOD *bion)) (BIO *); + int (*BIO_meth_get_create(BIO_METHOD *bion)) (BIO *); int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)); - int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *); + int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *); int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)); - long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) + long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *); int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, long (*callback_ctrl) (BIO *, int, @@ -121,7 +121,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BN_add.pod b/worker/deps/openssl/openssl/doc/crypto/BN_add.pod index b2c5dd2cc5..db3b0d45b4 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BN_add.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BN_add.pod @@ -92,9 +92,7 @@ BN_exp() raises I to the I

-th power and places the result in I BN_mul(). BN_mod_exp() computes I to the I

-th power modulo I (C). This function uses less time and space than BN_exp(). Do not call this -function when B is even and any of the parameters have the -B flag set. +m>). This function uses less time and space than BN_exp(). BN_gcd() computes the greatest common divisor of I and I and places the result in I. I may be the same B as I or @@ -119,7 +117,7 @@ L, L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod b/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod index c9ca33fd13..ac46948477 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BN_bn2bin.pod @@ -55,8 +55,8 @@ freed later using OPENSSL_free(). BN_hex2bn() takes as many characters as possible from the string B, including the leading character '-' which means negative, to form a valid hexadecimal number representation and converts them to a B and -stores it in **B. If *B is NULL, a new B is created. If -B is NULL, it only computes the length of valid representation. +stores it in **B. If *B is NULL, a new B is created. If +B is NULL, it only computes the length of valid representation. A "negative zero" is converted to zero. BN_dec2bn() is the same using the decimal system. @@ -106,7 +106,7 @@ L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod b/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod index 4cd667e2e3..c97536b5c4 100644 --- a/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod +++ b/worker/deps/openssl/openssl/doc/crypto/BN_generate_prime.pod @@ -100,17 +100,7 @@ If B, this test is skipped. Both BN_is_prime_ex() and BN_is_prime_fasttest_ex() perform a Miller-Rabin probabilistic primality test with B iterations. If B, a number of iterations is used that -yields a false positive rate of at most 2^-64 for random input. -The error rate depends on the size of the prime and goes down for bigger primes. -The rate is 2^-80 starting at 308 bits, 2^-112 at 852 bits, 2^-128 at 1080 bits, -2^-192 at 3747 bits and 2^-256 at 6394 bits. - -When the source of the prime is not random or not trusted, the number -of checks needs to be much higher to reach the same level of assurance: -It should equal half of the targeted security level in bits (rounded up to the -next integer if necessary). -For instance, to reach the 128 bit security level, B should be set to -64. +yields a false positive rate of at most 2^-80 for random input. If B is not B, B is called after the j-th iteration (j = 0, 1, ...). B is a @@ -194,7 +184,7 @@ and BN_GENCB_get_arg() were added in OpenSSL 1.1.0 =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod b/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod index cbd5a21353..0ed42628c3 100644 --- a/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod +++ b/worker/deps/openssl/openssl/doc/crypto/CMS_encrypt.pod @@ -18,8 +18,9 @@ B is the symmetric cipher to use. B is an optional set of flags. =head1 NOTES -Only certificates carrying RSA, Diffie-Hellman or EC keys are supported by this -function. +Only certificates carrying RSA keys are supported so the recipient certificates +supplied to this function must all contain RSA public keys, though they do not +have to be signed using the RSA algorithm. EVP_des_ede3_cbc() (triple DES) is the algorithm of choice for S/MIME use because most clients will support it. @@ -93,7 +94,7 @@ The B flag was first supported in OpenSSL 1.0.0. =head1 COPYRIGHT -Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod b/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod index cea088857a..e5532c96f4 100644 --- a/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod +++ b/worker/deps/openssl/openssl/doc/crypto/CMS_get0_SignerInfos.pod @@ -54,7 +54,7 @@ CMS_SignerInfo_set1_signer_cert(). Once all signer certificates have been set CMS_verify() can be used. -Although CMS_get0_SignerInfos() can return NULL if an error occurs B if +Although CMS_get0_SignerInfos() can return NULL is an error occur B if there are no signers this is not a problem in practice because the only error which can occur is if the B structure is not of type signedData due to application error. @@ -79,7 +79,7 @@ L, L =head1 COPYRIGHT -Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod b/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod index cb961be797..79f5f4232d 100644 --- a/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod +++ b/worker/deps/openssl/openssl/doc/crypto/CMS_get1_ReceiptRequest.pod @@ -48,7 +48,7 @@ CMS_verify(). CMS_ReceiptRequest_create0() returns a signed receipt request structure or NULL if an error occurred. -CMS_add1_ReceiptRequest() returns 1 for success or 0 if an error occurred. +CMS_add1_ReceiptRequest() returns 1 for success or 0 is an error occurred. CMS_get1_ReceiptRequest() returns 1 is a signed receipt request is found and decoded. It returns 0 if a signed receipt request is not present and -1 if @@ -62,7 +62,7 @@ L =head1 COPYRIGHT -Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod index ef0a80b195..d768da8c6e 100644 --- a/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/DH_meth_new.pod @@ -19,7 +19,7 @@ DH_meth_set_generate_params - Routines to build up DH methods DH_METHOD *DH_meth_dup(const DH_METHOD *dhm); const char *DH_meth_get0_name(const DH_METHOD *dhm); int DH_meth_set1_name(DH_METHOD *dhm, const char *name); - int DH_meth_get_flags(const DH_METHOD *dhm); + int DH_meth_get_flags(DH_METHOD *dhm); int DH_meth_set_flags(DH_METHOD *dhm, int flags); void *DH_meth_get0_app_data(const DH_METHOD *dhm); int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data); @@ -146,7 +146,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod index 8ebf7ab6bc..948ab29b58 100644 --- a/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/DSA_meth_new.pod @@ -21,7 +21,7 @@ DSA_meth_set_keygen - Routines to build up DSA methods DSA_METHOD *DSA_meth_dup(const DSA_METHOD *meth); const char *DSA_meth_get0_name(const DSA_METHOD *dsam); int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name); - int DSA_meth_get_flags(const DSA_METHOD *dsam); + int DSA_meth_get_flags(DSA_METHOD *dsam); int DSA_meth_set_flags(DSA_METHOD *dsam, int flags); void *DSA_meth_get0_app_data(const DSA_METHOD *dsam); int DSA_meth_set0_app_data(DSA_METHOD *dsam, void *app_data); @@ -183,7 +183,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod b/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod index b91f89f073..ba0f6b863e 100644 --- a/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod +++ b/worker/deps/openssl/openssl/doc/crypto/DSA_sign.pod @@ -24,12 +24,13 @@ digest B using the private key B and places its ASN.1 DER encoding at B. The length of the signature is places in *B. B must point to DSA_size(B) bytes of memory. -DSA_sign_setup() is defined only for backward binary compatibility and -should not be used. -Since OpenSSL 1.1.0 the DSA type is opaque and the output of -DSA_sign_setup() cannot be used anyway: calling this function will only -cause overhead, and does not affect the actual signature -(pre-)computation. +DSA_sign_setup() may be used to precompute part of the signing +operation in case signature generation is time-critical. It expects +B to contain DSA parameters. It places the precomputed values +in newly allocated Bs at *B and *B, after freeing +the old ones unless *B and *B are NULL. These values may +be passed to DSA_sign() in Bkinv> and Br>. +B is a pre-allocated B or NULL. DSA_verify() verifies that the signature B of size B matches a given message digest B of size B. @@ -59,7 +60,7 @@ L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod b/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod index f544ccbb32..9e1f662c62 100644 --- a/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/ECDSA_SIG_new.pod @@ -114,8 +114,6 @@ returned as a newly allocated B structure (or NULL on error). =head1 RETURN VALUES -ECDSA_SIG_new() returns NULL if the allocation fails. - ECDSA_SIG_set0() returns 1 on success or 0 on failure. ECDSA_size() returns the maximum length signature or 0 on error. @@ -199,7 +197,7 @@ L =head1 COPYRIGHT -Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod index 9fda29ba07..bb7ef7a28f 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestInit.pod @@ -3,12 +3,11 @@ =head1 NAME EVP_MD_CTX_new, EVP_MD_CTX_reset, EVP_MD_CTX_free, EVP_MD_CTX_copy_ex, -EVP_MD_CTX_set_flags, EVP_MD_CTX_clear_flags, EVP_MD_CTX_test_flags, EVP_DigestInit_ex, EVP_DigestUpdate, EVP_DigestFinal_ex, EVP_DigestInit, EVP_DigestFinal, EVP_MD_CTX_copy, EVP_MD_type, EVP_MD_pkey_type, EVP_MD_size, EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size, -EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_MD_CTX_md_data, EVP_md_null, EVP_md2, -EVP_md5, EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_mdc2, +EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, EVP_sha1, +EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_mdc2, EVP_ripemd160, EVP_blake2b512, EVP_blake2s256, EVP_get_digestbyname, EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines @@ -19,9 +18,6 @@ EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines EVP_MD_CTX *EVP_MD_CTX_new(void); int EVP_MD_CTX_reset(EVP_MD_CTX *ctx); void EVP_MD_CTX_free(EVP_MD_CTX *ctx); - void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags); - void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags); - int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags); int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl); int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, size_t cnt); @@ -45,7 +41,6 @@ EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines int EVP_MD_CTX_size(const EVP_MD *ctx); int EVP_MD_CTX_block_size(const EVP_MD *ctx); int EVP_MD_CTX_type(const EVP_MD *ctx); - void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx); const EVP_MD *EVP_md_null(void); const EVP_MD *EVP_md2(void); @@ -78,9 +73,6 @@ to reuse an already existing context. EVP_MD_CTX_free() cleans up digest context B and frees up the space allocated to it. -EVP_MD_CTX_set_flags(), EVP_MD_CTX_clear_flags() and EVP_MD_CTX_test_flags() -sets, clears and tests B flags. See L below for more information. - EVP_DigestInit_ex() sets up digest context B to use a digest B from ENGINE B. B must be initialized before calling this function. B will typically be supplied by a function such as EVP_sha1(). @@ -125,11 +117,6 @@ representing the given message digest when passed an B structure. For example EVP_MD_type(EVP_sha1()) returns B. This function is normally used when setting ASN1 OIDs. -EVP_MD_CTX_md_data() return the digest method private data for the passed -B. -The space is allocated by OpenSSL and has the size originally set with -EVP_MD_meth_set_app_datasize(). - EVP_MD_CTX_md() returns the B structure corresponding to the passed B. @@ -152,38 +139,6 @@ EVP_get_digestbyname(), EVP_get_digestbynid() and EVP_get_digestbyobj() return an B structure when passed a digest name, a digest NID or an ASN1_OBJECT structure respectively. -=head1 FLAGS - -EVP_MD_CTX_set_flags(), EVP_MD_CTX_clear_flags() and EVP_MD_CTX_test_flags() -can be used the manipulate and test these B flags: - -=over 4 - -=item EVP_MD_CTX_FLAG_ONESHOT - -This flag instructs the digest to optimize for one update only, if possible. - -=for comment EVP_MD_CTX_FLAG_CLEANED is internal, don't mention it - -=for comment EVP_MD_CTX_FLAG_REUSE is internal, don't mention it - -=for comment We currently avoid documenting flags that are only bit holder: -EVP_MD_CTX_FLAG_NON_FIPS_ALLOW, EVP_MD_CTX_FLAGS_PAD_* - -=item EVP_MD_CTX_FLAG_NO_INIT - -This flag instructs EVP_DigestInit() and similar not to initialise the -implementation specific data. - -=item EVP_MD_CTX_FLAG_FINALISE - -Some functions such as EVP_DigestSign only finalise copies of internal -contexts so additional data can be included after the finalisation call. -This is inefficient if this functionality is not required, and can be -disabled with this flag. - -=back - =head1 RETURN VALUES EVP_DigestInit_ex(), EVP_DigestUpdate() and EVP_DigestFinal_ex() return 1 for @@ -223,7 +178,7 @@ EVP_MD_CTX_copy_ex() because they can efficiently reuse a digest context instead of initializing and cleaning it up on each call and allow non default implementations of digests to be specified. -If digest contexts are not cleaned up after use, +If digest contexts are not cleaned up after use memory leaks will occur. EVP_MD_CTX_size(), EVP_MD_CTX_block_size(), EVP_MD_CTX_type(), @@ -294,7 +249,7 @@ was removed in OpenSSL 1.1.0 =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod index a3938d5800..7ec06b7a27 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod @@ -19,69 +19,26 @@ The EVP signature routines are a high level interface to digital signatures. EVP_DigestSignInit() sets up signing context B to use digest B from ENGINE B and private key B. B must be created with -EVP_MD_CTX_new() before calling this function. If B is not NULL, the +EVP_MD_CTX_new() before calling this function. If B is not NULL the EVP_PKEY_CTX of the signing operation will be written to B<*pctx>: this can -be used to set alternative signing options. Note that any existing value in -B<*pctx> is overwritten. The EVP_PKEY_CTX value returned must not be freed -directly by the application (it will be freed automatically when the EVP_MD_CTX -is freed). The digest B may be NULL if the signing algorithm supports it. - -Only EVP_PKEY types that support signing can be used with these functions. This -includes MAC algorithms where the MAC generation is considered as a form of -"signing". Built-in EVP_PKEY types supported by these functions are CMAC, DSA, -ECDSA, HMAC and RSA. - -Not all digests can be used for all key types. The following combinations apply. - -=over 4 - -=item DSA - -Supports SHA1, SHA224, SHA256, SHA384 and SHA512 - -=item ECDSA - -Supports SHA1, SHA224, SHA256, SHA384 and SHA512 - -=item RSA with no padding - -Supports no digests (the digest B must be NULL) - -=item RSA with X931 padding - -Supports SHA1, SHA256, SHA384 and SHA512 - -=item All other RSA padding types - -Support SHA1, SHA224, SHA256, SHA384, SHA512, MD5, MD5_SHA1, MD2, MD4, MDC2, -RIPEMD160 - -=item HMAC - -Supports any digest - -=item CMAC - -Will ignore any digest provided. - -=back +be used to set alternative signing options. EVP_DigestSignUpdate() hashes B bytes of data at B into the signature context B. This function can be called several times on the same B to include additional data. This function is currently implemented using a macro. -EVP_DigestSignFinal() signs the data in B and places the signature in B. +EVP_DigestSignFinal() signs the data in B places the signature in B. If B is B then the maximum size of the output buffer is written to the B parameter. If B is not B then before the call the -B parameter should contain the length of the B buffer. If the +B parameter should contain the length of the B buffer, if the call is successful the signature is written to B and the amount of data written to B. =head1 RETURN VALUES EVP_DigestSignInit() EVP_DigestSignUpdate() and EVP_DigestSignaFinal() return -1 for success and 0 or a negative value for failure. In particular, a return +1 for success and 0 or a negative value for failure. In particular a return value of -2 indicates the operation is not supported by the public key algorithm. @@ -105,7 +62,7 @@ The call to EVP_DigestSignFinal() internally finalizes a copy of the digest context. This means that calls to EVP_DigestSignUpdate() and EVP_DigestSignFinal() can be called later to digest and sign additional data. -Since only a copy of the digest context is ever finalized, the context must +Since only a copy of the digest context is ever finalized the context must be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak will occur. @@ -129,7 +86,7 @@ were first added to OpenSSL 1.0.0. =head1 COPYRIGHT -Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod index ff1153b644..ce59422d3e 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod @@ -19,12 +19,9 @@ The EVP signature routines are a high level interface to digital signatures. EVP_DigestVerifyInit() sets up verification context B to use digest B from ENGINE B and public key B. B must be created -with EVP_MD_CTX_new() before calling this function. If B is not NULL, the +with EVP_MD_CTX_new() before calling this function. If B is not NULL the EVP_PKEY_CTX of the verification operation will be written to B<*pctx>: this -can be used to set alternative verification options. Note that any existing -value in B<*pctx> is overwritten. The EVP_PKEY_CTX value returned must not be -freed directly by the application (it will be freed automatically when the -EVP_MD_CTX is freed). +can be used to set alternative verification options. EVP_DigestVerifyUpdate() hashes B bytes of data at B into the verification context B. This function can be called several times on the @@ -65,7 +62,7 @@ The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest context. This means that EVP_VerifyUpdate() and EVP_VerifyFinal() can be called later to digest and verify additional data. -Since only a copy of the digest context is ever finalized, the context must +Since only a copy of the digest context is ever finalized the context must be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak will occur. @@ -84,7 +81,7 @@ were first added to OpenSSL 1.0.0. =head1 COPYRIGHT -Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod index 459e7a02ff..61e0eec528 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod @@ -59,7 +59,7 @@ All these functions are implemented as macros. A context for HKDF can be obtained by calling: - EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL); + EVP_PKEY_CTX *pctx = EVP_PKEY_new_id(EVP_PKEY_HKDF, NULL); The digest, key, salt and info values must be set before a key is derived or an error occurs. @@ -118,7 +118,7 @@ L =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod index fe35a5ece8..f1f0ae4fbe 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod @@ -50,7 +50,7 @@ All these functions are implemented as macros. A context for the TLS PRF can be obtained by calling: - EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_TLS1_PRF, NULL); + EVP_PKEY_CTX *pctx = EVP_PKEY_new_id(EVP_PKEY_TLS1_PRF, NULL); The digest, secret value and seed must be set before a key is derived or an error occurs. @@ -98,7 +98,7 @@ L =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod index 9ad2daed4f..a190f5e9ab 100644 --- a/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod +++ b/worker/deps/openssl/openssl/doc/crypto/EVP_PKEY_asn1_get_count.pod @@ -48,7 +48,7 @@ engine that implements it. EVP_PKEY_asn1_get0_info() returns the public key ID, base public key ID (both NIDs), any flags, the method description and PEM type string -associated with the public key ASN.1 method B<*ameth>. +associated with the public key ASN.1 method B<*ameth>. EVP_PKEY_asn1_count(), EVP_PKEY_asn1_get0(), EVP_PKEY_asn1_find() and EVP_PKEY_asn1_find_str() are not thread safe, but as long as all diff --git a/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod b/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod index c84adb2e46..3ada6679cf 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OBJ_nid2obj.pod @@ -54,7 +54,7 @@ constants. OBJ_nid2obj(), OBJ_nid2ln() and OBJ_nid2sn() convert the NID B to an ASN1_OBJECT structure, its long name and its short name respectively, -or B if an error occurred. +or B is an error occurred. OBJ_obj2nid(), OBJ_ln2nid(), OBJ_sn2nid() return the corresponding NID for the object B, the long name or the short name respectively @@ -188,7 +188,7 @@ OBJ_cleanup() was deprecated in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod b/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod index a4e3c1c2f0..5123f0ad6d 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OCSP_resp_find_status.pod @@ -6,12 +6,8 @@ OCSP_resp_get0_certs, OCSP_resp_get0_signer, OCSP_resp_get0_id, OCSP_resp_get0_produced_at, -OCSP_resp_get0_signature, -OCSP_resp_get0_tbs_sigalg, -OCSP_resp_get0_respdata, OCSP_resp_find_status, OCSP_resp_count, OCSP_resp_get0, OCSP_resp_find, -OCSP_single_get0_status, OCSP_check_validity, -OCSP_basic_verify +OCSP_single_get0_status, OCSP_check_validity - OCSP response utility functions =head1 SYNOPSIS @@ -35,9 +31,6 @@ OCSP_basic_verify const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at( const OCSP_BASICRESP* single); - const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs); - const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs); - const OCSP_RESPDATA *OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs); const STACK_OF(X509) *OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); int OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer, @@ -51,9 +44,6 @@ OCSP_basic_verify ASN1_GENERALIZEDTIME *nextupd, long sec, long maxsec); - int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs, - X509_STORE *st, unsigned long flags); - =head1 DESCRIPTION OCSP_resp_find_status() searches B for an OCSP response for B. If it is @@ -84,12 +74,6 @@ B<*revtime>, B<*thisupd> and B<*nextupd>. OCSP_resp_get0_produced_at() extracts the B field from the single response B. -OCSP_resp_get0_signature() returns the signature from B. - -OCSP_resp_get0_tbs_sigalg() returns the B from B. - -OCSP_resp_get0_respdata() returns the B from B. - OCSP_resp_get0_certs() returns any certificates included in B. OCSP_resp_get0_signer() attempts to retrieve the certificate that directly @@ -109,27 +93,6 @@ OCSP_single_get0_status(). If B is non-zero it indicates how many seconds leeway should be allowed in the check. If B is positive it indicates the maximum age of B in seconds. -OCSP_basic_verify() checks that the basic response message B is correctly -signed and that the signer certificate can be validated. It takes B as -the trusted store and B as a set of untrusted intermediate certificates. -The function first tries to find the signer certificate of the response -in . It also searches the certificates the responder may have included -in B unless the B contain B. -It fails if the signer certificate cannot be found. -Next, the function checks the signature of B and fails on error -unless the B contain B. Then the function already returns -success if the B contain B or if the signer certificate -was found in B and the B contain B. -Otherwise the function continues by validating the signer certificate. -To this end, all certificates in B and in B are considered as -untrusted certificates for the construction of the validation path for the -signer certificate unless the B flag is set. After successful path -validation the function returns success if the B flag is set. -Otherwise it verifies that the signer certificate meets the OCSP issuer -criteria including potential delegation. If this does not succeed and the -B do not contain B the function checks for explicit -trust for OCSP signing in the root CA certificate. - =head1 RETURN VALUES OCSP_resp_find_status() returns 1 if B is found in B and 0 otherwise. @@ -149,9 +112,6 @@ occurred. OCSP_resp_get0_signer() returns 1 if the signing certificate was located, or 0 on error. -OCSP_basic_verify() returns 1 on success, 0 on error, or -1 on fatal error such -as malloc failure. - =head1 NOTES Applications will typically call OCSP_resp_find_status() using the certificate @@ -182,7 +142,7 @@ L =head1 COPYRIGHT -Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod index 01623bac76..f50faec772 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod @@ -2,14 +2,13 @@ =head1 NAME -OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, OpenSSL_version, +OPENSSL_VERSION_NUMBER, OpenSSL_version, OpenSSL_version_num - get OpenSSL version number =head1 SYNOPSIS #include #define OPENSSL_VERSION_NUMBER 0xnnnnnnnnnL - #define OPENSSL_VERSION_TEXT "OpenSSL x.y.z xx XXX xxxx" #include @@ -46,12 +45,13 @@ Version 0.9.5a had an interim interpretation that is like the current one, except the patch level got the highest bit set, to keep continuity. The number was therefore 0x0090581f. -OPENSSL_VERSION_TEXT is the text variant of the version number and the -release date. For example, -"OpenSSL 1.0.1a 15 Oct 2015". - OpenSSL_version_num() returns the version number. +The macro OPENSSL_VERSION_AT_LEAST(major,minor) can be used at compile +time test if the current version is at least as new as the version provided. +The arguments major, minor and fix correspond to the version information +as given above. + OpenSSL_version() returns different strings depending on B: =over 4 diff --git a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod index f9664ee352..f0b3c8aa8d 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_init_crypto.pod @@ -190,10 +190,10 @@ resources should be freed at an earlier time, or under the circumstances described in the NOTES section below. The B flag will load a default configuration -file. For optional configuration file settings, an B -must be created and used. -The routines OPENSSL_init_new() and OPENSSL_INIT_set_config_appname() can -be used to allocate the object and set the application name, and then the +file. To specify a different file, an B must +be created and used. The routines +OPENSSL_init_new() and OPENSSL_INIT_set_config_appname() can be used to +allocate the object and set the application name, and then the object can be released with OPENSSL_INIT_free() when done. =head1 NOTES @@ -235,7 +235,7 @@ and OPENSSL_INIT_free() functions were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod index ba5dc1069f..2104f43108 100644 --- a/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod +++ b/worker/deps/openssl/openssl/doc/crypto/OPENSSL_malloc.pod @@ -68,8 +68,8 @@ CRYPTO_mem_leaks, CRYPTO_mem_leaks_fp - Memory allocation functions int CRYPTO_mem_debug_push(const char *info, const char *file, int line); int CRYPTO_mem_debug_pop(void); - int CRYPTO_mem_leaks(BIO *b); - int CRYPTO_mem_leaks_fp(FILE *fp); + void CRYPTO_mem_leaks(BIO *b); + void CRYPTO_mem_leaks_fp(FILE *fp); =head1 DESCRIPTION @@ -197,7 +197,7 @@ only, say, the malloc() implementation is outright dangerous.> =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod b/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod index b0ba62a3b3..6b3006ef35 100644 --- a/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod +++ b/worker/deps/openssl/openssl/doc/crypto/PEM_read_bio_PrivateKey.pod @@ -294,7 +294,7 @@ for it twice) if B is 1. The B parameter has the same value as the B parameter passed to the PEM routine. It allows arbitrary data to be passed to the callback by the application (for example a window handle in a GUI application). The callback -B return the number of characters in the passphrase or -1 if +B return the number of characters in the passphrase or 0 if an error occurred. =head1 EXAMPLES @@ -348,16 +348,17 @@ Skeleton pass phrase callback: int pass_cb(char *buf, int size, int rwflag, void *u) { + int len; + char *tmp; /* We'd probably do something else if 'rwflag' is 1 */ printf("Enter pass phrase for \"%s\"\n", (char *)u); /* get pass phrase, length 'len' into 'tmp' */ - char *tmp = "hello"; - if (tmp == NULL) /* An error occurred */ - return -1; - - size_t len = strlen(tmp); + tmp = "hello"; + len = strlen(tmp); + if (len <= 0) + return 0; if (len > size) len = size; @@ -470,7 +471,7 @@ L, L =head1 COPYRIGHT -Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod b/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod index 8f6d428afc..9970aa6b73 100644 --- a/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod +++ b/worker/deps/openssl/openssl/doc/crypto/RSA_meth_new.pod @@ -24,7 +24,7 @@ RSA_meth_set_verify, RSA_meth_get_keygen, RSA_meth_set_keygen RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth); const char *RSA_meth_get0_name(const RSA_METHOD *meth); int RSA_meth_set1_name(RSA_METHOD *meth, const char *name); - int RSA_meth_get_flags(const RSA_METHOD *meth); + int RSA_meth_get_flags(RSA_METHOD *meth); int RSA_meth_set_flags(RSA_METHOD *meth, int flags); void *RSA_meth_get0_app_data(const RSA_METHOD *meth); int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data); @@ -58,9 +58,9 @@ RSA_meth_set_verify, RSA_meth_get_keygen, RSA_meth_set_keygen int padding)); /* Can be null */ int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) - (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx); + (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx); int RSA_meth_set_mod_exp(RSA_METHOD *rsa, - int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa, + int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)); /* Can be null */ int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth)) @@ -225,7 +225,7 @@ The functions described here were added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod b/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod index c11090891a..3eb8bbc9a0 100644 --- a/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod +++ b/worker/deps/openssl/openssl/doc/crypto/SMIME_read_PKCS7.pod @@ -57,7 +57,7 @@ streaming single pass option should be available. =head1 RETURN VALUES SMIME_read_PKCS7() returns a valid B structure or B -if an error occurred. The error can be obtained from ERR_get_error(3). +is an error occurred. The error can be obtained from ERR_get_error(3). =head1 SEE ALSO @@ -68,7 +68,7 @@ L =head1 COPYRIGHT -Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod b/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod index 340d9b2ae2..8a0d9f2d25 100644 --- a/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod +++ b/worker/deps/openssl/openssl/doc/crypto/UI_STRING.pod @@ -132,4 +132,3 @@ in the file LICENSE in the source distribution or at L. =cut - diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod b/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod index 4f2768d4f4..5f8dfa93b0 100644 --- a/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod +++ b/worker/deps/openssl/openssl/doc/crypto/X509_LOOKUP_hash_dir.pod @@ -117,11 +117,10 @@ L, L, L, L, -L, =head1 COPYRIGHT -Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod index 320b258a85..5263facfd4 100644 --- a/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod +++ b/worker/deps/openssl/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod @@ -11,9 +11,7 @@ X509_VERIFY_PARAM_get_auth_level, X509_VERIFY_PARAM_set_time, X509_VERIFY_PARAM_get_time, X509_VERIFY_PARAM_add0_policy, X509_VERIFY_PARAM_set1_policies, X509_VERIFY_PARAM_set1_host, X509_VERIFY_PARAM_add1_host, -X509_VERIFY_PARAM_set_hostflags, -X509_VERIFY_PARAM_get_hostflags, -X509_VERIFY_PARAM_get0_peername, +X509_VERIFY_PARAM_set_hostflags, X509_VERIFY_PARAM_get0_peername, X509_VERIFY_PARAM_set1_email, X509_VERIFY_PARAM_set1_ip, X509_VERIFY_PARAM_set1_ip_asc - X509 verification parameters @@ -56,7 +54,6 @@ X509_VERIFY_PARAM_set1_ip_asc const char *name, size_t namelen); void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags); - unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param); char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param); int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, size_t emaillen); @@ -133,32 +130,14 @@ B clearing any previously specified host name or names. If B is NULL, or empty the list of hostnames is cleared, and name checks are not performed on the peer certificate. If B is NUL-terminated, B may be zero, otherwise B -must be set to the length of B. - -When a hostname is specified, +must be set to the length of B. When a hostname is specified, certificate verification automatically invokes L with flags equal to the B argument given to X509_VERIFY_PARAM_set_hostflags() (default zero). Applications are strongly advised to use this interface in preference to explicitly -calling L, hostname checks may be out of scope +calling L, hostname checks are out of scope with the DANE-EE(3) certificate usage, and the internal check will -be suppressed as appropriate when DANE verification is enabled. - -When the subject CommonName will not be ignored, whether as a result of the -B host flag, or because no DNS subject -alternative names are present in the certificate, any DNS name constraints in -issuer certificates apply to the subject CommonName as well as the subject -alternative name extension. - -When the subject CommonName will be ignored, whether as a result of the -B host flag, or because some DNS subject -alternative names are present in the certificate, DNS name constraints in -issuer certificates will not be applied to the subject DN. -As described in X509_check_host(3) the B -flag takes precendence over the B flag. - -X509_VERIFY_PARAM_get_hostflags() returns any host flags previously set via a -call to X509_VERIFY_PARAM_set_hostflags(). +be suppressed as appropriate when DANE support is added to OpenSSL. X509_VERIFY_PARAM_add1_host() adds B as an additional reference identifier that can match the peer's certificate. Any previous names @@ -207,8 +186,6 @@ failure. X509_VERIFY_PARAM_get_flags() returns the current verification flags. -X509_VERIFY_PARAM_get_hostflags() returns any current host flags. - X509_VERIFY_PARAM_get_inh_flags() returns the current inheritance flags. X509_VERIFY_PARAM_set_time() and X509_VERIFY_PARAM_set_depth() do not return @@ -370,8 +347,6 @@ The B flag was added in OpenSSL 1.1.0 The legacy B flag is deprecated as of OpenSSL 1.1.0, and has no effect. -X509_VERIFY_PARAM_get_hostflags() was added in OpenSSL 1.1.0i. - =head1 COPYRIGHT Copyright 2009-2018 The OpenSSL Project Authors. All Rights Reserved. diff --git a/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod b/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod index fb9f6a64ec..93848152b5 100644 --- a/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod +++ b/worker/deps/openssl/openssl/doc/crypto/X509_check_host.pod @@ -93,9 +93,6 @@ consider the subject DN even if the certificate contains no subject alternative names of the right type (DNS name or email address as appropriate); the default is to use the subject DN when no corresponding subject alternative names are present. -If both B and -B are specified, the latter takes -precedence and the subject DN is not checked for matching names. If set, B disables wildcard expansion; this only applies to B. @@ -131,9 +128,9 @@ NULs. Applications are encouraged to use X509_VERIFY_PARAM_set1_host() rather than explicitly calling L. Host name -checks may be out of scope with the DANE-EE(3) certificate usage, +checks are out of scope with the DANE-EE(3) certificate usage, and the internal checks will be suppressed as appropriate when -DANE support is enabled. +DANE support is added to OpenSSL. =head1 SEE ALSO @@ -150,7 +147,7 @@ These functions were added in OpenSSL 1.0.2. =head1 COPYRIGHT -Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/crypto/bio.pod b/worker/deps/openssl/openssl/doc/crypto/bio.pod index 1e1dd02106..7be3121fd1 100644 --- a/worker/deps/openssl/openssl/doc/crypto/bio.pod +++ b/worker/deps/openssl/openssl/doc/crypto/bio.pod @@ -87,4 +87,3 @@ in the file LICENSE in the source distribution or at L. =cut - diff --git a/worker/deps/openssl/openssl/doc/fingerprints.txt b/worker/deps/openssl/openssl/doc/fingerprints.txt index 2cb74aec27..1863224df3 100644 --- a/worker/deps/openssl/openssl/doc/fingerprints.txt +++ b/worker/deps/openssl/openssl/doc/fingerprints.txt @@ -18,7 +18,10 @@ uid Richard Levitte uid Richard Levitte uid Richard Levitte +pub 4096R/FA40E9E2 2005-03-19 + Key fingerprint = 6260 5AA4 334A F9F0 DDE5 D349 D357 7507 FA40 E9E2 +uid Dr Stephen N Henson + pub 2048R/0E604491 2013-04-30 Key fingerprint = 8657 ABB2 60F0 56B1 E519 0839 D9C4 D26D 0E60 4491 -uid Matt Caswell uid Matt Caswell diff --git a/worker/deps/openssl/openssl/doc/openssl-c-indent.el b/worker/deps/openssl/openssl/doc/openssl-c-indent.el index 852f794f96..cca118303e 100644 --- a/worker/deps/openssl/openssl/doc/openssl-c-indent.el +++ b/worker/deps/openssl/openssl/doc/openssl-c-indent.el @@ -54,7 +54,6 @@ (arglist-close . c-lineup-arglist) ; From "gnu" style (inline-open . 0) ; From "gnu" style (brace-list-open . +) ; From "gnu" style - (inextern-lang . 0) ; Don't indent inside extern block (topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont) ; From "gnu" style ) diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod index 12fdcab83c..a28e218332 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_CONF_cmd.pod @@ -506,6 +506,10 @@ Set supported curves to P-256, P-384: SSL_CONF_cmd(ctx, "Curves", "P-256:P-384"); +Set automatic support for any elliptic curve for key exchange: + + SSL_CONF_cmd(ctx, "ECDHParameters", "Automatic"); + =head1 RETURN VALUES SSL_CONF_cmd() returns 1 if the value of B is recognised and B is diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod index 4a2fa946fe..1dead1dbfc 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_set_ctlog_list_file.pod @@ -24,7 +24,7 @@ See L for the file format. =head1 NOTES These functions will not clear the existing CT log list - it will be appended -to. To replace the existing list, use L first. +to. To replace the existing list, use L first. If an error occurs whilst parsing a particular log entry in the file, that log entry will be skipped. diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod index 8ed7b5ea15..c645f58078 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_CTX_use_certificate.pod @@ -153,13 +153,6 @@ L. of view, it however does not make sense as the data in the certificate is considered public anyway.) -All of the functions to set a new certificate will replace any existing -certificate of the same type that has already been set. Similarly all of the -functions to set a new private key will replace any private key that has already -been set. Applications should call L or -L as appropriate after loading a new certificate and -private key to confirm that the certificate and key match. - =head1 RETURN VALUES On success, the functions return 1. @@ -177,7 +170,7 @@ L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod index 2759cc3cc6..cc55095d47 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_get_ciphers.pod @@ -2,12 +2,8 @@ =head1 NAME -SSL_get1_supported_ciphers, -SSL_get_client_ciphers, -SSL_get_ciphers, -SSL_CTX_get_ciphers, -SSL_get_cipher_list, -SSL_get_shared_ciphers +SSL_get1_supported_ciphers, SSL_get_client_ciphers, +SSL_get_ciphers, SSL_CTX_get_ciphers, SSL_get_cipher_list - get list of available SSL_CIPHERs =head1 SYNOPSIS @@ -19,7 +15,6 @@ SSL_get_shared_ciphers STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s); STACK_OF(SSL_CIPHER) *SSL_get_client_ciphers(const SSL *ssl); const char *SSL_get_cipher_list(const SSL *ssl, int priority); - char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size); =head1 DESCRIPTION @@ -30,16 +25,16 @@ is returned. SSL_CTX_get_ciphers() returns the stack of available SSL_CIPHERs for B. SSL_get1_supported_ciphers() returns the stack of enabled SSL_CIPHERs for -B as would be sent in a ClientHello (that is, sorted by preference). +B, sorted by preference. The list depends on settings like the cipher list, the supported protocol versions, the security level, and the enabled signature algorithms. SRP and PSK ciphers are only enabled if the appropriate callbacks or settings have been applied. -The list of ciphers that would be sent in a ClientHello can differ from -the list of ciphers that would be acceptable when acting as a server. -For example, additional ciphers may be usable by a server if there is -a gap in the list of supported protocols, and some ciphers may not be -usable by a server if there is not a suitable certificate configured. +This is the list that will be sent by the client to the server. +The list supported by the server might include more ciphers in case there is a +hole in the list of supported protocols. +The server will also not use ciphers from this list depending on the +configured certificates and DH parameters. If B is NULL or no ciphers are available, NULL is returned. SSL_get_client_ciphers() returns the stack of available SSL_CIPHERs matching the @@ -51,19 +46,6 @@ listed for B with B. If B is NULL, no ciphers are available, or there are less ciphers than B available, NULL is returned. -SSL_get_shared_ciphers() creates a colon separated and NUL terminated list of -SSL_CIPHER names that are available in both the client and the server. B is -the buffer that should be populated with the list of names and B is the -size of that buffer. A pointer to B is returned on success or NULL on -error. If the supplied buffer is not large enough to contain the complete list -of names then a truncated list of names will be returned. Note that just because -a ciphersuite is available (i.e. it is configured in the cipher list) and shared -by both the client and the server it does not mean that it is enabled (see the -description of SSL_get1_supported_ciphers() above). This function will return -available shared ciphersuites whether or not they are enabled. This is a server -side function only and must only be called after the completion of the initial -handshake. - =head1 NOTES The details of the ciphers obtained by SSL_get_ciphers(), SSL_CTX_get_ciphers() @@ -92,7 +74,7 @@ L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod index 2de241fcda..99936ad765 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_get_session.pod @@ -28,11 +28,6 @@ count of the B is incremented by one. The ssl session contains all information required to re-establish the connection without a new handshake. -A session will be automatically removed from the session cache and marked as -non-resumable if the connection is not closed down cleanly, e.g. if a fatal -error occurs on the connection or L is not called prior to -L. - SSL_get0_session() returns a pointer to the actual session. As the reference counter is not incremented, the pointer is only valid while the connection is in use. If L or @@ -77,7 +72,7 @@ L =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod index 507ca9f362..23b6497d4f 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_get_version.pod @@ -15,9 +15,7 @@ SSL_get_version, SSL_is_dtls - get the protocol information of a connection =head1 DESCRIPTION SSL_get_version() returns the name of the protocol used for the -connection B. It should only be called after the initial handshake has been -completed. Prior to that the results returned from this function may be -unreliable. +connection B. SSL_is_dtls() returns one if the connection is using DTLS, zero if not. @@ -45,7 +43,7 @@ The connection uses the TLSv1.2 protocol. =item unknown -This indicates an unknown protocol version. +This indicates that no version has been set (no connection established). =back @@ -59,7 +57,7 @@ SSL_is_dtls() was added in OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod b/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod index 715845e1f7..3339a0e803 100644 --- a/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod +++ b/worker/deps/openssl/openssl/doc/ssl/SSL_set1_host.pod @@ -56,7 +56,7 @@ is cleared or freed, or a renegotiation takes place. Applications must not free the return value. SSL clients are advised to use these functions in preference to -explicitly calling L. Hostname checks may be out +explicitly calling L. Hostname checks are out of scope with the RFC7671 DANE-EE(3) certificate usage, and the internal check will be suppressed as appropriate when DANE is enabled. @@ -111,7 +111,7 @@ These functions were first added to OpenSSL 1.1.0. =head1 COPYRIGHT -Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/doc/ssl/ssl.pod b/worker/deps/openssl/openssl/doc/ssl/ssl.pod index da12e29c63..4d919072ea 100644 --- a/worker/deps/openssl/openssl/doc/ssl/ssl.pod +++ b/worker/deps/openssl/openssl/doc/ssl/ssl.pod @@ -91,6 +91,12 @@ includes both more private SSL headers and headers from the B library. Whenever you need hard-core details on the internals of the SSL API, look inside this header file. +OPENSSL_VERSION_AT_LEAST(major,minor) can be +used in C<#if> statements in order to determine which version of the library is +being used. This can be used to either enable optional features at compile +time, or work around issues with a previous version. +See L. + =item B Unused. Present for backwards compatibility only. @@ -568,7 +574,7 @@ fresh handle for each connection. =item SSL_SESSION *B(const SSL *ssl); -=item char *B(const SSL *ssl, char *buf, int size); +=item char *B(const SSL *ssl, char *buf, int len); =item int B(const SSL *ssl); diff --git a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl index bf6b312cd1..fec99bfb65 100644 --- a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl +++ b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86.pl @@ -448,7 +448,7 @@ sub generate_mode { &mov ("esi",&wparam(1)); &mov ("ecx",&wparam(2)); if ($::win32 or $::coff) { - &push (&::islabel("_win32_segv_handler")); + &push (&::islabel("_win32_segv_handler")); &data_byte(0x64,0xff,0x30); # push %fs:(%eax) &data_byte(0x64,0x89,0x20); # mov %esp,%fs:(%eax) } @@ -499,7 +499,7 @@ sub generate_mode { &mov ("edi",&wparam(0)); &movups (&QWP(0,"edi"),"xmm0"); # copy-out context &mov (&DWP(16,"edi"),"eax"); - &pop ("esi"); + &pop ("esi"); &pop ("edi"); &ret (); &function_end_B("padlock_sha1_blocks"); @@ -512,7 +512,7 @@ sub generate_mode { &mov ("esi",&wparam(1)); &mov ("ecx",&wparam(2)); if ($::win32 or $::coff) { - &push (&::islabel("_win32_segv_handler")); + &push (&::islabel("_win32_segv_handler")); &data_byte(0x64,0xff,0x30); # push %fs:(%eax) &data_byte(0x64,0x89,0x20); # mov %esp,%fs:(%eax) } diff --git a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl index da285abc61..834b1ea79c 100644 --- a/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl +++ b/worker/deps/openssl/openssl/engines/asm/e_padlock-x86_64.pl @@ -535,7 +535,7 @@ sub generate_mode { sub $len,%rsp shr \$3,$len lea (%rsp),$out - .byte 0xf3,0x48,0xa5 # rep movsq + .byte 0xf3,0x48,0xa5 # rep movsq lea (%r8),$out lea (%rsp),$inp mov $chunk,$len diff --git a/worker/deps/openssl/openssl/engines/e_capi.c b/worker/deps/openssl/openssl/engines/e_capi.c index a1de0b4b3c..4660f1a340 100644 --- a/worker/deps/openssl/openssl/engines/e_capi.c +++ b/worker/deps/openssl/openssl/engines/e_capi.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -917,7 +917,6 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from, unsigned char *tmpbuf; CAPI_KEY *capi_key; CAPI_CTX *ctx; - DWORD flags = 0; DWORD dlen; if (flen <= 0) @@ -933,23 +932,12 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from, return -1; } - switch (padding) { - case RSA_PKCS1_PADDING: - /* Nothing to do */ - break; -#ifdef CRYPT_DECRYPT_RSA_NO_PADDING_CHECK - case RSA_NO_PADDING: - flags = CRYPT_DECRYPT_RSA_NO_PADDING_CHECK; - break; -#endif - default: - { - char errstr[10]; - BIO_snprintf(errstr, 10, "%d", padding); - CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_UNSUPPORTED_PADDING); - ERR_add_error_data(2, "padding=", errstr); - return -1; - } + if (padding != RSA_PKCS1_PADDING) { + char errstr[10]; + BIO_snprintf(errstr, 10, "%d", padding); + CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_UNSUPPORTED_PADDING); + ERR_add_error_data(2, "padding=", errstr); + return -1; } /* Create temp reverse order version of input */ @@ -962,16 +950,14 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from, /* Finally decrypt it */ dlen = flen; - if (!CryptDecrypt(capi_key->key, 0, TRUE, flags, tmpbuf, &dlen)) { + if (!CryptDecrypt(capi_key->key, 0, TRUE, 0, tmpbuf, &dlen)) { CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_DECRYPT_ERROR); capi_addlasterror(); - OPENSSL_cleanse(tmpbuf, dlen); OPENSSL_free(tmpbuf); return -1; } else { memcpy(to, tmpbuf, (flen = (int)dlen)); } - OPENSSL_cleanse(tmpbuf, flen); OPENSSL_free(tmpbuf); return flen; diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL index 7c5e4c6bde..466f8e5040 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL @@ -21,7 +21,7 @@ Detailed documentation is at the bottom of the lib/Text/Template.pm file. You may be able to view it with the following command: perldoc Text::Template - + Or: perldoc lib/Text/Template.pm diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README index e184d8cd2f..bdd3dd4a42 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/README @@ -5,7 +5,7 @@ This is a library for generating form letters, building HTML pages, or filling in templates generally. A `template' is a piece of text that has little Perl programs embedded in it here and there. When you `fill in' a template, you evaluate the little programs and replace -them with their values. +them with their values. Here's an example of a template: @@ -45,7 +45,7 @@ encourages functional separation. You can fill in the template in a `Safe' compartment. This means that if you don't trust the person who wrote the code in the template, you won't have to worry that they are tampering with your program when you -execute it. +execute it. ---------------------------------------------------------------- @@ -87,7 +87,7 @@ What's new in v1.46 since v1.44: parameter to ->new is omitted. ---------------------------------------------------------------- -What's new in v1.44 since v1.43: +What's new in v1.44 since v1.43: This is a maintentance release. There are no feature changes. @@ -182,7 +182,7 @@ What's new in v1.40 since v1.31: ---------------------------------------------------------------- What's new in v1.31 since v1.23: - Just bug fixes---fill_in_string was failing. Thanks to + Just bug fixes---fill_in_string was failing. Thanks to Donald L. Greer Jr. for the test case. ---------------------------------------------------------------- @@ -252,7 +252,7 @@ What's new in v1.10 since v1.03: New OUTPUT option delivers template results directly to a filehandle instead of making them into a string. Saves space - and time. + and time. PACKAGE and HASH now work intelligently with SAFE. @@ -263,16 +263,16 @@ What's new in v1.10 since v1.03: { my $blist = ''; foreach $i (@items) { $blist .= qq{ * $i\n}; - } + } $blist; - } + } You can now write this instead, because $OUT is special. { foreach $i (@items) { $OUT.= " * $i\n"; - } - } + } + } (`A spoonful of sugar makes the medicine go down.') @@ -281,7 +281,7 @@ What's new in v1.10 since v1.03: More documentation. Errors fixed. - Lots more tests. + Lots more tests. ---------------------------------------------------------------- @@ -289,22 +289,22 @@ What's new in v1.03 since v1.0: Code added to support HASH option to fill_in. (Incl. `_gensym' function.) - + Documentation for HASH. - + New test file for HASH. - + Note about failure of lexical variables to propagate into - templates. Why does this surprise people? - + templates. Why does this surprise people? + Bug fix: program fragments are evaluated in an environment with - `no strict' by default. Otherwise, you get a lot of `Global - symbol "$v" requires explicit package name' failures. Why didn't - the test program pick this up? Because the only variable the test - program ever used was `$a', which is exempt. Duhhhhh. - + `no strict' by default. Otherwise, you get a lot of `Global + symbol "$v" requires explicit package name' failures. Why didn't + the test program pick this up? Because the only variable the test + program ever used was `$a', which is exempt. Duhhhhh. + Fixed the test program. - + Various minor documentation fixes. @@ -315,25 +315,24 @@ Improvements of 1.0 over the old 0.1beta: New features: - At least twice as fast + At least twice as fast - Better support for filling out the same template more than once + Better support for filling out the same template more than once Now supports evaluation of program fragments in Safe - compartments. (Thanks, Jonathan!) + compartments. (Thanks, Jonathan!) - Better argument syntax + Better argument syntax - More convenience functions + More convenience functions - The parser is much better and simpler. + The parser is much better and simpler. Once a template is parsed, the parsed version is stored so that - it needn't be parsed again. + it needn't be parsed again. BROKEN function behavior is rationalized. You can now pass an arbitrary argument to your BROKEN function, or return a value - from it to the main program. - - Documentation overhauled. + from it to the main program. + Documentation overhauled. diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm index dc4f3bac77..2b8a391b53 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm @@ -5,7 +5,7 @@ # # Copyright 2013 M. J. Dominus. # You may copy and distribute this program under the -# same terms as Perl iteself. +# same terms as Perl iteself. # If in doubt, write to mjd-perl-template+@plover.com for a license. # # Version 1.46 @@ -44,7 +44,7 @@ sub always_prepend { my %LEGAL_TYPE; - BEGIN { + BEGIN { %LEGAL_TYPE = map {$_=>1} qw(FILE FILEHANDLE STRING ARRAY); } sub new { @@ -78,7 +78,7 @@ sub always_prepend bless $self => $pack; return unless $self->_acquire_data; - + $self; } } @@ -89,7 +89,7 @@ sub _acquire_data { my ($self) = @_; my $type = $self->{TYPE}; if ($type eq 'STRING') { - # nothing necessary + # nothing necessary } elsif ($type eq 'FILE') { my $data = _load_text($self->{SOURCE}); unless (defined $data) { @@ -115,7 +115,7 @@ sub _acquire_data { } $self->{SOURCE} = $data; } else { - # This should have been caught long ago, so it represents a + # This should have been caught long ago, so it represents a # drastic `can't-happen' sort of failure my $pack = ref $self; die "Can only acquire data for $pack objects of subtype STRING, but this is $type; aborting"; @@ -145,7 +145,7 @@ sub compile { return undef unless $self->_acquire_data; unless ($self->{TYPE} eq 'STRING') { my $pack = ref $self; - # This should have been caught long ago, so it represents a + # This should have been caught long ago, so it represents a # drastic `can't-happen' sort of failure die "Can only compile $pack objects of subtype STRING, but this is $self->{TYPE}; aborting"; } @@ -153,7 +153,7 @@ sub compile { my @tokens; my $delim_pats = shift() || $self->{DELIM}; - + my ($t_open, $t_close) = ('{', '}'); my $DELIM; # Regex matches a delimiter if $delim_pats @@ -215,7 +215,7 @@ sub compile { } else { die "Can't happen error #1"; } - + $self->{TYPE} = 'PREPARSED'; $self->{SOURCE} = \@content; 1; @@ -247,7 +247,7 @@ sub fill_in { my $fi_varhash = _param('hash', %fi_a); my $fi_package = _param('package', %fi_a) ; - my $fi_broken = + my $fi_broken = _param('broken', %fi_a) || $fi_self->{BROKEN} || \&_default_broken; my $fi_broken_arg = _param('broken_arg', %fi_a) || []; my $fi_safe = _param('safe', %fi_a); @@ -305,7 +305,7 @@ sub fill_in { } elsif ($fi_type eq 'PROG') { no strict; my $fi_lcomment = "#line $fi_lineno $fi_filename"; - my $fi_progtext = + my $fi_progtext = "package $fi_eval_package; $fi_prepend;\n$fi_lcomment\n$fi_text;"; my $fi_res; my $fi_eval_err = ''; @@ -445,7 +445,7 @@ sub _unconditionally_untaint { } } } - + # Given a hashful of variables (or a list of such hashes) # install the variables into the specified package, # overwriting whatever variables were there before. @@ -467,7 +467,7 @@ sub _install_hash { } elsif (ref $val) { *SYM = $val; } else { - *SYM = \$val; + *SYM = \$val; } } } @@ -478,7 +478,7 @@ sub TTerror { $ERROR } 1; -=head1 NAME +=head1 NAME Text::Template - Expand template text with embedded Perl @@ -539,7 +539,7 @@ This file documents C version B<1.46> $text = fill_in_string( < 'T', ...); Dear {$recipient}, Pay me at once. - Love, + Love, G.V. EOM @@ -555,7 +555,7 @@ This is a library for generating form letters, building HTML pages, or filling in templates generally. A `template' is a piece of text that has little Perl programs embedded in it here and there. When you `fill in' a template, you evaluate the little programs and replace -them with their values. +them with their values. You can store a template in a file outside your program. People can modify the template without modifying the program. You can separate @@ -683,16 +683,16 @@ The fragments are evaluated in order, and side effects from earlier fragments will persist into later fragments: {$x = @things; ''}The Lord High Chamberlain has gotten {$x} - things for me this year. - { $diff = $x - 17; + things for me this year. + { $diff = $x - 17; $more = 'more' if ($diff == 0) { $diff = 'no'; } elsif ($diff < 0) { $more = 'fewer'; - } + } ''; - } + } That is {$diff} {$more} than he gave me last year. The value of C<$x> set in the first line will persist into the next @@ -701,11 +701,11 @@ C<$more> set in the second fragment will persist and be interpolated into the last line. The output will look something like this: The Lord High Chamberlain has gotten 42 - things for me this year. + things for me this year. That is 25 more than he gave me last year. -That is all the syntax there is. +That is all the syntax there is. =head2 The C<$OUT> variable @@ -726,9 +726,9 @@ One way to do it is with a template like this: { my $blist = ''; foreach $i (@items) { $blist .= qq{ * $i\n}; - } + } $blist; - } + } Here we construct the list in a variable called C<$blist>, which we return at the end. This is a little cumbersome. There is a shortcut. @@ -743,11 +743,11 @@ This means that you can write the template above like this: Here is a list of the things I have got for you since 1907: { foreach $i (@items) { $OUT .= " * $i\n"; - } - } + } + } C<$OUT> is reinitialized to the empty string at the start of each -program fragment. It is private to C, so +program fragment. It is private to C, so you can't use a variable named C<$OUT> in your template without invoking the special behavior. @@ -780,15 +780,15 @@ else that makes sense with C. The C can also be C, in which case the C should be a string: - new Text::Template ( TYPE => 'STRING', + new Text::Template ( TYPE => 'STRING', SOURCE => "This is the actual template!" ); The C can be C, in which case the source should be a reference to an array of strings. The concatenation of these strings is the template: - new Text::Template ( TYPE => 'ARRAY', - SOURCE => [ "This is ", "the actual", + new Text::Template ( TYPE => 'ARRAY', + SOURCE => [ "This is ", "the actual", " template!", ] ); @@ -800,7 +800,7 @@ C will read the text from the filehandle up to end-of-file, and that text is the template: # Read template source code from STDIN: - new Text::Template ( TYPE => 'FILEHANDLE', + new Text::Template ( TYPE => 'FILEHANDLE', SOURCE => \*STDIN ); @@ -870,7 +870,7 @@ overridden in the arguments to C. See L> below. Loads all the template text from the template's source, parses and compiles it. If successful, returns true; otherwise returns false and sets C<$Text::Template::ERROR>. If the template is already compiled, -it returns true and does nothing. +it returns true and does nothing. You don't usually need to invoke this function, because C (see below) compiles the template if it isn't compiled already. @@ -977,10 +977,10 @@ variables. You may not want to put the template variables into a package. Packages can be hard to manage: You can't copy them, for example. -C provides an alternative. +C provides an alternative. The value for C should be a reference to a hash that maps -variable names to values. For example, +variable names to values. For example, $template->fill_in(HASH => { recipient => "The King", items => ['gold', 'frankincense', 'myrrh'], @@ -996,19 +996,19 @@ should be passed by reference. We also want to pass an object, which is in C<$self>; note that we pass a reference to the object, C<\$self> instead. Since we've passed a reference to a scalar, inside the template the object appears as -C<$object>. +C<$object>. The full details of how it works are a little involved, so you might want to skip to the next section. -Suppose the key in the hash is I and the value is I. +Suppose the key in the hash is I and the value is I. =over 4 =item * If the I is C, then any variables named C<$key>, -C<@key>, C<%key>, etc., are undefined. +C<@key>, C<%key>, etc., are undefined. =item * @@ -1032,7 +1032,7 @@ and have almost exactly the same effect. (The difference is that in the former case, the value is copied, and in the latter case it is -aliased.) +aliased.) =item * @@ -1074,7 +1074,7 @@ You can also use this to set two variables with the same name: ] ); -This sets C<$v> to C<"The King"> and C<@v> to C<(1,2,3)>. +This sets C<$v> to C<"The King"> and C<@v> to C<(1,2,3)>. =item C @@ -1082,13 +1082,13 @@ If any of the program fragments fails to compile or aborts for any reason, and you have set the C option to a function reference, C will invoke the function. This function is called the I function>. The C function will tell -C what to do next. +C what to do next. If the C function returns C, C will immediately abort processing the template and return the text that it has accumulated so far. If your function does this, it should set a flag that you can examine after C returns so that you can -tell whether there was a premature return or not. +tell whether there was a premature return or not. If the C function returns any other value, that value will be interpolated into the template as if that value had been the return @@ -1150,7 +1150,7 @@ If you supply the C option to C, the value of the option is passed to the C function whenever it is called. The default C function ignores the C, but you can write a custom C function that uses the C to get -more information about what went wrong. +more information about what went wrong. The C function could also use the C as a reference to store an error message or some other information that it wants to @@ -1158,7 +1158,7 @@ communicate back to the caller. For example: $error = ''; - sub my_broken { + sub my_broken { my %args = @_; my $err_ref = $args{arg}; ... @@ -1191,7 +1191,7 @@ operations that can be performed in them. If you use the C option with C, the package you specify will be placed into the safe compartment and evaluation will take -place in that package as usual. +place in that package as usual. If not, C operation is a little different from the default. Usually, if you don't specify a package, evaluation of program @@ -1235,11 +1235,11 @@ If this option is present, its value should be a reference to a list of two strings. The first string is the string that signals the beginning of each program fragment, and the second string is the string that signals the end of each program fragment. See -L<"Alternative Delimiters">, below. +L<"Alternative Delimiters">, below. If you specify C in the call to C, they override any delimiters you set when you created the template object with -C. +C. =back @@ -1266,7 +1266,7 @@ An example: $text = Text::Template->fill_this_in( <<'EOM', PACKAGE => Q); Dear {$name}, - You owe me \\${sprintf('%.2f', $amount)}. + You owe me \\${sprintf('%.2f', $amount)}. Pay or I will break your {$part}. Love, Grand Vizopteryx of Irkutsk. @@ -1371,7 +1371,7 @@ The text C doesn't get into the form letter. Why not? Because C<$recipient> is a C variable, and the whole point of C variables is that they're private and inaccessible except in the scope in which they're declared. The template is not part of that -scope, so the template can't see C<$recipient>. +scope, so the template can't see C<$recipient>. If that's not the behavior you want, don't use C. C means a private variable, and in this case you don't want the variable to be @@ -1380,7 +1380,7 @@ package, and use the C option to C: $Q::recipient = $recipient; my $text = fill_in_file('formletter.tmpl', PACKAGE => 'Q'); - + or pass the names and values in a hash with the C option: @@ -1397,8 +1397,8 @@ rest of your program and wreck something. Nevertheless, there's really no way (except with C) to protect against a template that says - { $Important::Secret::Security::Enable = 0; - # Disable security checks in this program + { $Important::Secret::Security::Enable = 0; + # Disable security checks in this program } or @@ -1462,12 +1462,12 @@ you may be able to make it work by doing this instead: --@] It may be safer to choose delimiters that begin with a newline -character. +character. Because the parsing of templates is simplified by the absence of backslash escapes, using alternative C may speed up the parsing process by 20-25%. This shows that my original choice of C<{> -and C<}> was very bad. +and C<}> was very bad. =head2 C feature and using C in templates @@ -1492,11 +1492,11 @@ each and every code fragment: Because we didn't put C at the top of the second fragment, it was only active in the first fragment, and we didn't get any C checking in the second fragment. Then we mispelled C<$foo> -and the error wasn't caught. +and the error wasn't caught. C version 1.22 and higher has a new feature to make this easier. You can specify that any text at all be automatically -added to the beginning of each program fragment. +added to the beginning of each program fragment. When you make a call to C, you can specify a @@ -1541,7 +1541,7 @@ except where overridden by C options to C or C. =head2 Prepending in Derived Classes This section is technical, and you should skip it on the first few -readings. +readings. Normally there are three places that prepended text could come from. It could come from the C option in the C call, from @@ -1551,12 +1551,12 @@ C looks for these three things in order and takes the first one that it finds. In a subclass of C, this last possibility is -ambiguous. Suppose C is a subclass of C. Should +ambiguous. Suppose C is a subclass of C. Should Text::Template->always_prepend(...); affect objects in class C? The answer is that you can have it -either way. +either way. The C value for C is normally stored in a hash variable named C<%GLOBAL_PREPEND> under the key @@ -1587,7 +1587,7 @@ method to get an arbitrary effect. Jennifer D. St Clair asks: > Most of my pages contain JavaScript and Stylesheets. - > How do I change the template identifier? + > How do I change the template identifier? Jennifer is worried about the braces in the JavaScript being taken as the delimiters of the Perl program fragments. Of course, disaster @@ -1600,13 +1600,13 @@ some reason, there are two easy workarounds: 1. You can put C<\> in front of C<{>, C<}>, or C<\> to remove its special meaning. So, for example, instead of - if (br== "n3") { + if (br== "n3") { // etc. } you can put - if (br== "n3") \{ + if (br== "n3") \{ // etc. \} @@ -1627,21 +1627,21 @@ So if we wrote {q{foo}} -it would turn into +it would turn into foo So for your JavaScript, just write - {q{if (br== "n3") { - // etc. + {q{if (br== "n3") { + // etc. }} } and it'll come out as - if (br== "n3") { - // etc. + if (br== "n3") { + // etc. } which is what you want. @@ -1657,7 +1657,7 @@ their templates, like this: } Then they complain because there is a C<17> at the top of the output -that they didn't want to have there. +that they didn't want to have there. Remember that a program fragment is replaced with its own return value, and that in Perl the return value of a code block is the value @@ -1723,14 +1723,14 @@ complicated to remember, but probably easier to use. The rule is now: Backslashes are always passed to Perl unchanged I they occur as part of a sequence like C<\\\\\\{> or C<\\\\\\}>. In these contexts, they are special; C<\\> is replaced with C<\>, and C<\{> and -C<\}> signal a literal brace. +C<\}> signal a literal brace. Examples: \{ foo \} is I evaluated, because the C<\> before the braces signals that -they should be taken literally. The result in the output looks like this: +they should be taken literally. The result in the output looks like this: { foo } @@ -1797,7 +1797,7 @@ It's totally straightforward. Just call the C functions from inside the template: { $q->checkbox_group(NAME => 'toppings', - LINEBREAK => true, + LINEBREAK => true, COLUMNS => 3, VALUES => \@toppings, ); @@ -1864,7 +1864,7 @@ of the mailing list. The mailing list address is a secret.) =head1 THANKS Many thanks to the following people for offering support, -encouragement, advice, bug reports, and all the other good stuff. +encouragement, advice, bug reports, and all the other good stuff. David H. Adler / Joel Appelbaum / @@ -1895,7 +1895,7 @@ Matt X. Hunter / Robert M. Ioffe / Daniel LaLiberte / Reuven M. Lerner / -Trip Lilley / +Trip Lilley / Yannis Livassof / Val Luck / Kevin Madsen / @@ -1941,12 +1941,12 @@ Special thanks to: =over 2 -=item Jonathan Roy +=item Jonathan Roy for telling me how to do the C support (I spent two years worrying about it, and then Jonathan pointed out that it was trivial.) -=item Ranjit Bhatnagar +=item Ranjit Bhatnagar for demanding less verbose fragments like they have in ASP, for helping me figure out the Right Thing, and, especially, for talking me diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm index 1e41037bd3..c6e3298ee2 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm @@ -28,7 +28,7 @@ sub preprocessor { 1; -=head1 NAME +=head1 NAME Text::Template::Preprocess - Expand template text with embedded Perl @@ -82,8 +82,8 @@ this: Plain text here... { perl code } { more perl code } @@ -96,7 +96,7 @@ JavaScript program with executable Perl code. One strategy: s()(q{$1})gsi; } -Then use C \"e_scripts>. This will transform +Then use C \"e_scripts>. This will transform @@ -141,4 +141,3 @@ For updates, visit C. =cut - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t index 5f9560f898..4784ba008e 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t @@ -8,4 +8,3 @@ if ($Text::Template::VERSION == 1.46) { } else { print "not ok 1\n"; } - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t index be43390c67..d983797786 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t @@ -33,12 +33,12 @@ if (defined($template)) { $n++; # (3) Fill in template from file -$X::v = "abc"; +$X::v = "abc"; $resultX = < abc We will evaluate 1+1 here -> 2 EOM -$Y::v = "ABC"; +$Y::v = "ABC"; $resultY = < ABC We will evaluate 1+1 here -> 2 @@ -74,7 +74,7 @@ $n++; # (6) test creation of template from filehandle if (open (TMPL, "< $TEMPFILE")) { - $template = new Text::Template ('type' => 'FILEHANDLE', + $template = new Text::Template ('type' => 'FILEHANDLE', 'source' => *TMPL); if (defined($template)) { print "ok $n\n"; @@ -109,9 +109,9 @@ if (open (TMPL, "< $TEMPFILE")) { # (9) test creation of template from array -$template = new Text::Template - ('type' => 'ARRAY', - 'source' => [ +$template = new Text::Template + ('type' => 'ARRAY', + 'source' => [ 'We will put value of $v (which is "abc") here -> {$v}', "\n", 'We will evaluate 1+1 here -> {1+1}', @@ -209,7 +209,7 @@ for ($i=0; $i<@tests; $i+=2) { # MJD 20010827 # (28) test creation of template from filehandle if (open (TMPL, "< $TEMPFILE")) { - $template = new Text::Template ('type' => 'FILEHANDLE', + $template = new Text::Template ('type' => 'FILEHANDLE', 'source' => \*TMPL); if (defined($template)) { print "ok $n\n"; diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t index 29ba51a40e..050638c853 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t @@ -68,13 +68,13 @@ my $WARNINGS = 0; local $^W = 1; # Make sure this is on for this test $template8 = 'We will put value of $v (which is "good") here -> {defined $v ? "bad" : "good"}'; $result8 = 'We will put value of $v (which is "good") here -> good'; - my $template = + my $template = new Text::Template ('type' => 'STRING', 'source' => $template8); my $text = $template->fill_in(HASH => {'v' => undef}); # (8) Did we generate a warning? print +($WARNINGS == 0 ? '' : 'not '), "ok $n\n"; $n++; - + # (9) Was the output correct? print +($text eq $result8 ? '' : 'not '), "ok $n\n"; $n++; @@ -85,7 +85,7 @@ my $WARNINGS = 0; # (10) Did we generate a warning? print +($WARNINGS == 0 ? '' : 'not '), "ok $n\n"; $n++; - + # (11) Was the output correct? if ($] < 5.005) { print "ok $n # skipped -- not supported before 5.005\n"; @@ -98,7 +98,7 @@ my $WARNINGS = 0; # (12) Now we'll test the multiple-hash option (Added for 1.20.) $text = Text::Template::fill_in_string(q{$v: {$v}. @v: [{"@v"}].}, - HASH => [{'v' => 17}, + HASH => [{'v' => 17}, {'v' => ['a', 'b', 'c']}, {'v' => \23}, ]); @@ -108,4 +108,3 @@ $n++; exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t index 0ba65a54dc..8094392dca 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t @@ -46,11 +46,10 @@ $textOUT = $templateOUT->fill_in() print +($text eq $textOUT ? '' : 'not '), "ok $n\n"; $n++; -# Missing: Test this feature in Safe compartments; +# Missing: Test this feature in Safe compartments; # it's a totally different code path. # Decision: Put that into safe.t, because that file should # be skipped when Safe.pm is unavailable. exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t index 4c07121b44..6d94820d2a 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t @@ -141,13 +141,13 @@ print +($text1 eq $text2 ? '' : 'not '), "ok $n\n"; $n++; # (16) Try the BROKEN routine in safe compartments -sub my_broken { +sub my_broken { my %a = @_; $a{error} =~ s/ at.*//s; "OK! text:$a{text} error:$a{error} lineno:$a{lineno} arg:$a{arg}" ; } $templateB = new Text::Template (TYPE => 'STRING', SOURCE => '{die}') or die; -$text1 = $templateB->fill_in(BROKEN => \&my_broken, +$text1 = $templateB->fill_in(BROKEN => \&my_broken, BROKEN_ARG => 'barg', SAFE => new Safe, ); @@ -158,4 +158,3 @@ $n++; exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t index 03534770f1..71f242592f 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t @@ -96,10 +96,7 @@ print +($Q::H eq 'good7' ? '' : 'not '), "ok $n\n"; $Q::H = $Q::H; $n++; -# (12) +# (12) print +($Q2::H eq 'good8' ? '' : 'not '), "ok $n\n"; $Q2::H = $Q2::H; $n++; - - - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t index 6865ad1945..22d4a1c841 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t @@ -36,4 +36,3 @@ print +($t eq "My process ID is $$" ? '' : 'not '), "ok $n\n"; $n++; exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t index 5f438f6148..8baaf7ad44 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t @@ -88,4 +88,3 @@ $n++; } exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t index ef9cfafdee..6014400840 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t @@ -14,7 +14,7 @@ Aborting" print "1..6\n"; $n=1; -$Q::n = $Q::n = 119; +$Q::n = $Q::n = 119; # (1) Test fill_in_string $out = fill_in_string('The value of $n is {$n}.', PACKAGE => 'Q' ); @@ -26,7 +26,7 @@ $TEMPFILE = "tt$$"; open F, "> $TEMPFILE" or die "Couldn't open test file: $!; aborting"; print F 'The value of $n is {$n}.', "\n"; close F or die "Couldn't write test file: $!; aborting"; -$R::n = $R::n = 8128; +$R::n = $R::n = 8128; $out = fill_in_file($TEMPFILE, PACKAGE => 'R'); print +($out eq "The value of \$n is 8128.\n" ? '' : 'not '), "ok $n\n"; @@ -42,7 +42,7 @@ print +($out eq "With a message here? It is good!\n" ? '' : 'not '), "ok $n\n"; $n++; # (4) It probably occurs in fill_this_in also: -$out = +$out = Text::Template->fill_this_in("With a message here? [% \$var %]\n", DELIMITERS => ['[%', '%]'], HASH => { "var" => \"It is good!" }); @@ -50,7 +50,7 @@ print +($out eq "With a message here? It is good!\n" ? '' : 'not '), "ok $n\n"; $n++; # (5) This test failed in 1.25. It was supplied by Donald L. Greer Jr. -# Note that it's different from (1) in that there's no explicit +# Note that it's different from (1) in that there's no explicit # package=> argument. use vars qw($string $foo $r); $string='Hello {$foo}'; @@ -72,4 +72,3 @@ package main; END { $TEMPFILE && unlink $TEMPFILE } exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t index 40f9fac6cb..c9d03f27f8 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t @@ -49,15 +49,14 @@ if ($@ =~ /^\QIllegal value `WLUNCH' for TYPE parameter/) { $n++; # (4-5) File does not exist -my $o = Text::Template->new(TYPE => 'file', +my $o = Text::Template->new(TYPE => 'file', SOURCE => 'this file does not exist'); print $o ? "not ok $n\n" : "ok $n\n"; $n++; -print defined($Text::Template::ERROR) +print defined($Text::Template::ERROR) && $Text::Template::ERROR =~ /^Couldn't open file/ ? "ok $n\n" : "not ok $n\n"; $n++; exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t index f74d591cc7..4b32ce0411 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t @@ -19,7 +19,7 @@ $n = 1; $V = $V = 119; $template = q{The value of $V is <<$V>>.}; $result = q{The value of $V is 119.}; -$template1 = Text::Template->new(TYPE => STRING, +$template1 = Text::Template->new(TYPE => STRING, SOURCE => $template, DELIMITERS => ['<<', '>>'] ) @@ -37,7 +37,7 @@ $n++; # (3) Now we'll try using regex metacharacters # First with the delimiters specified at object creation time $template = q{The value of $V is [$V].}; -$template1 = Text::Template->new(TYPE => STRING, +$template1 = Text::Template->new(TYPE => STRING, SOURCE => $template, DELIMITERS => ['[', ']'] ) @@ -63,10 +63,10 @@ my @tests = ('{""}' => '', # (5) '{"}"}' => undef, '{"\\}"}' => undef, # One backslash '{"\\\\}"}' => undef, # Two backslashes - '{"\\\\\\}"}' => undef, # Three backslashes + '{"\\\\\\}"}' => undef, # Three backslashes '{"\\\\\\\\}"}' => undef, # Four backslashes (10) '{"\\\\\\\\\\}"}' => undef, # Five backslashes - + # Backslashes are always passed directly to Perl '{"x20"}' => 'x20', '{"\\x20"}' => ' ', # One backslash @@ -96,4 +96,3 @@ for ($i=0; $i<@tests; $i+=2) { exit; - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t index fe242e5898..833a5fa444 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t @@ -22,11 +22,11 @@ my $tin = q{The value of $foo is: {$foo}}; Text::Template->always_prepend(q{$foo = "global"}); $tmpl1 = Text::Template->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, ); $tmpl2 = Text::Template->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, PREPEND => q{$foo = "template"}, ); @@ -46,11 +46,11 @@ print "ok $n\n"; $n++; Emptyclass1->always_prepend(q{$foo = 'Emptyclass global';}); $tmpl1 = Emptyclass1->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, ); $tmpl2 = Emptyclass1->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, PREPEND => q{$foo = "template"}, ); @@ -69,11 +69,11 @@ print "ok $n\n"; $n++; print "ok $n\n"; $n++; $tmpl1 = Emptyclass2->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, ); $tmpl2 = Emptyclass2->new(TYPE => 'STRING', - SOURCE => $tin, + SOURCE => $tin, PREPEND => q{$foo = "template"}, ); @@ -90,5 +90,3 @@ print "ok $n\n"; $n++; print "ok $n\n"; $n++; ($t3 eq 'The value of $foo is: fillin') or print "not "; print "ok $n\n"; $n++; - - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t index 60b6b0c65b..422b10ec9a 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t @@ -32,16 +32,16 @@ for my $trial (1, 0) { for my $test (0 .. 3) { my $tmpl; if ($trial == 0) { - $tmpl = new Text::Template::Preprocess + $tmpl = new Text::Template::Preprocess (TYPE => 'STRING', SOURCE => $t) or die; } else { open TF, "< $TMPFILE" or die "Couldn't open test file: $!; aborting"; - $tmpl = new Text::Template::Preprocess + $tmpl = new Text::Template::Preprocess (TYPE => 'FILEHANDLE', SOURCE => \*TF) or die; } $tmpl->preprocessor($py) if ($test & 1) == 1; my @args = ((($test & 2) == 2) ? (PREPROCESSOR => $pz) : ()); - my $o = $tmpl->fill_in(@args, + my $o = $tmpl->fill_in(@args, HASH => {x => 119, 'y' => 23, z => 5}); # print STDERR "$o/$result[$test]\n"; print +(($o eq $result[$test]) ? '' : 'not '), "ok $n\n"; diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t index d92a37463a..30664993ac 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t @@ -58,14 +58,14 @@ sub should_be_tainted { if (Text::Template::_is_clean($_[0])) { print "not ok $n\n"; $n++; return; } - print "ok $n\n"; $n++; return; + print "ok $n\n"; $n++; return; } sub should_be_clean { unless (Text::Template::_is_clean($_[0])) { print "not ok $n\n"; $n++; return; } - print "ok $n\n"; $n++; return; + print "ok $n\n"; $n++; return; } # Tainted filename should die with and without UNTAINT option @@ -116,4 +116,3 @@ Text::Template::_unconditionally_untaint($tfile); should_be_clean($tfile); END { unlink $file } - diff --git a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t index d362395cfb..db88a0711f 100644 --- a/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t +++ b/worker/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t @@ -68,7 +68,7 @@ Aborting" # (5) BROKEN sub passed correct args when called in ->fill_in? { my $r = Text::Template->new(TYPE => 'string', SOURCE => '{1/0}', - )->fill_in(BROKEN => + )->fill_in(BROKEN => sub { my %a = @_; qq{$a{lineno},$a{error},$a{text}} }); @@ -79,4 +79,3 @@ Aborting" } $n++; } - diff --git a/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm b/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm index b21f875312..7dbfe3f84f 100644 --- a/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm +++ b/worker/deps/openssl/openssl/external/perl/transfer/Text/Template.pm @@ -1,4 +1,4 @@ -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -7,9 +7,6 @@ # Quick transfer to the downloaded Text::Template -package transfer::Text::Template; -$VERSION = 1.46; - BEGIN { use File::Spec::Functions; use File::Basename; diff --git a/worker/deps/openssl/openssl/fuzz/test-corpus.c b/worker/deps/openssl/openssl/fuzz/test-corpus.c index 628e633536..c553697d6c 100644 --- a/worker/deps/openssl/openssl/fuzz/test-corpus.c +++ b/worker/deps/openssl/openssl/fuzz/test-corpus.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL licenses, (the "License"); * you may not use this file except in compliance with the License. @@ -16,47 +16,9 @@ #include #include -#include #include #include #include "fuzzer.h" -#include "internal/o_dir.h" - -#if defined(_WIN32) && defined(_MAX_PATH) -# define PATH_MAX _MAX_PATH -#endif - -#ifndef PATH_MAX -# define PATH_MAX 4096 -#endif - -# if !defined(S_ISREG) -# define S_ISREG(m) ((m) & S_IFREG) -# endif - -static void testfile(const char *pathname) -{ - struct stat st; - FILE *f; - unsigned char *buf; - size_t s; - - if (stat(pathname, &st) < 0 || !S_ISREG(st.st_mode)) - return; - printf("# %s\n", pathname); - fflush(stdout); - f = fopen(pathname, "rb"); - if (f == NULL) - return; - buf = malloc(st.st_size); - if (buf != NULL) { - s = fread(buf, 1, st.st_size, f); - OPENSSL_assert(s == (size_t)st.st_size); - FuzzerTestOneInput(buf, s); - free(buf); - } - fclose(f); -} int main(int argc, char **argv) { int n; @@ -64,38 +26,21 @@ int main(int argc, char **argv) { FuzzerInitialize(&argc, &argv); for (n = 1; n < argc; ++n) { - size_t dirname_len = strlen(argv[n]); - const char *filename = NULL; - char *pathname = NULL; - OPENSSL_DIR_CTX *ctx = NULL; - int wasdir = 0; - - /* - * We start with trying to read the given path as a directory. - */ - while ((filename = OPENSSL_DIR_read(&ctx, argv[n])) != NULL) { - wasdir = 1; - if (pathname == NULL) { - pathname = malloc(PATH_MAX); - if (pathname == NULL) - break; - strcpy(pathname, argv[n]); -#ifdef __VMS - if (strchr(":<]", pathname[dirname_len - 1]) == NULL) -#endif - pathname[dirname_len++] = '/'; - pathname[dirname_len] = '\0'; - } - strcpy(pathname + dirname_len, filename); - testfile(pathname); - } - OPENSSL_DIR_end(&ctx); - - /* If it wasn't a directory, treat it as a file instead */ - if (!wasdir) - testfile(argv[n]); - - free(pathname); + struct stat st; + FILE *f; + unsigned char *buf; + size_t s; + + stat(argv[n], &st); + f = fopen(argv[n], "rb"); + if (f == NULL) + continue; + buf = malloc(st.st_size); + s = fread(buf, 1, st.st_size, f); + OPENSSL_assert(s == (size_t)st.st_size); + FuzzerTestOneInput(buf, s); + free(buf); + fclose(f); } return 0; } diff --git a/worker/deps/openssl/openssl/include/internal/numbers.h b/worker/deps/openssl/openssl/include/internal/numbers.h index 31931df3c2..cf2c30eebb 100644 --- a/worker/deps/openssl/openssl/include/internal/numbers.h +++ b/worker/deps/openssl/openssl/include/internal/numbers.h @@ -65,4 +65,3 @@ # endif #endif - diff --git a/worker/deps/openssl/openssl/include/openssl/asn1.h b/worker/deps/openssl/openssl/include/openssl/asn1.h index d0b1099a4f..05ae1dbe1c 100644 --- a/worker/deps/openssl/openssl/include/openssl/asn1.h +++ b/worker/deps/openssl/openssl/include/openssl/asn1.h @@ -953,10 +953,8 @@ int ERR_load_ASN1_strings(void); # define ASN1_F_D2I_AUTOPRIVATEKEY 207 # define ASN1_F_D2I_PRIVATEKEY 154 # define ASN1_F_D2I_PUBLICKEY 155 -# define ASN1_F_DO_BUF 142 # define ASN1_F_DO_TCREATE 222 # define ASN1_F_I2D_ASN1_BIO_STREAM 211 -# define ASN1_F_I2D_ASN1_OBJECT 143 # define ASN1_F_I2D_DSA_PUBKEY 161 # define ASN1_F_I2D_EC_PUBKEY 181 # define ASN1_F_I2D_PRIVATEKEY 163 diff --git a/worker/deps/openssl/openssl/include/openssl/bio.h b/worker/deps/openssl/openssl/include/openssl/bio.h index 3a72862561..f435bd8ef6 100644 --- a/worker/deps/openssl/openssl/include/openssl/bio.h +++ b/worker/deps/openssl/openssl/include/openssl/bio.h @@ -730,26 +730,26 @@ __bio_h__attr__((__format__(__printf__, 3, 0))); BIO_METHOD *BIO_meth_new(int type, const char *name); void BIO_meth_free(BIO_METHOD *biom); -int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int); +int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int); int BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int)); -int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int); +int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int)); -int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *); +int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *); int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *)); -int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int); +int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int); int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int)); -long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *); +long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *)); -int (*BIO_meth_get_create(const BIO_METHOD *bion)) (BIO *); +int (*BIO_meth_get_create(BIO_METHOD *bion)) (BIO *); int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)); -int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *); +int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *); int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)); -long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) +long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *); int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, long (*callback_ctrl) (BIO *, int, diff --git a/worker/deps/openssl/openssl/include/openssl/bn.h b/worker/deps/openssl/openssl/include/openssl/bn.h index 301edd5250..54ae760152 100644 --- a/worker/deps/openssl/openssl/include/openssl/bn.h +++ b/worker/deps/openssl/openssl/include/openssl/bn.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -119,76 +119,25 @@ void *BN_GENCB_get_arg(BN_GENCB *cb); * on the size of the number */ /* - * BN_prime_checks_for_size() returns the number of Miller-Rabin iterations - * that will be done for checking that a random number is probably prime. The - * error rate for accepting a composite number as prime depends on the size of - * the prime |b|. The error rates used are for calculating an RSA key with 2 primes, - * and so the level is what you would expect for a key of double the size of the - * prime. - * - * This table is generated using the algorithm of FIPS PUB 186-4 - * Digital Signature Standard (DSS), section F.1, page 117. - * (https://dx.doi.org/10.6028/NIST.FIPS.186-4) - * - * The following magma script was used to generate the output: - * securitybits:=125; - * k:=1024; - * for t:=1 to 65 do - * for M:=3 to Floor(2*Sqrt(k-1)-1) do - * S:=0; - * // Sum over m - * for m:=3 to M do - * s:=0; - * // Sum over j - * for j:=2 to m do - * s+:=(RealField(32)!2)^-(j+(k-1)/j); - * end for; - * S+:=2^(m-(m-1)*t)*s; - * end for; - * A:=2^(k-2-M*t); - * B:=8*(Pi(RealField(32))^2-6)/3*2^(k-2)*S; - * pkt:=2.00743*Log(2)*k*2^-k*(A+B); - * seclevel:=Floor(-Log(2,pkt)); - * if seclevel ge securitybits then - * printf "k: %5o, security: %o bits (t: %o, M: %o)\n",k,seclevel,t,M; - * break; - * end if; - * end for; - * if seclevel ge securitybits then break; end if; - * end for; - * - * It can be run online at: - * http://magma.maths.usyd.edu.au/calc - * - * And will output: - * k: 1024, security: 129 bits (t: 6, M: 23) - * - * k is the number of bits of the prime, securitybits is the level we want to - * reach. - * - * prime length | RSA key size | # MR tests | security level - * -------------+--------------|------------+--------------- - * (b) >= 6394 | >= 12788 | 3 | 256 bit - * (b) >= 3747 | >= 7494 | 3 | 192 bit - * (b) >= 1345 | >= 2690 | 4 | 128 bit - * (b) >= 1080 | >= 2160 | 5 | 128 bit - * (b) >= 852 | >= 1704 | 5 | 112 bit - * (b) >= 476 | >= 952 | 5 | 80 bit - * (b) >= 400 | >= 800 | 6 | 80 bit - * (b) >= 347 | >= 694 | 7 | 80 bit - * (b) >= 308 | >= 616 | 8 | 80 bit - * (b) >= 55 | >= 110 | 27 | 64 bit - * (b) >= 6 | >= 12 | 34 | 64 bit + * number of Miller-Rabin iterations for an error rate of less than 2^-80 for + * random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook of + * Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996]; + * original paper: Damgaard, Landrock, Pomerance: Average case error + * estimates for the strong probable prime test. -- Math. Comp. 61 (1993) + * 177-194) */ - -# define BN_prime_checks_for_size(b) ((b) >= 3747 ? 3 : \ - (b) >= 1345 ? 4 : \ - (b) >= 476 ? 5 : \ - (b) >= 400 ? 6 : \ - (b) >= 347 ? 7 : \ - (b) >= 308 ? 8 : \ - (b) >= 55 ? 27 : \ - /* b >= 6 */ 34) +# define BN_prime_checks_for_size(b) ((b) >= 1300 ? 2 : \ + (b) >= 850 ? 3 : \ + (b) >= 650 ? 4 : \ + (b) >= 550 ? 5 : \ + (b) >= 450 ? 6 : \ + (b) >= 400 ? 7 : \ + (b) >= 350 ? 8 : \ + (b) >= 300 ? 9 : \ + (b) >= 250 ? 12 : \ + (b) >= 200 ? 15 : \ + (b) >= 150 ? 18 : \ + /* b >= 100 */ 27) # define BN_num_bytes(a) ((BN_num_bits(a)+7)/8) diff --git a/worker/deps/openssl/openssl/include/openssl/conf.h b/worker/deps/openssl/openssl/include/openssl/conf.h index e0539e3128..980a51b157 100644 --- a/worker/deps/openssl/openssl/include/openssl/conf.h +++ b/worker/deps/openssl/openssl/include/openssl/conf.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -191,7 +191,6 @@ int ERR_load_CONF_strings(void); # define CONF_F_NCONF_LOAD_BIO 110 # define CONF_F_NCONF_LOAD_FP 114 # define CONF_F_NCONF_NEW 111 -# define CONF_F_SSL_MODULE_INIT 123 # define CONF_F_STR_COPY 101 /* Reason codes. */ @@ -207,10 +206,6 @@ int ERR_load_CONF_strings(void); # define CONF_R_NO_SECTION 107 # define CONF_R_NO_SUCH_FILE 114 # define CONF_R_NO_VALUE 108 -# define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 -# define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 -# define CONF_R_SSL_SECTION_EMPTY 119 -# define CONF_R_SSL_SECTION_NOT_FOUND 120 # define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 # define CONF_R_UNKNOWN_MODULE_NAME 113 # define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116 diff --git a/worker/deps/openssl/openssl/include/openssl/crypto.h b/worker/deps/openssl/openssl/include/openssl/crypto.h index fa3f12af3b..1ba7f25f01 100644 --- a/worker/deps/openssl/openssl/include/openssl/crypto.h +++ b/worker/deps/openssl/openssl/include/openssl/crypto.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -371,9 +371,7 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, # define OPENSSL_INIT_ENGINE_CAPI 0x00002000L # define OPENSSL_INIT_ENGINE_PADLOCK 0x00004000L # define OPENSSL_INIT_ENGINE_AFALG 0x00008000L -/* OPENSSL_INIT_ZLIB 0x00010000L */ -/* currently unused 0x00020000L */ -/* OPENSSL_INIT_BASE_ONLY 0x00040000L */ +/* OPENSSL_INIT flag 0x00010000 reserved for internal use */ /* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */ /* Max OPENSSL_INIT flag value is 0x80000000 */ diff --git a/worker/deps/openssl/openssl/include/openssl/dh.h b/worker/deps/openssl/openssl/include/openssl/dh.h index 8cf879e14f..fbd479039e 100644 --- a/worker/deps/openssl/openssl/include/openssl/dh.h +++ b/worker/deps/openssl/openssl/include/openssl/dh.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -187,7 +187,7 @@ void DH_meth_free(DH_METHOD *dhm); DH_METHOD *DH_meth_dup(const DH_METHOD *dhm); const char *DH_meth_get0_name(const DH_METHOD *dhm); int DH_meth_set1_name(DH_METHOD *dhm, const char *name); -int DH_meth_get_flags(const DH_METHOD *dhm); +int DH_meth_get_flags(DH_METHOD *dhm); int DH_meth_set_flags(DH_METHOD *dhm, int flags); void *DH_meth_get0_app_data(const DH_METHOD *dhm); int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data); diff --git a/worker/deps/openssl/openssl/include/openssl/dsa.h b/worker/deps/openssl/openssl/include/openssl/dsa.h index 3a7b1a626e..139718edb9 100644 --- a/worker/deps/openssl/openssl/include/openssl/dsa.h +++ b/worker/deps/openssl/openssl/include/openssl/dsa.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -146,12 +146,10 @@ int DSAparams_print_fp(FILE *fp, const DSA *x); int DSA_print_fp(FILE *bp, const DSA *x, int off); # endif -# define DSS_prime_checks 64 +# define DSS_prime_checks 50 /* - * Primality test according to FIPS PUB 186-4, Appendix C.3. Since we only - * have one value here we set the number of checks to 64 which is the 128 bit - * security level that is the highest level and valid for creating a 3072 bit - * DSA key. + * Primality test according to FIPS PUB 186[-1], Appendix 2.1: 50 rounds of + * Rabin-Miller */ # define DSA_is_prime(n, callback, cb_arg) \ BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg) @@ -188,7 +186,7 @@ void DSA_meth_free(DSA_METHOD *dsam); DSA_METHOD *DSA_meth_dup(const DSA_METHOD *dsam); const char *DSA_meth_get0_name(const DSA_METHOD *dsam); int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name); -int DSA_meth_get_flags(const DSA_METHOD *dsam); +int DSA_meth_get_flags(DSA_METHOD *dsam); int DSA_meth_set_flags(DSA_METHOD *dsam, int flags); void *DSA_meth_get0_app_data(const DSA_METHOD *dsam); int DSA_meth_set0_app_data(DSA_METHOD *dsam, void *app_data); @@ -262,7 +260,6 @@ int ERR_load_DSA_strings(void); # define DSA_F_DSA_SIG_NEW 102 # define DSA_F_OLD_DSA_PRIV_DECODE 122 # define DSA_F_PKEY_DSA_CTRL 120 -# define DSA_F_PKEY_DSA_CTRL_STR 104 # define DSA_F_PKEY_DSA_KEYGEN 121 /* Reason codes. */ diff --git a/worker/deps/openssl/openssl/include/openssl/ec.h b/worker/deps/openssl/openssl/include/openssl/ec.h index d6b36c77c0..f06680a788 100644 --- a/worker/deps/openssl/openssl/include/openssl/ec.h +++ b/worker/deps/openssl/openssl/include/openssl/ec.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1424,7 +1424,6 @@ int ERR_load_EC_strings(void); # define EC_F_EC_GFP_NIST_FIELD_MUL 200 # define EC_F_EC_GFP_NIST_FIELD_SQR 201 # define EC_F_EC_GFP_NIST_GROUP_SET_CURVE 202 -# define EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES 287 # define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT 165 # define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE 166 # define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE 102 diff --git a/worker/deps/openssl/openssl/include/openssl/evp.h b/worker/deps/openssl/openssl/include/openssl/evp.h index 36e2934485..43c97a7560 100644 --- a/worker/deps/openssl/openssl/include/openssl/evp.h +++ b/worker/deps/openssl/openssl/include/openssl/evp.h @@ -1351,34 +1351,34 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, const char *type, const char *value)); -void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth, int (**pinit) (EVP_PKEY_CTX *ctx)); -void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth, int (**pcopy) (EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)); -void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth, void (**pcleanup) (EVP_PKEY_CTX *ctx)); -void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth, int (**pparamgen_init) (EVP_PKEY_CTX *ctx), int (**pparamgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)); -void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth, int (**pkeygen_init) (EVP_PKEY_CTX *ctx), int (**pkeygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)); -void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, int (**psign_init) (EVP_PKEY_CTX *ctx), int (**psign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, const unsigned char *tbs, size_t tbslen)); -void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth, int (**pverify_init) (EVP_PKEY_CTX *ctx), int (**pverify) (EVP_PKEY_CTX *ctx, const unsigned char *sig, @@ -1386,7 +1386,7 @@ void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth, const unsigned char *tbs, size_t tbslen)); -void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth, int (**pverify_recover_init) (EVP_PKEY_CTX *ctx), int (**pverify_recover) (EVP_PKEY_CTX @@ -1398,7 +1398,7 @@ void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth, char *tbs, size_t tbslen)); -void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth, int (**psignctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**psignctx) (EVP_PKEY_CTX *ctx, @@ -1406,7 +1406,7 @@ void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth, size_t *siglen, EVP_MD_CTX *mctx)); -void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth, int (**pverifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx), int (**pverifyctx) (EVP_PKEY_CTX *ctx, @@ -1414,7 +1414,7 @@ void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth, int siglen, EVP_MD_CTX *mctx)); -void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth, int (**pencrypt_init) (EVP_PKEY_CTX *ctx), int (**pencryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -1422,7 +1422,7 @@ void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth, const unsigned char *in, size_t inlen)); -void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth, int (**pdecrypt_init) (EVP_PKEY_CTX *ctx), int (**pdecrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, @@ -1430,13 +1430,13 @@ void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth, const unsigned char *in, size_t inlen)); -void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth, int (**pderive_init) (EVP_PKEY_CTX *ctx), int (**pderive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)); -void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth, +void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth, int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2), int (**pctrl_str) (EVP_PKEY_CTX *ctx, @@ -1506,8 +1506,6 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_PKEY_GET0_RSA 121 # define EVP_F_EVP_PKEY_KEYGEN 146 # define EVP_F_EVP_PKEY_KEYGEN_INIT 147 -# define EVP_F_EVP_PKEY_METH_ADD0 172 -# define EVP_F_EVP_PKEY_METH_NEW 173 # define EVP_F_EVP_PKEY_NEW 106 # define EVP_F_EVP_PKEY_PARAMGEN 148 # define EVP_F_EVP_PKEY_PARAMGEN_INIT 149 @@ -1572,7 +1570,6 @@ int ERR_load_EVP_strings(void); # define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150 # define EVP_R_OPERATON_NOT_INITIALIZED 151 # define EVP_R_PARTIALLY_OVERLAPPING 162 -# define EVP_R_PBKDF2_ERROR 176 # define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 175 # define EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED 164 # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145 diff --git a/worker/deps/openssl/openssl/include/openssl/lhash.h b/worker/deps/openssl/openssl/include/openssl/lhash.h index 8ecc588484..82d40c1e0e 100644 --- a/worker/deps/openssl/openssl/include/openssl/lhash.h +++ b/worker/deps/openssl/openssl/include/openssl/lhash.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -95,7 +95,7 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out); # define _LHASH OPENSSL_LHASH # define LHASH_NODE OPENSSL_LH_NODE # define lh_error OPENSSL_LH_error -# define lh_new OPENSSL_LH_new +# define lh_new OPENSSL_lh_new # define lh_free OPENSSL_LH_free # define lh_insert OPENSSL_LH_insert # define lh_delete OPENSSL_LH_delete diff --git a/worker/deps/openssl/openssl/include/openssl/ocsp.h b/worker/deps/openssl/openssl/include/openssl/ocsp.h index ba1b97315b..90ebe5ccd0 100644 --- a/worker/deps/openssl/openssl/include/openssl/ocsp.h +++ b/worker/deps/openssl/openssl/include/openssl/ocsp.h @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -92,6 +92,7 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES; # define V_OCSP_RESPID_KEY 1 DEFINE_STACK_OF(OCSP_RESPID) +DECLARE_ASN1_FUNCTIONS(OCSP_RESPID) typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO; @@ -158,6 +159,8 @@ int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, int OCSP_REQ_CTX_nbio_d2i(OCSP_REQ_CTX *rctx, ASN1_VALUE **pval, const ASN1_ITEM *it); BIO *OCSP_REQ_CTX_get0_mem_bio(OCSP_REQ_CTX *rctx); +int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, + ASN1_VALUE *val); int OCSP_REQ_CTX_http(OCSP_REQ_CTX *rctx, const char *op, const char *path); int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req); int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx, @@ -191,8 +194,6 @@ int OCSP_response_status(OCSP_RESPONSE *resp); OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp); const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs); -const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs); -const OCSP_RESPDATA *OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs); int OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer, STACK_OF(X509) *extra_certs); diff --git a/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in b/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in index 17807fb6bd..9f8634a3a2 100644 --- a/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in +++ b/worker/deps/openssl/openssl/include/openssl/opensslconf.h.in @@ -68,18 +68,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#ifndef DECLARE_DEPRECATED -# if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -# else -# define DECLARE_DEPRECATED(f) f; -# ifdef __GNUC__ -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# undef DECLARE_DEPRECATED -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -# endif -# endif -# endif +#if defined(OPENSSL_NO_DEPRECATED) +# define DECLARE_DEPRECATED(f) +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +#else +# define DECLARE_DEPRECATED(f) f; #endif #ifndef OPENSSL_FILE diff --git a/worker/deps/openssl/openssl/include/openssl/opensslv.h b/worker/deps/openssl/openssl/include/openssl/opensslv.h index 49f3c0a780..4fb437f2ee 100644 --- a/worker/deps/openssl/openssl/include/openssl/opensslv.h +++ b/worker/deps/openssl/openssl/include/openssl/opensslv.h @@ -39,13 +39,18 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x101000afL +# define OPENSSL_VERSION_NUMBER 0x1010008fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j-fips 20 Nov 2018" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-fips 27 Mar 2018" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0j 20 Nov 2018" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h 27 Mar 2018" # endif +#define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch) + +/* use this for #if tests, should never depend upon fix/patch */ +#define OPENSSL_VERSION_AT_LEAST(maj,min) (OPENSSL_MAKE_VERSION(maj,min, 0, 0) >= OPENSSL_VERSION_NUMBER) + /*- * The macros below are to be used for shared library (.so, .dll, ...) * versioning. That kind of versioning works a bit differently between diff --git a/worker/deps/openssl/openssl/include/openssl/pem.h b/worker/deps/openssl/openssl/include/openssl/pem.h index f7ce3c61f5..2375d63553 100644 --- a/worker/deps/openssl/openssl/include/openssl/pem.h +++ b/worker/deps/openssl/openssl/include/openssl/pem.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -322,8 +322,7 @@ int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt); int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, EVP_PKEY *pkey); -/* The default pem_password_cb that's used internally */ -int PEM_def_callback(char *buf, int num, int rwflag, void *userdata); +int PEM_def_callback(char *buf, int num, int w, void *key); void PEM_proc_type(char *buf, int type); void PEM_dek_info(char *buf, const char *type, int len, char *str); diff --git a/worker/deps/openssl/openssl/include/openssl/rsa.h b/worker/deps/openssl/openssl/include/openssl/rsa.h index 9c28329f1d..d97d6e075a 100644 --- a/worker/deps/openssl/openssl/include/openssl/rsa.h +++ b/worker/deps/openssl/openssl/include/openssl/rsa.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -374,7 +374,7 @@ void RSA_meth_free(RSA_METHOD *meth); RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth); const char *RSA_meth_get0_name(const RSA_METHOD *meth); int RSA_meth_set1_name(RSA_METHOD *meth, const char *name); -int RSA_meth_get_flags(const RSA_METHOD *meth); +int RSA_meth_get_flags(RSA_METHOD *meth); int RSA_meth_set_flags(RSA_METHOD *meth, int flags); void *RSA_meth_get0_app_data(const RSA_METHOD *meth); int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data); @@ -407,9 +407,9 @@ int RSA_meth_set_priv_dec(RSA_METHOD *rsa, unsigned char *to, RSA *rsa, int padding)); int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) - (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx); + (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx); int RSA_meth_set_mod_exp(RSA_METHOD *rsa, - int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa, + int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)); int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth)) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p, diff --git a/worker/deps/openssl/openssl/include/openssl/ssl.h b/worker/deps/openssl/openssl/include/openssl/ssl.h index 56e2056260..1cb3462f48 100644 --- a/worker/deps/openssl/openssl/include/openssl/ssl.h +++ b/worker/deps/openssl/openssl/include/openssl/ssl.h @@ -381,7 +381,7 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); # define SSL_OP_PKCS1_CHECK_1 0x0 /* Removed from OpenSSL 1.0.1. Was 0x10000000L */ # define SSL_OP_PKCS1_CHECK_2 0x0 -/* Removed from OpenSSL 1.1.0. Was 0x20000000L */ +/* Removed from OpenSSL 1.1.0. Was 0x20000000L */ # define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 /* Removed from OpenSSL 1.1.0. Was 0x40000000L */ # define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0 @@ -967,8 +967,8 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count); # define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02 # define SSL_VERIFY_CLIENT_ONCE 0x04 +# define OpenSSL_add_ssl_algorithms() SSL_library_init() # if OPENSSL_API_COMPAT < 0x10100000L -# define OpenSSL_add_ssl_algorithms() SSL_library_init() # define SSLeay_add_ssl_algorithms() SSL_library_init() # endif @@ -1358,7 +1358,7 @@ __owur int SSL_get_fd(const SSL *s); __owur int SSL_get_rfd(const SSL *s); __owur int SSL_get_wfd(const SSL *s); __owur const char *SSL_get_cipher_list(const SSL *s, int n); -__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size); +__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len); __owur int SSL_get_read_ahead(const SSL *s); __owur int SSL_pending(const SSL *s); __owur int SSL_has_pending(const SSL *s); diff --git a/worker/deps/openssl/openssl/include/openssl/ssl3.h b/worker/deps/openssl/openssl/include/openssl/ssl3.h index 115940ad31..4ca434e760 100644 --- a/worker/deps/openssl/openssl/include/openssl/ssl3.h +++ b/worker/deps/openssl/openssl/include/openssl/ssl3.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -252,15 +252,9 @@ extern "C" { # define SSL3_CT_FORTEZZA_DMS 20 /* * SSL3_CT_NUMBER is used to size arrays and it must be large enough to - * contain all of the cert types defined for *either* SSLv3 and TLSv1. + * contain all of the cert types defined either for SSLv3 and TLSv1. */ -# define SSL3_CT_NUMBER 10 - -# if defined(TLS_CT_NUMBER) -# if TLS_CT_NUMBER != SSL3_CT_NUMBER -# error "SSL/TLS CT_NUMBER values do not match" -# endif -# endif +# define SSL3_CT_NUMBER 9 # define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001 diff --git a/worker/deps/openssl/openssl/include/openssl/symhacks.h b/worker/deps/openssl/openssl/include/openssl/symhacks.h index 156ea6e4ee..caf1f1a75d 100644 --- a/worker/deps/openssl/openssl/include/openssl/symhacks.h +++ b/worker/deps/openssl/openssl/include/openssl/symhacks.h @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -28,6 +28,21 @@ # undef i2d_ECPKPARAMETERS # define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS +/* + * These functions do not seem to exist! However, I'm paranoid... Original + * command in x509v3.h: These functions are being redefined in another + * directory, and clash when the linker is case-insensitive, so let's hide + * them a little, by giving them an extra 'o' at the beginning of the name... + */ +# undef X509v3_cleanup_extensions +# define X509v3_cleanup_extensions oX509v3_cleanup_extensions +# undef X509v3_add_extension +# define X509v3_add_extension oX509v3_add_extension +# undef X509v3_add_netscape_extensions +# define X509v3_add_netscape_extensions oX509v3_add_netscape_extensions +# undef X509v3_add_standard_extensions +# define X509v3_add_standard_extensions oX509v3_add_standard_extensions + /* This one clashes with CMS_data_create */ # undef cms_Data_create # define cms_Data_create priv_cms_Data_create diff --git a/worker/deps/openssl/openssl/include/openssl/tls1.h b/worker/deps/openssl/openssl/include/openssl/tls1.h index 732e87ab35..3fe01fe813 100644 --- a/worker/deps/openssl/openssl/include/openssl/tls1.h +++ b/worker/deps/openssl/openssl/include/openssl/tls1.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -883,13 +883,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see * comment there) */ -# define TLS_CT_NUMBER 10 - -# if defined(SSL3_CT_NUMBER) -# if TLS_CT_NUMBER != SSL3_CT_NUMBER -# error "SSL/TLS CT_NUMBER values do not match" -# endif -# endif +# define TLS_CT_NUMBER 9 # define TLS1_FINISH_MAC_LENGTH 12 diff --git a/worker/deps/openssl/openssl/include/openssl/x509.h b/worker/deps/openssl/openssl/include/openssl/x509.h index 780386d530..d23fad8e35 100644 --- a/worker/deps/openssl/openssl/include/openssl/x509.h +++ b/worker/deps/openssl/openssl/include/openssl/x509.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -805,7 +805,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const unsigned char *bytes, int len); X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, - int type, + int type, const unsigned char *bytes, int len); int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, @@ -1055,7 +1055,6 @@ int ERR_load_X509_strings(void); # define X509_F_X509_LOAD_CERT_CRL_FILE 132 # define X509_F_X509_LOAD_CERT_FILE 111 # define X509_F_X509_LOAD_CRL_FILE 112 -# define X509_F_X509_LOOKUP_METH_NEW 160 # define X509_F_X509_NAME_ADD_ENTRY 113 # define X509_F_X509_NAME_ENTRY_CREATE_BY_NID 114 # define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT 131 diff --git a/worker/deps/openssl/openssl/include/openssl/x509_vfy.h b/worker/deps/openssl/openssl/include/openssl/x509_vfy.h index 131b6cf791..1aa0a33b8a 100644 --- a/worker/deps/openssl/openssl/include/openssl/x509_vfy.h +++ b/worker/deps/openssl/openssl/include/openssl/x509_vfy.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -257,9 +257,7 @@ X509_OBJECT *X509_OBJECT_new(void); void X509_OBJECT_free(X509_OBJECT *a); X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a); X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a); -int X509_OBJECT_set1_X509(X509_OBJECT *a, X509 *obj); X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *a); -int X509_OBJECT_set1_X509_CRL(X509_OBJECT *a, X509_CRL *obj); X509_STORE *X509_STORE_new(void); void X509_STORE_free(X509_STORE *v); int X509_STORE_lock(X509_STORE *ctx); @@ -366,76 +364,6 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m); X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void); X509_LOOKUP_METHOD *X509_LOOKUP_file(void); -typedef int (*X509_LOOKUP_ctrl_fn)(X509_LOOKUP *ctx, int cmd, const char *argc, - long argl, char **ret); -typedef int (*X509_LOOKUP_get_by_subject_fn)(X509_LOOKUP *ctx, - X509_LOOKUP_TYPE type, - X509_NAME *name, - X509_OBJECT *ret); -typedef int (*X509_LOOKUP_get_by_issuer_serial_fn)(X509_LOOKUP *ctx, - X509_LOOKUP_TYPE type, - X509_NAME *name, - ASN1_INTEGER *serial, - X509_OBJECT *ret); -typedef int (*X509_LOOKUP_get_by_fingerprint_fn)(X509_LOOKUP *ctx, - X509_LOOKUP_TYPE type, - const unsigned char* bytes, - int len, - X509_OBJECT *ret); -typedef int (*X509_LOOKUP_get_by_alias_fn)(X509_LOOKUP *ctx, - X509_LOOKUP_TYPE type, - const char *str, - int len, - X509_OBJECT *ret); - -X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name); -void X509_LOOKUP_meth_free(X509_LOOKUP_METHOD *method); - -int X509_LOOKUP_meth_set_new_item(X509_LOOKUP_METHOD *method, - int (*new_item) (X509_LOOKUP *ctx)); -int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method)) - (X509_LOOKUP *ctx); - -int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method, - void (*free_fn) (X509_LOOKUP *ctx)); -void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method)) - (X509_LOOKUP *ctx); - -int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method, - int (*init) (X509_LOOKUP *ctx)); -int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method)) - (X509_LOOKUP *ctx); - -int X509_LOOKUP_meth_set_shutdown(X509_LOOKUP_METHOD *method, - int (*shutdown) (X509_LOOKUP *ctx)); -int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method)) - (X509_LOOKUP *ctx); - -int X509_LOOKUP_meth_set_ctrl(X509_LOOKUP_METHOD *method, - X509_LOOKUP_ctrl_fn ctrl_fn); -X509_LOOKUP_ctrl_fn X509_LOOKUP_meth_get_ctrl(const X509_LOOKUP_METHOD *method); - -int X509_LOOKUP_meth_set_get_by_subject(X509_LOOKUP_METHOD *method, - X509_LOOKUP_get_by_subject_fn fn); -X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject( - const X509_LOOKUP_METHOD *method); - -int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method, - X509_LOOKUP_get_by_issuer_serial_fn fn); -X509_LOOKUP_get_by_issuer_serial_fn X509_LOOKUP_meth_get_get_by_issuer_serial( - const X509_LOOKUP_METHOD *method); - -int X509_LOOKUP_meth_set_get_by_fingerprint(X509_LOOKUP_METHOD *method, - X509_LOOKUP_get_by_fingerprint_fn fn); -X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint( - const X509_LOOKUP_METHOD *method); - -int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method, - X509_LOOKUP_get_by_alias_fn fn); -X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias( - const X509_LOOKUP_METHOD *method); - - int X509_STORE_add_cert(X509_STORE *ctx, X509 *x); int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x); @@ -465,9 +393,6 @@ int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, X509_OBJECT *ret); int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, const char *str, int len, X509_OBJECT *ret); -int X509_LOOKUP_set_method_data(X509_LOOKUP *ctx, void *data); -void *X509_LOOKUP_get_method_data(const X509_LOOKUP *ctx); -X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx); int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); int X509_STORE_load_locations(X509_STORE *ctx, @@ -550,7 +475,6 @@ int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, const char *name, size_t namelen); void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags); -unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param); char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *); void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *); int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, diff --git a/worker/deps/openssl/openssl/ms/uplink-x86.pl b/worker/deps/openssl/openssl/ms/uplink-x86.pl index 2c0b12b86e..e25668ea35 100755 --- a/worker/deps/openssl/openssl/ms/uplink-x86.pl +++ b/worker/deps/openssl/openssl/ms/uplink-x86.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -41,4 +41,4 @@ } &asm_finish(); -close STDOUT; +close OUTPUT; diff --git a/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c b/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c index 6111a2e191..b3ff5f1fbf 100644 --- a/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c +++ b/worker/deps/openssl/openssl/ssl/record/rec_layer_d1.c @@ -423,7 +423,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, /* get new packet if necessary */ if ((SSL3_RECORD_get_length(rr) == 0) || (s->rlayer.rstate == SSL_ST_READ_BODY)) { - RECORD_LAYER_set_numrpipes(&s->rlayer, 0); ret = dtls1_get_record(s); if (ret <= 0) { ret = dtls1_read_failed(s, ret); @@ -433,7 +432,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, else goto start; } - RECORD_LAYER_set_numrpipes(&s->rlayer, 1); } /* @@ -444,19 +442,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, && SSL3_RECORD_get_length(rr) != 0) s->rlayer.alert_count = 0; - if (SSL3_RECORD_get_type(rr) != SSL3_RT_HANDSHAKE - && SSL3_RECORD_get_type(rr) != SSL3_RT_CHANGE_CIPHER_SPEC - && !SSL_in_init(s) - && (s->d1->next_timeout.tv_sec != 0 - || s->d1->next_timeout.tv_usec != 0)) { - /* - * The timer is still running but we've received something that isn't - * handshake data - so the peer must have finished processing our - * last handshake flight. Stop the timer. - */ - dtls1_stop_timer(s); - } - /* we now have a packet which can be read and processed */ if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec, @@ -473,7 +458,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, return -1; } SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); goto start; } @@ -483,9 +467,8 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, */ if (s->shutdown & SSL_RECEIVED_SHUTDOWN) { SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); s->rwstate = SSL_NOTHING; - return 0; + return (0); } if (type == SSL3_RECORD_get_type(rr) @@ -510,16 +493,8 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, if (recvd_type != NULL) *recvd_type = SSL3_RECORD_get_type(rr); - if (len <= 0) { - /* - * Mark a zero length record as read. This ensures multiple calls to - * SSL_read() with a zero length buffer will eventually cause - * SSL_pending() to report data as being available. - */ - if (SSL3_RECORD_get_length(rr) == 0) - SSL3_RECORD_set_read(rr); - return len; - } + if (len <= 0) + return (len); if ((unsigned int)len > SSL3_RECORD_get_length(rr)) n = SSL3_RECORD_get_length(rr); @@ -527,16 +502,12 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, n = (unsigned int)len; memcpy(buf, &(SSL3_RECORD_get_data(rr)[SSL3_RECORD_get_off(rr)]), n); - if (peek) { - if (SSL3_RECORD_get_length(rr) == 0) - SSL3_RECORD_set_read(rr); - } else { + if (!peek) { SSL3_RECORD_sub_length(rr, n); SSL3_RECORD_add_off(rr, n); if (SSL3_RECORD_get_length(rr) == 0) { s->rlayer.rstate = SSL_ST_READ_HEADER; SSL3_RECORD_set_off(rr, 0); - SSL3_RECORD_set_read(rr); } } #ifndef OPENSSL_NO_SCTP @@ -587,7 +558,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, } /* Exit and notify application to read again */ SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); s->rwstate = SSL_READING; BIO_clear_retry_flags(SSL_get_rbio(s)); BIO_set_retry_read(SSL_get_rbio(s)); @@ -632,7 +602,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, #endif s->rlayer.rstate = SSL_ST_READ_HEADER; SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); goto start; } @@ -642,8 +611,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, SSL3_RECORD_add_off(rr, 1); SSL3_RECORD_add_length(rr, -1); } - if (SSL3_RECORD_get_length(rr) == 0) - SSL3_RECORD_set_read(rr); *dest_len = dest_maxlen; } } @@ -714,7 +681,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, } } else { SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION); } /* @@ -739,7 +705,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, || (s->options & SSL_OP_NO_RENEGOTIATION) != 0)) { s->rlayer.d->handshake_fragment_len = 0; SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION); goto start; } @@ -767,7 +732,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, if (alert_level == SSL3_AL_WARNING) { s->s3->warn_alert = alert_descr; - SSL3_RECORD_set_read(rr); s->rlayer.alert_count++; if (s->rlayer.alert_count == MAX_WARN_ALERT_COUNT) { @@ -832,7 +796,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, BIO_snprintf(tmp, sizeof(tmp), "%d", alert_descr); ERR_add_error_data(2, "SSL alert number ", tmp); s->shutdown |= SSL_RECEIVED_SHUTDOWN; - SSL3_RECORD_set_read(rr); SSL_CTX_remove_session(s->session_ctx, s->session); return (0); } else { @@ -848,8 +811,7 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, * shutdown */ s->rwstate = SSL_NOTHING; SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); - return 0; + return (0); } if (SSL3_RECORD_get_type(rr) == SSL3_RT_CHANGE_CIPHER_SPEC) { @@ -858,7 +820,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, * are still missing, so just drop it. */ SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); goto start; } @@ -873,7 +834,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, dtls1_get_message_header(rr->data, &msg_hdr); if (SSL3_RECORD_get_epoch(rr) != s->rlayer.d->r_epoch) { SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); goto start; } @@ -887,19 +847,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, dtls1_retransmit_buffered_messages(s); SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); - if (!(s->mode & SSL_MODE_AUTO_RETRY)) { - if (SSL3_BUFFER_get_left(&s->rlayer.rbuf) == 0) { - /* no read-ahead left? */ - BIO *bio; - - s->rwstate = SSL_READING; - bio = SSL_get_rbio(s); - BIO_clear_retry_flags(bio); - BIO_set_retry_read(bio); - return -1; - } - } goto start; } @@ -942,7 +889,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, /* TLS just ignores unknown message types */ if (s->version == TLS1_VERSION) { SSL3_RECORD_set_length(rr, 0); - SSL3_RECORD_set_read(rr); goto start; } al = SSL_AD_UNEXPECTED_MESSAGE; diff --git a/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c b/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c index 1ffc1205d9..20225d2db7 100644 --- a/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c +++ b/worker/deps/openssl/openssl/ssl/record/rec_layer_s3.c @@ -368,7 +368,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) * promptly send beyond the end of the users buffer ... so we trap and * report the error in a way the user will notice */ - if (((unsigned int)len < s->rlayer.wnum) + if (((unsigned int)len < s->rlayer.wnum) || ((wb->left != 0) && ((unsigned int)len < (s->rlayer.wnum + s->rlayer.wpend_tot)))) { SSLerr(SSL_F_SSL3_WRITE_BYTES, SSL_R_BAD_LENGTH); return -1; diff --git a/worker/deps/openssl/openssl/ssl/record/ssl3_record.c b/worker/deps/openssl/openssl/ssl/record/ssl3_record.c index c80add37f9..c7a54feb12 100644 --- a/worker/deps/openssl/openssl/ssl/record/ssl3_record.c +++ b/worker/deps/openssl/openssl/ssl/record/ssl3_record.c @@ -1531,7 +1531,6 @@ int dtls1_get_record(SSL *s) p += 6; n2s(p, rr->length); - rr->read = 0; /* * Lets check the version. We tolerate alerts that don't have the exact @@ -1541,7 +1540,6 @@ int dtls1_get_record(SSL *s) if (version != s->version) { /* unexpected version, silently discard */ rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } @@ -1550,7 +1548,6 @@ int dtls1_get_record(SSL *s) if ((version & 0xff00) != (s->version & 0xff00)) { /* wrong version, silently discard record */ rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } @@ -1558,10 +1555,10 @@ int dtls1_get_record(SSL *s) if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH) { /* record too long, silently discard it */ rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } + /* now s->rlayer.rstate == SSL_ST_READ_BODY */ } @@ -1575,7 +1572,6 @@ int dtls1_get_record(SSL *s) /* this packet contained a partial record, dump it */ if (n != i) { rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } @@ -1592,7 +1588,6 @@ int dtls1_get_record(SSL *s) bitmap = dtls1_get_bitmap(s, rr, &is_next_epoch); if (bitmap == NULL) { rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); /* dump this record */ goto again; /* get another record */ } @@ -1607,7 +1602,6 @@ int dtls1_get_record(SSL *s) */ if (!dtls1_record_replay_check(s, bitmap)) { rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); /* dump this record */ goto again; /* get another record */ } @@ -1616,10 +1610,8 @@ int dtls1_get_record(SSL *s) #endif /* just read a 0 length packet */ - if (rr->length == 0) { - rr->read = 1; + if (rr->length == 0) goto again; - } /* * If this record is from the next epoch (either HM or ALERT), and a @@ -1634,14 +1626,12 @@ int dtls1_get_record(SSL *s) return -1; } rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); goto again; } if (!dtls1_process_record(s, bitmap)) { rr->length = 0; - rr->read = 1; RECORD_LAYER_reset_packet_length(&s->rlayer); /* dump this record */ goto again; /* get another record */ } diff --git a/worker/deps/openssl/openssl/ssl/s3_enc.c b/worker/deps/openssl/openssl/ssl/s3_enc.c index 65fe913141..e08857df9b 100644 --- a/worker/deps/openssl/openssl/ssl/s3_enc.c +++ b/worker/deps/openssl/openssl/ssl/s3_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -404,14 +404,13 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p) } if (!EVP_MD_CTX_copy_ex(ctx, s->s3->handshake_dgst)) { SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_INTERNAL_ERROR); - ret = 0; - goto err; + return 0; } ret = EVP_MD_CTX_size(ctx); if (ret < 0) { - ret = 0; - goto err; + EVP_MD_CTX_reset(ctx); + return 0; } if ((sender != NULL && EVP_DigestUpdate(ctx, sender, len) <= 0) @@ -423,7 +422,6 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p) ret = 0; } - err: EVP_MD_CTX_free(ctx); return ret; diff --git a/worker/deps/openssl/openssl/ssl/ssl_ciph.c b/worker/deps/openssl/openssl/ssl/ssl_ciph.c index b8da982105..7a393cbe80 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_ciph.c +++ b/worker/deps/openssl/openssl/ssl/ssl_ciph.c @@ -101,7 +101,10 @@ static const ssl_cipher_table ssl_cipher_table_cipher[SSL_ENC_NUM_IDX] = { {SSL_CHACHA20POLY1305, NID_chacha20_poly1305}, }; -static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]; +static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = { + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL +}; #define SSL_COMP_NULL_IDX 0 #define SSL_COMP_ZLIB_IDX 1 diff --git a/worker/deps/openssl/openssl/ssl/ssl_conf.c b/worker/deps/openssl/openssl/ssl/ssl_conf.c index 9d9309ac15..7f894885dc 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_conf.c +++ b/worker/deps/openssl/openssl/ssl/ssl_conf.c @@ -222,9 +222,8 @@ static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value) int nid; /* Ignore values supported by 1.0.2 for the automatic selection */ - if ((cctx->flags & SSL_CONF_FLAG_FILE) - && (strcasecmp(value, "+automatic") == 0 - || strcasecmp(value, "automatic") == 0)) + if ((cctx->flags & SSL_CONF_FLAG_FILE) && + strcasecmp(value, "+automatic") == 0) return 1; if ((cctx->flags & SSL_CONF_FLAG_CMDLINE) && strcmp(value, "auto") == 0) diff --git a/worker/deps/openssl/openssl/ssl/ssl_init.c b/worker/deps/openssl/openssl/ssl/ssl_init.c index dc16e39bf3..3e62d48111 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_init.c +++ b/worker/deps/openssl/openssl/ssl/ssl_init.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -12,7 +12,6 @@ #include "internal/err.h" #include #include -#include #include #include "ssl_locl.h" #include "internal/thread_once.h" @@ -127,8 +126,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings) "ERR_load_SSL_strings()\n"); # endif ERR_load_SSL_strings(); - ssl_strings_inited = 1; #endif + ssl_strings_inited = 1; return 1; } @@ -192,13 +191,11 @@ int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS * settings) return 0; } - if (!OPENSSL_init_crypto(opts - | OPENSSL_INIT_ADD_ALL_CIPHERS - | OPENSSL_INIT_ADD_ALL_DIGESTS, - settings)) + if (!RUN_ONCE(&ssl_base, ossl_init_ssl_base)) return 0; - if (!RUN_ONCE(&ssl_base, ossl_init_ssl_base)) + if (!OPENSSL_init_crypto(opts | OPENSSL_INIT_ADD_ALL_CIPHERS + | OPENSSL_INIT_ADD_ALL_DIGESTS, settings)) return 0; if ((opts & OPENSSL_INIT_NO_LOAD_SSL_STRINGS) diff --git a/worker/deps/openssl/openssl/ssl/ssl_lib.c b/worker/deps/openssl/openssl/ssl/ssl_lib.c index 2002c1712f..8a190d23e8 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_lib.c +++ b/worker/deps/openssl/openssl/ssl/ssl_lib.c @@ -2213,37 +2213,28 @@ int SSL_set_cipher_list(SSL *s, const char *str) return 1; } -char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size) +char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len) { char *p; - STACK_OF(SSL_CIPHER) *clntsk, *srvrsk; + STACK_OF(SSL_CIPHER) *sk; const SSL_CIPHER *c; int i; - if (!s->server - || s->session == NULL - || s->session->ciphers == NULL - || size < 2) - return NULL; + if ((s->session == NULL) || (s->session->ciphers == NULL) || (len < 2)) + return (NULL); p = buf; - clntsk = s->session->ciphers; - srvrsk = SSL_get_ciphers(s); - if (clntsk == NULL || srvrsk == NULL) - return NULL; + sk = s->session->ciphers; - if (sk_SSL_CIPHER_num(clntsk) == 0 || sk_SSL_CIPHER_num(srvrsk) == 0) + if (sk_SSL_CIPHER_num(sk) == 0) return NULL; - for (i = 0; i < sk_SSL_CIPHER_num(clntsk); i++) { + for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) { int n; - c = sk_SSL_CIPHER_value(clntsk, i); - if (sk_SSL_CIPHER_find(srvrsk, c) < 0) - continue; - + c = sk_SSL_CIPHER_value(sk, i); n = strlen(c->name); - if (n + 1 > size) { + if (n + 1 > len) { if (p != buf) --p; *p = '\0'; @@ -2252,7 +2243,7 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size) memcpy(p, c->name, n + 1); p += n; *(p++) = ':'; - size -= n + 1; + len -= n + 1; } p[-1] = '\0'; return (buf); @@ -3044,13 +3035,12 @@ void ssl_update_cache(SSL *s, int mode) /* * If sid_ctx_length is 0 there is no specific application context * associated with this session, so when we try to resume it and - * SSL_VERIFY_PEER is requested to verify the client identity, we have no - * indication that this is actually a session for the proper application - * context, and the *handshake* will fail, not just the resumption attempt. - * Do not cache (on the server) these sessions that are not resumable - * (clients can set SSL_VERIFY_PEER without needing a sid_ctx set). + * SSL_VERIFY_PEER is requested, we have no indication that this is + * actually a session for the proper application context, and the + * *handshake* will fail, not just the resumption attempt. + * Do not cache these sessions that are not resumable. */ - if (s->server && s->session->sid_ctx_length == 0 + if (s->session->sid_ctx_length == 0 && (s->verify_mode & SSL_VERIFY_PEER) != 0) return; @@ -3529,6 +3519,7 @@ void ssl_free_wbio_buffer(SSL *s) return; s->wbio = BIO_pop(s->wbio); + assert(s->wbio != NULL); BIO_free(s->bbio); s->bbio = NULL; } diff --git a/worker/deps/openssl/openssl/ssl/ssl_locl.h b/worker/deps/openssl/openssl/ssl/ssl_locl.h index 3c7c1a8e64..d86bd7e8e2 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_locl.h +++ b/worker/deps/openssl/openssl/ssl/ssl_locl.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -164,8 +164,6 @@ (c)[1]=(unsigned char)(((l)>> 8)&0xff), \ (c)[2]=(unsigned char)(((l) )&0xff)),(c)+=3) -# define SSL_MAX_2_BYTE_LEN (0xffff) - /* * DTLS version numbers are strange because they're inverted. Except for * DTLS1_BAD_VER, which should be considered "lower" than the rest. @@ -349,9 +347,6 @@ /* we have used 0000003f - 26 bits left to go */ -# define SSL_IS_FIRST_HANDSHAKE(S) ((s)->s3->tmp.finish_md_len == 0 \ - || (s)->s3->tmp.peer_finish_md_len == 0) - /* Check if an SSL structure is using DTLS */ # define SSL_IS_DTLS(s) (s->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) /* See if we need explicit IV */ @@ -542,7 +537,7 @@ struct ssl_session_st { const SSL_CIPHER *cipher; unsigned long cipher_id; /* when ASN.1 loaded, this needs to be used to * load the 'cipher' structure */ - STACK_OF(SSL_CIPHER) *ciphers; /* ciphers offered by the client */ + STACK_OF(SSL_CIPHER) *ciphers; /* shared ciphers? */ CRYPTO_EX_DATA ex_data; /* application specific data */ /* * These are used to make removal of session-ids more efficient and to diff --git a/worker/deps/openssl/openssl/ssl/ssl_mcnf.c b/worker/deps/openssl/openssl/ssl/ssl_mcnf.c index 24742660e4..c2d9dba64a 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_mcnf.c +++ b/worker/deps/openssl/openssl/ssl/ssl_mcnf.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,35 +11,148 @@ #include #include #include "ssl_locl.h" -#include "internal/sslconf.h" /* SSL library configuration module. */ +struct ssl_conf_name { + /* Name of this set of commands */ + char *name; + /* List of commands */ + struct ssl_conf_cmd *cmds; + /* Number of commands */ + size_t cmd_count; +}; + +struct ssl_conf_cmd { + /* Command */ + char *cmd; + /* Argument */ + char *arg; +}; + +static struct ssl_conf_name *ssl_names; +static size_t ssl_names_count; + +static void ssl_module_free(CONF_IMODULE *md) +{ + size_t i, j; + if (ssl_names == NULL) + return; + for (i = 0; i < ssl_names_count; i++) { + struct ssl_conf_name *tname = ssl_names + i; + OPENSSL_free(tname->name); + for (j = 0; j < tname->cmd_count; j++) { + OPENSSL_free(tname->cmds[j].cmd); + OPENSSL_free(tname->cmds[j].arg); + } + OPENSSL_free(tname->cmds); + } + OPENSSL_free(ssl_names); + ssl_names = NULL; + ssl_names_count = 0; +} + +static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf) +{ + size_t i, j, cnt; + int rv = 0; + const char *ssl_conf_section; + STACK_OF(CONF_VALUE) *cmd_lists; + ssl_conf_section = CONF_imodule_get_value(md); + cmd_lists = NCONF_get_section(cnf, ssl_conf_section); + if (sk_CONF_VALUE_num(cmd_lists) <= 0) { + if (cmd_lists == NULL) + SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_SECTION_NOT_FOUND); + else + SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_SECTION_EMPTY); + ERR_add_error_data(2, "section=", ssl_conf_section); + goto err; + } + cnt = sk_CONF_VALUE_num(cmd_lists); + ssl_names = OPENSSL_zalloc(sizeof(*ssl_names) * cnt); + ssl_names_count = cnt; + for (i = 0; i < ssl_names_count; i++) { + struct ssl_conf_name *ssl_name = ssl_names + i; + CONF_VALUE *sect = sk_CONF_VALUE_value(cmd_lists, i); + STACK_OF(CONF_VALUE) *cmds = NCONF_get_section(cnf, sect->value); + if (sk_CONF_VALUE_num(cmds) <= 0) { + if (cmds == NULL) + SSLerr(SSL_F_SSL_MODULE_INIT, + SSL_R_SSL_COMMAND_SECTION_NOT_FOUND); + else + SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_COMMAND_SECTION_EMPTY); + ERR_add_error_data(4, "name=", sect->name, ", value=", sect->value); + goto err; + } + ssl_name->name = BUF_strdup(sect->name); + if (ssl_name->name == NULL) + goto err; + cnt = sk_CONF_VALUE_num(cmds); + ssl_name->cmds = OPENSSL_zalloc(cnt * sizeof(struct ssl_conf_cmd)); + if (ssl_name->cmds == NULL) + goto err; + ssl_name->cmd_count = cnt; + for (j = 0; j < cnt; j++) { + const char *name; + CONF_VALUE *cmd_conf = sk_CONF_VALUE_value(cmds, j); + struct ssl_conf_cmd *cmd = ssl_name->cmds + j; + /* Skip any initial dot in name */ + name = strchr(cmd_conf->name, '.'); + if (name != NULL) + name++; + else + name = cmd_conf->name; + cmd->cmd = BUF_strdup(name); + cmd->arg = BUF_strdup(cmd_conf->value); + if (cmd->cmd == NULL || cmd->arg == NULL) + goto err; + } + + } + rv = 1; + err: + if (rv == 0) + ssl_module_free(md); + return rv; +} + void SSL_add_ssl_module(void) { - /* Just load all of the crypto builtin modules. This includes the SSL one */ - OPENSSL_load_builtin_modules(); + CONF_module_add("ssl_conf", ssl_module_init, ssl_module_free); +} + +static const struct ssl_conf_name *ssl_name_find(const char *name) +{ + size_t i; + const struct ssl_conf_name *nm; + if (name == NULL) + return NULL; + for (i = 0, nm = ssl_names; i < ssl_names_count; i++, nm++) { + if (strcmp(nm->name, name) == 0) + return nm; + } + return NULL; } static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name) { SSL_CONF_CTX *cctx = NULL; - size_t i, idx, cmd_count; + size_t i; int rv = 0; unsigned int flags; const SSL_METHOD *meth; - const SSL_CONF_CMD *cmds; - + const struct ssl_conf_name *nm; + struct ssl_conf_cmd *cmd; if (s == NULL && ctx == NULL) { SSLerr(SSL_F_SSL_DO_CONFIG, ERR_R_PASSED_NULL_PARAMETER); goto err; } - if (!conf_ssl_name_find(name, &idx)) { + nm = ssl_name_find(name); + if (nm == NULL) { SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_INVALID_CONFIGURATION_NAME); ERR_add_error_data(2, "name=", name); goto err; } - cmds = conf_ssl_get(idx, &name, &cmd_count); cctx = SSL_CONF_CTX_new(); if (cctx == NULL) goto err; @@ -57,18 +170,15 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name) if (meth->ssl_connect != ssl_undefined_function) flags |= SSL_CONF_FLAG_CLIENT; SSL_CONF_CTX_set_flags(cctx, flags); - for (i = 0; i < cmd_count; i++) { - char *cmdstr, *arg; - - conf_ssl_get_cmd(cmds, i, &cmdstr, &arg); - rv = SSL_CONF_cmd(cctx, cmdstr, arg); + for (i = 0, cmd = nm->cmds; i < nm->cmd_count; i++, cmd++) { + rv = SSL_CONF_cmd(cctx, cmd->cmd, cmd->arg); if (rv <= 0) { if (rv == -2) SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_UNKNOWN_COMMAND); else SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_BAD_VALUE); - ERR_add_error_data(6, "section=", name, ", cmd=", cmdstr, - ", arg=", arg); + ERR_add_error_data(6, "section=", name, ", cmd=", cmd->cmd, + ", arg=", cmd->arg); goto err; } } diff --git a/worker/deps/openssl/openssl/ssl/ssl_sess.c b/worker/deps/openssl/openssl/ssl/ssl_sess.c index 926b55c7ba..0dea8b5224 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_sess.c +++ b/worker/deps/openssl/openssl/ssl/ssl_sess.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -734,11 +734,11 @@ static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck) if (lck) CRYPTO_THREAD_unlock(ctx->lock); - if (ctx->remove_session_cb != NULL) - ctx->remove_session_cb(ctx, c); - if (ret) SSL_SESSION_free(r); + + if (ctx->remove_session_cb != NULL) + ctx->remove_session_cb(ctx, c); } else ret = 0; return (ret); diff --git a/worker/deps/openssl/openssl/ssl/ssl_txt.c b/worker/deps/openssl/openssl/ssl/ssl_txt.c index f149a3ad09..dbbf9d9e8d 100644 --- a/worker/deps/openssl/openssl/ssl/ssl_txt.c +++ b/worker/deps/openssl/openssl/ssl/ssl_txt.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -70,18 +70,18 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) if (x->cipher == NULL) { if (((x->cipher_id) & 0xff000000) == 0x02000000) { - if (BIO_printf(bp, " Cipher : %06lX\n", - x->cipher_id & 0xffffff) <= 0) + if (BIO_printf + (bp, " Cipher : %06lX\n", x->cipher_id & 0xffffff) <= 0) goto err; } else { - if (BIO_printf(bp, " Cipher : %04lX\n", - x->cipher_id & 0xffff) <= 0) + if (BIO_printf + (bp, " Cipher : %04lX\n", x->cipher_id & 0xffff) <= 0) goto err; } } else { - if (BIO_printf(bp, " Cipher : %s\n", - ((x->cipher->name == NULL) ? "unknown" - : x->cipher->name)) <= 0) + if (BIO_printf + (bp, " Cipher : %s\n", + ((x->cipher == NULL) ? "unknown" : x->cipher->name)) <= 0) goto err; } if (BIO_puts(bp, " Session-ID: ") <= 0) diff --git a/worker/deps/openssl/openssl/ssl/statem/README b/worker/deps/openssl/openssl/ssl/statem/README index 145c69db8d..4467bd1e58 100644 --- a/worker/deps/openssl/openssl/ssl/statem/README +++ b/worker/deps/openssl/openssl/ssl/statem/README @@ -60,4 +60,3 @@ Conceptually the state machine component is designed as follows: | Non core functions common | | Non core functions common to | | to both servers and clients | | both DTLS servers and clients | |_____________________________| |_______________________________| - diff --git a/worker/deps/openssl/openssl/ssl/statem/statem.c b/worker/deps/openssl/openssl/ssl/statem/statem.c index 69bb40f00e..b91ec0a360 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem.c @@ -556,8 +556,10 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) * Validate that we are allowed to move to the new state and move * to that state if so */ - if (!transition(s, mt)) + if (!transition(s, mt)) { + ossl_statem_set_error(s); return SUB_STATE_ERROR; + } if (s->s3->tmp.message_size > max_message_size(s)) { ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER); diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c b/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c index ed993553c5..6fa3f1db67 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_clnt.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -265,21 +265,6 @@ int ossl_statem_client_read_transition(SSL *s, int mt) err: /* No valid transition found */ - if (SSL_IS_DTLS(s) && mt == SSL3_MT_CHANGE_CIPHER_SPEC) { - BIO *rbio; - - /* - * CCS messages don't have a message sequence number so this is probably - * because of an out-of-order CCS. We'll just drop it. - */ - s->init_num = 0; - s->rwstate = SSL_READING; - rbio = SSL_get_rbio(s); - BIO_clear_retry_flags(rbio); - BIO_set_retry_read(rbio); - return 0; - } - ossl_statem_set_error(s); ssl3_send_alert(s, SSL3_AL_FATAL, SSL3_AD_UNEXPECTED_MESSAGE); SSLerr(SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION, SSL_R_UNEXPECTED_MESSAGE); return 0; diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c b/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c index 5b34425445..6b80620ee9 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_dtls.c @@ -493,8 +493,7 @@ static int dtls1_retrieve_buffered_fragment(SSL *s, int *ok) al = dtls1_preprocess_fragment(s, &frag->msg_header); - /* al will be 0 if no alert */ - if (al == 0 && frag->msg_header.frag_len > 0) { + if (al == 0) { /* no alert */ unsigned char *p = (unsigned char *)s->init_buf->data + DTLS1_HM_HEADER_LENGTH; memcpy(&p[frag->msg_header.frag_off], frag->fragment, diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_lib.c b/worker/deps/openssl/openssl/ssl/statem/statem_lib.c index eba4c6fb40..36d410bdf7 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_lib.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_lib.c @@ -299,15 +299,6 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst) s->ctx->stats.sess_accept_good++; s->handshake_func = ossl_statem_accept; - - if (SSL_IS_DTLS(s) && !s->hit) { - /* - * We are finishing after the client. We start the timer going - * in case there are any retransmits of our final flight - * required. - */ - dtls1_start_timer(s); - } } else { ssl_update_cache(s, SSL_SESS_CACHE_CLIENT); if (s->hit) @@ -315,15 +306,6 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst) s->handshake_func = ossl_statem_connect; s->ctx->stats.sess_connect_good++; - - if (SSL_IS_DTLS(s) && s->hit) { - /* - * We are finishing after the server. We start the timer going - * in case there are any retransmits of our final flight - * required. - */ - dtls1_start_timer(s); - } } if (s->info_callback != NULL) @@ -1091,13 +1073,6 @@ int ssl_set_client_hello_version(SSL *s) { int ver_min, ver_max, ret; - /* - * In a renegotiation we always send the same client_version that we sent - * last time, regardless of which version we eventually negotiated. - */ - if (!SSL_IS_FIRST_HANDSHAKE(s)) - return 0; - ret = ssl_get_client_min_max_version(s, &ver_min, &ver_max); if (ret != 0) diff --git a/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c b/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c index f81fa5e199..c7cd9eb662 100644 --- a/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c +++ b/worker/deps/openssl/openssl/ssl/statem/statem_srvr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -213,21 +213,6 @@ int ossl_statem_server_read_transition(SSL *s, int mt) } /* No valid transition found */ - if (SSL_IS_DTLS(s) && mt == SSL3_MT_CHANGE_CIPHER_SPEC) { - BIO *rbio; - - /* - * CCS messages don't have a message sequence number so this is probably - * because of an out-of-order CCS. We'll just drop it. - */ - s->init_num = 0; - s->rwstate = SSL_READING; - rbio = SSL_get_rbio(s); - BIO_clear_retry_flags(rbio); - BIO_set_retry_read(rbio); - return 0; - } - ossl_statem_set_error(s); ssl3_send_alert(s, SSL3_AL_FATAL, SSL3_AD_UNEXPECTED_MESSAGE); SSLerr(SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION, SSL_R_UNEXPECTED_MESSAGE); return 0; @@ -1713,12 +1698,6 @@ int tls_construct_server_key_exchange(SSL *s) } dh = EVP_PKEY_get0_DH(s->s3->tmp.pkey); - if (dh == NULL) { - al = SSL_AD_INTERNAL_ERROR; - SSLerr(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE, - ERR_R_INTERNAL_ERROR); - goto err; - } EVP_PKEY_free(pkdh); pkdh = NULL; @@ -2006,11 +1985,6 @@ int tls_construct_certificate_request(SSL *s) const unsigned char *psigs; unsigned char *etmp = p; nl = tls12_get_psigalgs(s, 1, &psigs); - if (nl > SSL_MAX_2_BYTE_LEN) { - SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, - SSL_R_LENGTH_TOO_LONG); - goto err; - } /* Skip over length for now */ p += 2; nl = tls12_copy_sigalgs(s, p, psigs, nl); @@ -2030,11 +2004,6 @@ int tls_construct_certificate_request(SSL *s) for (i = 0; i < sk_X509_NAME_num(sk); i++) { name = sk_X509_NAME_value(sk, i); j = i2d_X509_NAME(name, NULL); - if (j > SSL_MAX_2_BYTE_LEN) { - SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, - SSL_R_LENGTH_TOO_LONG); - goto err; - } if (!BUF_MEM_grow_clean(buf, SSL_HM_HEADER_LENGTH(s) + n + j + 2)) { SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, ERR_R_BUF_LIB); goto err; @@ -2044,11 +2013,6 @@ int tls_construct_certificate_request(SSL *s) i2d_X509_NAME(name, &p); n += 2 + j; nl += 2 + j; - if (nl > SSL_MAX_2_BYTE_LEN) { - SSLerr(SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, - SSL_R_LENGTH_TOO_LONG); - goto err; - } } } /* else no CA names */ @@ -2339,12 +2303,13 @@ static int tls_process_cke_dhe(SSL *s, PACKET *pkt, int *al) SSLerr(SSL_F_TLS_PROCESS_CKE_DHE, SSL_R_BN_LIB); goto err; } - cdh = EVP_PKEY_get0_DH(ckey); pub_key = BN_bin2bn(data, i, NULL); - if (pub_key == NULL || cdh == NULL || !DH_set0_key(cdh, pub_key, NULL)) { + + if (pub_key == NULL || !DH_set0_key(cdh, pub_key, NULL)) { SSLerr(SSL_F_TLS_PROCESS_CKE_DHE, ERR_R_INTERNAL_ERROR); - BN_free(pub_key); + if (pub_key != NULL) + BN_free(pub_key); goto err; } diff --git a/worker/deps/openssl/openssl/ssl/t1_lib.c b/worker/deps/openssl/openssl/ssl/t1_lib.c index 95711fb6df..7a5721a1e2 100644 --- a/worker/deps/openssl/openssl/ssl/t1_lib.c +++ b/worker/deps/openssl/openssl/ssl/t1_lib.c @@ -408,7 +408,7 @@ int tls1_set_curves(unsigned char **pext, size_t *pextlen, return 1; } -# define MAX_CURVELIST OSSL_NELEM(nid_list) +# define MAX_CURVELIST 28 typedef struct { size_t nidcnt; @@ -490,16 +490,13 @@ static int tls1_set_ec_id(unsigned char *curve_id, unsigned char *comp_id, return 1; } -# define DONT_CHECK_OWN_GROUPS 0 -# define CHECK_OWN_GROUPS 1 /* Check an EC key is compatible with extensions */ -static int tls1_check_ec_key(SSL *s, unsigned char *curve_id, - unsigned char *comp_id, int check_own_groups) +static int tls1_check_ec_key(SSL *s, + unsigned char *curve_id, unsigned char *comp_id) { const unsigned char *pformats, *pcurves; size_t num_formats, num_curves, i; int j; - /* * If point formats extension present check it, otherwise everything is * supported (see RFC4492). @@ -516,12 +513,8 @@ static int tls1_check_ec_key(SSL *s, unsigned char *curve_id, } if (!curve_id) return 1; - - if (!s->server && !check_own_groups) - return 1; - /* Check curve is consistent with client and server preferences */ - for (j = check_own_groups ? 0 : 1; j <= 1; j++) { + for (j = 0; j <= 1; j++) { if (!tls1_get_curvelist(s, j, &pcurves, &num_curves)) return 0; if (j == 1 && num_curves == 0) { @@ -586,12 +579,9 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md) return 0; /* * Can't check curve_id for client certs as we don't have a supported - * curves extension. For server certs we will tolerate certificates that - * aren't in our own list of curves. If we've been configured to use an EC - * cert then we should use it - therefore we use DONT_CHECK_OWN_GROUPS here. + * curves extension. */ - rv = tls1_check_ec_key(s, s->server ? curve_id : NULL, &comp_id, - DONT_CHECK_OWN_GROUPS); + rv = tls1_check_ec_key(s, s->server ? curve_id : NULL, &comp_id); if (!rv) return 0; /* @@ -654,7 +644,7 @@ int tls1_check_ec_tmp_key(SSL *s, unsigned long cid) return 0; curve_id[0] = 0; /* Check this curve is acceptable */ - if (!tls1_check_ec_key(s, curve_id, NULL, CHECK_OWN_GROUPS)) + if (!tls1_check_ec_key(s, curve_id, NULL)) return 0; return 1; } @@ -756,9 +746,8 @@ size_t tls12_get_psigalgs(SSL *s, int sent, const unsigned char **psigs) } /* - * Check signature algorithm received from the peer with a signature is - * consistent with the sent supported signature algorithms and if so return - * relevant digest. + * Check signature algorithm is consistent with sent supported signature + * algorithms and if so return relevant digest. */ int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s, const unsigned char *sig, EVP_PKEY *pkey) @@ -780,8 +769,7 @@ int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s, /* Check compression and curve matches extensions */ if (!tls1_set_ec_id(curve_id, &comp_id, EVP_PKEY_get0_EC_KEY(pkey))) return 0; - if (!s->server && !tls1_check_ec_key(s, curve_id, &comp_id, - CHECK_OWN_GROUPS)) { + if (!s->server && !tls1_check_ec_key(s, curve_id, &comp_id)) { SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_CURVE); return 0; } @@ -2156,10 +2144,6 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al) } } } else if (type == TLSEXT_TYPE_status_request) { - /* Ignore this if resuming */ - if (s->hit) - continue; - if (!PACKET_get_1(&extension, (unsigned int *)&s->tlsext_status_type)) { return 0; @@ -2800,7 +2784,7 @@ int tls1_set_server_sigalgs(SSL *s) if (!s->cert->shared_sigalgs) { SSLerr(SSL_F_TLS1_SET_SERVER_SIGALGS, SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS); - al = SSL_AD_HANDSHAKE_FAILURE; + al = SSL_AD_ILLEGAL_PARAMETER; goto err; } } else { @@ -4141,16 +4125,13 @@ DH *ssl_get_auto_dh(SSL *s) if (dhp == NULL) return NULL; g = BN_new(); - if (g == NULL || !BN_set_word(g, 2)) { - DH_free(dhp); - BN_free(g); - return NULL; - } + if (g != NULL) + BN_set_word(g, 2); if (dh_secbits >= 192) p = BN_get_rfc3526_prime_8192(NULL); else p = BN_get_rfc3526_prime_3072(NULL); - if (p == NULL || !DH_set0_pqg(dhp, p, NULL, g)) { + if (p == NULL || g == NULL || !DH_set0_pqg(dhp, p, NULL, g)) { DH_free(dhp); BN_free(p); BN_free(g); @@ -4191,9 +4172,6 @@ static int ssl_security_cert_sig(SSL *s, SSL_CTX *ctx, X509 *x, int op) if ((X509_get_extension_flags(x) & EXFLAG_SS) != 0) return 1; sig_nid = X509_get_signature_nid(x); - /* We are not able to look up the CA MD for RSA PSS in this version */ - if (sig_nid == NID_rsassaPss) - return 1; if (sig_nid && OBJ_find_sigid_algs(sig_nid, &md_nid, NULL)) { const EVP_MD *md; if (md_nid && (md = EVP_get_digestbynid(md_nid))) diff --git a/worker/deps/openssl/openssl/ssl/t1_trce.c b/worker/deps/openssl/openssl/ssl/t1_trce.c index 588cb8cc3d..76bdf792ae 100644 --- a/worker/deps/openssl/openssl/ssl/t1_trce.c +++ b/worker/deps/openssl/openssl/ssl/t1_trce.c @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -725,8 +725,6 @@ static int ssl_print_extensions(BIO *bio, int indent, int server, BIO_puts(bio, "No Extensions\n"); return 1; } - if (msglen < 2) - return 0; extslen = (msg[0] << 8) | msg[1]; if (extslen != msglen - 2) return 0; @@ -1094,8 +1092,6 @@ static int ssl_print_cert_request(BIO *bio, int indent, SSL *s, msglen -= xlen + 2; skip_sig: - if (msglen < 2) - return 0; xlen = (msg[0] << 8) | msg[1]; BIO_indent(bio, indent, 80); if (msglen < xlen + 2) @@ -1275,16 +1271,7 @@ void SSL_trace(int write_p, int version, int content_type, switch (content_type) { case SSL3_RT_HEADER: { - int hvers; - - /* avoid overlapping with length at the end of buffer */ - if (msglen < (size_t)(SSL_IS_DTLS(ssl) ? - DTLS1_RT_HEADER_LENGTH : SSL3_RT_HEADER_LENGTH)) { - BIO_puts(bio, write_p ? "Sent" : "Received"); - ssl_print_hex(bio, 0, " too short message", msg, msglen); - break; - } - hvers = msg[1] << 8 | msg[2]; + int hvers = msg[1] << 8 | msg[2]; BIO_puts(bio, write_p ? "Sent" : "Received"); BIO_printf(bio, " Record\nHeader:\n Version = %s (0x%x)\n", ssl_trace_str(hvers, ssl_version_tbl), hvers); diff --git a/worker/deps/openssl/openssl/test/README b/worker/deps/openssl/openssl/test/README index ef39d38ac9..b1222399f7 100644 --- a/worker/deps/openssl/openssl/test/README +++ b/worker/deps/openssl/openssl/test/README @@ -38,9 +38,9 @@ A recipe that just runs a test executable A script that just runs a program looks like this: #! /usr/bin/perl - + use OpenSSL::Test::Simple; - + simple_test("test_{name}", "{name}test", "{name}"); {name} is the unique name you have chosen for your test. @@ -62,28 +62,28 @@ documentation. For OpenSSL::Test, do `perldoc test/testlib/OpenSSL/Test.pm'. A script to start from could be this: #! /usr/bin/perl - + use strict; use warnings; use OpenSSL::Test; - + setup("test_{name}"); - + plan tests => 2; # The number of tests being performed - + ok(test1, "test1"); ok(test2, "test1"); - + sub test1 { # test feature 1 } - + sub test2 { # test feature 2 } - + Changes to test/Makefile ======================== diff --git a/worker/deps/openssl/openssl/test/bioprinttest.c b/worker/deps/openssl/openssl/test/bioprinttest.c index b2d26225e5..d8bb2c2e34 100644 --- a/worker/deps/openssl/openssl/test/bioprinttest.c +++ b/worker/deps/openssl/openssl/test/bioprinttest.c @@ -221,5 +221,3 @@ int main(int argc, char **argv) } return 0; } - - diff --git a/worker/deps/openssl/openssl/test/build.info b/worker/deps/openssl/openssl/test/build.info index 2367ab841a..c262248b6f 100644 --- a/worker/deps/openssl/openssl/test/build.info +++ b/worker/deps/openssl/openssl/test/build.info @@ -1,8 +1,7 @@ IF[{- !$disabled{tests} -}] PROGRAMS_NO_INST=\ - versions \ aborttest \ - sanitytest rsa_complex exdatatest bntest \ + sanitytest exdatatest bntest \ ectest ecdsatest gmdifftest pbelutest ideatest \ md2test md4test md5test \ hmactest wp_test \ @@ -18,11 +17,7 @@ IF[{- !$disabled{tests} -}] dtlsv1listentest ct_test threadstest afalgtest d2i_test \ ssl_test_ctx_test ssl_test x509aux cipherlist_test asynciotest \ bioprinttest sslapitest dtlstest sslcorrupttest bio_enc_test \ - ocspapitest fatalerrtest x509_time_test x509_dup_cert_test errtest - - SOURCE[versions]=versions.c - INCLUDE[versions]=../include - DEPEND[versions]=../libcrypto + ocspapitest fatalerrtest SOURCE[aborttest]=aborttest.c INCLUDE[aborttest]=../include @@ -32,9 +27,6 @@ IF[{- !$disabled{tests} -}] INCLUDE[sanitytest]=../include DEPEND[sanitytest]=../libcrypto - SOURCE[rsa_complex]=rsa_complex.c - INCLUDE[rsa_complex]=../include - SOURCE[exdatatest]=exdatatest.c INCLUDE[exdatatest]=../include DEPEND[exdatatest]=../libcrypto @@ -300,23 +292,11 @@ IF[{- !$disabled{tests} -}] INCLUDE[bio_enc_test]=../include DEPEND[bio_enc_test]=../libcrypto - SOURCE[x509_time_test]=x509_time_test.c testutil.c - INCLUDE[x509_time_test]=.. ../include - DEPEND[x509_time_test]=../libcrypto - - SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c - INCLUDE[x509_dup_cert_test]=../include - DEPEND[x509_dup_cert_test]=../libcrypto - IF[{- !$disabled{shared} -}] PROGRAMS_NO_INST=shlibloadtest SOURCE[shlibloadtest]=shlibloadtest.c INCLUDE[shlibloadtest]=../include ENDIF - - SOURCE[errtest]=errtest.c testutil.c - INCLUDE[errtest]=../include - DEPEND[errtest]=../libcrypto ENDIF {- diff --git a/worker/deps/openssl/openssl/test/certs/alt1-cert.pem b/worker/deps/openssl/openssl/test/certs/alt1-cert.pem index d68b0e5193..b94d0eaf9d 100644 --- a/worker/deps/openssl/openssl/test/certs/alt1-cert.pem +++ b/worker/deps/openssl/openssl/test/certs/alt1-cert.pem @@ -1,21 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDgTCCAmmgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 -IE5DIENBIDEwIBcNMTgwNTE2MDIzODEzWhgPMjExODA1MTcwMjM4MTNaMFQxIzAh -BgNVBAoMGkdvb2QgTkMgVGVzdCBDZXJ0aWZpY2F0ZSAxMRgwFgYDVQQDDA93d3cu -ZXhhbXBsZS5uZXQxEzARBgNVBAMMCkpvZSBCbG9nZ3MwggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQDTqvf6j+WxCtn4RU8/6uXXgCTcksv6NDXCZ9JAz4Vv -cQbJfhFbDWpGZQZDOCqwtj+7CSVIraxItHzPlrt36cevsoPmpuqGbHrUaOLneme2 -x81SXUq0z/DmDvwxVENmRj1u7iCt3sL7awcid4SiotLOY2F1jBazmqprqKZBUiyQ -XqpSp+9uSav77ydwDXCrQozBdns1YRshgU9omQrTcIqHCj1f9Lo+A2y4+TZYZkvS -DuUZiTfPTPouR6sopM8JLyAZc+TvFFncEg24N+zz3O3jwH82BZEjzavw92J9npJB -UXvKb8O9z7UA65WYuL2he7kSQCsPNLoRWZnVpchwr3VHAgMBAAGjgZgwgZUwHQYD -VR0OBBYEFHvLhGWckFjVXdDI3ds9Wti6zgXAMB8GA1UdIwQYMBaAFAjRm/nm1WRw -oPFrGp7tUtrd9VBDMAkGA1UdEwQCMAAwSAYDVR0RBEEwP4IMd3d3Lmdvb2Qub3Jn -ggxhbnkuZ29vZC5jb22BDWdvb2RAZ29vZC5vcmeBDGFueUBnb29kLmNvbYcEwKgA -ATANBgkqhkiG9w0BAQsFAAOCAQEATVcTyrAxsehdQNrkL6kquXxWlyegJcxvVxUe -hfh9+Lw4620b2S1/l2YxFM3peLAsRgJOznmJOeG18+y7/kx/3UNqYGY7e8iJQ3Gl -JwDIJp5JCaUOlodjhMJtRc7jn9RcsL97oizXdcryyWT0vSlM9Pie9NtHG5iq5X4+ -oL3X8+OG25MOkF2h3YVCEG3vDu7quyTlHc2ebwpdLZRndcOewO2Cap1ettyWXUPP -Mha6wyJE8LJhrGmrI8Lw+i7gGscP0xYZn3yCLk5BtOabn4dvCiDmb+TPruKQQARw -BG45LEZzGxz+Ad3xRdZyVi1I67v9YShoYTCpMTSxJaR0erH74g== +MIIDlTCCAn2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTYwNzA5MTQ0ODExWhgPMjExNjA3MTAxNDQ4MTFaMGgxIzAh +BgNVBAoMGkdvb2QgTkMgVGVzdCBDZXJ0aWZpY2F0ZSAxMRUwEwYDVQQDDAx3d3cu +Z29vZC5vcmcxEzARBgNVBAMMCkpvZSBCbG9nZ3MxFTATBgNVBAMMDGFueS5nb29k +LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAv1X8S8uUpnjTa +3bv7m1jJbbX7bC9w7k4TfxiU5XL/m3EhN//EUBJSoamy6vFC6oy/6jA8XmptlVrY +Sp3ZKFdjdZh+CyYZKcrv4JReF2lfRIINn6d6EgcAobGTNwdcv67xuNtMi0meAvmK +gLjOa/IhCHNC+l8vNDJx/a+7mxH+yNxPL6lC/kJMja6oaYndx74WJpPC22LJ/cCp +xspKKsoPYYjk0BX9RvbKO8s4b86Wjzzntht+NpQ4LLh9XwPZog11qGE4UIrsV8XA +YxJrMGQNZd69cnCOz8vnOVCszFOa4qVvXeAGr0iFlZAXbQJevpiiXaXHMEt8C1qH +xpcW8DcCAwEAAaOBmDCBlTAdBgNVHQ4EFgQUw8nB25NP0gUaFCrOwAO5KzllnREw +HwYDVR0jBBgwFoAUCNGb+ebVZHCg8Wsanu1S2t31UEMwCQYDVR0TBAIwADBIBgNV +HREEQTA/ggx3d3cuZ29vZC5vcmeCDGFueS5nb29kLmNvbYENZ29vZEBnb29kLm9y +Z4EMYW55QGdvb2QuY29thwTAqAABMA0GCSqGSIb3DQEBCwUAA4IBAQBUnDMrg1py +8/iYXzs11Qbw7bBhc/HQDpu5QVgriaX2zDUpTLSEUV7qZFSHmwWm91ILw2VA1Xni +ua2sF19o/tJT0ZHpapkfqGpfsym2H04NDMKy0l0fSZhlCB5Kv5wpiFt9hBUrxS/2 +Dd6Kg+Ka02nD5QBXSAk/xz0FmgezzGGCLjg85/Sfe9Y7tNhQXh3HuGXuJizYccdQ +Fh1IAFYW3DZoDKS7dDTCltvDEma/2IE684+CRJiA6PH9rYfJ1CCUfAMpyA85CxKT +P68GDKI++WoUgM8LDfxS0KOL7A9cqcpM2L27hjyEgnqIBPHFfm9fxztBotuCTl5L +vRlTFVjv65nn -----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/alt1-key.pem b/worker/deps/openssl/openssl/test/certs/alt1-key.pem index 6df050a38f..b5d4d326c5 100644 --- a/worker/deps/openssl/openssl/test/certs/alt1-key.pem +++ b/worker/deps/openssl/openssl/test/certs/alt1-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDTqvf6j+WxCtn4 -RU8/6uXXgCTcksv6NDXCZ9JAz4VvcQbJfhFbDWpGZQZDOCqwtj+7CSVIraxItHzP -lrt36cevsoPmpuqGbHrUaOLneme2x81SXUq0z/DmDvwxVENmRj1u7iCt3sL7awci -d4SiotLOY2F1jBazmqprqKZBUiyQXqpSp+9uSav77ydwDXCrQozBdns1YRshgU9o -mQrTcIqHCj1f9Lo+A2y4+TZYZkvSDuUZiTfPTPouR6sopM8JLyAZc+TvFFncEg24 -N+zz3O3jwH82BZEjzavw92J9npJBUXvKb8O9z7UA65WYuL2he7kSQCsPNLoRWZnV -pchwr3VHAgMBAAECggEACPTB+1sdV+lioaulF8pDoWOtq5uWf+a3o5sq/U0Kk1WP -+PSZnWWq6oGZyzxUKhf8CFjxt+qJUKY6Zbo2AnPk3B1MkXTclYV/iP9LIoo+WzCH -EoYaBB6MTd+ycg/jri8oqEnxHgo/681yhtXRyePj0ZHI7OVZjI3tyhJfvoHQmuci -u6qYYUP0GWuyM+kHS11vn6Q1U8nOZWvXpEDXDDdJ7+2QRuv01AXcjFxpbFzkMn2W -JkhKkCTIQpUU66VMRHwNexi+TR2rRESq0G+fa+6gaVFVIs0vBukq48IeC5W21j1L -zyftHxci67FlYC9iaiUxDVt3KB+lcukx6Cz5mjtzqQKBgQD/GrAtFfjiXKj9O5ld -K7dnnBHE8fzyWQWyOfwpVjNAC1J7tgwFvDpBpTHOwS5JnCwMWWM3rkBPRhCusmrF -AtfE8b643G+cJbTgDuEhGh11QR0p9VWMVFQL9kZxx12PegDtFBfzcfcI3XQwKVKL -ZbQn4ibW3BKSt9+Nh3APa0s5iwKBgQDUaTxZBajTdzoDd6Pg3warL5BhsxWr2tUQ -qf+iVoba2Y9NTBdxBht2whSaYweU9kxmeNZvnCu95B8HeRGE69Dxb7IWwpsaxoaf -ND0NcCF7aPZgx7hvhbHF7duzt3nuv+q5sOuuyHPzm+nF2snAuY3Zg+Bpv3nlYekf -18aXZdwStQKBgEpF8e9ei1UUl1sLZC6dUMvIw9+sePHye1cVzNYYM9m8sio0qbFt -ySRdvW+uDRT/dE+wItQOVsj95FOIvM9ZcYr0u4vFGnXDALOPgXqKyPLfn2cc9+hg -kQvei0oLOrFQWz6rcAHAN6WMHIz9KvxNAzPtg1NhRcMT5/Gj8jt7CK7bAoGAIeKz -7OO5Phr8F0eDzkDmGHMbDmr6XxMnAGSOUoCJPOqOMN+dsbsusHBfxw1bTUlJgONw -GhgI5l85EAEhaVoRWCLgfz8GbWwUV9uGjdlAjiZ9f4z9AFWMua2rae0wN4VIVd1C -i/yQeuF5lsXDf8paNcQTDeus74oCHcFXfhmS1S0CgYB2q8E+H0kFHbUxkIZYwhsM -r0lTecn+kVsyPPje2UlzfTwvcC9dFIC4ppCdJGUJAwi/PJnr6xNyOH6I1pjUA8ER -Aofm4Oj2DwX8W+81oO71/RXSfEFUjdOw0H6iRDyvWa1gqftj2/aWjV7Ifdo49thx -EzX/9GdsRInifN6FfOfo/A== +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCwL9V/EvLlKZ40 +2t27+5tYyW21+2wvcO5OE38YlOVy/5txITf/xFASUqGpsurxQuqMv+owPF5qbZVa +2Eqd2ShXY3WYfgsmGSnK7+CUXhdpX0SCDZ+nehIHAKGxkzcHXL+u8bjbTItJngL5 +ioC4zmvyIQhzQvpfLzQycf2vu5sR/sjcTy+pQv5CTI2uqGmJ3ce+FiaTwttiyf3A +qcbKSirKD2GI5NAV/Ub2yjvLOG/Olo8857YbfjaUOCy4fV8D2aINdahhOFCK7FfF +wGMSazBkDWXevXJwjs/L5zlQrMxTmuKlb13gBq9IhZWQF20CXr6Yol2lxzBLfAta +h8aXFvA3AgMBAAECggEAa073DcqQvhq3DSIw4wm/+DfW5nwXzF1QB6XAR0yI453j +IuhEnzcGPeKuLBmZFxDWoptRG8fpCZFs4kPSTomxFGizewlp6O5ykfPAKR2VzMwF +geCiWPL0f+dWlD1Byu4moXsASDE6tL/UuAAvnl+7R2HvL6SfsdGiTQc4qAvvyukM +szks+MePHSlXmL5Eld7HfKgpvxY1SbYOQU0aPXAQAnLaOT931q+tgZMG6nBWN+pu +w5bgKCA26BMAAaUAdIIDEa9fjzkpXjElCT4qhJYVKQn9Pb7aSc4jihSpCknqbb9c +55nW5PWMZJyCbCOUG/SVTblXV+NmhdtwrgUbHImXIQKBgQDcb/7vp+rq06uNx3b4 +AjTZdzCVbHM8gp7b1GkGD0SncrzX6RxPSzNn7d4AUKY065bwa89A+TRwV8DSo7G8 +hxjzdU/FKCg8ce0eqoCtWjIT2r+rV2P9dFhfRT5jdOwHrym8LeSGzANjIBNV7FOf +FIRkQ1BVD0QSPla+26ASqsw60wKBgQDMnEzChQWgAsBelALmGaj/wDdWDUXK8xRg +s7dG1Sx41SLk39SAjCUYXPyy8IHBitJtPZNDp23tR4/m8Ui1pB2T0EnlzBsuzrZ/ +0aCbJnQ08FXE8iVajrgce4ZCdT8vkeH8EVhqDpJIlAhoKy3HaoAr4o2/uRoGDpHZ +iAbDLTEOjQKBgFrp4dXLhkqFNArMShetKUjLLIFj8f7xzDzT1ODH6UO6QYI2xRM6 +65+gbd/pYzMOOvk7LYYZgXQX7RGyq3oaqcK3Dkg88KNFRUtRfLKCMYcYv9YVu8pr +cosQTtPMBBCDQI44yziA6aC3OOJGDpLcbmG/lWEPY762cSZUBCfOw147AoGAd8S+ +AdcPtdwmcrY9BCfdDuea/JoEUon7UaehDqtVvt0z8bk7kIt4Y0x69ttleL8j8aHr +g9yLsisDhvGR2BFa5t0zhHn3J20E0skINAlMWHieHAyJ5PpJtxJvQpOTCutf1sbo +dBxXcHiGe0NbJrGmmQmiY6mcHBOHOEgxfSoE3zkCgYAc+ozIr3xmUcooUeA7uqpd +LvGGqHThGrtXVFIErOIcajC9bHEeZw4Do/oT5L7Wr7pOZ20VUmuRvwytd7IYYTVV +g+nIyKaMttEaCzHEsO0CQUHexOkJbL4rpc3HiK5hIhL8Yo2L/obQgCxYmvyChpo3 +sXJAoFllBNfAK3aanFOR1Q== -----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem b/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem index f41568f6ee..fbe040b52c 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt6-cert.pem @@ -1,21 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDeDCCAmCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 -IE5DIENBIDEwIBcNMTgwNTE2MDMyNjMyWhgPMjExODA1MTcwMzI2MzJaMGkxIjAg +MIIDljCCAn6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTYwNzA5MTQ0ODExWhgPMjExNjA3MTAxNDQ4MTFaMGkxIjAg BgNVBAoMGUJhZCBOQyBUZXN0IENlcnRpZmljYXRlIDYxFzAVBgNVBAMMDm90aGVy Lmdvb2Qub3JnMRMwEQYDVQQDDApKb2UgQmxvZ2dzMRUwEwYDVQQDDAxhbnkuZ29v -ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl46xhstHmmYhp -XY/FcnQStR4XHtHcNRyvq1perl0fezeCY85KkddGppic5qIWQDL4ViP3HfvhMlDZ -E0tAjEfr8Auac9gpa2IFVJAzMnnzOkhO6cr5kmid4392tNCG5sUWS99t2Z4f9sOP -DQKdoN7lnmxnpZqNf9NUERsN5i4fcvErfQZ4LqV5ld810ZAQZUfarn1rg6/U/ADc -qA0uQgk9RxVgSDt3M5mi8AaC73Be9nAefXQUybzs6J8EfsDijhD85msxs4Fha4pg -gM+bXHv9C7whxM5F2WTeET0cIcAfE3+jzQlkjcjlS1rTEq4d0Pd+1rXkhMwZeze2 -KRL2Le8jAgMBAAGjezB5MB0GA1UdDgQWBBRJJljvheyfKr9neNplhIMIFx25QjAf -BgNVHSMEGDAWgBQI0Zv55tVkcKDxaxqe7VLa3fVQQzAJBgNVHRMEAjAAMCwGA1Ud -EQQlMCOBDWdvb2RAZ29vZC5vcmeBDGFueUBnb29kLmNvbYcEwKgAATANBgkqhkiG -9w0BAQsFAAOCAQEAPfRFkpkTsPlH54n/i3kxR8Hw17kUOV0/v39fnNzV+PXS/IIU -9OFfP7qNeuoWVQKXCwNWGWYXb7O0LNJMJQWWtyXtzWH3rOSxdSRIrTsCVHA41Lbo -te2nrfnGMtg6em51Do6Kk0JM304sVAWl5OY/eckBmuDgN/5WfZudOLd8Ohv8vZ6U -ZNoSBNpu1x5gfEPywMUGAgbkNZVpzNAfulx3/D2kWk0qwEKqnphUyaXiTVqO49gr -n1LwSVdqBcmapBmEO3puV4TBWFwM49iMMNGn0fp/JBVsLjt+q7TK96qGBo/BSEL+ -e2TXTNpdkn3l+ZK2FYdf7s8fytoe+6o92dN+fA== +ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKz8F/ndKz0vuv +BymjTUjtrWSQsnsuisR+oW8CIliNBi8yqqeNrtoa2s+e2GBC7gxDlK9IOqGo4Ulu +9jY5On6RysrFWLpK97I7EP9cg63alH+NRFEwczRzErHtYx54yiBjcovcCVeTtdnd +7/P4T8hIGy6QjdW68lzwnN/I9x11NWoipIKvAOGXz0L/WaPPWZ0GJFlBqEX//O3+ +6sweSUX4ivAC9txou3rwDA8kJx5Ge9trQ9dPPG/jpL96f1DLE9H2SkVff1KLTPmb +jUwiYj161lsKLxGkbdmPWRjt1pP4+5UUhioo1Y0WrTd5ELwB1eKTtWsOlRsdLOa8 +1L6m8ngXAgMBAAGjgZgwgZUwHQYDVR0OBBYEFBIKyD5bUUNIFxlQJl/rBvvIm0XZ +MB8GA1UdIwQYMBaAFAjRm/nm1WRwoPFrGp7tUtrd9VBDMAkGA1UdEwQCMAAwSAYD +VR0RBEEwP4IMd3d3Lmdvb2Qub3JnggxhbnkuZ29vZC5jb22BDWdvb2RAZ29vZC5v +cmeBDGFueUBnb29kLmNvbYcEwKgAATANBgkqhkiG9w0BAQsFAAOCAQEAa2lydA7a +YgRhYeIuPEtR+bKyDkIKNjvx2IRL/FL70s/IWFWDK1rpsMYLGNa7rWpW5gq4T6zb +JIwC/770Rw1p+0j9eAC95d2wCEhyNcLdoP4ch7whr0MhxYHUJ8zQGPdQ97DWGoEB +2seLjrhMrX004TM4UlM+lpjsb88QEcD+kOEhdDTKm0ABUygOr1KRay437mtUhAzb +WyUbAjKbhgyv6IFRNHKy6YtCMugPihn+Pd1NY6c2ACRVOAUS/+rvVyjxBCATW5Wk +zAtNIxYgcm3rYRroGYT2BGj8Ic7oqPOWPdGWhsieX0c+y2ZnS727Kwc5tXFfW9By +GH32QmEN5o5jZQ== -----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt6-key.pem b/worker/deps/openssl/openssl/test/certs/badalt6-key.pem index 782d69334a..203a4c7a00 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt6-key.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt6-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDl46xhstHmmYhp -XY/FcnQStR4XHtHcNRyvq1perl0fezeCY85KkddGppic5qIWQDL4ViP3HfvhMlDZ -E0tAjEfr8Auac9gpa2IFVJAzMnnzOkhO6cr5kmid4392tNCG5sUWS99t2Z4f9sOP -DQKdoN7lnmxnpZqNf9NUERsN5i4fcvErfQZ4LqV5ld810ZAQZUfarn1rg6/U/ADc -qA0uQgk9RxVgSDt3M5mi8AaC73Be9nAefXQUybzs6J8EfsDijhD85msxs4Fha4pg -gM+bXHv9C7whxM5F2WTeET0cIcAfE3+jzQlkjcjlS1rTEq4d0Pd+1rXkhMwZeze2 -KRL2Le8jAgMBAAECggEBAMcDjTTa2GmYWoZUr+UPizqyvsTnMmg/NoFBhy9WJVne -kpR3kJvvm30XNiEGbCV1GGryL5p7w5UVuPXjhQ7xIkY3feQNC4H361iP93HK7dXJ -i9V9AfGCdLzSuILsT2Wpm88MifUQIpqrRmqtqakKHkyMFG655409rpYlZNVogl9H -vzrTE8rjysNMjP+bpbgkxUJfeATw8OYhEwd9ahj/E0r0r2enYhGEP3j+1zYsGdmM -L2Uy4M+modaAWpZg5pUWpFjxl+V2cSJHdaQc8KYg8Z8RUyzYipFk3YzjP5jtprq5 -dHf9FqlcXk+MtzcYe+x8mIb3uwZhOtdpnUqe5l+GTyECgYEA9j++rS9sajQzMqp0 -p+EptacD/p7A3wldIDGEpPJsSQL+vhcigyn4iPCM1pGWR4iuR7Od9RpQSf3Tfnqc -ZwUJQOpiYpxo1+QlqlBJkDjDRztp+kETZAgzc084ZhwQv9PfYyxa+8layQFhnClt -Z9G0o4AV1povVeQLO5+9CQZQ4VMCgYEA7v4WuydzlLGKppsJEG8vvieR64mjOfO4 -gHBMEYnzEeTZPDvIfEfguM1upJCvt5GXp3huVHCAsFgs6kDjVbpIL1A2HzrMPtOa -MNDSOrpuLcakAgEgx2VFv4TMnA1QKPg3//YCqEqqTJyX0C4OwaADRZJS7YfHp9lg -mpv90baE8PECgYAv3oxulj15F9SsEL7Es9yr11/La4kK0oMr8vRaLFYoi1CCG3U2 -Ej6iQEDgpUSVe1iFz8DxGMBq4dDvUV5+GFiIKggeK1GmRk+cICdsxdwQSNh9MZFX -bNCzpb7M+r+2yrUuTj0RnT7svDwBY3xFJlr7PbcBFNAG3mHgoVjaHEQ0yQKBgHbS -zepvSv/65bzACFmrbklU0zAQVp9RlcIGE0wFEl0rMvbHon5oHkrDmOcpKLRUJtqU -/gXtiY4jyPEPIfhVjd44OzB7w2DZRChRKrUYS/9ma9SzSuDYcT0vgat00w4Lm4wf -fGK//Lvqf3B59cw/CmFkxuZiQ9ooMees9x11adOBAoGBAMdb0r8sAtgh+KTbA8Kq -guIWiknOk6/LYUTuT3fidPIPbErrUQQR9WWHuXjrj2RyHI/RLjYLFamikvhU7PmE -jPjPAo4p1a0WBwrYgjGDIRjTVjbUK282vuYkunGWYfgnZurAyjJCndL/eNZuX2F5 -m1rTfab8O+tOOGKGyzfouD2A +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDKz8F/ndKz0vuv +BymjTUjtrWSQsnsuisR+oW8CIliNBi8yqqeNrtoa2s+e2GBC7gxDlK9IOqGo4Ulu +9jY5On6RysrFWLpK97I7EP9cg63alH+NRFEwczRzErHtYx54yiBjcovcCVeTtdnd +7/P4T8hIGy6QjdW68lzwnN/I9x11NWoipIKvAOGXz0L/WaPPWZ0GJFlBqEX//O3+ +6sweSUX4ivAC9txou3rwDA8kJx5Ge9trQ9dPPG/jpL96f1DLE9H2SkVff1KLTPmb +jUwiYj161lsKLxGkbdmPWRjt1pP4+5UUhioo1Y0WrTd5ELwB1eKTtWsOlRsdLOa8 +1L6m8ngXAgMBAAECggEBAJNMHK8BAvzTqTPPsfAGu4bTvgxRdKGy609FFAiqxUF3 +UmQsCZEfgwyqCszFPfSeS43xuPRukObE6L6MV4ls8GwWqvp1nKfCClJX3/9jK6tq +2tDQ416a7Wb+FvfgW0tDEg7oLKfcqRyAoQFNuxWHbGDiTQlz2dzzFYkzhlzBDUYH +/pu9qkNFGfYMFwsBUd8pp8zMnv552CCIgalBBFr1hy9q47HBaJPaF2/CjZJmsqkp +rVMBH7+j0y1DW3JO5rSKcRdz+mgEd9m/yQIazvBPJKxeGza8JfLBuACYFLIoO1S+ +b8s/zmQPHeZwTxSsM64M1uYi4dmJy0viozLlWsjrE1ECgYEA/GxGG/lB1mL+Hzmc +kXzWmA2nLPxZXGxMBOYH/n8l4OyDmKi2Bmly7kS0kLdY6gYTVBWFCRcvPxf+UJu9 +x4NcKDkjXVXSg7Muux3Bh1JoRCOKB2Hk3pqdDe55GcT5bSikkd5PYCNobcnqzSK1 +HzKveDdukraZxIPFpVs1VM9/gxMCgYEAza+BJUAEWoq925a1RKlMwdXW1ONBhFqU +fXon15fgycHkiYIBGbGE65Oyz8BwE6jNAT+SwKlNCc6jPAkXvEUpczEi5Rcox8Ec +hNoXBHcBxHEhtfV2VKX5I9JFAadmvnfS5St7HjRLzE2Y6xym1+fKfnAlSLpdb3W2 +eRqVBi3F020CgYEA6K/yrQTHwRX+BdC42JCIzSAA1IJG6eDW7skR43NX+pBr+sTD +DwQTszrYbHLnXst888zmluutXO8EO1Bl0E3yHQ4W4IolhcweLtUOOm0nunA8Y/PE +48MJNfd34N5nw01s7x5Mc2YQdOxmKvVsmzbA9AO9RTdYZgPGpVh/wA+LDssCgYBh +F2+G/ekQNF3awhFfD+vDtAVtCLlsmLVvZbJY+sCJfJU8s7mBP2LXMSk/GD/Ph+b9 +p9zGRSSwdHJpbIFfxeYDEja+nWgKowWrUKd83BBhgmW/Vtc8rfwlBKS+Wx8M2dMb +iqLbZyRAlICSuzumvyu+84EmC5L/gjlYgUvHVuQDIQKBgHH7q3hrKI5mQ0BR9h75 +4yP98c+Duz8IsQllIG0gzCiiOYIVTl3uzTCa/E9Sa+jG+kFsCeUDchmC6LmHdF/Z +ZHfECcQT4B37xMMwvjwNW7E6/FyRx3XC762Fd5vlz3fBuVKburfh1JpfpcO85Wvo +R1UfsJugW9Yetsqd9WB6q3ln -----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem b/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem index 4fa81b3c6f..b515ba43d9 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt7-cert.pem @@ -1,22 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDtjCCAp6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 -IE5DIENBIDEwIBcNMTgwNTE2MDMyNzA5WhgPMjExODA1MTcwMzI3MDlaMIGmMTsw +MIID1DCCArygAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxUZXN0 +IE5DIENBIDEwIBcNMTYwNzA5MTQ0ODExWhgPMjExNjA3MTAxNDQ4MTFaMIGmMTsw OQYDVQQKHjIAQgBhAGQAIABOAEMAIABUAGUAcwB0ACAAQwBlAHIAdABpAGYAaQBj AGEAdABlACAANzElMCMGA1UEAx4cAG8AdABoAGUAcgAuAGcAbwBvAGQALgBvAHIA ZzEdMBsGA1UEAx4UAEoAbwBlACAAQgBsAG8AZwBnAHMxITAfBgNVBAMeGABhAG4A eQAuAGcAbwBvAGQALgBjAG8AbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAOG4PegItzkmJDwlSA/FyVHWLWUIQrnxgS0KSds3On2CMsjDJ+X77B4s1IPI -yKHuqNbXqV/hJGAxKnZRZe0D6VsmKlYOYpz9QtFxvpo5DwA3q6BTx6sIElFn/lip -Pbu5ZeIMNeN4bot7x5sBobr6OgidAVaAuqQHHJnD7mQ1s22qY0UqkBqNBhhJWOmx -YC0Q56WDi9+C7Cy2+kiiSlT4jCZ8m1K0F7tTK5mF0p4HppXmXLzcecZ/Sw8jOqQK -JM/4UCj/nxWCGYKWkv8zLJtG+ryfZMf15/0Cd1dzHAS9mYU4mFssPdFyT+WFpw7b -K3TOTXkS/tAPbj0xin2wqBJz8m8CAwEAAaN7MHkwHQYDVR0OBBYEFOWYNq+H1LH6 -lZUpgijb/S/sAiDsMB8GA1UdIwQYMBaAFAjRm/nm1WRwoPFrGp7tUtrd9VBDMAkG -A1UdEwQCMAAwLAYDVR0RBCUwI4ENZ29vZEBnb29kLm9yZ4EMYW55QGdvb2QuY29t -hwTAqAABMA0GCSqGSIb3DQEBCwUAA4IBAQAwUxnqq0gBgKmEHIRgZVu10KtOknjt -p/wEcqQ9METvXb+4/a4U6ftjTgaOrPVjamNFlaoUcTgx2nk2zRsjM+e+tpnxDgRR -/yoVB3HsISpdeN70s/WYAgvev/FdV3O+JWhUYHdKrDB4DMfPhlRIfSgOymJljo6+ -wL8qa7lVonF91Im4SCbq4dqtAnbg4ttblQ3yjFfQtuwzyJD/3ism6FQPLbg1K4eu -1Si0EDL4Fct581Gb5D+NU8PYiwg7Nk8ubNlRHXydoVGDLmT0hLE+/IsPd1M8tMqm -sifRl2Is+lGVeg4pPHFjB0npTNkaYafu89dz/3PNRRr5If06B+apk4AX +ggEBANStByWr70u2A49OO+LYu0ivQP+uBu2n3E6RoEYf+op/+JF3clwfMQCGqiSg +QxOJMHkcu4gJDudRLCSXqHPnR0hOd+mQ5wQQJmLj8A99ImcD2oN5R3V5I4bSlXP9 +GCq2pFDnwXuEcJ3d2Dt1HYO4jA4Ol/RBT3NIqmwSnQzXv98mjYFpy6AuAIaYGmbh +1DLWxsTPI2NjNafJYS85NrQDLkTpq48nCmQCJ+ly6Zzu7WuJiDKD1Rxs7ZwgNtLi +Zhp41TeFHxCbfSFKe9u4rnUmImKxwgc9KuzOLpLAzD9avWpPGHtkCsLFsiw/EJYf +UdeCXc7tz9WhXZzOk/ffLOcrorMCAwEAAaOBmDCBlTAdBgNVHQ4EFgQUwYsR1XfZ +2cPcAR7i5i9obalnJcIwHwYDVR0jBBgwFoAUCNGb+ebVZHCg8Wsanu1S2t31UEMw +CQYDVR0TBAIwADBIBgNVHREEQTA/ggx3d3cuZ29vZC5vcmeCDGFueS5nb29kLmNv +bYENZ29vZEBnb29kLm9yZ4EMYW55QGdvb2QuY29thwTAqAABMA0GCSqGSIb3DQEB +CwUAA4IBAQAN/klfzMLi2acp5KdH9UZR4XCk3cZBOuMuI0vU+wrU/ETgY6rFhAwY +gSZsO6vX0mt/G6QfOmY5+kW4FY5XavGhhNVY2x5ATZKvQCf+orIsUHOBxVTjH6az +uEnxGDRTbjXSkBTCTSoOqdJNeOmEwiaHEVy/atumUW2B2KP5FeBGdud/94c4Q9/O +WBJ0EICGF6hYTDra63lAjxyARTvocVakIE8zytT1SbU4yO05mYPyNdXxiXikepFE +phPQWNSLx4EPBIorGCFj7MPDmFCH/+EjDjGz3SNUvqsak6MstzK94KVriQyIHKex +IL5WuKFm0XSGKTX8SzyMGErMGeriveL2 -----END CERTIFICATE----- diff --git a/worker/deps/openssl/openssl/test/certs/badalt7-key.pem b/worker/deps/openssl/openssl/test/certs/badalt7-key.pem index b453f1ff30..50557e8968 100644 --- a/worker/deps/openssl/openssl/test/certs/badalt7-key.pem +++ b/worker/deps/openssl/openssl/test/certs/badalt7-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDhuD3oCLc5JiQ8 -JUgPxclR1i1lCEK58YEtCknbNzp9gjLIwyfl++weLNSDyMih7qjW16lf4SRgMSp2 -UWXtA+lbJipWDmKc/ULRcb6aOQ8AN6ugU8erCBJRZ/5YqT27uWXiDDXjeG6Le8eb -AaG6+joInQFWgLqkBxyZw+5kNbNtqmNFKpAajQYYSVjpsWAtEOelg4vfguwstvpI -okpU+IwmfJtStBe7UyuZhdKeB6aV5ly83HnGf0sPIzqkCiTP+FAo/58VghmClpL/ -MyybRvq8n2TH9ef9AndXcxwEvZmFOJhbLD3Rck/lhacO2yt0zk15Ev7QD249MYp9 -sKgSc/JvAgMBAAECggEAZG2cJawTEXtV7ejMii//Jck8g1JMlfzM86Q7Pizxejw+ -qjKiguI2qSpbF5NzKRFNz+E+e+lpTN8zPFd1GSJ/Zk2x0n4uBBlu7E9GdcnjUb5z -Py9njEJYHB4//WS3kdmoag3ywBWqYaceJWpxcga5YXGx0bIO2MJNSGDzpWR7Q9QQ -tG/lWmno5goY2BxI08BTKSlqNIBkg/rr9jJo3axRcEmbx7hj4vUkAlypFKtmR4dW -bNo0f6VAd5Y6c9YbnKybR/44lScBksuSkZjm076cbbbp5PpsiLGe/12bqUcwCH+T -8hRVndmOLdOxC11OZOvMbX6x2uXNh3/Qr/GMyfzZcQKBgQD4we7E9vOygk1J5Vbl -1zETR9x3dujpBBx3xaHXUSJNUTNwmnZ+0JoFTqPkRmmPMNK7XfZuPymBehtk8WYt -NnezM2UNTdbfVOnJWnU6igRNGBaDW6F9AezlADBNwIbFVw6RqP4fTUFsmm9TQ/8M -4kZmmlW4uLZyX0WQO+AJa7NShwKBgQDoSpnQgmWqXMcaHwY2l8fEDuDc41nDoJIm -/CMppPbr7GkUX4OU785p6E0N0o1ONt+xCBT1lxHwWEeMAKZXrNC1XGpfvhpVZ72v -VruATDFs1rcL3S2Sty7A+jhFKKXlGeDWNcpaKY8nDvv2uJG0+J3bLprdMqnY/gQ1 -C+FzyQ6S2QKBgDnHIaRSD6xoo3cEc7iS0O0/ha+hyNtGfy46kyqlx6fZsm73EYrG -/N86ssp0qFP/7RJj8rcMqKFQMUiy4R6jRg4zY8dBSyU4XczM2+mq4PDfJWuBPvMA -HXvbHV0R2LvBSrr+W3f9w7Jr9GuMoZLmg5+VPU/YZ1gNVOT5Y0IM5+vFAoGBANx9 -CzlGvLeTrw1VS3GAaobn1Hr2dlrhTDki9UFvK03PLgK/ksdJRLV0YcdwBt6p6XRB -hpuC1O087lSuvTXVfJnZacMNUDOm7/7BpeJm8DcuK7tgKwTrSb61A7ppleY7xRWv -Iy6n6hCaAYIzuWJ85mGJAEhb8apdmqK7bzmXK3UpAoGBALdOvJfqbF0YlHbdQCVi -ftjtxs/dZKdF1rNARR0VMqUtZX+WP2b6OPXlwux94Cr//iNv5ih3B4Z4LIgTpgBJ -AKGXEBGMMthAlptC4BcOAEs9cYeWGLAoYk8jpNmXvXjhGqvzhPO2YrX5xy46dVOG -iiCseyA7Kr8Axt9QhUzoi5f7 +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDUrQclq+9LtgOP +Tjvi2LtIr0D/rgbtp9xOkaBGH/qKf/iRd3JcHzEAhqokoEMTiTB5HLuICQ7nUSwk +l6hz50dITnfpkOcEECZi4/APfSJnA9qDeUd1eSOG0pVz/RgqtqRQ58F7hHCd3dg7 +dR2DuIwODpf0QU9zSKpsEp0M17/fJo2BacugLgCGmBpm4dQy1sbEzyNjYzWnyWEv +OTa0Ay5E6auPJwpkAifpcumc7u1riYgyg9UcbO2cIDbS4mYaeNU3hR8Qm30hSnvb +uK51JiJiscIHPSrszi6SwMw/Wr1qTxh7ZArCxbIsPxCWH1HXgl3O7c/VoV2czpP3 +3yznK6KzAgMBAAECggEADjQ0Kv7tr3fLixGljEP/Vh5mT+02hz7TxueQ9b4DBKcB +We3JVH+8zRUxXdraP/7EnwIdQDuipC5WrWb3mC4VI64h8hZ8Z1gQyEAC83XfC1RF +jsxVynG5vrJnyuRXbdre5Ixl7rLsto5vd6EdxINZz0KIQYbvIHr07tzbYlUyelvA +mu0kYdtbjm2p2AGJJ99zN3EiQ9lZDyiFirOXEA9P/YdKKVlIwpDPbn/TmNY/k6Ul +mRxgAJKwKiR6Gg3QMdTUKeaXBpKf/pa+5rzR7zxNbiQO3IXOVx7ZzQ2R0Wuivpqk +yjMaqUa7dDuvtIHJBpJB7TIL6SlQkiS1lEQFhO7EAQKBgQDz30obdymxqQVy7IsH +NLo5xRX1hRRN9h34Y4qC0JXkCTG1fWJ19KYHod0S5peaIo/ThDVf1UXln6amdCjM +oIfhmo0baNIdMMpxxBdsdLfUKwyVh8qROaBscPE4FGBUrfEW/wSn1WRYcWh+oda3 +LuLVf5Qt9a9f6ZYuy1X6dDi8swKBgQDfQJTSFUNkV8yKfMX54x0DcUkiWOu3LaET +GSu0UXqBVn1Q+u6CUAkh5jA9fpyM5sp9+t5FuwjO+ITHfiNFoD/LCeMUfYVDF7O2 +uCLTsN+7gTGpKMnfL/rg9exrsfDdsmbQe4BhrUFBsYfKgBlBraL0QGD+25qgU8CS +CQ6toGCCAQKBgQDCYJskwRoObPXW4AsAN1qnaRtTkjrY2O6SaGSiV7bhByMD0WiF +M/aR5sXapsj3Jc0Vfi88rzUDDPk7eyJ51wn3G8SUsDuo4Ja7jtxMqctL5PQmyxD+ +J7xiMrNRS4xscifTeHgxfbh5dgsfw8bsQwaxvPpSl5ytCfWWXqOs+K2wWQKBgBM4 +Mher8PNQg7FgcILExJipRgyI7zID4ZwNTK/nW86KrZstHx9k2IRslraUkdGnhMM3 +t671HRsEVhn+h/bUhulp3nzDGZffEH+odocW8QvpYWcYtdha/xQi18mltgC//Q3x +s+m0yqtnJzONt57p3d99M1x9d2BaFXf9A6B68BQBAoGBAOatu9+wGaIEB//fpaQt +mnsS2XBJco5gHTjOegCSNe3gQQsB5mhTEekOeMzJ8WLTMVXQVCXx9/8HxKoycbq8 +M/7ScH1iT/wJTkSsjyeycUgH31GPeRvmo9YU2PsW3NN6ZyNpxWJFdcPYHAzZqJeA +cZtQWiEyaf026DdR8YBYn6tf -----END PRIVATE KEY----- diff --git a/worker/deps/openssl/openssl/test/certs/setup.sh b/worker/deps/openssl/openssl/test/certs/setup.sh index 018e5fc690..7e1086a224 100755 --- a/worker/deps/openssl/openssl/test/certs/setup.sh +++ b/worker/deps/openssl/openssl/test/certs/setup.sh @@ -241,30 +241,15 @@ NC="$NC excluded;DNS:bad.ok.good.com" NC=$NC ./mkcert.sh genca "Test NC sub CA" ncca3-key ncca3-cert \ ncca1-key ncca1-cert -# all subjectAltNames allowed by CA1. Some CNs are not! +# all subjectAltNames allowed by CA1. ./mkcert.sh req alt1-key "O = Good NC Test Certificate 1" \ - "1.CN=www.example.net" "2.CN=Joe Bloggs" | \ + "1.CN=www.good.org" "2.CN=Joe Bloggs" "3.CN=any.good.com" | \ ./mkcert.sh geneealt alt1-key alt1-cert ncca1-key ncca1-cert \ "DNS.1 = www.good.org" "DNS.2 = any.good.com" \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.1" "IP = 192.168.0.1" -# all DNS-like CNs allowed by CA1, no DNS SANs. - -./mkcert.sh req goodcn1-key "O = Good NC Test Certificate 1" \ - "1.CN=www.good.org" "2.CN=any.good.com" \ - "3.CN=not..dns" "4.CN=not@dns" "5.CN=not-.dns" "6.CN=not.dns." | \ - ./mkcert.sh geneealt goodcn1-key goodcn1-cert ncca1-key ncca1-cert \ - "IP = 127.0.0.1" "IP = 192.168.0.1" - -# Some DNS-like CNs not permitted by CA1, no DNS SANs. - -./mkcert.sh req badcn1-key "O = Good NC Test Certificate 1" \ - "1.CN=www.good.org" "3.CN=bad.net" | \ - ./mkcert.sh geneealt badcn1-key badcn1-cert ncca1-key ncca1-cert \ - "IP = 127.0.0.1" "IP = 192.168.0.1" - # no subjectAltNames excluded by CA2. ./mkcert.sh req alt2-key "O = Good NC Test Certificate 2" | \ @@ -308,17 +293,19 @@ NC=$NC ./mkcert.sh genca "Test NC sub CA" ncca3-key ncca3-cert \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.2" -# No DNS-ID SANs and subject CN not allowed by CA1. +# all subject alt names OK but subject CN not allowed by CA1. ./mkcert.sh req badalt6-key "O = Bad NC Test Certificate 6" \ "1.CN=other.good.org" "2.CN=Joe Bloggs" "3.CN=any.good.com" | \ ./mkcert.sh geneealt badalt6-key badalt6-cert ncca1-key ncca1-cert \ + "DNS.1 = www.good.org" "DNS.2 = any.good.com" \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.1" "IP = 192.168.0.1" -# No DNS-ID SANS and subject CN not allowed by CA1, BMPSTRING +# all subject alt names OK but subject CN not allowed by CA1, BMPSTRING REQMASK=MASK:0x800 ./mkcert.sh req badalt7-key "O = Bad NC Test Certificate 7" \ "1.CN=other.good.org" "2.CN=Joe Bloggs" "3.CN=any.good.com" | \ ./mkcert.sh geneealt badalt7-key badalt7-cert ncca1-key ncca1-cert \ + "DNS.1 = www.good.org" "DNS.2 = any.good.com" \ "email.1 = good@good.org" "email.2 = any@good.com" \ "IP = 127.0.0.1" "IP = 192.168.0.1" diff --git a/worker/deps/openssl/openssl/test/ct/log_list.conf b/worker/deps/openssl/openssl/test/ct/log_list.conf index 4b68e53558..3724599a9d 100644 --- a/worker/deps/openssl/openssl/test/ct/log_list.conf +++ b/worker/deps/openssl/openssl/test/ct/log_list.conf @@ -35,4 +35,3 @@ key = MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEluqsHEYMG1XcDfy1lCdGV0JwOmkY4r87xNuroP [venafi] description = Venafi log key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolpIHxdSlTXLo1s6H1OCdpSj/4DyHDc8wLG9wVmLqy1lk9fz4ATVmm+/1iN2Nk8jmctUKK2MFUtlWXZBSpym97M7frGlSaQXUWyA3CqQUEuIJOmlEjKTBEiQAvpfDjCHjlV2Be4qTM6jamkJbiWtgnYPhJL6ONaGTiSPm7Byy57iaz/hbckldSOIoRhYBiMzeNoA0DiRZ9KmfSeXZ1rB8y8X5urSW+iBzf2SaOfzBvDpcoTuAaWx2DPazoOl28fP1hZ+kHUYvxbcMjttjauCFx+JII0dmuZNIwjfeG/GBb9frpSX219k1O4Wi6OEbHEr8at/XQ0y7gTikOxBn/s5wQIDAQAB - diff --git a/worker/deps/openssl/openssl/test/ct_test.c b/worker/deps/openssl/openssl/test/ct_test.c index 49c46958ee..ea90923d74 100644 --- a/worker/deps/openssl/openssl/test/ct_test.c +++ b/worker/deps/openssl/openssl/test/ct_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -542,8 +542,8 @@ static int test_default_ct_policy_eval_ctx_time_is_now() { int success = 0; CT_POLICY_EVAL_CTX *ct_policy_ctx = CT_POLICY_EVAL_CTX_new(); - const time_t default_time = - (time_t)(CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / 1000); + const time_t default_time = CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / + 1000; const time_t time_tolerance = 600; /* 10 minutes */ if (fabs(difftime(time(NULL), default_time)) > time_tolerance) { diff --git a/worker/deps/openssl/openssl/test/danetest.in b/worker/deps/openssl/openssl/test/danetest.in index 0cedf10a2a..c94f526aab 100644 --- a/worker/deps/openssl/openssl/test/danetest.in +++ b/worker/deps/openssl/openssl/test/danetest.in @@ -26,7 +26,7 @@ # 3 1 0 3059301306072A8648CE3D020106082A8648CE3D03010703420004664995F47BDE35E7B4DE48B258E9E8A07ADEBBDB863B3D06F481A1946C83DA9F56CFF4D9389B855D2F364B1585B0C734FCFA263026964FF5A4308B3FC879BDB8 # 3 1 1 3111668338043DE264D0256A702248696C9484B6221A42740F920187B4C61838 # 3 1 2 CB861AF6DDED185EE04472A9092052CCC735120C34785E72C996C94B122EBA6F329BE630B1B4C6E2756E7A75392C21E253C6AEACC31FD45FF4595DED375FAF62 -# -- +# -- # subject= CN = Issuer CA # 2 0 0 308201683082010DA003020102020102300A06082A8648CE3D04030230123110300E06035504030C07526F6F742043413020170D3135313231333233323030395A180F33303135303431353233323030395A30143112301006035504030C094973737565722043413059301306072A8648CE3D020106082A8648CE3D030107034200047D4BAE18B49F5DC69D0A3C85C66A3E2119DE92CFAD081FAD55C12D510EC97B6C00E13695A8D9713548FE60DF15573390433E2A1BD92DB4B7AA016EC6185DC5AFA350304E301D0603551D0E041604147AB75A3CD295CA5DF7C5150916E18FF5CC376A15301F0603551D23041830168014E4BD405F052A820DDF9883F93D7D3F90AAEC723F300C0603551D13040530030101FF300A06082A8648CE3D0403020349003046022100831DCD882DA8785D50E41020898C0248879DDDF72D701D1DC1DE6BE08155B43E022100B84B2FB519C4CD3CBC791603D4488F7707597DB7980D9C173E7FDD0ECD7CA308 # 2 0 1 0DAA76425A1FC398C55A643D5A2485AE4CC2B64B9515A75054722B2E83C31BBD diff --git a/worker/deps/openssl/openssl/test/evp_extra_test.c b/worker/deps/openssl/openssl/test/evp_extra_test.c index bc02fad4f2..9217f3ae51 100644 --- a/worker/deps/openssl/openssl/test/evp_extra_test.c +++ b/worker/deps/openssl/openssl/test/evp_extra_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -9,7 +9,6 @@ #include #include -#include #include #include #include @@ -327,46 +326,6 @@ static int test_d2i_AutoPrivateKey(const unsigned char *input, return ret; } -static int test_EVP_Enveloped(void) -{ - int ret = 0; - EVP_CIPHER_CTX *ctx = NULL; - EVP_PKEY *keypair = NULL; - unsigned char *kek = NULL; - int kek_len; - unsigned char iv[EVP_MAX_IV_LENGTH]; - static const unsigned char msg[] = { 1, 2, 3, 4, 5, 6, 7, 8 }; - int len, ciphertext_len, plaintext_len; - unsigned char ciphertext[32], plaintext[16]; - const EVP_CIPHER *type = EVP_aes_256_cbc(); - - if ((keypair = load_example_rsa_key()) == NULL - || (kek = OPENSSL_zalloc(EVP_PKEY_size(keypair))) == NULL - || (ctx = EVP_CIPHER_CTX_new()) == NULL - || !EVP_SealInit(ctx, type, &kek, &kek_len, iv, &keypair, 1) - || !EVP_SealUpdate(ctx, ciphertext, &ciphertext_len, - msg, sizeof(msg)) - || !EVP_SealFinal(ctx, ciphertext + ciphertext_len, &len)) - goto err; - - ciphertext_len += len; - if (!EVP_OpenInit(ctx, type, kek, kek_len, iv, keypair) - || !EVP_OpenUpdate(ctx, plaintext, &plaintext_len, - ciphertext, ciphertext_len) - || !EVP_OpenFinal(ctx, plaintext + plaintext_len, &len) - || (plaintext_len += len) != sizeof(msg) - || memcmp(msg, plaintext, sizeof(msg)) != 0) - goto err; - - ret = 1; - -err: - OPENSSL_free(kek); - EVP_PKEY_free(keypair); - EVP_CIPHER_CTX_free(ctx); - return ret; -} - #ifndef OPENSSL_NO_EC /* Tests loading a bad key in PKCS8 format */ static int test_EVP_PKCS82PKEY(void) @@ -427,11 +386,6 @@ int main(void) return 1; } - if (!test_EVP_Enveloped()) { - fprintf(stderr, "test_EVP_Enveloped failed\n"); - return 1; - } - #ifndef OPENSSL_NO_EC if (!test_d2i_AutoPrivateKey(kExampleECKeyDER, sizeof(kExampleECKeyDER), EVP_PKEY_EC)) { diff --git a/worker/deps/openssl/openssl/test/evp_test.c b/worker/deps/openssl/openssl/test/evp_test.c index ea9455374f..4bea4ea2b9 100644 --- a/worker/deps/openssl/openssl/test/evp_test.c +++ b/worker/deps/openssl/openssl/test/evp_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1592,19 +1592,19 @@ static int pderive_test_run(struct evp_test *t) struct pkey_data *kdata = t->data; unsigned char *out = NULL; size_t out_len; - const char *err = "DERIVE_ERROR"; + const char *err = "INTERNAL_ERROR"; - if (EVP_PKEY_derive(kdata->ctx, NULL, &out_len) <= 0) - goto err; + out_len = kdata->output_len; out = OPENSSL_malloc(out_len); if (!out) { fprintf(stderr, "Error allocating output buffer!\n"); exit(1); } + err = "DERIVE_ERROR"; if (EVP_PKEY_derive(kdata->ctx, out, &out_len) <= 0) goto err; err = "SHARED_SECRET_LENGTH_MISMATCH"; - if (kdata->output == NULL || out_len != kdata->output_len) + if (out_len != kdata->output_len) goto err; err = "SHARED_SECRET_MISMATCH"; if (check_output(t, kdata->output, out, out_len)) @@ -2169,4 +2169,3 @@ static const struct evp_test_method keypair_test_method = { void_test_parse, keypair_test_run }; - diff --git a/worker/deps/openssl/openssl/test/evptests.txt b/worker/deps/openssl/openssl/test/evptests.txt new file mode 100644 index 0000000000..83c6c6a3a9 --- /dev/null +++ b/worker/deps/openssl/openssl/test/evptests.txt @@ -0,0 +1,19244 @@ +# +# Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +#cipher:key:iv:plaintext:ciphertext:0/1(decrypt/encrypt) +#aadcipher:key:iv:plaintext:ciphertext:aad:tag:0/1(decrypt/encrypt) +#digest:::input:output + +# BLAKE2 tests, using same inputs as MD5 +# There are no official BLAKE2 test vectors we can use since they all use a key +# Which is currently unsupported by OpenSSL. They were generated using the +# reference implementation. RFC7693 also mentions the 616263 / "abc" values. +Digest = BLAKE2s256 +Input = +Output = 69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9 + +Digest = BLAKE2s256 +Input = 61 +Output = 4a0d129873403037c2cd9b9048203687f6233fb6738956e0349bd4320fec3e90 + +Digest = BLAKE2s256 +Input = 616263 +Output = 508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982 + +Digest = BLAKE2s256 +Input = 6d65737361676520646967657374 +Output = fa10ab775acf89b7d3c8a6e823d586f6b67bdbac4ce207fe145b7d3ac25cd28c + +Digest = BLAKE2s256 +Input = 6162636465666768696a6b6c6d6e6f707172737475767778797a +Output = bdf88eb1f86a0cdf0e840ba88fa118508369df186c7355b4b16cf79fa2710a12 + +Digest = BLAKE2s256 +Input = 4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839 +Output = c75439ea17e1de6fa4510c335dc3d3f343e6f9e1ce2773e25b4174f1df8b119b + +Digest = BLAKE2s256 +Input = 3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930 +Output = fdaedb290a0d5af9870864fec2e090200989dc9cd53a3c092129e8535e8b4f66 + +Digest = BLAKE2s256 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F +Output = 1FA877DE67259D19863A2A34BCC6962A2B25FCBF5CBECD7EDE8F1FA36688A796 + +Digest = BLAKE2s256 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F8081 +Output = C80ABEEBB669AD5DEEB5F5EC8EA6B7A05DDF7D31EC4C0A2EE20B0B98CAEC6746 + +Digest = BLAKE2b512 +Input = +Output = 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce + +Digest = BLAKE2b512 +Input = 61 +Output = 333fcb4ee1aa7c115355ec66ceac917c8bfd815bf7587d325aec1864edd24e34d5abe2c6b1b5ee3face62fed78dbef802f2a85cb91d455a8f5249d330853cb3c + +Digest = BLAKE2b512 +Input = 616263 +Output = ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923 + +Digest = BLAKE2b512 +Input = 6d65737361676520646967657374 +Output = 3c26ce487b1c0f062363afa3c675ebdbf5f4ef9bdc022cfbef91e3111cdc283840d8331fc30a8a0906cff4bcdbcd230c61aaec60fdfad457ed96b709a382359a + +Digest = BLAKE2b512 +Input = 6162636465666768696a6b6c6d6e6f707172737475767778797a +Output = c68ede143e416eb7b4aaae0d8e48e55dd529eafed10b1df1a61416953a2b0a5666c761e7d412e6709e31ffe221b7a7a73908cb95a4d120b8b090a87d1fbedb4c + +Digest = BLAKE2b512 +Input = 4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839 +Output = 99964802e5c25e703722905d3fb80046b6bca698ca9e2cc7e49b4fe1fa087c2edf0312dfbb275cf250a1e542fd5dc2edd313f9c491127c2e8c0c9b24168e2d50 + +Digest = BLAKE2b512 +Input = 3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930 +Output = 686f41ec5afff6e87e1f076f542aa466466ff5fbde162c48481ba48a748d842799f5b30f5b67fc684771b33b994206d05cc310f31914edd7b97e41860d77d282 + +Digest = BLAKE2b512 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F +Output = 2319E3789C47E2DAA5FE807F61BEC2A1A6537FA03F19FF32E87EECBFD64B7E0E8CCFF439AC333B040F19B0C4DDD11A61E24AC1FE0F10A039806C5DCC0DA3D115 + +Digest = BLAKE2b512 +Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F8081 +Output = DF0A9D0C212843A6A934E3902B2DD30D17FBA5F969D2030B12A546D8A6A45E80CF5635F071F0452E9C919275DA99BED51EB1173C1AF0518726B75B0EC3BAE2B5 + +# SHA(1) tests (from shatest.c) +Digest = SHA1 +Input = 616263 +Output = a9993e364706816aba3e25717850c26c9cd0d89d + + +# MD5 tests (from md5test.c) +Digest = MD5 +Input = +Output = d41d8cd98f00b204e9800998ecf8427e + +Digest = MD5 +Input = 61 +Output = 0cc175b9c0f1b6a831c399e269772661 + +Digest = MD5 +Input = 616263 +Output = 900150983cd24fb0d6963f7d28e17f72 + +Digest = MD5 +Input = 6d65737361676520646967657374 +Output = f96b697d7cb7938d525a2f31aaf161d0 + +Digest = MD5 +Input = 6162636465666768696a6b6c6d6e6f707172737475767778797a +Output = c3fcd3d76192e4007dfb496cca67e13b + +Digest = MD5 +Input = 4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839 +Output = d174ab98d277d9f5a5611c2c9f419d9f + +Digest = MD5 +Input = 3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930 +Output = 57edf4a22be3c955ac49da2e2107b67a + +# MD4 tests from md4test.c +Digest = MD4 +Input = "" +Output = 31d6cfe0d16ae931b73c59d7e0c089c0 + +Digest = MD4 +Input = "a" +Output = bde52cb31de33e46245e05fbdbd6fb24 + +Digest = MD4 +Input = "abc" +Output = a448017aaf21d8525fc10ae87aa6729d + +Digest = MD4 +Input = "message digest" +Output = d9130a8164549fe818874806e1c7014b + +Digest = MD4 +Input = "abcdefghijklmnopqrstuvwxyz" +Output = d79e1c308aa5bbcdeea8ed63df412da9 + +Digest = MD4 +Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" +Output = 043f8582f241db351ce627e153e7f0e4 + +Digest = MD4 +Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890" +Output = e33b4ddc9c38f2199c3e7b164fcc0536 + +# RIPEMD160 tests from rmdtest.c +Digest = RIPEMD160 +Input = "" +Output = 9c1185a5c5e9fc54612808977ee8f548b2258d31 + +Digest = RIPEMD160 +Input = "a" +Output = 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe + +Digest = RIPEMD160 +Input = "abc" +Output = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc + +Digest = RIPEMD160 +Input = "message digest" +Output = 5d0689ef49d2fae572b881b123a85ffa21595f36 + +Digest = RIPEMD160 +Input = "abcdefghijklmnopqrstuvwxyz" +Output = f71c27109c692c1b56bbdceb5b9d2865b3708dbc + +Digest = RIPEMD160 +Input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" +Output = 12a053384a9c0c88e405a06c27dcf49ada62eb2b + +Digest = RIPEMD160 +Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" +Output = b0e20b6e3116640286ed3a87a5713079b21f5189 + +Digest = RIPEMD160 +Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890" +Output = 9b752e45573d4b39f4dbd3323cab82bf63326bfb + +# whirlpool tests from wp_test.c +Digest = whirlpool +Input = "" +Output = 19FA61D75522A4669B44E39C1D2E1726C530232130D407F89AFEE0964997F7A73E83BE698B288FEBCF88E3E03C4F0757EA8964E59B63D93708B138CC42A66EB3 + +Digest = whirlpool +Input = "a" +Output = 8ACA2602792AEC6F11A67206531FB7D7F0DFF59413145E6973C45001D0087B42D11BC645413AEFF63A42391A39145A591A92200D560195E53B478584FDAE231A + +Digest = whirlpool +Input = "abc" +Output = 4E2448A4C6F486BB16B6562C73B4020BF3043E3A731BCE721AE1B303D97E6D4C7181EEBDB6C57E277D0E34957114CBD6C797FC9D95D8B582D225292076D4EEF5 + +Digest = whirlpool +Input = "message digest" +Output = 378C84A4126E2DC6E56DCC7458377AAC838D00032230F53CE1F5700C0FFB4D3B8421557659EF55C106B4B52AC5A4AAA692ED920052838F3362E86DBD37A8903E + +Digest = whirlpool +Input = "abcdefghijklmnopqrstuvwxyz" +Output = F1D754662636FFE92C82EBB9212A484A8D38631EAD4238F5442EE13B8054E41B08BF2A9251C30B6A0B8AAE86177AB4A6F68F673E7207865D5D9819A3DBA4EB3B + +Digest = whirlpool +Input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" +Output = DC37E008CF9EE69BF11F00ED9ABA26901DD7C28CDEC066CC6AF42E40F82F3A1E08EBA26629129D8FB7CB57211B9281A65517CC879D7B962142C65F5A7AF01467 + +Digest = whirlpool +Input = "12345678901234567890123456789012345678901234567890123456789012345678901234567890" +Output = 466EF18BABB0154D25B9D38A6414F5C08784372BCCB204D6549C4AFADB6014294D5BD8DF2A6C44E538CD047B2681A51A2C60481E88C5A20B2C2A80CF3A9A083B + +Digest = whirlpool +Input = "abcdbcdecdefdefgefghfghighijhijk" +Output = 2A987EA40F917061F5D6F0A0E4644F488A7A5A52DEEE656207C562F988E95C6916BDC8031BC5BE1B7B947639FE050B56939BAAA0ADFF9AE6745B7B181C3BE3FD + +Digest = whirlpool +Input = "aaaaaaaaaa" +Count = 100000 +Output = 0C99005BEB57EFF50A7CF005560DDF5D29057FD86B20BFD62DECA0F1CCEA4AF51FC15490EDDC47AF32BB2B66C34FF9AD8C6008AD677F77126953B226E4ED8B01 + +# DES EDE3 CFB1 +# echo -n "Hello World" | +# apps/openssl enc -des-ede3-cfb1 \ +# -K 000102030405060708090A0B0C0D0E0F1011121314151617 -iv 0001020304050607 | +# xxd -ps -u + +Cipher = DES-EDE3-CFB1 +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +IV = 0001020304050607 +Plaintext = "Hello World" +Ciphertext = 3CF55D656E9C0664513358 + +Cipher = DES-EDE3-CFB1 +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +IV = 0001020304050607 +Operation = DECRYPT +Plaintext = "Hello World" +Ciphertext = 3CF55D656E9C0664513358 + +# AES 128 ECB tests (from FIPS-197 test vectors, encrypt) + +Cipher = AES-128-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 69C4E0D86A7B0430D8CDB78070B4C55A + +# AES 192 ECB tests (from FIPS-197 test vectors, encrypt) + +Cipher = AES-192-ECB +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = DDA97CA4864CDFE06EAF70A0EC0D7191 + + +# AES 256 ECB tests (from FIPS-197 test vectors, encrypt) + +Cipher = AES-256-ECB +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 8EA2B7CA516745BFEAFC49904B496089 + + +# AES 128 ECB tests (from NIST test vectors, encrypt) + +#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F:1 + +# AES 128 ECB tests (from NIST test vectors, decrypt) + +#AES-128-ECB:00000000000000000000000000000000::44416AC2D1F53C583303917E6BE9EBE0:00000000000000000000000000000000:0 + +# AES 192 ECB tests (from NIST test vectors, decrypt) + +#AES-192-ECB:000000000000000000000000000000000000000000000000::48E31E9E256718F29229319C19F15BA4:00000000000000000000000000000000:0 + +# AES 256 ECB tests (from NIST test vectors, decrypt) + +#AES-256-ECB:0000000000000000000000000000000000000000000000000000000000000000::058CCFFDBBCB382D1F6F56585D8A4ADE:00000000000000000000000000000000:0 + +# AES 128 CBC tests (from NIST test vectors, encrypt) + +#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:8A05FC5E095AF4848A08D328D3688E3D:1 + +# AES 192 CBC tests (from NIST test vectors, encrypt) + +#AES-192-CBC:000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:7BD966D53AD8C1BB85D2ADFAE87BB104:1 + +# AES 256 CBC tests (from NIST test vectors, encrypt) + +#AES-256-CBC:0000000000000000000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:FE3C53653E2F45B56FCD88B2CC898FF0:1 + +# AES 128 CBC tests (from NIST test vectors, decrypt) + +#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:FACA37E0B0C85373DF706E73F7C9AF86:00000000000000000000000000000000:0 + +# AES tests from NIST document SP800-38A +# For all ECB encrypts and decrypts, the transformed sequence is +# AES-bits-ECB:key::plaintext:ciphertext:encdec +# ECB-AES128.Encrypt and ECB-AES128.Decrypt +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3AD77BB40D7A3660A89ECAF32466EF97 + +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = F5D3D58503B9699DE785895A96FDBAAF + +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 43B1CD7F598ECE23881B00E3ED030688 + +Cipher = AES-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 7B0C785E27E8AD3F8223207104725DD4 + +# ECB-AES192.Encrypt and ECB-AES192.Decrypt +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = BD334F1D6E45F25FF712A214571FA5CC + +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 974104846D0AD3AD7734ECB3ECEE4EEF + +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = EF7AFD2270E2E60ADCE0BA2FACE6444E + +Cipher = AES-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 9A4B41BA738D6C72FB16691603C18E0E + +# ECB-AES256.Encrypt and ECB-AES256.Decrypt +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = F3EED1BDB5D2A03C064B5A7E3DB181F8 + +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 591CCB10D410ED26DC5BA74A31362870 + +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = B6ED21B99CA6F4F9F153E7B1BEAFED1D + +Cipher = AES-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 23304B7A39F9F3FF067D8D8F9E24ECC7 + +# For all CBC encrypts and decrypts, the transformed sequence is +# AES-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec +# CBC-AES128.Encrypt and CBC-AES128.Decrypt +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 7649ABAC8119B246CEE98E9B12E9197D + +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 7649ABAC8119B246CEE98E9B12E9197D +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 5086CB9B507219EE95DB113A917678B2 + +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 5086CB9B507219EE95DB113A917678B2 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 73BED6B8E3C1743B7116E69E22229516 + +Cipher = AES-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 73BED6B8E3C1743B7116E69E22229516 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 3FF1CAA1681FAC09120ECA307586E1A7 + +# CBC-AES192.Encrypt and CBC-AES192.Decrypt +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 4F021DB243BC633D7178183A9FA071E8 + +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 4F021DB243BC633D7178183A9FA071E8 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = B4D9ADA9AD7DEDF4E5E738763F69145A + +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = B4D9ADA9AD7DEDF4E5E738763F69145A +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 571B242012FB7AE07FA9BAAC3DF102E0 + +Cipher = AES-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 571B242012FB7AE07FA9BAAC3DF102E0 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 08B0E27988598881D920A9E64F5615CD + +# CBC-AES256.Encrypt and CBC-AES256.Decrypt +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = F58C4C04D6E5F1BA779EABFB5F7BFBD6 + +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = F58C4C04D6E5F1BA779EABFB5F7BFBD6 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 9CFC4E967EDB808D679F777BC6702C7D + +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 9CFC4E967EDB808D679F777BC6702C7D +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 39F23369A9D9BACFA530E26304231461 + +Cipher = AES-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 39F23369A9D9BACFA530E26304231461 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = B2EB05E2C39BE9FCDA6C19078C6A9D1B + +# We don't support CFB{1,8}-AESxxx.{En,De}crypt +# For all CFB128 encrypts and decrypts, the transformed sequence is +# AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec +# CFB128-AES128.Encrypt +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 3B3FD92EB72DAD20333449F8E83CFB4A +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 26751F67A3CBB140B1808CF187A4F4DF +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6 + +# CFB128-AES128.Decrypt +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 3B3FD92EB72DAD20333449F8E83CFB4A +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF + +Cipher = AES-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 26751F67A3CBB140B1808CF187A4F4DF +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6 + +# CFB128-AES192.Encrypt +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = CDC80D6FDDF18CAB34C25909C99A4174 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 67CE7F7F81173621961A2B70171D3D7A + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 67CE7F7F81173621961A2B70171D3D7A +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF + +# CFB128-AES192.Decrypt +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = CDC80D6FDDF18CAB34C25909C99A4174 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 67CE7F7F81173621961A2B70171D3D7A + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 67CE7F7F81173621961A2B70171D3D7A +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 + +Cipher = AES-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF + +# CFB128-AES256.Encrypt +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DC7E84BFDA79164B7ECD8486985D3860 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 39FFED143B28B1C832113C6331E5407B + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 39FFED143B28B1C832113C6331E5407B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = DF10132415E54B92A13ED0A8267AE2F9 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DF10132415E54B92A13ED0A8267AE2F9 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 75A385741AB9CEF82031623D55B1E471 + +# CFB128-AES256.Decrypt +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DC7E84BFDA79164B7ECD8486985D3860 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 39FFED143B28B1C832113C6331E5407B + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 39FFED143B28B1C832113C6331E5407B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = DF10132415E54B92A13ED0A8267AE2F9 + +Cipher = AES-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = DF10132415E54B92A13ED0A8267AE2F9 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 75A385741AB9CEF82031623D55B1E471 + +# For all OFB encrypts and decrypts, the transformed sequence is +# AES-bits-CFB:key:IV/output':plaintext:ciphertext:encdec +# OFB-AES128.Encrypt +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 7789508D16918F03F53C52DAC54ED825 + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9740051E9C5FECF64344F7A82260EDCC + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 304C6528F659C77866A510D9C1D6AE5E + +# OFB-AES128.Decrypt +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 7789508D16918F03F53C52DAC54ED825 + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9740051E9C5FECF64344F7A82260EDCC + +Cipher = AES-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 304C6528F659C77866A510D9C1D6AE5E + +# OFB-AES192.Encrypt +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = FCC28B8D4C63837C09E81700C1100401 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A + +# OFB-AES192.Decrypt +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = FCC28B8D4C63837C09E81700C1100401 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2 + +Cipher = AES-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A + +# OFB-AES256.Encrypt +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0126141D67F37BE8538F5A8BE740E484 + +# OFB-AES256.Decrypt +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408 + +Cipher = AES-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0126141D67F37BE8538F5A8BE740E484 + + +# AES Counter test vectors from RFC3686 +Cipher = aes-128-ctr +Key = AE6852F8121067CC4BF7A5765577F39E +IV = 00000030000000000000000000000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = E4095D4FB7A7B3792D6175A3261311B8 + +Cipher = aes-128-ctr +Key = 7E24067817FAE0D743D6CE1F32539163 +IV = 006CB6DBC0543B59DA48D90B00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = 5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28 + +Cipher = aes-128-ctr +Key = 7691BE035E5020A8AC6E618529F9A0DC +IV = 00E0017B27777F3F4A1786F000000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F + + +Cipher = aes-192-ctr +Key = 16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515 +IV = 0000004836733C147D6D93CB00000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 4B55384FE259C9C84E7935A003CBE928 + +Cipher = aes-192-ctr +Key = 7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A +IV = 0096B03B020C6EADC2CB500D00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = 453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00 + +Cipher = aes-192-ctr +Key = 02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE +IV = 0007BDFD5CBD60278DCC091200000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = 96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935 + + +Cipher = aes-256-ctr +Key = 776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104 +IV = 00000060DB5672C97AA8F0B200000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 145AD01DBF824EC7560863DC71E3E0C0 + +Cipher = aes-256-ctr +Key = F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884 +IV = 00FAAC24C1585EF15A43D87500000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C + +Cipher = aes-256-ctr +Key = FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D +IV = 001CC5B751A51D70A1C1114800000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8 + + +# Self-generated vector to trigger false carry on big-endian platforms +Cipher = aes-128-ctr +Key = 7E24067817FAE0D743D6CE1F32539163 +IV = 00000000000000007FFFFFFFFFFFFFFF +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = A2D459477E6432BD74184B1B5370D2243CDC202BC43583B2A55D288CDBBD1E03 + +# DES ECB tests (from destest) + +Cipher = DES-ECB +Key = 0000000000000000 +Plaintext = 0000000000000000 +Ciphertext = 8CA64DE9C1B123A7 + +Cipher = DES-ECB +Key = FFFFFFFFFFFFFFFF +Plaintext = FFFFFFFFFFFFFFFF +Ciphertext = 7359B2163E4EDC58 + +Cipher = DES-ECB +Key = 3000000000000000 +Plaintext = 1000000000000001 +Ciphertext = 958E6E627A05557B + +Cipher = DES-ECB +Key = 1111111111111111 +Plaintext = 1111111111111111 +Ciphertext = F40379AB9E0EC533 + +Cipher = DES-ECB +Key = 0123456789ABCDEF +Plaintext = 1111111111111111 +Ciphertext = 17668DFC7292532D + +Cipher = DES-ECB +Key = 1111111111111111 +Plaintext = 0123456789ABCDEF +Ciphertext = 8A5AE1F81AB8F2DD + +Cipher = DES-ECB +Key = FEDCBA9876543210 +Plaintext = 0123456789ABCDEF +Ciphertext = ED39D950FA74BCC4 + + +# DESX-CBC tests (from destest) +Cipher = DESX-CBC +Key = 0123456789abcdeff1e0d3c2b5a49786fedcba9876543210 +IV = fedcba9876543210 +Plaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000 +Ciphertext = 846B2914851E9A2954732F8AA0A611C115CDC2D7951B1053A63C5E03B21AA3C4 + + +# DES EDE3 CBC tests (from destest) +Cipher = DES-EDE3-CBC +Key = 0123456789abcdeff1e0d3c2b5a49786fedcba9876543210 +IV = fedcba9876543210 +Plaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000 +Ciphertext = 3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675 + + +# RC4 tests (from rc4test) +Cipher = RC4 +Key = 0123456789abcdef0123456789abcdef +Plaintext = 0123456789abcdef +Ciphertext = 75b7878099e0c596 + +Cipher = RC4 +Key = 0123456789abcdef0123456789abcdef +Plaintext = 0000000000000000 +Ciphertext = 7494c2e7104b0879 + +Cipher = RC4 +Key = 00000000000000000000000000000000 +Plaintext = 0000000000000000 +Ciphertext = de188941a3375d3a + +Cipher = RC4 +Key = ef012345ef012345ef012345ef012345 +Plaintext = 0000000000000000000000000000000000000000 +Ciphertext = d6a141a7ec3c38dfbd615a1162e1c7ba36b67858 + +Cipher = RC4 +Key = 0123456789abcdef0123456789abcdef +Plaintext = 123456789ABCDEF0123456789ABCDEF0123456789ABCDEF012345678 +Ciphertext = 66a0949f8af7d6891f7f832ba833c00c892ebe30143ce28740011ecf + +Cipher = RC4 +Key = ef012345ef012345ef012345ef012345 +Plaintext = 00000000000000000000 +Ciphertext = d6a141a7ec3c38dfbd61 + + + +# Camellia tests from RFC3713 +# For all ECB encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-ECB:key::plaintext:ciphertext:encdec +Cipher = CAMELLIA-128-ECB +Key = 0123456789abcdeffedcba9876543210 +Plaintext = 0123456789abcdeffedcba9876543210 +Ciphertext = 67673138549669730857065648eabe43 + +Cipher = CAMELLIA-192-ECB +Key = 0123456789abcdeffedcba98765432100011223344556677 +Plaintext = 0123456789abcdeffedcba9876543210 +Ciphertext = b4993401b3e996f84ee5cee7d79b09b9 + +Cipher = CAMELLIA-256-ECB +Key = 0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff +Plaintext = 0123456789abcdeffedcba9876543210 +Ciphertext = 9acc237dff16d76c20ef7c919e3a7509 + + +# ECB-CAMELLIA128.Encrypt +Cipher = CAMELLIA-128-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 77CF412067AF8270613529149919546F + +Cipher = CAMELLIA-192-ECB +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = B22F3C36B72D31329EEE8ADDC2906C68 + +Cipher = CAMELLIA-256-ECB +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Operation = ENCRYPT +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 2EDF1F3418D53B88841FC8985FB1ECF2 + + +# ECB-CAMELLIA128.Encrypt and ECB-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 432FC5DCD628115B7C388D770B270C96 + +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 0BE1F14023782A22E8384C5ABB7FAB2B + +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = A0A1ABCD1893AB6FE0FE5B65DF5F8636 + +Cipher = CAMELLIA-128-ECB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = E61925E0D5DFAA9BB29F815B3076E51A + + +# ECB-CAMELLIA192.Encrypt and ECB-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CCCC6C4E138B45848514D48D0D3439D3 + +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 5713C62C14B2EC0F8393B6AFD6F5785A + +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = B40ED2B60EB54D09D030CF511FEEF366 + +Cipher = CAMELLIA-192-ECB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 909DBD95799096748CB27357E73E1D26 + + +# ECB-CAMELLIA256.Encrypt and ECB-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = BEFD219B112FA00098919CD101C9CCFA + +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = C91D3A8F1AEA08A9386CF4B66C0169EA + +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = A623D711DC5F25A51BB8A80D56397D28 + +Cipher = CAMELLIA-256-ECB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 7960109FB6DC42947FCFE59EA3C5EB6B + + +# For all CBC encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec +# CBC-CAMELLIA128.Encrypt and CBC-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 1607CF494B36BBF00DAEB0B503C831AB + +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 1607CF494B36BBF00DAEB0B503C831AB +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = A2F2CF671629EF7840C5A5DFB5074887 + +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A2F2CF671629EF7840C5A5DFB5074887 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 0F06165008CF8B8B5A63586362543E54 + +Cipher = CAMELLIA-128-CBC +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 36A84CDAFD5F9A85ADA0F0A993D6D577 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 74C64268CDB8B8FAF5B34E8AF3732980 + + +# CBC-CAMELLIA192.Encrypt and CBC-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 2A4830AB5AC4A1A2405955FD2195CF93 + +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 2A4830AB5AC4A1A2405955FD2195CF93 +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 5D5A869BD14CE54264F892A6DD2EC3D5 + +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 5D5A869BD14CE54264F892A6DD2EC3D5 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 37D359C3349836D884E310ADDF68C449 + +Cipher = CAMELLIA-192-CBC +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 37D359C3349836D884E310ADDF68C449 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 01FAAA930B4AB9916E9668E1428C6B08 + + +# CBC-CAMELLIA256.Encrypt and CBC-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = E6CFA35FC02B134A4D2C0B6737AC3EDA + +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E6CFA35FC02B134A4D2C0B6737AC3EDA +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 36CBEB73BD504B4070B1B7DE2B21EB50 + +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 36CBEB73BD504B4070B1B7DE2B21EB50 +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = E31A6055297D96CA3330CDF1B1860A83 + +Cipher = CAMELLIA-256-CBC +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E31A6055297D96CA3330CDF1B1860A83 +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 5D563F6D1CCCF236051C0C5C1C58F28F + + +# We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt +# For all CFB128 encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec +# CFB128-CAMELLIA128.Encrypt +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 14F7646187817EB586599146B82BD719 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = A53D28BB82DF741103EA4F921A44880B + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A53D28BB82DF741103EA4F921A44880B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9C2157A664626D1DEF9EA420FDE69B96 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 9C2157A664626D1DEF9EA420FDE69B96 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 742A25F0542340C7BAEF24CA8482BB09 + + +# CFB128-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 14F7646187817EB586599146B82BD719 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = A53D28BB82DF741103EA4F921A44880B + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A53D28BB82DF741103EA4F921A44880B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 9C2157A664626D1DEF9EA420FDE69B96 + +Cipher = CAMELLIA-128-CFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 9C2157A664626D1DEF9EA420FDE69B96 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 742A25F0542340C7BAEF24CA8482BB09 + + +# CFB128-CAMELLIA192.Encrypt +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = C832BB9780677DAA82D9B6860DCD565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 86F8491627906D780C7A6D46EA331F98 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 86F8491627906D780C7A6D46EA331F98 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 69511CCE594CF710CB98BB63D7221F01 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 69511CCE594CF710CB98BB63D7221F01 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D5B5378A3ABED55803F25565D8907B84 + + +# CFB128-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = C832BB9780677DAA82D9B6860DCD565E +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 86F8491627906D780C7A6D46EA331F98 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 86F8491627906D780C7A6D46EA331F98 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 69511CCE594CF710CB98BB63D7221F01 + +Cipher = CAMELLIA-192-CFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 69511CCE594CF710CB98BB63D7221F01 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D5B5378A3ABED55803F25565D8907B84 + + +# CFB128-CAMELLIA256.Encrypt +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = CF6107BB0CEA7D7FB1BD31F5E7B06C93 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 89BEDB4CCDD864EA11BA4CBE849B5E2B + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 89BEDB4CCDD864EA11BA4CBE849B5E2B +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 555FC3F34BDD2D54C62D9E3BF338C1C4 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 555FC3F34BDD2D54C62D9E3BF338C1C4 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 5953ADCE14DB8C7F39F1BD39F359BFFA + + +# CFB128-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = CF6107BB0CEA7D7FB1BD31F5E7B06C93 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 89BEDB4CCDD864EA11BA4CBE849B5E2B + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 89BEDB4CCDD864EA11BA4CBE849B5E2B +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 555FC3F34BDD2D54C62D9E3BF338C1C4 + +Cipher = CAMELLIA-256-CFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 555FC3F34BDD2D54C62D9E3BF338C1C4 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 5953ADCE14DB8C7F39F1BD39F359BFFA + + +# For all OFB encrypts and decrypts, the transformed sequence is +# CAMELLIA-bits-OFB:key:IV/output':plaintext:ciphertext:encdec +# OFB-CAMELLIA128.Encrypt +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 25623DB569CA51E01482649977E28D84 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = C776634A60729DC657D12B9FCA801E98 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D776379BE0E50825E681DA1A4C980E8E + + +# OFB-CAMELLIA128.Decrypt +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = 14F7646187817EB586599146B82BD719 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = 50FE67CC996D32B6DA0937E99BAFEC60 +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 25623DB569CA51E01482649977E28D84 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = D9A4DADA0892239F6B8B3D7680E15674 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = C776634A60729DC657D12B9FCA801E98 + +Cipher = CAMELLIA-128-OFB +Key = 2B7E151628AED2A6ABF7158809CF4F3C +IV = A78819583F0308E7A6BF36B1386ABF23 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = D776379BE0E50825E681DA1A4C980E8E + + +# OFB-CAMELLIA192.Encrypt +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 8ECEB7D0350D72C7F78562AEBDF99339 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = BDD62DBBB9700846C53B507F544696F0 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = E28014E046B802F385C4C2E13EAD4A72 + + +# OFB-CAMELLIA192.Decrypt +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = C832BB9780677DAA82D9B6860DCD565E + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = A609B38DF3B1133DDDFF2718BA09565E +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 8ECEB7D0350D72C7F78562AEBDF99339 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 52EF01DA52602FE0975F78AC84BF8A50 +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = BDD62DBBB9700846C53B507F544696F0 + +Cipher = CAMELLIA-192-OFB +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = BD5286AC63AABD7EB067AC54B553F71D +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = E28014E046B802F385C4C2E13EAD4A72 + + +# OFB-CAMELLIA256.Encrypt +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = ENCRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 127AD97E8E3994E4820027D7BA109368 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = ENCRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 6BFF6265A6A6B7A535BC65A80B17214E + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = ENCRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0A4A0404E26AA78A27CB271E8BF3CF20 + + +# OFB-CAMELLIA256.Decrypt +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 6BC1BEE22E409F96E93D7E117393172A +Ciphertext = CF6107BB0CEA7D7FB1BD31F5E7B06C93 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A +Operation = DECRYPT +Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 +Ciphertext = 127AD97E8E3994E4820027D7BA109368 + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = E1C656305ED1A7A6563805746FE03EDC +Operation = DECRYPT +Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF +Ciphertext = 6BFF6265A6A6B7A535BC65A80B17214E + +Cipher = CAMELLIA-256-OFB +Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 +IV = 41635BE625B48AFC1666DD42A09D96E7 +Operation = DECRYPT +Plaintext = F69F2445DF4F9B17AD2B417BE66C3710 +Ciphertext = 0A4A0404E26AA78A27CB271E8BF3CF20 + + +# Camellia test vectors from RFC5528 +Cipher = CAMELLIA-128-CTR +Key = AE6852F8121067CC4BF7A5765577F39E +IV = 00000030000000000000000000000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = D09DC29A8214619A20877C76DB1F0B3F + +Cipher = CAMELLIA-128-CTR +Key = 7E24067817FAE0D743D6CE1F32539163 +IV = 006CB6DBC0543B59DA48D90B00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = DBF3C78DC08396D4DA7C907765BBCB442B8E8E0F31F0DCA72C7417E35360E048 + +Cipher = CAMELLIA-128-CTR +Key = 7691BE035E5020A8AC6E618529F9A0DC +IV = 00E0017B27777F3F4A1786F000000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = B19D1FCDCB75EB882F849CE24D85CF739CE64B2B5C9D73F14F2D5D9DCE9889CDDF508696 + +Cipher = CAMELLIA-192-CTR +Key = 16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515 +IV = 0000004836733C147D6D93CB00000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 2379399E8A8D2B2B16702FC78B9E9696 + +Cipher = CAMELLIA-192-CTR +Key = 7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A +IV = 0096B03B020C6EADC2CB500D00000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = 7DEF34F7A5D0E415674B7FFCAE67C75DD018B86FF23051E056392A99F35A4CED + +Cipher = CAMELLIA-192-CTR +Key = 02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE +IV = 0007BDFD5CBD60278DCC091200000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = 5710E556E1487A20B5AC0E73F19E4E7876F37FDC91B1EF4D4DADE8E666A64D0ED557AB57 + +Cipher = CAMELLIA-256-CTR +Key = 776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104 +IV = 00000060DB5672C97AA8F0B200000001 +Operation = ENCRYPT +Plaintext = 53696E676C6520626C6F636B206D7367 +Ciphertext = 3401F9C8247EFFCEBD6994714C1BBB11 + +Cipher = CAMELLIA-256-CTR +Key = F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884 +IV = 00FAAC24C1585EF15A43D87500000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = D6C30392246F7808A83C2B22A8839E45E51CD48A1CDF406EBC9CC2D3AB834108 + +Cipher = CAMELLIA-256-CTR +Key = FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D +IV = 001CC5B751A51D70A1C1114800000001 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223 +Ciphertext = A4DA23FCE6A5FFAA6D64AE9A0652A42CD161A34B65F9679F75C01F101F71276F15EF0D8D + +# SEED test vectors from RFC4269 +Cipher = SEED-ECB +Key = 00000000000000000000000000000000 +Operation = DECRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = 5EBAC6E0054E166819AFF1CC6D346CDB + +Cipher = SEED-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = DECRYPT +Plaintext = 00000000000000000000000000000000 +Ciphertext = C11F22F20140505084483597E4370F43 + +Cipher = SEED-ECB +Key = 4706480851E61BE85D74BFB3FD956185 +Operation = DECRYPT +Plaintext = 83A2F8A288641FB9A4E9A5CC2F131C7D +Ciphertext = EE54D13EBCAE706D226BC3142CD40D4A + +Cipher = SEED-ECB +Key = 28DBC3BC49FFD87DCFA509B11D422BE7 +Operation = DECRYPT +Plaintext = B41E6BE2EBA84A148E2EED84593C5EC7 +Ciphertext = 9B9B7BFCD1813CB95D0B3618F40F5122 + +Cipher = SEED-ECB +Key = 00000000000000000000000000000000 +Operation = ENCRYPT +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = 5EBAC6E0054E166819AFF1CC6D346CDB + +Cipher = SEED-ECB +Key = 000102030405060708090A0B0C0D0E0F +Operation = ENCRYPT +Plaintext = 00000000000000000000000000000000 +Ciphertext = C11F22F20140505084483597E4370F43 + +Cipher = SEED-ECB +Key = 4706480851E61BE85D74BFB3FD956185 +Operation = ENCRYPT +Plaintext = 83A2F8A288641FB9A4E9A5CC2F131C7D +Ciphertext = EE54D13EBCAE706D226BC3142CD40D4A + +Cipher = SEED-ECB +Key = 28DBC3BC49FFD87DCFA509B11D422BE7 +Operation = ENCRYPT +Plaintext = B41E6BE2EBA84A148E2EED84593C5EC7 +Ciphertext = 9B9B7BFCD1813CB95D0B3618F40F5122 + + +# AES CCM 256 bit key +Cipher = aes-256-ccm +Key = 1bde3251d41a8b5ea013c195ae128b218b3e0306376357077ef1c1c78548b92e +IV = 5b8e40746f6b98e00f1d13ff41 +AAD = c17a32514eb6103f3249e076d4c871dc97e04b286699e54491dc18f6d734d4c0 +Tag = 2024931d73bca480c24a24ece6b6c2bf +Plaintext = 53bd72a97089e312422bf72e242377b3c6ee3e2075389b999c4ef7f28bd2b80a +Ciphertext = 9a5fcccdb4cf04e7293d2775cc76a488f042382d949b43b7d6bb2b9864786726 + +Cipher = aes-256-ccm +Key = 1bde3251d41a8b5ea013c195ae128b218b3e0306376357077ef1c1c78548b92e +IV = 5b8e40746f6b98e00f1d13ff41 +AAD = c17a32514eb6103f3249e076d4c871dc97e04b286699e54491dc18f6d734d4c0 +Tag = 2024931d73bca480c24a24ece6b6c2be +Plaintext = 53bd72a97089e312422bf72e242377b3c6ee3e2075389b999c4ef7f28bd2b80a +Ciphertext = 9a5fcccdb4cf04e7293d2775cc76a488f042382d949b43b7d6bb2b9864786726 +Operation = DECRYPT +Result = CIPHERUPDATE_ERROR + +# AES GCM test vectors from http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-spec.pdf +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 58e2fccefa7e3061367f1d57a4e7455a +Plaintext = +Ciphertext = + +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = ab6e47d42cec13bdf53a67b21257bddf +Plaintext = 00000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = +Tag = 4d5c2af327cd64a62cf35abd2ba6fab4 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 +Ciphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 5bc94fbc3221a5db94fae95ae7121a47 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbad +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 3612d2e79e3b0785561be14aaca2fccb +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 619cc5aefffe0bfa462af43c1699d050 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5 + +Cipher = aes-128-gcm +Key = feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 619cc5aefffe0bfa462af43c1699d051 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5 +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +Cipher = aes-192-gcm +Key = 000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = cd33b28ac773f74ba00ed1f312572435 +Plaintext = +Ciphertext = + +Cipher = aes-192-gcm +Key = 000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 2ff58d80033927ab8ef4d4587514f0fb +Plaintext = 00000000000000000000000000000000 +Ciphertext = 98e7247c07f0fe411c267e4384b0f600 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = cafebabefacedbaddecaf888 +AAD = +Tag = 9924a7c8587336bfb118024db8674a14 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 +Ciphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = cafebabefacedbaddecaf888 +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 2519498e80f1478f37ba55bd6d27618c +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = cafebabefacedbad +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 65dcc57fcf623a24094fcca40d3533f8 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7 + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = dcf566ff291c25bbb8568fc3d376a6d9 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b + +Cipher = aes-192-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = dcf566ff291c25bbb8568fc3d376a6d8 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +Cipher = aes-256-gcm +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 530f8afbc74536b9a963b4f1c4cb738b +Plaintext = +Ciphertext = + +Cipher = aes-256-gcm +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = d0d1c8a799996bf0265b98b5d48ab919 +Plaintext = 00000000000000000000000000000000 +Ciphertext = cea7403d4d606b6e074ec5d3baf39d18 + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = +Tag = b094dac5d93471bdec1a502270e3cc6c +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255 +Ciphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbaddecaf888 +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 76fc6ece0f4e1768cddf8853bb2d551b +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662 + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = cafebabefacedbad +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = 3a337dbf46a792c45e454913fe2ea8f2 +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = a44a8266ee1c8eb0c8b5d4cf5ae9f19a +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f + +Cipher = aes-256-gcm +Key = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308 +IV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b +AAD = feedfacedeadbeeffeedfacedeadbeefabaddad2 +Tag = a44a8266ee1c8eb0c8b5d4cf5ae9f19b +Plaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39 +Ciphertext = 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +# local add-ons, primarily streaming ghash tests +# 128 bytes aad +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad +Tag = 5fea793a2d6f974d37e68e0cb8ff9492 +Plaintext = +Ciphertext = + +# 48 bytes plaintext +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 9dd0a376b08e40eb00c35f29f9ea61a4 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0 + +# 80 bytes plaintext +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = 98885a3a22bd4742fe7b72172193b163 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d5270291 + +# 128 bytes plaintext +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = 000000000000000000000000 +AAD = +Tag = cac45f60e31efd3b5a43b98a22ce1aa1 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d527029195b84d1b96c690ff2f2de30bf2ec89e00253786e126504f0dab90c48a30321de3345e6b0461e7c9e6c6b7afedde83f40 + +# 192 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +AAD = +Tag = 566f8ef683078bfdeeffa869d751a017 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606 + +# 240 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +AAD = +Tag = fd0c7011ff07f0071324bdfb2d0f3a29 +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606872ca10dee15b3249b1a1b958f23134c4bccb7d03200bce420a2f8eb66dcf3644d1423c1b5699003c13ecef4bf38a3b6 + +# 288 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF +Cipher = aes-128-gcm +Key = 00000000000000000000000000000000 +IV = ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +AAD = +Tag = 8b307f6b33286d0ab026a9ed3fe1e85f +Plaintext = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606872ca10dee15b3249b1a1b958f23134c4bccb7d03200bce420a2f8eb66dcf3644d1423c1b5699003c13ecef4bf38a3b60eedc34033bac1902783dc6d89e2e774188a439c7ebcc0672dbda4ddcfb2794613b0be41315ef778708a70ee7d75165c + +# 80 bytes plaintext, submitted by Intel +Cipher = aes-128-gcm +Key = 843ffcf5d2b72694d19ed01d01249412 +IV = dbcca32ebf9b804617c3aa9e +AAD = 00000000000000000000000000000000101112131415161718191a1b1c1d1e1f +Tag = 3b629ccfbc1119b7319e1dce2cd6fd6d +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f +Ciphertext = 6268c6fa2a80b2d137467f092f657ac04d89be2beaa623d61b5a868c8f03ff95d3dcee23ad2f1ab3a6c80eaf4b140eb05de3457f0fbc111a6b43d0763aa422a3013cf1dc37fe417d1fbfc449b75d4cc5 + +#AES OCB Test vectors +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 197B9C3C441D3C83EAFB2BEF633B9182 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 0001020304050607 +Tag = 16DC76A46D47E1EAD537209E8A96D14E +Plaintext = 0001020304050607 +Ciphertext = 92B657130A74B85A + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 0001020304050607 +Tag = 98B91552C8C009185044E30A6EB2FE21 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 971EFFCAE19AD4716F88E87B871FBEED +Plaintext = 0001020304050607 +Ciphertext = 92B657130A74B85A + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F +Tag = 776C9924D6723A1FC4524532AC3E5BEB +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F +Tag = 7DDB8E6CEA6814866212509619B19CC6 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 13CC8B747807121A4CBB3E4BD6B456AF +Plaintext = 000102030405060708090A0B0C0D0E0F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F1011121314151617 +Tag = 5FA94FC3F38820F1DC3F3D1FD4E55E1C +Plaintext = 000102030405060708090A0B0C0D0E0F1011121314151617 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122FCFCEE7A2A8D4D48 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F1011121314151617 +Tag = 282026DA3068BC9FA118681D559F10F6 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 6EF2F52587FDA0ED97DC7EEDE241DF68 +Plaintext = 000102030405060708090A0B0C0D0E0F1011121314151617 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122FCFCEE7A2A8D4D48 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Tag = B2A040DD3BD5164372D76D7BB6824240 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Tag = E1E072633BADE51A60E85951D9C42A1B +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 4A3BAE824465CFDAF8C41FC50C7DF9D9 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 659C623211DEEA0DE30D2C381879F4C8 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB68C65778B058A635 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 7AEB7A69A1687DD082CA27B0D9A37096 +Plaintext = +Ciphertext = + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = +Tag = 060C8467F4ABAB5E8B3C2067A2E115DC +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = BEA5E8798DBE7110031C144DA0B26122CEAAB9B05DF771A657149D53773463CB68C65778B058A635 + +#AES OCB Non standard test vectors - generated from reference implementation +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 1b6c44f34e3abb3cbf8976e7 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = 09a4fd29de949d9a9aa9924248422097ad4883b4713e6c214ff6567ada08a96766fc4e2ee3e3a5a1 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B0C0D0E +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 1ad62009901f40cba7cd7156f94a7324 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Ciphertext = 5e2fa7367ffbdb3938845cfd415fcc71ec79634eb31451609d27505f5e2978f43c44213d8fa441ee + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = C203F98CE28F7DAD3F31C021 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F3031 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C822D6 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 8346D7D47C5D893ED472F5AB +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F4041 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F714FF + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 5822A9A70FDF55D29D2984A6 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F5051 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB8294170634D + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 81772B6741ABB4ECA9D2DEB2 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F6061 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB829417001E54E15A7576C4DF32366E0F439C7050FAA + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 3E52A01D068DE85456DB03B7 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB829417001E54E15A7576C4DF32366E0F439C7051CB4824B8114E9A720CBC1CE0185B156B486 + +Cipher = aes-128-ocb +Key = 000102030405060708090A0B0C0D0E0F +IV = 000102030405060708090A0B +AAD = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627 +Tag = 3E52A01D068DE85456DB03B6 +Plaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071 +Ciphertext = 09A4FD29DE949D9A9AA9924248422097AD4883B4713E6C214FF6567ADA08A967B2176C12F110DD441B7CAA3A509B13C86A023AFCEE998BEE42028D44507B15F77C528A1DE6406B519BCEE8FCB829417001E54E15A7576C4DF32366E0F439C7051CB4824B8114E9A720CBC1CE0185B156B486 +Operation = DECRYPT +Result = CIPHERFINAL_ERROR + +# AES XTS test vectors from IEEE Std 1619-2007 +Cipher = aes-128-xts +Key = 0000000000000000000000000000000000000000000000000000000000000000 +IV = 00000000000000000000000000000000 +Plaintext = 0000000000000000000000000000000000000000000000000000000000000000 +Ciphertext = 917cf69ebd68b2ec9b9fe9a3eadda692cd43d2f59598ed858c02c2652fbf922e + +Cipher = aes-128-xts +Key = 1111111111111111111111111111111122222222222222222222222222222222 +IV = 33333333330000000000000000000000 +Plaintext = 4444444444444444444444444444444444444444444444444444444444444444 +Ciphertext = c454185e6a16936e39334038acef838bfb186fff7480adc4289382ecd6d394f0 + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f022222222222222222222222222222222 +IV = 33333333330000000000000000000000 +Plaintext = 4444444444444444444444444444444444444444444444444444444444444444 +Ciphertext = af85336b597afc1a900b2eb21ec949d292df4c047e0b21532186a5971a227a89 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f4341332e4ca60482a4ba1a03b3e65008fc5da76b70bf1690db4eae29c5f1badd03c5ccf2a55d705ddcd86d449511ceb7ec30bf12b1fa35b913f9f747a8afd1b130e94bff94effd01a91735ca1726acd0b197c4e5b03393697e126826fb6bbde8ecc1e08298516e2c9ed03ff3c1b7860f6de76d4cecd94c8119855ef5297ca67e9f3e7ff72b1e99785ca0a7e7720c5b36dc6d72cac9574c8cbbc2f801e23e56fd344b07f22154beba0f08ce8891e643ed995c94d9a69c9f1b5f499027a78572aeebd74d20cc39881c213ee770b1010e4bea718846977ae119f7a023ab58cca0ad752afe656bb3c17256a9f6e9bf19fdd5a38fc82bbe872c5539edb609ef4f79c203ebb140f2e583cb2ad15b4aa5b655016a8449277dbd477ef2c8d6c017db738b18deb4a427d1923ce3ff262735779a418f20a282df920147beabe421ee5319d0568 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 01000000000000000000000000000000 +Plaintext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f4341332e4ca60482a4ba1a03b3e65008fc5da76b70bf1690db4eae29c5f1badd03c5ccf2a55d705ddcd86d449511ceb7ec30bf12b1fa35b913f9f747a8afd1b130e94bff94effd01a91735ca1726acd0b197c4e5b03393697e126826fb6bbde8ecc1e08298516e2c9ed03ff3c1b7860f6de76d4cecd94c8119855ef5297ca67e9f3e7ff72b1e99785ca0a7e7720c5b36dc6d72cac9574c8cbbc2f801e23e56fd344b07f22154beba0f08ce8891e643ed995c94d9a69c9f1b5f499027a78572aeebd74d20cc39881c213ee770b1010e4bea718846977ae119f7a023ab58cca0ad752afe656bb3c17256a9f6e9bf19fdd5a38fc82bbe872c5539edb609ef4f79c203ebb140f2e583cb2ad15b4aa5b655016a8449277dbd477ef2c8d6c017db738b18deb4a427d1923ce3ff262735779a418f20a282df920147beabe421ee5319d0568 +Ciphertext = 264d3ca8512194fec312c8c9891f279fefdd608d0c027b60483a3fa811d65ee59d52d9e40ec5672d81532b38b6b089ce951f0f9c35590b8b978d175213f329bb1c2fd30f2f7f30492a61a532a79f51d36f5e31a7c9a12c286082ff7d2394d18f783e1a8e72c722caaaa52d8f065657d2631fd25bfd8e5baad6e527d763517501c68c5edc3cdd55435c532d7125c8614deed9adaa3acade5888b87bef641c4c994c8091b5bcd387f3963fb5bc37aa922fbfe3df4e5b915e6eb514717bdd2a74079a5073f5c4bfd46adf7d282e7a393a52579d11a028da4d9cd9c77124f9648ee383b1ac763930e7162a8d37f350b2f74b8472cf09902063c6b32e8c2d9290cefbd7346d1c779a0df50edcde4531da07b099c638e83a755944df2aef1aa31752fd323dcb710fb4bfbb9d22b925bc3577e1b8949e729a90bbafeacf7f7879e7b1147e28ba0bae940db795a61b15ecf4df8db07b824bb062802cc98a9545bb2aaeed77cb3fc6db15dcd7d80d7d5bc406c4970a3478ada8899b329198eb61c193fb6275aa8ca340344a75a862aebe92eee1ce032fd950b47d7704a3876923b4ad62844bf4a09c4dbe8b4397184b7471360c9564880aedddb9baa4af2e75394b08cd32ff479c57a07d3eab5d54de5f9738b8d27f27a9f0ab11799d7b7ffefb2704c95c6ad12c39f1e867a4b7b1d7818a4b753dfd2a89ccb45e001a03a867b187f225dd + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 02000000000000000000000000000000 +Plaintext = 264d3ca8512194fec312c8c9891f279fefdd608d0c027b60483a3fa811d65ee59d52d9e40ec5672d81532b38b6b089ce951f0f9c35590b8b978d175213f329bb1c2fd30f2f7f30492a61a532a79f51d36f5e31a7c9a12c286082ff7d2394d18f783e1a8e72c722caaaa52d8f065657d2631fd25bfd8e5baad6e527d763517501c68c5edc3cdd55435c532d7125c8614deed9adaa3acade5888b87bef641c4c994c8091b5bcd387f3963fb5bc37aa922fbfe3df4e5b915e6eb514717bdd2a74079a5073f5c4bfd46adf7d282e7a393a52579d11a028da4d9cd9c77124f9648ee383b1ac763930e7162a8d37f350b2f74b8472cf09902063c6b32e8c2d9290cefbd7346d1c779a0df50edcde4531da07b099c638e83a755944df2aef1aa31752fd323dcb710fb4bfbb9d22b925bc3577e1b8949e729a90bbafeacf7f7879e7b1147e28ba0bae940db795a61b15ecf4df8db07b824bb062802cc98a9545bb2aaeed77cb3fc6db15dcd7d80d7d5bc406c4970a3478ada8899b329198eb61c193fb6275aa8ca340344a75a862aebe92eee1ce032fd950b47d7704a3876923b4ad62844bf4a09c4dbe8b4397184b7471360c9564880aedddb9baa4af2e75394b08cd32ff479c57a07d3eab5d54de5f9738b8d27f27a9f0ab11799d7b7ffefb2704c95c6ad12c39f1e867a4b7b1d7818a4b753dfd2a89ccb45e001a03a867b187f225dd +Ciphertext = fa762a3680b76007928ed4a4f49a9456031b704782e65e16cecb54ed7d017b5e18abd67b338e81078f21edb7868d901ebe9c731a7c18b5e6dec1d6a72e078ac9a4262f860beefa14f4e821018272e411a951502b6e79066e84252c3346f3aa62344351a291d4bedc7a07618bdea2af63145cc7a4b8d4070691ae890cd65733e7946e9021a1dffc4c59f159425ee6d50ca9b135fa6162cea18a939838dc000fb386fad086acce5ac07cb2ece7fd580b00cfa5e98589631dc25e8e2a3daf2ffdec26531659912c9d8f7a15e5865ea8fb5816d6207052bd7128cd743c12c8118791a4736811935eb982a532349e31dd401e0b660a568cb1a4711f552f55ded59f1f15bf7196b3ca12a91e488ef59d64f3a02bf45239499ac6176ae321c4a211ec545365971c5d3f4f09d4eb139bfdf2073d33180b21002b65cc9865e76cb24cd92c874c24c18350399a936ab3637079295d76c417776b94efce3a0ef7206b15110519655c956cbd8b2489405ee2b09a6b6eebe0c53790a12a8998378b33a5b71159625f4ba49d2a2fdba59fbf0897bc7aabd8d707dc140a80f0f309f835d3da54ab584e501dfa0ee977fec543f74186a802b9a37adb3e8291eca04d66520d229e60401e7282bef486ae059aa70696e0e305d777140a7a883ecdcb69b9ff938e8a4231864c69ca2c2043bed007ff3e605e014bcf518138dc3a25c5e236171a2d01d6 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = fd000000000000000000000000000000 +Plaintext = 8e41b78c390b5af9d758bb214a67e9f6bf7727b09ac6124084c37611398fa45daad94868600ed391fb1acd4857a95b466e62ef9f4b377244d1c152e7b30d731aad30c716d214b707aed99eb5b5e580b3e887cf7497465651d4b60e6042051da3693c3b78c14489543be8b6ad0ba629565bba202313ba7b0d0c94a3252b676f46cc02ce0f8a7d34c0ed229129673c1f61aed579d08a9203a25aac3a77e9db60267996db38df637356d9dcd1632e369939f2a29d89345c66e05066f1a3677aef18dea4113faeb629e46721a66d0a7e785d3e29af2594eb67dfa982affe0aac058f6e15864269b135418261fc3afb089472cf68c45dd7f231c6249ba0255e1e033833fc4d00a3fe02132d7bc3873614b8aee34273581ea0325c81f0270affa13641d052d36f0757d484014354d02d6883ca15c24d8c3956b1bd027bcf41f151fd8023c5340e5606f37e90fdb87c86fb4fa634b3718a30bace06a66eaf8f63c4aa3b637826a87fe8cfa44282e92cb1615af3a28e53bc74c7cba1a0977be9065d0c1a5dec6c54ae38d37f37aa35283e048e5530a85c4e7a29d7b92ec0c3169cdf2a805c7604bce60049b9fb7b8eaac10f51ae23794ceba68bb58112e293b9b692ca721b37c662f8574ed4dba6f88e170881c82cddc1034a0ca7e284bf0962b6b26292d836fa9f73c1ac770eef0f2d3a1eaf61d3e03555fd424eedd67e18a18094f888 +Ciphertext = d55f684f81f4426e9fde92a5ff02df2ac896af63962888a97910c1379e20b0a3b1db613fb7fe2e07004329ea5c22bfd33e3dbe4cf58cc608c2c26c19a2e2fe22f98732c2b5cb844cc6c0702d91e1d50fc4382a7eba5635cd602432a2306ac4ce82f8d70c8d9bc15f918fe71e74c622d5cf71178bf6e0b9cc9f2b41dd8dbe441c41cd0c73a6dc47a348f6702f9d0e9b1b1431e948e299b9ec2272ab2c5f0c7be86affa5dec87a0bee81d3d50007edaa2bcfccb35605155ff36ed8edd4a40dcd4b243acd11b2b987bdbfaf91a7cac27e9c5aea525ee53de7b2d3332c8644402b823e94a7db26276d2d23aa07180f76b4fd29b9c0823099c9d62c519880aee7e9697617c1497d47bf3e571950311421b6b734d38b0db91eb85331b91ea9f61530f54512a5a52a4bad589eb69781d537f23297bb459bdad2948a29e1550bf4787e0be95bb173cf5fab17dab7a13a052a63453d97ccec1a321954886b7a1299faaeecae35c6eaaca753b041b5e5f093bf83397fd21dd6b3012066fcc058cc32c3b09d7562dee29509b5839392c9ff05f51f3166aaac4ac5f238038a3045e6f72e48ef0fe8bc675e82c318a268e43970271bf119b81bf6a982746554f84e72b9f00280a320a08142923c23c883423ff949827f29bbacdc1ccdb04938ce6098c95ba6b32528f4ef78eed778b2e122ddfd1cbdd11d1c0a6783e011fc536d63d053260637 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = fe000000000000000000000000000000 +Plaintext = d55f684f81f4426e9fde92a5ff02df2ac896af63962888a97910c1379e20b0a3b1db613fb7fe2e07004329ea5c22bfd33e3dbe4cf58cc608c2c26c19a2e2fe22f98732c2b5cb844cc6c0702d91e1d50fc4382a7eba5635cd602432a2306ac4ce82f8d70c8d9bc15f918fe71e74c622d5cf71178bf6e0b9cc9f2b41dd8dbe441c41cd0c73a6dc47a348f6702f9d0e9b1b1431e948e299b9ec2272ab2c5f0c7be86affa5dec87a0bee81d3d50007edaa2bcfccb35605155ff36ed8edd4a40dcd4b243acd11b2b987bdbfaf91a7cac27e9c5aea525ee53de7b2d3332c8644402b823e94a7db26276d2d23aa07180f76b4fd29b9c0823099c9d62c519880aee7e9697617c1497d47bf3e571950311421b6b734d38b0db91eb85331b91ea9f61530f54512a5a52a4bad589eb69781d537f23297bb459bdad2948a29e1550bf4787e0be95bb173cf5fab17dab7a13a052a63453d97ccec1a321954886b7a1299faaeecae35c6eaaca753b041b5e5f093bf83397fd21dd6b3012066fcc058cc32c3b09d7562dee29509b5839392c9ff05f51f3166aaac4ac5f238038a3045e6f72e48ef0fe8bc675e82c318a268e43970271bf119b81bf6a982746554f84e72b9f00280a320a08142923c23c883423ff949827f29bbacdc1ccdb04938ce6098c95ba6b32528f4ef78eed778b2e122ddfd1cbdd11d1c0a6783e011fc536d63d053260637 +Ciphertext = 72efc1ebfe1ee25975a6eb3aa8589dda2b261f1c85bdab442a9e5b2dd1d7c3957a16fc08e526d4b1223f1b1232a11af274c3d70dac57f83e0983c498f1a6f1aecb021c3e70085a1e527f1ce41ee5911a82020161529cd82773762daf5459de94a0a82adae7e1703c808543c29ed6fb32d9e004327c1355180c995a07741493a09c21ba01a387882da4f62534b87bb15d60d197201c0fd3bf30c1500a3ecfecdd66d8721f90bcc4c17ee925c61b0a03727a9c0d5f5ca462fbfa0af1c2513a9d9d4b5345bd27a5f6e653f751693e6b6a2b8ead57d511e00e58c45b7b8d005af79288f5c7c22fd4f1bf7a898b03a5634c6a1ae3f9fae5de4f296a2896b23e7ed43ed14fa5a2803f4d28f0d3ffcf24757677aebdb47bb388378708948a8d4126ed1839e0da29a537a8c198b3c66ab00712dd261674bf45a73d67f76914f830ca014b65596f27e4cf62de66125a5566df9975155628b400fbfb3a29040ed50faffdbb18aece7c5c44693260aab386c0a37b11b114f1c415aebb653be468179428d43a4d8bc3ec38813eca30a13cf1bb18d524f1992d44d8b1a42ea30b22e6c95b199d8d182f8840b09d059585c31ad691fa0619ff038aca2c39a943421157361717c49d322028a74648113bd8c9d7ec77cf3c89c1ec8718ceff8516d96b34c3c614f10699c9abc4ed0411506223bea16af35c883accdbe1104eef0cfdb54e12fb230a + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = ff000000000000000000000000000000 +Plaintext = 72efc1ebfe1ee25975a6eb3aa8589dda2b261f1c85bdab442a9e5b2dd1d7c3957a16fc08e526d4b1223f1b1232a11af274c3d70dac57f83e0983c498f1a6f1aecb021c3e70085a1e527f1ce41ee5911a82020161529cd82773762daf5459de94a0a82adae7e1703c808543c29ed6fb32d9e004327c1355180c995a07741493a09c21ba01a387882da4f62534b87bb15d60d197201c0fd3bf30c1500a3ecfecdd66d8721f90bcc4c17ee925c61b0a03727a9c0d5f5ca462fbfa0af1c2513a9d9d4b5345bd27a5f6e653f751693e6b6a2b8ead57d511e00e58c45b7b8d005af79288f5c7c22fd4f1bf7a898b03a5634c6a1ae3f9fae5de4f296a2896b23e7ed43ed14fa5a2803f4d28f0d3ffcf24757677aebdb47bb388378708948a8d4126ed1839e0da29a537a8c198b3c66ab00712dd261674bf45a73d67f76914f830ca014b65596f27e4cf62de66125a5566df9975155628b400fbfb3a29040ed50faffdbb18aece7c5c44693260aab386c0a37b11b114f1c415aebb653be468179428d43a4d8bc3ec38813eca30a13cf1bb18d524f1992d44d8b1a42ea30b22e6c95b199d8d182f8840b09d059585c31ad691fa0619ff038aca2c39a943421157361717c49d322028a74648113bd8c9d7ec77cf3c89c1ec8718ceff8516d96b34c3c614f10699c9abc4ed0411506223bea16af35c883accdbe1104eef0cfdb54e12fb230a +Ciphertext = 3260ae8dad1f4a32c5cafe3ab0eb95549d461a67ceb9e5aa2d3afb62dece0553193ba50c75be251e08d1d08f1088576c7efdfaaf3f459559571e12511753b07af073f35da06af0ce0bbf6b8f5ccc5cea500ec1b211bd51f63b606bf6528796ca12173ba39b8935ee44ccce646f90a45bf9ccc567f0ace13dc2d53ebeedc81f58b2e41179dddf0d5a5c42f5d8506c1a5d2f8f59f3ea873cbcd0eec19acbf325423bd3dcb8c2b1bf1d1eaed0eba7f0698e4314fbeb2f1566d1b9253008cbccf45a2b0d9c5c9c21474f4076e02be26050b99dee4fd68a4cf890e496e4fcae7b70f94ea5a9062da0daeba1993d2ccd1dd3c244b8428801495a58b216547e7e847c46d1d756377b6242d2e5fb83bf752b54e0df71e889f3a2bb0f4c10805bf3c590376e3c24e22ff57f7fa965577375325cea5d920db94b9c336b455f6e894c01866fe9fbb8c8d3f70a2957285f6dfb5dcd8cbf54782f8fe7766d4723819913ac773421e3a31095866bad22c86a6036b2518b2059b4229d18c8c2ccbdf906c6cc6e82464ee57bddb0bebcb1dc645325bfb3e665ef7251082c88ebb1cf203bd779fdd38675713c8daadd17e1cabee432b09787b6ddf3304e38b731b45df5df51b78fcfb3d32466028d0ba36555e7e11ab0ee0666061d1645d962444bc47a38188930a84b4d561395c73c087021927ca638b7afc8a8679ccb84c26555440ec7f10445cd + + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ff000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 1c3b3a102f770386e4836c99e370cf9bea00803f5e482357a4ae12d414a3e63b5d31e276f8fe4a8d66b317f9ac683f44680a86ac35adfc3345befecb4bb188fd5776926c49a3095eb108fd1098baec70aaa66999a72a82f27d848b21d4a741b0c5cd4d5fff9dac89aeba122961d03a757123e9870f8acf1000020887891429ca2a3e7a7d7df7b10355165c8b9a6d0a7de8b062c4500dc4cd120c0f7418dae3d0b5781c34803fa75421c790dfe1de1834f280d7667b327f6c8cd7557e12ac3a0f93ec05c52e0493ef31a12d3d9260f79a289d6a379bc70c50841473d1a8cc81ec583e9645e07b8d9670655ba5bbcfecc6dc3966380ad8fecb17b6ba02469a020a84e18e8f84252070c13e9f1f289be54fbc481457778f616015e1327a02b140f1505eb309326d68378f8374595c849d84f4c333ec4423885143cb47bd71c5edae9be69a2ffeceb1bec9de244fbe15992b11b77c040f12bd8f6a975a44a0f90c29a9abc3d4d893927284c58754cce294529f8614dcd2aba991925fedc4ae74ffac6e333b93eb4aff0479da9a410e4450e0dd7ae4c6e2910900575da401fc07059f645e8b7e9bfdef33943054ff84011493c27b3429eaedb4ed5376441a77ed43851ad77f16f541dfd269d50d6a5f14fb0aab1cbb4c1550be97f7ab4066193c4caa773dad38014bd2092fa755c824bb5e54c4f36ffda9fcea70b9c6e693e148c151 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffff0000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 77a31251618a15e6b92d1d66dffe7b50b50bad552305ba0217a610688eff7e11e1d0225438e093242d6db274fde801d4cae06f2092c728b2478559df58e837c2469ee4a4fa794e4bbc7f39bc026e3cb72c33b0888f25b4acf56a2a9804f1ce6d3d6e1dc6ca181d4b546179d55544aa7760c40d06741539c7e3cd9d2f6650b2013fd0eeb8c2b8e3d8d240ccae2d4c98320a7442e1c8d75a42d6e6cfa4c2eca1798d158c7aecdf82490f24bb9b38e108bcda12c3faf9a21141c3613b58367f922aaa26cd22f23d708dae699ad7cb40a8ad0b6e2784973dcb605684c08b8d6998c69aac049921871ebb65301a4619ca80ecb485a31d744223ce8ddc2394828d6a80470c092f5ba413c3378fa6054255c6f9df4495862bbb3287681f931b687c888abf844dfc8fc28331e579928cd12bd2390ae123cf03818d14dedde5c0c24c8ab018bfca75ca096f2d531f3d1619e785f1ada437cab92e980558b3dce1474afb75bfedbf8ff54cb2618e0244c9ac0d3c66fb51598cd2db11f9be39791abe447c63094f7c453b7ff87cb5bb36b7c79efb0872d17058b83b15ab0866ad8a58656c5a7e20dbdf308b2461d97c0ec0024a2715055249cf3b478ddd4740de654f75ca686e0d7345c69ed50cdc2a8b332b1f8824108ac937eb050585608ee734097fc09054fbff89eeaeea791f4a7ab1f9868294a4f9e27b42af8100cb9d59cef9645803 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffffff00000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = e387aaa58ba483afa7e8eb469778317ecf4cf573aa9d4eac23f2cdf914e4e200a8b490e42ee646802dc6ee2b471b278195d60918ececb44bf79966f83faba0499298ebc699c0c8634715a320bb4f075d622e74c8c932004f25b41e361025b5a87815391f6108fc4afa6a05d9303c6ba68a128a55705d415985832fdeaae6c8e19110e84d1b1f199a2692119edc96132658f09da7c623efcec712537a3d94c0bf5d7e352ec94ae5797fdb377dc1551150721adf15bd26a8efc2fcaad56881fa9e62462c28f30ae1ceaca93c345cf243b73f542e2074a705bd2643bb9f7cc79bb6e7091ea6e232df0f9ad0d6cf502327876d82207abf2115cdacf6d5a48f6c1879a65b115f0f8b3cb3c59d15dd8c769bc014795a1837f3901b5845eb491adfefe097b1fa30a12fc1f65ba22905031539971a10f2f36c321bb51331cdefb39e3964c7ef079994f5b69b2edd83a71ef549971ee93f44eac3938fcdd61d01fa71799da3a8091c4c48aa9ed263ff0749df95d44fef6a0bb578ec69456aa5408ae32c7af08ad7ba8921287e3bbee31b767be06a0e705c864a769137df28292283ea81a2480241b44d9921cdbec1bc28dc1fda114bd8e5217ac9d8ebafa720e9da4f9ace231cc949e5b96fe76ffc21063fddc83a6b8679c00d35e09576a875305bed5f36ed242c8900dd1fa965bc950dfce09b132263a1eef52dd6888c309f5a7d712826 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffffffff000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = bf53d2dade78e822a4d949a9bc6766b01b06a8ef70d26748c6a7fc36d80ae4c5520f7c4ab0ac8544424fa405162fef5a6b7f229498063618d39f0003cb5fb8d1c86b643497da1ff945c8d3bedeca4f479702a7a735f043ddb1d6aaade3c4a0ac7ca7f3fa5279bef56f82cd7a2f38672e824814e10700300a055e1630b8f1cb0e919f5e942010a416e2bf48cb46993d3cb6a51c19bacf864785a00bc2ecff15d350875b246ed53e68be6f55bd7e05cfc2b2ed6432198a6444b6d8c247fab941f569768b5c429366f1d3f00f0345b96123d56204c01c63b22ce78baf116e525ed90fdea39fa469494d3866c31e05f295ff21fea8d4e6e13d67e47ce722e9698a1c1048d68ebcde76b86fcf976eab8aa9790268b7068e017a8b9b749409514f1053027fd16c3786ea1bac5f15cb79711ee2abe82f5cf8b13ae73030ef5b9e4457e75d1304f988d62dd6fc4b94ed38ba831da4b7634971b6cd8ec325d9c61c00f1df73627ed3745a5e8489f3a95c69639c32cd6e1d537a85f75cc844726e8a72fc0077ad22000f1d5078f6b866318c668f1ad03d5a5fced5219f2eabbd0aa5c0f460d183f04404a0d6f469558e81fab24a167905ab4c7878502ad3e38fdbe62a41556cec37325759533ce8f25f367c87bb5578d667ae93f9e2fd99bcbc5f2fbba88cf6516139420fcff3b7361d86322c4bd84c82f335abb152c4a93411373aaa8220 + +Cipher = aes-256-xts +Key = 27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592 +IV = ffffffffff0000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 64497e5a831e4a932c09be3e5393376daa599548b816031d224bbf50a818ed2350eae7e96087c8a0db51ad290bd00c1ac1620857635bf246c176ab463be30b808da548081ac847b158e1264be25bb0910bbc92647108089415d45fab1b3d2604e8a8eff1ae4020cfa39936b66827b23f371b92200be90251e6d73c5f86de5fd4a950781933d79a28272b782a2ec313efdfcc0628f43d744c2dc2ff3dcb66999b50c7ca895b0c64791eeaa5f29499fb1c026f84ce5b5c72ba1083cddb5ce45434631665c333b60b11593fb253c5179a2c8db813782a004856a1653011e93fb6d876c18366dd8683f53412c0c180f9c848592d593f8609ca736317d356e13e2bff3a9f59cd9aeb19cd482593d8c46128bb32423b37a9adfb482b99453fbe25a41bf6feb4aa0bef5ed24bf73c762978025482c13115e4015aac992e5613a3b5c2f685b84795cb6e9b2656d8c88157e52c42f978d8634c43d06fea928f2822e465aa6576e9bf419384506cc3ce3c54ac1a6f67dc66f3b30191e698380bc999b05abce19dc0c6dcc2dd001ec535ba18deb2df1a101023108318c75dc98611a09dc48a0acdec676fabdf222f07e026f059b672b56e5cbc8e1d21bbd867dd927212054681d70ea737134cdfce93b6f82ae22423274e58a0821cc5502e2d0ab4585e94de6975be5e0b4efce51cd3e70c25a1fbbbd609d273ad5b0d59631c531f6a0a57b9 + + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f10 +Ciphertext = 6c1625db4671522d3d7599601de7ca09ed + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f1011 +Ciphertext = d069444b7a7e0cab09e24447d24deb1fedbf + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112 +Ciphertext = e5df1351c0544ba1350b3363cd8ef4beedbf9d + +Cipher = aes-128-xts +Key = fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0 +IV = 9a785634120000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f10111213 +Ciphertext = 9d84c813f719aa2c7be3f66171c7c5c2edbf9dac + +Cipher = aes-128-xts +Key = e0e1e2e3e4e5e6e7e8e9eaebecedeeefc0c1c2c3c4c5c6c7c8c9cacbcccdcecf +IV = 21436587a90000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Ciphertext = 38b45812ef43a05bd957e545907e223b954ab4aaf088303ad910eadf14b42be68b2461149d8c8ba85f992be970bc621f1b06573f63e867bf5875acafa04e42ccbd7bd3c2a0fb1fff791ec5ec36c66ae4ac1e806d81fbf709dbe29e471fad38549c8e66f5345d7c1eb94f405d1ec785cc6f6a68f6254dd8339f9d84057e01a17741990482999516b5611a38f41bb6478e6f173f320805dd71b1932fc333cb9ee39936beea9ad96fa10fb4112b901734ddad40bc1878995f8e11aee7d141a2f5d48b7a4e1e7f0b2c04830e69a4fd1378411c2f287edf48c6c4e5c247a19680f7fe41cefbd49b582106e3616cbbe4dfb2344b2ae9519391f3e0fb4922254b1d6d2d19c6d4d537b3a26f3bcc51588b32f3eca0829b6a5ac72578fb814fb43cf80d64a233e3f997a3f02683342f2b33d25b492536b93becb2f5e1a8b82f5b883342729e8ae09d16938841a21a97fb543eea3bbff59f13c1a18449e398701c1ad51648346cbc04c27bb2da3b93a1372ccae548fb53bee476f9e9c91773b1bb19828394d55d3e1a20ed69113a860b6829ffa847224604435070221b257e8dff783615d2cae4803a93aa4334ab482a0afac9c0aeda70b45a481df5dec5df8cc0f423c77a5fd46cd312021d4b438862419a791be03bb4d97c0e59578542531ba466a83baf92cefc151b5cc1611a167893819b63fb8a6b18e86de60290fa72b797b0ce59f3 + +# Exercise different lengths covering even ciphertext stealing cases +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f6061 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5B079C6307EA0914559C6D2FB6384F8AADF94 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce84 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f7071 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CEF4F253466EF4953ADC8FE2F5BC1FF57593FD + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad0265 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f8081 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE842973C68248EDDFE26FB9B096659C8A5D6BB7 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f9091 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD0265C4DD16E65A24575A709F174593F19FF85EA9 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD02655EA92DC4C4E41A8952C651D33174BE519215FA160C664D4B07D757A034AB3B35A10C + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f91 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD02655EA92DC4C4E41A8952C651D33174BE51A10C421110E6D81588EDE82103A252D82C6CBC24F9357BD1FB882AA4B2CC2E7FA750 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf +Ciphertext = 27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f434 + +Cipher = aes-128-xts +Key = 2718281828459045235360287471352631415926535897932384626433832795 +IV = 00000000000000000000000000000000 +Plaintext = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1 +Ciphertext = 27A7479BEFA1D476489F308CD4CFA6E2A96E4BBE3208FF25287DD3819616E89CC78CF7F5E543445F8333D8FA7F56000005279FA5D8B5E4AD40E736DDB4D35412328063FD2AAB53E5EA1E0A9F332500A5DF9487D07A5C92CC512C8866C7E860CE93FDF166A24912B422976146AE20CE846BB7DC9BA94A767AAEF20C0D61AD02655EA92DC4C4E41A8952C651D33174BE51A10C421110E6D81588EDE82103A252D8A750E8768DEFFFED9122810AAEB99F910409B03D164E727C31290FD4E039500872AF + +# AES wrap tests from RFC3394 +Cipher = id-aes128-wrap +Key = 000102030405060708090A0B0C0D0E0F +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 1FA68B0A8112B447AEF34BD8FB5A7B829D3E862371D2CFE5 + +Cipher = id-aes192-wrap +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 96778B25AE6CA435F92B5B97C050AED2468AB8A17AD84E5D + +Cipher = id-aes256-wrap +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Plaintext = 00112233445566778899AABBCCDDEEFF +Ciphertext = 64E8C3F9CE0F5BA263E9777905818A2A93C8191E7D6E8AE7 + +Cipher = id-aes192-wrap +Key = 000102030405060708090A0B0C0D0E0F1011121314151617 +Plaintext = 00112233445566778899AABBCCDDEEFF0001020304050607 +Ciphertext = 031D33264E15D33268F24EC260743EDCE1C6C7DDEE725A936BA814915C6762D2 + +Cipher = id-aes256-wrap +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Plaintext = 00112233445566778899AABBCCDDEEFF0001020304050607 +Ciphertext = A8F9BC1612C68B3FF6E6F4FBE30E71E4769C8B80A32CB8958CD5D17D6B254DA1 + +Cipher = id-aes256-wrap +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F +Plaintext = 00112233445566778899AABBCCDDEEFF000102030405060708090A0B0C0D0E0F +Ciphertext = 28C9F404C4B810F4CBCCB35CFB87F8263F5786E2D80ED326CBC7F0E71A99F43BFB988B9B7A02DD21 + +# Same as previous example but with invalid unwrap key: should be rejected +# without returning any plaintext +Cipher = id-aes256-wrap +Operation = DECRYPT +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E00 +Plaintext = 00112233445566778899AABBCCDDEEFF000102030405060708090A0B0C0D0E0F +Ciphertext = 28C9F404C4B810F4CBCCB35CFB87F8263F5786E2D80ED326CBC7F0E71A99F43BFB988B9B7A02DD21 +Result = CIPHERUPDATE_ERROR + +# AES wrap tests from RFC5649 +Cipher = id-aes192-wrap-pad +Key = 5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8 +Plaintext = c37b7e6492584340bed12207808941155068f738 +Ciphertext = 138bdeaa9b8fa7fc61f97742e72248ee5ae6ae5360d1ae6a5f54f373fa543b6a + +Cipher = id-aes192-wrap-pad +Key = 5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8 +Plaintext = 466f7250617369 +Ciphertext = afbeb0f07dfbf5419200f2ccb50bb24f + +# HMAC tests from RFC2104 +MAC = HMAC +Algorithm = MD5 +Key = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b +Input = "Hi There" +Output = 9294727a3638bb1c13f48ef8158bfc9d + +MAC = HMAC +Algorithm = MD5 +Key = "Jefe" +Input = "what do ya want for nothing?" +Output = 750c783e6ab0b503eaa86e310a5db738 + +MAC = HMAC +Algorithm = MD5 +Key = AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +Input = DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD +Output = 56be34521d144c88dbb8c733f0e8b3f6 + +# HMAC tests from NIST test data + +MAC = HMAC +Algorithm = SHA1 +Input = "Sample message for keylen=blocklen" +Key = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F +Output = 5FD596EE78D5553C8FF4E72D266DFD192366DA29 + +MAC = HMAC +Algorithm = SHA1 +Input = "Sample message for keylen 5; -# We want to know that an absurdly small number of bits isn't support is(run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', '8'])), 0, "genrsa -3 8"); - -# Depending on the shared library, we might have different lower limits. -# Let's find it! This is a simple binary search -# ------------------------------------------------------------ -# NOTE: $good may need an update in the future -# ------------------------------------------------------------ -note "Looking for lowest amount of bits"; -my $bad = 3; # Log2 of number of bits (2 << 3 == 8) -my $good = 11; # Log2 of number of bits (2 << 11 == 2048) -while ($good > $bad + 1) { - my $checked = int(($good + $bad + 1) / 2); - if (run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', - 2 ** $checked ], stderr => undef))) { - note 2 ** $checked, " bits is good"; - $good = $checked; - } else { - note 2 ** $checked, " bits is bad"; - $bad = $checked; - } -} -$good++ if $good == $bad; -$good = 2 ** $good; -note "Found lowest allowed amount of bits to be $good"; - -ok(run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', $good ])), - "genrsa -3 $good"); -ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout' ])), - "rsa -check"); -ok(run(app([ 'openssl', 'genrsa', '-f4', '-out', 'genrsatest.pem', $good ])), - "genrsa -f4 $good"); -ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout' ])), - "rsa -check"); +ok(run(app([ 'openssl', 'genrsa', '-3', '-out', 'genrsatest.pem', '16'])), "genrsa -3 16"); +ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout'])), "rsa -check"); +ok(run(app([ 'openssl', 'genrsa', '-f4', '-out', 'genrsatest.pem', '16'])), "genrsa -f4 16"); +ok(run(app([ 'openssl', 'rsa', '-check', '-in', 'genrsatest.pem', '-noout'])), "rsa -check"); unlink 'genrsatest.pem'; diff --git a/worker/deps/openssl/openssl/test/recipes/25-test_verify.t b/worker/deps/openssl/openssl/test/recipes/25-test_verify.t index 11f54d0486..11bd43090f 100644 --- a/worker/deps/openssl/openssl/test/recipes/25-test_verify.t +++ b/worker/deps/openssl/openssl/test/recipes/25-test_verify.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -30,7 +30,7 @@ sub verify { run(app([@args])); } -plan tests => 129; +plan tests => 127; # Canonical success ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]), @@ -326,12 +326,6 @@ ok(verify("alt2-cert", "sslserver", ["root-cert"], ["ncca2-cert"], ), ok(verify("alt3-cert", "sslserver", ["root-cert"], ["ncca1-cert", "ncca3-cert"], ), "Name Constraints nested test all permitted"); -ok(verify("goodcn1-cert", "sslserver", ["root-cert"], ["ncca1-cert"], ), - "Name Constraints CNs permitted"); - -ok(!verify("badcn1-cert", "sslserver", ["root-cert"], ["ncca1-cert"], ), - "Name Constraints CNs not permitted"); - ok(!verify("badalt1-cert", "sslserver", ["root-cert"], ["ncca1-cert"], ), "Name Constraints hostname not permitted"); diff --git a/worker/deps/openssl/openssl/test/recipes/30-test_evp.t b/worker/deps/openssl/openssl/test/recipes/30-test_evp.t index da0eadad25..c277fcdfa0 100644 --- a/worker/deps/openssl/openssl/test/recipes/30-test_evp.t +++ b/worker/deps/openssl/openssl/test/recipes/30-test_evp.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -10,17 +10,10 @@ use strict; use warnings; -use OpenSSL::Test qw/:DEFAULT data_file/; +use OpenSSL::Test qw/:DEFAULT srctop_file/; setup("test_evp"); -my @files = ( "evpciph.txt", "evpdigest.txt", "evpencod.txt", "evpkdf.txt", - "evpmac.txt", "evppbe.txt", "evppkey.txt", "evppkey_ecc.txt", - "evpcase.txt" ); - -plan tests => scalar(@files); - -foreach my $f ( @files ) { - ok(run(test(["evp_test", data_file("$f")])), - "running evp_test $f"); -} +plan tests => 1; +ok(run(test(["evp_test", srctop_file("test", "evptests.txt")])), + "running evp_test evptests.txt"); diff --git a/worker/deps/openssl/openssl/test/recipes/80-test_ca.t b/worker/deps/openssl/openssl/test/recipes/80-test_ca.t index 28a090ea7d..f40aba1d4d 100644 --- a/worker/deps/openssl/openssl/test/recipes/80-test_ca.t +++ b/worker/deps/openssl/openssl/test/recipes/80-test_ca.t @@ -56,4 +56,3 @@ sub yes { close PIPE; return 0; } - diff --git a/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t b/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t index 5c1b1d4545..98d537e5f3 100644 --- a/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t +++ b/worker/deps/openssl/openssl/test/recipes/80-test_cipherlist.t @@ -1,6 +1,6 @@ #! /usr/bin/perl # -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -12,16 +12,11 @@ use strict; use warnings; use OpenSSL::Test::Simple; -use OpenSSL::Test qw(:DEFAULT openssl_versions); +use OpenSSL::Test; use OpenSSL::Test::Utils qw(alldisabled available_protocols); setup("test_cipherlist"); -my ($build_version, $library_version) = openssl_versions(); -plan skip_all => - "This test recipe isn't supported when doing regression testing" - if $build_version != $library_version; - my $no_anytls = alldisabled(available_protocols("tls")); # If we have no protocols, then we also have no supported ciphers. diff --git a/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t b/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t index 65ba5fcf52..b4897c5808 100644 --- a/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t +++ b/worker/deps/openssl/openssl/test/recipes/80-test_x509aux.t @@ -19,7 +19,7 @@ plan skip_all => "test_dane uses ec which is not supported by this OpenSSL build plan tests => 1; # The number of tests being performed -ok(run(test(["x509aux", +ok(run(test(["x509aux", srctop_file("test", "certs", "roots.pem"), srctop_file("test", "certs", "root+anyEKU.pem"), srctop_file("test", "certs", "root-anyEKU.pem"), diff --git a/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t b/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t index 8d3b3541fc..d152925733 100644 --- a/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t +++ b/worker/deps/openssl/openssl/test/recipes/90-test_fuzz.t @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -26,14 +26,14 @@ plan tests => scalar @fuzzers; foreach my $f (@fuzzers) { subtest "Fuzzing $f" => sub { - my @dirs = glob(srctop_file('fuzz', 'corpora', $f)); - push @dirs, glob(srctop_file('fuzz', 'corpora', "$f-*")); + my @files = glob(srctop_file('fuzz', 'corpora', $f, '*')); + push @files, glob(srctop_file('fuzz', 'corpora', "$f-*", '*')); - plan skip_all => "No corpora for $f-test" unless @dirs; + plan skip_all => "No corpora for $f-test" unless @files; - plan tests => scalar @dirs; + plan tests => scalar @files; - foreach (@dirs) { + foreach (@files) { ok(run(fuzz(["$f-test", $_]))); } } diff --git a/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t b/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t index 78899f674a..2bc86fdec5 100644 --- a/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t +++ b/worker/deps/openssl/openssl/test/recipes/90-test_shlibload.t @@ -1,12 +1,13 @@ #! /usr/bin/env perl -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html -use OpenSSL::Test qw/:DEFAULT bldtop_dir bldtop_file/; + +use OpenSSL::Test qw/:DEFAULT bldtop_dir/; use OpenSSL::Test::Utils; #Load configdata.pm @@ -19,15 +20,14 @@ use configdata; plan skip_all => "Test only supported in a shared build" if disabled("shared"); -plan tests => 4; - -# When libssl and libcrypto are compiled on Linux with "-rpath", but not -# "--enable-new-dtags", the RPATH takes precedence over LD_LIBRARY_PATH, -# and we end up running with the wrong libraries. This is resolved by -# using paths to the shared objects, not just the names. +plan tests => 3; -my $libcrypto = bldtop_file(shlib('libcrypto')); -my $libssl = bldtop_file(shlib('libssl')); +my $libcrypto_idx = $unified_info{rename}->{libcrypto} // "libcrypto"; +my $libssl_idx = $unified_info{rename}->{libssl} // "libssl"; +my $libcrypto = + $unified_info{sharednames}->{$libcrypto_idx}.$target{shared_extension_simple}; +my $libssl = + $unified_info{sharednames}->{$libssl_idx}.$target{shared_extension_simple}; ok(run(test(["shlibloadtest", "-crypto_first", $libcrypto, $libssl])), "running shlibloadtest -crypto_first"); @@ -35,17 +35,3 @@ ok(run(test(["shlibloadtest", "-ssl_first", $libcrypto, $libssl])), "running shlibloadtest -ssl_first"); ok(run(test(["shlibloadtest", "-just_crypto", $libcrypto, $libssl])), "running shlibloadtest -just_crypto"); -ok(run(test(["shlibloadtest", "-dso_ref", $libcrypto, $libssl])), - "running shlibloadtest -dso_ref"); - -sub shlib { - my $lib = shift; - $lib = $unified_info{rename}->{$lib} - if defined $unified_info{rename}->{$lib}; - $lib = $unified_info{sharednames}->{$lib} - . ($target{shlib_variant} || "") - . ($target{shared_extension} || ".so"); - $lib =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\) - |.$config{shlib_version_number}|x; - return $lib; -} diff --git a/worker/deps/openssl/openssl/test/recipes/tconversion.pl b/worker/deps/openssl/openssl/test/recipes/tconversion.pl index 1cf68dc09b..e19147b697 100644 --- a/worker/deps/openssl/openssl/test/recipes/tconversion.pl +++ b/worker/deps/openssl/openssl/test/recipes/tconversion.pl @@ -23,7 +23,7 @@ sub tconversion { my $testtype = shift; my $t = shift; - my @conversionforms = + my @conversionforms = defined($conversionforms{$testtype}) ? @{$conversionforms{$testtype}} : @{$conversionforms{"*"}}; diff --git a/worker/deps/openssl/openssl/test/run_tests.pl b/worker/deps/openssl/openssl/test/run_tests.pl index 77dffb332b..889d6dc117 100644 --- a/worker/deps/openssl/openssl/test/run_tests.pl +++ b/worker/deps/openssl/openssl/test/run_tests.pl @@ -21,7 +21,7 @@ BEGIN use OpenSSL::Glob; use Module::Load::Conditional qw(can_load); -my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) +my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) ? 'TAP::Harness' : 'OpenSSL::TAP::Harness'; my $srctop = $ENV{SRCTOP} || $ENV{TOP}; diff --git a/worker/deps/openssl/openssl/test/secmemtest.c b/worker/deps/openssl/openssl/test/secmemtest.c index 36906f7854..9405f348ab 100644 --- a/worker/deps/openssl/openssl/test/secmemtest.c +++ b/worker/deps/openssl/openssl/test/secmemtest.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -18,8 +18,6 @@ int main(int argc, char **argv) { #if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX) char *p = NULL, *q = NULL, *r = NULL, *s = NULL; - int i; - const int size = 64; s = OPENSSL_secure_malloc(20); /* s = non-secure 20 */ @@ -130,48 +128,6 @@ int main(int argc, char **argv) return 1; } - if (!CRYPTO_secure_malloc_init(32768, 16)) { - perror_line(); - return 1; - } - - /* - * Verify that secure memory gets zeroed properly. - */ - if ((p = OPENSSL_secure_malloc(size)) == NULL) { - perror_line(); - return 1; - } - for (i = 0; i < size; i++) - if (p[i] != 0) { - perror_line(); - fprintf(stderr, "iteration %d\n", i); - return 1; - } - - for (i = 0; i < size; i++) - p[i] = (unsigned char)(i + ' ' + 1); - OPENSSL_secure_free(p); - - /* - * A deliberate use after free here to verify that the memory has been - * cleared properly. Since secure free doesn't return the memory to - * libc's memory pool, it technically isn't freed. However, the header - * bytes have to be skipped and these consist of two pointers in the - * current implementation. - */ - for (i = sizeof(void *) * 2; i < size; i++) - if (p[i] != 0) { - perror_line(); - fprintf(stderr, "iteration %d\n", i); - return 1; - } - - if (!CRYPTO_secure_malloc_done()) { - perror_line(); - return 1; - } - /*- * There was also a possible infinite loop when the number of * elements was 1<<31, as |int i| was set to that, which is a diff --git a/worker/deps/openssl/openssl/test/shlibloadtest.c b/worker/deps/openssl/openssl/test/shlibloadtest.c index d584413ac9..25df363f23 100644 --- a/worker/deps/openssl/openssl/test/shlibloadtest.c +++ b/worker/deps/openssl/openssl/test/shlibloadtest.c @@ -40,16 +40,6 @@ static OpenSSL_version_num_t OpenSSL_version_num; #ifdef DSO_DLFCN -# define DSO_DSOBYADDR "DSO_dsobyaddr" -# define DSO_FREE "DSO_free" - -typedef void DSO; -typedef DSO * (*DSO_dsobyaddr_t)(void (*addr)(void), int flags); -typedef int (*DSO_free_t)(DSO *dso); - -static DSO_dsobyaddr_t DSO_dsobyaddr; -static DSO_free_t DSO_free; - # include typedef void * SHLIB; @@ -118,13 +108,11 @@ static int shlib_close(SHLIB lib) # define CRYPTO_FIRST_OPT "-crypto_first" # define SSL_FIRST_OPT "-ssl_first" # define JUST_CRYPTO_OPT "-just_crypto" -# define DSO_REFTEST_OPT "-dso_ref" enum test_types_en { CRYPTO_FIRST, SSL_FIRST, - JUST_CRYPTO, - DSO_REFTEST + JUST_CRYPTO }; int main(int argc, char **argv) @@ -135,7 +123,7 @@ int main(int argc, char **argv) void (*func) (void); SHLIB_SYM sym; } tls_method_sym, ssl_ctx_new_sym, ssl_ctx_free_sym, err_get_error_sym, - openssl_version_num_sym, dso_dsobyaddr_sym, dso_free_sym; + openssl_version_num_sym; enum test_types_en test_type; int i; @@ -150,8 +138,6 @@ int main(int argc, char **argv) test_type = SSL_FIRST; } else if (strcmp(argv[1], JUST_CRYPTO_OPT) == 0) { test_type = JUST_CRYPTO; - } else if (strcmp(argv[1], DSO_REFTEST_OPT) == 0) { - test_type = DSO_REFTEST; } else { printf("Unrecognised argument\n"); return 1; @@ -159,8 +145,7 @@ int main(int argc, char **argv) for (i = 0; i < 2; i++) { if ((i == 0 && (test_type == CRYPTO_FIRST - || test_type == JUST_CRYPTO - || test_type == DSO_REFTEST)) + || test_type == JUST_CRYPTO)) || (i == 1 && test_type == SSL_FIRST)) { if (!shlib_load(argv[2], &cryptolib)) { printf("Unable to load libcrypto\n"); @@ -176,7 +161,7 @@ int main(int argc, char **argv) } } - if (test_type != JUST_CRYPTO && test_type != DSO_REFTEST) { + if (test_type != JUST_CRYPTO) { if (!shlib_sym(ssllib, TLS_METHOD, &tls_method_sym.sym) || !shlib_sym(ssllib, SSL_CTX_NEW, &ssl_ctx_new_sym.sym) || !shlib_sym(ssllib, SSL_CTX_FREE, &ssl_ctx_free_sym.sym)) { @@ -230,38 +215,6 @@ int main(int argc, char **argv) return 1; } - if (test_type == DSO_REFTEST) { -# ifdef DSO_DLFCN - /* - * This is resembling the code used in ossl_init_base() and - * OPENSSL_atexit() to block unloading the library after dlclose(). - * We are not testing this on Windows, because it is done there in a - * completely different way. Especially as a call to DSO_dsobyaddr() - * will always return an error, because DSO_pathbyaddr() is not - * implemented there. - */ - if (!shlib_sym(cryptolib, DSO_DSOBYADDR, &dso_dsobyaddr_sym.sym) - || !shlib_sym(cryptolib, DSO_FREE, &dso_free_sym.sym)) { - printf("Unable to load crypto dso symbols\n"); - return 1; - } - - DSO_dsobyaddr = (DSO_dsobyaddr_t)dso_dsobyaddr_sym.func; - DSO_free = (DSO_free_t)dso_free_sym.func; - - { - DSO *hndl; - /* use known symbol from crypto module */ - if ((hndl = DSO_dsobyaddr((void (*)(void))ERR_get_error, 0)) != NULL) { - DSO_free(hndl); - } else { - printf("Unable to obtain DSO reference from crypto symbol\n"); - return 1; - } - } -# endif /* DSO_DLFCN */ - } - for (i = 0; i < 2; i++) { if ((i == 0 && test_type == CRYPTO_FIRST) || (i == 1 && test_type == SSL_FIRST)) { @@ -271,8 +224,7 @@ int main(int argc, char **argv) } } if ((i == 0 && (test_type == SSL_FIRST - || test_type == JUST_CRYPTO - || test_type == DSO_REFTEST)) + || test_type == JUST_CRYPTO)) || (i == 1 && test_type == CRYPTO_FIRST)) { if (!shlib_close(cryptolib)) { printf("Unable to close libcrypto\n"); diff --git a/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf b/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf index 5f4dd841b4..65c7e5d151 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/01-simple.conf @@ -74,5 +74,3 @@ VerifyMode = Peer [test-2] ExpectedClientAlert = UnknownCA ExpectedResult = ClientFail - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf b/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf index cb89dbc10a..cb737f8072 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/02-protocol-version.conf @@ -9971,5 +9971,3 @@ VerifyMode = Peer [test-360] ExpectedProtocol = TLSv1.2 ExpectedResult = Success - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf b/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf index 8dca715e74..65c9005ff8 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/03-custom_verify.conf @@ -234,5 +234,3 @@ client = 8-verify-custom-fail-no-root-client-extra [8-verify-custom-fail-no-root-client-extra] VerifyCallback = RejectAll - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf index 0e91bed9f1..bf374039d1 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf @@ -588,5 +588,3 @@ VerifyMode = Peer [test-19] ExpectedResult = ServerFail ExpectedServerAlert = UnknownCA - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in index 8738aaa769..bb7fddb8bc 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in +++ b/worker/deps/openssl/openssl/test/ssl-tests/04-client_auth.conf.in @@ -119,5 +119,5 @@ sub generate_tests() { } } } - + generate_tests(); diff --git a/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf b/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf index e1fb3d9d89..4278cbf85b 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/05-sni.conf @@ -199,5 +199,3 @@ ServerNameCallback = RejectMismatch [5-SNI-bad-sni-reject-mismatch-client-extra] ServerName = invalid - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf b/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf index 9620e015a1..9ee9c71fcc 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/06-sni-ticket.conf @@ -730,5 +730,3 @@ ServerNameCallback = IgnoreMismatch [16-sni-session-ticket-client-extra] ServerName = server2 - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf b/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf index 3304a3bbaa..bd9a5db7a2 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/07-dtls-protocol-version.conf @@ -1816,5 +1816,3 @@ VerifyMode = Peer ExpectedProtocol = DTLSv1.2 ExpectedResult = Success Method = DTLS - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf index 9115ef458b..8b4b5360c0 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf @@ -790,5 +790,3 @@ NPNProtocols = baz [19-npn-used-if-alpn-not-supported-resumption-client-extra] ALPNProtocols = foo NPNProtocols = bar,baz - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in index bcb632f051..7965992244 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in +++ b/worker/deps/openssl/openssl/test/ssl-tests/08-npn.conf.in @@ -237,7 +237,7 @@ our @tests = ( test => { "ExpectedALPNProtocol" => undef, "ExpectedNPNProtocol" => "bar", - "ExpectedServerName" => "server2", + "ExpectedServerName" => "server2", }, }, { diff --git a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf index e7e6cb9534..bb11102636 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf @@ -615,5 +615,3 @@ ALPNProtocols = foo [15-alpn-no-client-support-resumption-client-extra] ALPNProtocols = foo - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in index 37035f1d84..41c9486fa5 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in +++ b/worker/deps/openssl/openssl/test/ssl-tests/09-alpn.conf.in @@ -180,7 +180,7 @@ our @tests = ( name => "alpn-selected-sni-server-does-not-support-alpn", server => { extra => { - "ALPNProtocols" => "bar", + "ALPNProtocols" => "bar", "ServerNameCallback" => "IgnoreMismatch", }, }, diff --git a/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf b/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf index b2deee4209..4c79b0898e 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/10-resumption.conf @@ -1332,5 +1332,3 @@ VerifyMode = Peer ExpectedProtocol = TLSv1.2 HandshakeMode = Resume ResumptionExpected = Yes - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf b/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf index ceed959744..df28ecb1e7 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/11-dtls_resumption.conf @@ -608,5 +608,3 @@ ExpectedProtocol = DTLSv1.2 HandshakeMode = Resume Method = DTLS ResumptionExpected = Yes - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf b/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf index 2e6e9dea67..985292e900 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/12-ct.conf @@ -187,5 +187,3 @@ CTValidation = Strict [5-ct-strict-resumption-resume-client-extra] CTValidation = Strict - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf b/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf index 4c1e9e2b33..02feb2c778 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/13-fragmentation.conf @@ -393,5 +393,3 @@ VerifyMode = Peer [test-15] ApplicationData = 4096 MaxFragmentSize = 4096 - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf b/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf index 7f7ac4ba8d..61b297053e 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/14-curves.conf @@ -783,5 +783,3 @@ VerifyMode = Peer [test-28] ExpectedResult = Success ExpectedTmpKeyType = X25519 - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf b/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf index bf6c41cda2..770f024d13 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/15-certstatus.conf @@ -58,5 +58,3 @@ server = 1-certstatus-bad-server-extra [1-certstatus-bad-server-extra] CertStatus = BadResponse - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf b/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf index a561803a55..eb55bbd71c 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/16-dtls-certstatus.conf @@ -58,5 +58,3 @@ server = 1-certstatus-bad-server-extra [1-certstatus-bad-server-extra] CertStatus = BadResponse - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf b/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf index 48f569fad6..45a9d5864b 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/17-renegotiate.conf @@ -424,5 +424,3 @@ ExpectedResult = ClientFail HandshakeMode = RenegotiateClient Method = TLS ResumptionExpected = No - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf b/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf index 3d8ebd74c4..d23a84a89b 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/18-dtls-renegotiate.conf @@ -272,5 +272,3 @@ client = 8-renegotiate-aead-to-aead-client-extra [8-renegotiate-aead-to-aead-client-extra] RenegotiateCiphers = AES256-GCM-SHA384 - - diff --git a/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf b/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf index 40480edbf8..8626a06669 100644 --- a/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf +++ b/worker/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf @@ -152,5 +152,3 @@ VerifyMode = Peer [test-5] ExpectedResult = Success - - diff --git a/worker/deps/openssl/openssl/test/ssl_test.tmpl b/worker/deps/openssl/openssl/test/ssl_test.tmpl index 9506837f84..0517bff44f 100644 --- a/worker/deps/openssl/openssl/test/ssl_test.tmpl +++ b/worker/deps/openssl/openssl/test/ssl_test.tmpl @@ -92,35 +92,35 @@ client = {-$testname-}-client{- $OUT .= "\n[$testname-server-extra]\n"; foreach my $key (sort keys %{$server{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$server{"extra"}{$key}\n} - if defined $server{"extra"}{$key}; + if defined $server{"extra"}{$key}; } } if (%server2 && $server2{"extra"}) { $OUT .= "\n[$testname-server2-extra]\n"; foreach my $key (sort keys %{$server2{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$server2{"extra"}{$key}\n} - if defined $server2{"extra"}{$key}; + if defined $server2{"extra"}{$key}; } } if (%resume_server && $resume_server{"extra"}) { $OUT .= "\n[$testname-resume-server-extra]\n"; foreach my $key (sort keys %{$resume_server{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$resume_server{"extra"}{$key}\n} - if defined $resume_server{"extra"}{$key}; + if defined $resume_server{"extra"}{$key}; } } if ($client{"extra"}) { $OUT .= "\n[$testname-client-extra]\n"; foreach my $key (sort keys %{$client{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$client{"extra"}{$key}\n} - if defined $client{"extra"}{$key}; + if defined $client{"extra"}{$key}; } } if (%resume_client && $resume_client{"extra"}) { $OUT .= "\n[$testname-resume-client-extra]\n"; foreach my $key (sort keys %{$resume_client{"extra"}}) { $OUT .= qq{$key} . " = " . qq{$resume_client{"extra"}{$key}\n} - if defined $resume_client{"extra"}{$key}; + if defined $resume_client{"extra"}{$key}; } } -} diff --git a/worker/deps/openssl/openssl/test/sslapitest.c b/worker/deps/openssl/openssl/test/sslapitest.c index 8badd284e3..77e8f2e9ad 100644 --- a/worker/deps/openssl/openssl/test/sslapitest.c +++ b/worker/deps/openssl/openssl/test/sslapitest.c @@ -1208,61 +1208,6 @@ static int test_custom_exts(int tst) return testresult; } -static int test_ssl_pending(int tst) -{ - SSL_CTX *cctx = NULL, *sctx = NULL; - SSL *clientssl = NULL, *serverssl = NULL; - int testresult = 0; - char msg[] = "A test message"; - char buf[5]; - size_t written; - - if (tst == 0) { - if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), - TLS1_VERSION, TLS_MAX_VERSION, - &sctx, &cctx, cert, privkey)) { - printf("Failed creating SSL_CTX pair\n"); - goto end; - } - } else { -#ifndef OPENSSL_NO_DTLS - if (!create_ssl_ctx_pair(DTLS_server_method(), DTLS_client_method(), - DTLS1_VERSION, DTLS_MAX_VERSION, - &sctx, &cctx, cert, privkey)) { - printf("Failed creating SSL_CTX pair\n"); - goto end; - } -#else - return 1; -#endif - } - - if (!create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL) - || !create_ssl_connection(serverssl, clientssl)) { - printf("Failed creating connection\n"); - goto end; - } - - written = SSL_write(serverssl, msg, sizeof(msg)); - if (written != sizeof(msg) - || SSL_read(clientssl, buf, sizeof(buf)) != sizeof(buf) - || SSL_pending(clientssl) != (int)(written - sizeof(buf))) { - printf("Failed checking SSL_pending\n"); - goto end; - } - - testresult = 1; - - end: - SSL_free(serverssl); - SSL_free(clientssl); - SSL_CTX_free(sctx); - SSL_CTX_free(cctx); - - return testresult; -} - - int main(int argc, char *argv[]) { BIO *err = NULL; @@ -1299,7 +1244,6 @@ int main(int argc, char *argv[]) ADD_TEST(test_ssl_bio_change_wbio); ADD_ALL_TESTS(test_set_sigalgs, OSSL_NELEM(testsigalgs) * 2); ADD_ALL_TESTS(test_custom_exts, 2); - ADD_ALL_TESTS(test_ssl_pending, 2); testresult = run_tests(argv[0]); diff --git a/worker/deps/openssl/openssl/test/verify_extra_test.c b/worker/deps/openssl/openssl/test/verify_extra_test.c index fabc1dc59f..cc05bc2ef1 100644 --- a/worker/deps/openssl/openssl/test/verify_extra_test.c +++ b/worker/deps/openssl/openssl/test/verify_extra_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -137,43 +137,6 @@ static int test_alt_chains_cert_forgery(const char *roots_f, return ret; } -static int test_store_ctx(const char *bad_f) -{ - X509_STORE_CTX *sctx = NULL; - X509 *x = NULL; - BIO *bio = NULL; - int testresult = 0, ret; - - bio = BIO_new_file(bad_f, "r"); - if (bio == NULL) - goto err; - - x = PEM_read_bio_X509(bio, NULL, 0, NULL); - if (x == NULL) - goto err; - - sctx = X509_STORE_CTX_new(); - if (sctx == NULL) - goto err; - - if (!X509_STORE_CTX_init(sctx, NULL, x, NULL)) - goto err; - - /* Verifying a cert where we have no trusted certs should fail */ - ret = X509_verify_cert(sctx); - - if (ret == 0) { - /* This is the result we were expecting: Test passed */ - testresult = 1; - } - - err: - X509_STORE_CTX_free(sctx); - X509_free(x); - BIO_free(bio); - return testresult; -} - int main(int argc, char **argv) { CRYPTO_set_mem_debug(1); @@ -189,11 +152,6 @@ int main(int argc, char **argv) return 1; } - if (!test_store_ctx(argv[3])) { - fprintf(stderr, "Test X509_STORE_CTX failed\n"); - return 1; - } - #ifndef OPENSSL_NO_CRYPTO_MDEBUG if (CRYPTO_mem_leaks_fp(stderr) <= 0) return 1; diff --git a/worker/deps/openssl/openssl/util/copy.pl b/worker/deps/openssl/openssl/util/copy.pl index fe1c908e68..01964f585e 100644 --- a/worker/deps/openssl/openssl/util/copy.pl +++ b/worker/deps/openssl/openssl/util/copy.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -18,7 +18,6 @@ my $stripcr = 0; my $arg; -my @excludes = (); foreach $arg (@ARGV) { if ($arg eq "-stripcr") @@ -26,16 +25,11 @@ $stripcr = 1; next; } - if ($arg =~ /^-exclude_re=(.*)$/) - { - push @excludes, $1; - next; - } $arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob... $arg = qq("$arg") if ($arg =~ /\s/); # compensate for bug in 5.10... - foreach my $f (glob $arg) + foreach (glob $arg) { - push @filelist, $f unless grep { $f =~ /$_/ } @excludes; + push @filelist, $_; } } diff --git a/worker/deps/openssl/openssl/util/dofile.pl b/worker/deps/openssl/openssl/util/dofile.pl index 4533c135a3..fc72989b0f 100644 --- a/worker/deps/openssl/openssl/util/dofile.pl +++ b/worker/deps/openssl/openssl/util/dofile.pl @@ -40,7 +40,7 @@ package OpenSSL::Template; use File::Basename; use File::Spec::Functions; use lib "$FindBin::Bin/perl"; -use with_fallback "Text::Template 1.46"; +use with_fallback qw(Text::Template); #use parent qw/Text::Template/; use vars qw/@ISA/; @@ -99,9 +99,9 @@ package main; # This adds quotes (") around the given string, and escapes any $, @, \, # " and ' by prepending a \ to them. sub quotify1 { - my $s = shift @_; + my $s = my $orig = shift @_; $s =~ s/([\$\@\\"'])/\\$1/g; - '"'.$s.'"'; + $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s; } # quotify_l LIST diff --git a/worker/deps/openssl/openssl/util/fipslink.pl b/worker/deps/openssl/openssl/util/fipslink.pl index 18a91532be..8248382c84 100644 --- a/worker/deps/openssl/openssl/util/fipslink.pl +++ b/worker/deps/openssl/openssl/util/fipslink.pl @@ -20,7 +20,7 @@ sub check_env my ($fips_cc,$fips_cc_args, $fips_link,$fips_target, $fips_libdir, $sha1_exe) = check_env("FIPS_CC", "FIPS_CC_ARGS", "FIPS_LINK", "FIPS_TARGET", - "FIPSLIB_D", "FIPS_SHA1_EXE"); + "FIPSLIB_D", "FIPS_SHA1_EXE"); @@ -109,7 +109,5 @@ sub check_hash $hashval =~ s/^.*=\s+//; die "Invalid hash syntax in file" if (length($hashfile) != 40); die "Invalid hash received for file" if (length($hashval) != 40); - die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile); + die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile); } - - diff --git a/worker/deps/openssl/openssl/util/incore b/worker/deps/openssl/openssl/util/incore index 26fcf95033..8a88f81559 100755 --- a/worker/deps/openssl/openssl/util/incore +++ b/worker/deps/openssl/openssl/util/incore @@ -65,7 +65,7 @@ # put aside e_machine in case one has to treat specific # platforms differently, see EM_ constants in elf.h for - # assortment... + # assortment... $self->{e_machine} = $elf_ehdr{e_machine}; ################################################# @@ -131,12 +131,12 @@ my $name; # (STT_OBJECT || STT_FUNC) if ($st_bind<3 && ($st_type==1 || $st_type==2) - && $st_secn <= $#sections # sane st_shndx + && $st_secn <= $#sections # sane st_shndx && @sections[$st_secn]->{sh_type} # not SHN_UNDEF && ($name=(split(chr(0),substr($strings,$elf_sym{st_name},128)))[0]) ) { # synthesize st_offset, ... - $elf_sym{st_offset} = $elf_sym{st_value} + $elf_sym{st_offset} = $elf_sym{st_value} - @sections[$st_secn]->{sh_addr} + @sections[$st_secn]->{sh_offset}; $elf_sym{st_name} = $name; diff --git a/worker/deps/openssl/openssl/util/libcrypto.num b/worker/deps/openssl/openssl/util/libcrypto.num index 2390fa0362..8414d97ff1 100644 --- a/worker/deps/openssl/openssl/util/libcrypto.num +++ b/worker/deps/openssl/openssl/util/libcrypto.num @@ -282,7 +282,7 @@ TS_REQ_free 282 1_1_0 EXIST::FUNCTION:TS PEM_read_DHparams 283 1_1_0 EXIST::FUNCTION:DH,STDIO RSA_private_decrypt 284 1_1_0 EXIST::FUNCTION:RSA X509V3_EXT_get_nid 285 1_1_0 EXIST::FUNCTION: -BIO_s_log 286 1_1_0 EXIST::FUNCTION: +BIO_s_log 286 1_1_0 EXIST:!WIN32,!macintosh:FUNCTION: EC_POINT_set_to_infinity 287 1_1_0 EXIST::FUNCTION:EC EVP_des_ede_ofb 288 1_1_0 EXIST::FUNCTION:DES ECDH_KDF_X9_62 289 1_1_0 EXIST::FUNCTION:EC @@ -4234,34 +4234,3 @@ CRYPTO_secure_clear_free 4315 1_1_0g EXIST::FUNCTION: EVP_PKEY_set1_engine 4347 1_1_0g EXIST::FUNCTION:ENGINE OCSP_resp_get0_signer 4374 1_1_0h EXIST::FUNCTION:OCSP X509_get0_authority_key_id 4448 1_1_0h EXIST::FUNCTION: -conf_ssl_name_find 4469 1_1_0i EXIST::FUNCTION: -conf_ssl_get_cmd 4470 1_1_0i EXIST::FUNCTION: -conf_ssl_get 4471 1_1_0i EXIST::FUNCTION: -X509_VERIFY_PARAM_get_hostflags 4472 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_get_by_fingerprint 4493 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_new 4494 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_init 4495 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_get_by_alias 4496 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_new_item 4497 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_shutdown 4498 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_new_item 4499 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_ctrl 4500 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_get_by_issuer_serial 4501 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_get_store 4502 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_ctrl 4503 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_get_by_alias 4504 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_get_by_subject 4505 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_free 4506 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_get_by_subject 4507 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_free 4508 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_shutdown 4509 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_set_method_data 4510 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_get_method_data 4511 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_get_by_fingerprint 4512 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_free 4513 1_1_0i EXIST::FUNCTION: -X509_OBJECT_set1_X509 4514 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_get_get_by_issuer_serial 4515 1_1_0i EXIST::FUNCTION: -X509_LOOKUP_meth_set_init 4516 1_1_0i EXIST::FUNCTION: -X509_OBJECT_set1_X509_CRL 4517 1_1_0i EXIST::FUNCTION: -OCSP_resp_get0_tbs_sigalg 4529 1_1_0j EXIST::FUNCTION:OCSP -OCSP_resp_get0_respdata 4530 1_1_0j EXIST::FUNCTION:OCSP diff --git a/worker/deps/openssl/openssl/util/local_shlib.com.in b/worker/deps/openssl/openssl/util/local_shlib.com.in index e49aa15c77..a381872537 100644 --- a/worker/deps/openssl/openssl/util/local_shlib.com.in +++ b/worker/deps/openssl/openssl/util/local_shlib.com.in @@ -16,7 +16,7 @@ $ $ NAMES := {- join(",", keys %names); -} {- join("\n", map { "\$ __$_ = \"".$names{$_}."\"" } keys %names); --} +-} $ I = 0 $ LOOP: $ E = F$ELEMENT(I,",",NAMES) diff --git a/worker/deps/openssl/openssl/util/mkdef.pl b/worker/deps/openssl/openssl/util/mkdef.pl index 3626dcdcb1..66db26c3b9 100755 --- a/worker/deps/openssl/openssl/util/mkdef.pl +++ b/worker/deps/openssl/openssl/util/mkdef.pl @@ -252,7 +252,6 @@ $crypto.=" include/internal/o_str.h"; $crypto.=" include/internal/err.h"; $crypto.=" include/internal/asn1t.h"; -$crypto.=" include/internal/sslconf.h"; $crypto.=" include/openssl/des.h" ; # unless $no_des; $crypto.=" include/openssl/idea.h" ; # unless $no_idea; $crypto.=" include/openssl/rc4.h" ; # unless $no_rc4; @@ -978,6 +977,16 @@ sub do_defs } } + # Prune the returned symbols + + delete $syms{"bn_dump1"}; + $platform{"BIO_s_log"} .= ",!WIN32,!macintosh"; + + $platform{"PEM_read_NS_CERT_SEQ"} = "VMS"; + $platform{"PEM_write_NS_CERT_SEQ"} = "VMS"; + $platform{"PEM_read_P8_PRIV_KEY_INFO"} = "VMS"; + $platform{"PEM_write_P8_PRIV_KEY_INFO"} = "VMS"; + # Info we know about push @ret, map { $_."\\".&info_string($_,"EXIST", @@ -1326,7 +1335,7 @@ sub print_def_file } elsif ($VMS) { print OUT ")\n"; (my $libvmaj, my $libvmin, my $libvedit) = - $currversion =~ /^(\d+)_(\d+)_(\d+)[a-z]{0,2}$/; + $currversion =~ /^(\d+)_(\d+)_(\d+)$/; # The reason to multiply the edit number with 100 is to make space # for the possibility that we want to encode the patch letters print OUT "GSMATCH=LEQUAL,",($libvmaj * 100 + $libvmin),",",($libvedit * 100),"\n"; diff --git a/worker/deps/openssl/openssl/util/mkrc.pl b/worker/deps/openssl/openssl/util/mkrc.pl index 99912eb8b5..c177349c13 100755 --- a/worker/deps/openssl/openssl/util/mkrc.pl +++ b/worker/deps/openssl/openssl/util/mkrc.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -60,7 +60,7 @@ BEGIN BLOCK "040904b0" BEGIN // Required: - VALUE "CompanyName", "The OpenSSL Project, https://www.openssl.org/\\0" + VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0" VALUE "FileDescription", "$description\\0" VALUE "FileVersion", "$version\\0" VALUE "InternalName", "$basename\\0" diff --git a/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm b/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm index a77909c606..5de7b58e8b 100644 --- a/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm +++ b/worker/deps/openssl/openssl/util/perl/OpenSSL/Test.pm @@ -21,8 +21,7 @@ $VERSION = "0.8"; @EXPORT_OK = (@Test::More::EXPORT_OK, qw(bldtop_dir bldtop_file srctop_dir srctop_file data_file - pipe with cmdstr quotify - openssl_versions)); + pipe with cmdstr quotify)); =head1 NAME @@ -696,32 +695,6 @@ sub quotify { return map { $arg_formatter->($_) } @_; } -=over 4 - -=item B - -Returns a list of two numbers, the first representing the build version, -the second representing the library version. See opensslv.h for more -information on those numbers. - -=back - -=cut - -my @versions = (); -sub openssl_versions { - unless (@versions) { - my %lines = - map { s/\R$//; - /^(.*): (0x[[:xdigit:]]{8})$/; - die "Weird line: $_" unless defined $1; - $1 => hex($2) } - run(test(['versions']), capture => 1); - @versions = ( $lines{'Build version'}, $lines{'Library version'} ); - } - return @versions; -} - ###################################################################### # private functions. These are never exported. diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm index 0821bdedd3..10daba4b42 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/Message.pm @@ -170,7 +170,7 @@ sub get_messages $startoffset = $recoffset; $recoffset += 4; $payload = ""; - + if ($recoffset <= $record->decrypt_len) { #Some payload data is present in this record if ($record->decrypt_len - $recoffset >= $messlen) { @@ -296,7 +296,7 @@ sub new $records, $startoffset, $message_frag_lens) = @_; - + my $self = { server => $server, data => $data, diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm index 786ba0c72b..ad942d4251 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/Record.pm @@ -178,7 +178,7 @@ sub new $decrypt_len, $data, $decrypt_data) = @_; - + my $self = { flight => $flight, content_type => $content_type, diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm index 79a8be9a89..fd3fba5694 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerHello.pm @@ -20,7 +20,7 @@ sub new $records, $startoffset, $message_frag_lens) = @_; - + my $self = $class->SUPER::new( $server, TLSProxy::Message::MT_SERVER_HELLO, @@ -66,7 +66,7 @@ sub parse my $extension_data; if ($extensions_len != 0) { $extension_data = substr($self->data, $ptr); - + if (length($extension_data) != $extensions_len) { die "Invalid extension length\n"; } diff --git a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm index 6e5b4cdcb4..c011d2707a 100644 --- a/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm +++ b/worker/deps/openssl/openssl/util/perl/TLSProxy/ServerKeyExchange.pm @@ -20,7 +20,7 @@ sub new $records, $startoffset, $message_frag_lens) = @_; - + my $self = $class->SUPER::new( $server, TLSProxy::Message::MT_SERVER_KEY_EXCHANGE, diff --git a/worker/deps/openssl/openssl/util/perl/with_fallback.pm b/worker/deps/openssl/openssl/util/perl/with_fallback.pm index 242365033f..2af1d5fbd5 100644 --- a/worker/deps/openssl/openssl/util/perl/with_fallback.pm +++ b/worker/deps/openssl/openssl/util/perl/with_fallback.pm @@ -1,4 +1,4 @@ -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -8,17 +8,15 @@ package with_fallback; sub import { - shift; - use File::Basename; use File::Spec::Functions; foreach (@_) { - eval "use $_"; + eval "require $_"; if ($@) { unshift @INC, catdir(dirname(__FILE__), "..", "..", "external", "perl"); my $transfer = "transfer::$_"; - eval "use $transfer"; + eval "require $transfer"; shift @INC; warn $@ if $@; } diff --git a/worker/deps/openssl/openssl/util/process_docs.pl b/worker/deps/openssl/openssl/util/process_docs.pl index f7daef0dd8..e084df78a5 100755 --- a/worker/deps/openssl/openssl/util/process_docs.pl +++ b/worker/deps/openssl/openssl/util/process_docs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -101,7 +101,7 @@ my $suffix = { man => ".$podinfo{section}".($options{suffix} // ""), html => ".html" } -> {$options{type}}; my $generate = { man => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"", - html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=apps:crypto:ssl \"--infile=$podpath\" \"--title=$podname\" --quiet" + html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=apps:crypto:ssl \"--infile=$podpath\" \"--title=$podname\"" } -> {$options{type}}; my $output_dir = catdir($options{destdir}, "man$podinfo{section}"); my $output_file = $podname . $suffix; @@ -115,32 +115,6 @@ @output = `$generate`; map { s|href="http://man\.he\.net/(man\d/[^"]+)(?:\.html)?"|href="../$1.html|g; } @output if $options{type} eq "html"; - if ($options{type} eq "man") { - # Because some *roff parsers are more strict than others, - # multiple lines in the NAME section must be merged into - # one. - my $in_name = 0; - my $name_line = ""; - my @newoutput = (); - foreach (@output) { - if ($in_name) { - if (/^\.SH "/) { - $in_name = 0; - push @newoutput, $name_line."\n"; - } else { - chomp (my $x = $_); - $name_line .= " " if $name_line; - $name_line .= $x; - next; - } - } - if (/^\.SH +"NAME" *$/) { - $in_name = 1; - } - push @newoutput, $_; - } - @output = @newoutput; - } } print STDERR "DEBUG: Done processing\n" if $options{debug}; @@ -264,7 +238,7 @@ =head1 OPTIONS =head1 COPYRIGHT -Copyright 2013-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/worker/deps/openssl/openssl/util/shlib_wrap.sh.in b/worker/deps/openssl/openssl/util/shlib_wrap.sh.in index d030d33ed6..6c115ba725 100755 --- a/worker/deps/openssl/openssl/util/shlib_wrap.sh.in +++ b/worker/deps/openssl/openssl/util/shlib_wrap.sh.in @@ -1,22 +1,5 @@ #!/bin/sh -{- - use lib '.'; - use configdata; - sub shlib { - my $lib = shift; - return "" if $disabled{shared}; - $lib = $unified_info{rename}->{$lib} - if defined $unified_info{rename}->{$lib}; - $lib = $unified_info{sharednames}->{$lib} - . ($target{shlib_variant} || "") - . ($target{shared_extension} || ".so"); - $lib =~ s|\.\$\(SHLIB_MAJOR\)\.\$\(SHLIB_MINOR\) - |.$config{shlib_version_number}|x; - return $lib; - } - ""; # Make sure no left over string sneaks its way into the script --} # To test this OpenSSL version's applications against another version's # shared libraries, simply set # @@ -42,8 +25,15 @@ fi THERE="`echo $0 | sed -e 's|[^/]*$||' 2>/dev/null`.." [ -d "${THERE}" ] || exec "$@" # should never happen... -LIBCRYPTOSO="${THERE}/{- shlib('libcrypto') -}" -LIBSSLSO="${THERE}/{- shlib('libssl') -}" +# Alternative to this is to parse ${THERE}/Makefile... +LIBCRYPTOSO="${THERE}/libcrypto.so" +if [ -f "$LIBCRYPTOSO" ]; then + while [ -h "$LIBCRYPTOSO" ]; do + LIBCRYPTOSO="${THERE}/`ls -l "$LIBCRYPTOSO" | sed -e 's|.*\-> ||'`" + done + SOSUFFIX=`echo ${LIBCRYPTOSO} | sed -e 's|.*\.so||' 2>/dev/null` + LIBSSLSO="${THERE}/libssl.so${SOSUFFIX}" +fi SYSNAME=`(uname -s) 2>/dev/null`; case "$SYSNAME" in From 443243f6f308251256eb7764bdc85981bbd8cb8d Mon Sep 17 00:00:00 2001 From: artushin Date: Tue, 8 Jan 2019 10:41:06 -0600 Subject: [PATCH 16/82] worker selection fix --- lib/Server.js | 8 +++++++- package.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Server.js b/lib/Server.js index a92b294acd..2ccc309b41 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -164,6 +164,11 @@ class Server extends EnhancedEventEmitter return this._workers.size; } + get workers() + { + return this._workers; + } + /** * Close the Server. */ @@ -279,6 +284,7 @@ class Server extends EnhancedEventEmitter } } + let worker; if (zeroCpus.length) { if (zeroCpus.length === array.length) { if (typeof workerIdx === 'number') @@ -299,7 +305,7 @@ class Server extends EnhancedEventEmitter this._latestWorkerIdx = 0; } } else { - this._latestWorkerIdx = Math.floor(Math.random() * Math.floor(zeroCpus.length)); + this._latestWorkerIdx = array.indexOf(zeroCpus[Math.floor(Math.random() * Math.floor(zeroCpus.length))]); } } else { this._latestWorkerIdx = lowestCpuIndex diff --git a/package.json b/package.json index 77e275d453..5301768644 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.3-lv1", + "version": "2.6.3-lv3", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 04b0ee11662ca706b9689d21bed9e10dc82a0446 Mon Sep 17 00:00:00 2001 From: artushin Date: Wed, 9 Jan 2019 16:19:38 -0600 Subject: [PATCH 17/82] workers fix --- lib/Server.js | 3 +-- package.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Server.js b/lib/Server.js index 2ccc309b41..30fe5d8721 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -166,7 +166,7 @@ class Server extends EnhancedEventEmitter get workers() { - return this._workers; + return Array.from(this._workers); } /** @@ -284,7 +284,6 @@ class Server extends EnhancedEventEmitter } } - let worker; if (zeroCpus.length) { if (zeroCpus.length === array.length) { if (typeof workerIdx === 'number') diff --git a/package.json b/package.json index 5301768644..0bc07766a5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.3-lv3", + "version": "2.6.3-lv4", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 62417d23d867b1c8e7dd565de4c0d26490ff2ea9 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Fri, 1 Mar 2019 16:31:31 -0600 Subject: [PATCH 18/82] orientation; initial commit to try to pass orientation from rtp extension header --- worker/include/RTC/RtpPacket.hpp | 26 +++++++++++++++++++++++++- worker/src/RTC/WebRtcTransport.cpp | 4 ++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index ba5153de95..84dbc4cea1 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -112,8 +112,9 @@ namespace RTC uint8_t* GetExtension(RTC::RtpHeaderExtensionUri::Type uri, uint8_t* len) const; bool ReadAudioLevel(uint8_t* volume, bool* voice) const; bool ReadAbsSendTime(uint32_t* time) const; + bool ReadVideoOrientation(const uint8_t** data, size_t* len) const; bool ReadMid(const uint8_t** data, size_t* len) const; - bool ReadRid(const uint8_t** data, size_t* len) const; + bool eadRidR(const uint8_t** data, size_t* len) const; uint8_t* GetPayload() const; size_t GetPayloadLength() const; uint8_t GetPayloadPadding() const; @@ -337,6 +338,29 @@ namespace RTC return true; } + inline bool RtpPacket::ReadVideoOrientation(const uint8_t** rotation, size_t* len) const + { + uint8_t extenLen; + uint8_t* extenValue; + + extenValue = GetExtension(RTC::RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION, &extenLen); + + if (!extenValue || extenLen == 0) + return false; + /** + FIXME: may need to massage this to get the actual value + Rotation signalling for 2-bit granularity + 00 = 0 rotation + 01 = 90 CCW (aka: 270 CW) + 10 = 180 CCW (aka: 180 CW) + 11 = 270 CCW (aka: 90 CW) + **/ + *rotation = extenValue; + *len = static_cast(extenLen); + + return true; + } + inline bool RtpPacket::ReadMid(const uint8_t** data, size_t* len) const { uint8_t extenLen; diff --git a/worker/src/RTC/WebRtcTransport.cpp b/worker/src/RTC/WebRtcTransport.cpp index d3d6014c64..2c21dc3109 100644 --- a/worker/src/RTC/WebRtcTransport.cpp +++ b/worker/src/RTC/WebRtcTransport.cpp @@ -247,6 +247,7 @@ namespace RTC static const Json::StaticString JsonStringFailed{ "failed" }; static const Json::StaticString JsonStringHeaderExtensionIds{ "headerExtensionIds" }; static const Json::StaticString JsonStringAbsSendTime{ "absSendTime" }; + static const Json::StaticString JsonStringVideoOrientation{ "videoOrientation" }; static const Json::StaticString JsonStringMid{ "mid" }; static const Json::StaticString JsonStringRid{ "rid" }; static const Json::StaticString JsonStringRtpListener{ "rtpListener" }; @@ -338,6 +339,9 @@ namespace RTC if (this->headerExtensionIds.absSendTime != 0u) jsonHeaderExtensionIds[JsonStringAbsSendTime] = this->headerExtensionIds.absSendTime; + if (this->headerExtensionIds.videoOrientation != 0u) + jsonHeaderExtensionIds[JsonStringVideoOrientation] = this->headerExtensionIds.videoOrientation; + if (this->headerExtensionIds.mid != 0u) jsonHeaderExtensionIds[JsonStringMid] = this->headerExtensionIds.mid; From 1c1949cc041b47937a90634c4b0f65d2ac0f3492 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Fri, 1 Mar 2019 16:38:30 -0600 Subject: [PATCH 19/82] orientation; fix typo in ReadRid func --- worker/include/RTC/RtpPacket.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 84dbc4cea1..09f2113599 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -114,7 +114,7 @@ namespace RTC bool ReadAbsSendTime(uint32_t* time) const; bool ReadVideoOrientation(const uint8_t** data, size_t* len) const; bool ReadMid(const uint8_t** data, size_t* len) const; - bool eadRidR(const uint8_t** data, size_t* len) const; + bool ReadRid(const uint8_t** data, size_t* len) const; uint8_t* GetPayload() const; size_t GetPayloadLength() const; uint8_t GetPayloadPadding() const; @@ -338,7 +338,7 @@ namespace RTC return true; } - inline bool RtpPacket::ReadVideoOrientation(const uint8_t** rotation, size_t* len) const + inline bool RtpPacket::ReadVideoOrientation(const uint8_t** rotation) const { uint8_t extenLen; uint8_t* extenValue; From 79fe374d9bba2bafec069ad6bff4e2a780753380 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Fri, 1 Mar 2019 16:41:05 -0600 Subject: [PATCH 20/82] orientation; udpate call to ReadVideoOrientatio --- worker/include/RTC/RtpPacket.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 09f2113599..9fff113f0e 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -112,7 +112,7 @@ namespace RTC uint8_t* GetExtension(RTC::RtpHeaderExtensionUri::Type uri, uint8_t* len) const; bool ReadAudioLevel(uint8_t* volume, bool* voice) const; bool ReadAbsSendTime(uint32_t* time) const; - bool ReadVideoOrientation(const uint8_t** data, size_t* len) const; + bool ReadVideoOrientation(const uint8_t** rotation) const; bool ReadMid(const uint8_t** data, size_t* len) const; bool ReadRid(const uint8_t** data, size_t* len) const; uint8_t* GetPayload() const; From 08d818e7093841c1750c2d81e7fabb2a93f7138f Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Fri, 1 Mar 2019 16:56:12 -0600 Subject: [PATCH 21/82] orientation; fix build errors --- worker/include/RTC/RtpPacket.hpp | 4 ++-- worker/include/RTC/Transport.hpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 9fff113f0e..20294193da 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -112,7 +112,7 @@ namespace RTC uint8_t* GetExtension(RTC::RtpHeaderExtensionUri::Type uri, uint8_t* len) const; bool ReadAudioLevel(uint8_t* volume, bool* voice) const; bool ReadAbsSendTime(uint32_t* time) const; - bool ReadVideoOrientation(const uint8_t** rotation) const; + bool ReadVideoOrientation(const uint8_t** data, size_t* len) const; bool ReadMid(const uint8_t** data, size_t* len) const; bool ReadRid(const uint8_t** data, size_t* len) const; uint8_t* GetPayload() const; @@ -338,7 +338,7 @@ namespace RTC return true; } - inline bool RtpPacket::ReadVideoOrientation(const uint8_t** rotation) const + inline bool RtpPacket::ReadVideoOrientation(const uint8_t** rotation, size_t* len) const { uint8_t extenLen; uint8_t* extenValue; diff --git a/worker/include/RTC/Transport.hpp b/worker/include/RTC/Transport.hpp index 9b0b3f898b..d50dabb437 100644 --- a/worker/include/RTC/Transport.hpp +++ b/worker/include/RTC/Transport.hpp @@ -44,9 +44,10 @@ namespace RTC // maps them to the corresponding ids in the room). struct HeaderExtensionIds { - uint8_t absSendTime{ 0 }; // 0 means no abs-send-time id. - uint8_t mid{ 0 }; // 0 means no MID id. - uint8_t rid{ 0 }; // 0 means no RID id. + uint8_t absSendTime{ 0 }; // 0 means no abs-send-time id. + uint8_t mid{ 0 }; // 0 means no MID id. + uint8_t rid{ 0 }; // 0 means no RID id. + uint8_t videoOrientation{ 0 }; // 0 means no RID id. }; public: From 44d839b71318c7144199e390dbd6af83dcf6ec84 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Mon, 4 Mar 2019 16:47:03 -0600 Subject: [PATCH 22/82] orientation; updates to try to get videoOrientation into stats object --- worker/include/RTC/Producer.hpp | 9 ++++--- worker/include/RTC/RtpPacket.hpp | 9 +++---- worker/include/RTC/RtpStream.hpp | 1 + worker/include/RTC/Transport.hpp | 2 +- worker/src/RTC/PlainRtpTransport.cpp | 5 ++++ worker/src/RTC/Producer.cpp | 18 ++++++++++++++ worker/src/RTC/RtpStream.cpp | 37 +++++++++++++++++----------- worker/src/RTC/WebRtcTransport.cpp | 5 ++++ 8 files changed, 61 insertions(+), 25 deletions(-) diff --git a/worker/include/RTC/Producer.hpp b/worker/include/RTC/Producer.hpp index ccbdeaa900..0eb013ca3d 100644 --- a/worker/include/RTC/Producer.hpp +++ b/worker/include/RTC/Producer.hpp @@ -32,10 +32,11 @@ namespace RTC private: struct HeaderExtensionIds { - uint8_t ssrcAudioLevel{ 0 }; // 0 means no ssrc-audio-level id. - uint8_t absSendTime{ 0 }; // 0 means no abs-send-time id. - uint8_t mid{ 0 }; // 0 means no MID id. - uint8_t rid{ 0 }; // 0 means no RID id. + uint8_t ssrcAudioLevel{ 0 }; // 0 means no ssrc-audio-level id. + uint8_t absSendTime{ 0 }; // 0 means no abs-send-time id. + uint8_t mid{ 0 }; // 0 means no MID id. + uint8_t rid{ 0 }; // 0 means no RID id. + uint8_t videoOrientation{ 0 }; // 0 means no video-orientation id. }; private: diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 20294193da..2f8ce7962a 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -112,7 +112,7 @@ namespace RTC uint8_t* GetExtension(RTC::RtpHeaderExtensionUri::Type uri, uint8_t* len) const; bool ReadAudioLevel(uint8_t* volume, bool* voice) const; bool ReadAbsSendTime(uint32_t* time) const; - bool ReadVideoOrientation(const uint8_t** data, size_t* len) const; + bool ReadVideoOrientation(uint8_t* data) const; bool ReadMid(const uint8_t** data, size_t* len) const; bool ReadRid(const uint8_t** data, size_t* len) const; uint8_t* GetPayload() const; @@ -338,14 +338,14 @@ namespace RTC return true; } - inline bool RtpPacket::ReadVideoOrientation(const uint8_t** rotation, size_t* len) const + inline bool RtpPacket::ReadVideoOrientation(uint8_t* rotation) const { uint8_t extenLen; uint8_t* extenValue; extenValue = GetExtension(RTC::RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION, &extenLen); - if (!extenValue || extenLen == 0) + if (!extenValue || extenLen != 1) return false; /** FIXME: may need to massage this to get the actual value @@ -355,8 +355,7 @@ namespace RTC 10 = 180 CCW (aka: 180 CW) 11 = 270 CCW (aka: 90 CW) **/ - *rotation = extenValue; - *len = static_cast(extenLen); + *rotation = Utils::Byte::Get1Byte(extenValue, 0); return true; } diff --git a/worker/include/RTC/RtpStream.hpp b/worker/include/RTC/RtpStream.hpp index 8f6936a677..dc3bbd3607 100644 --- a/worker/include/RTC/RtpStream.hpp +++ b/worker/include/RTC/RtpStream.hpp @@ -62,6 +62,7 @@ namespace RTC // Stats. uint32_t packetsLost{ 0 }; uint8_t fractionLost{ 0 }; + uint8_t videoOrientation{ 0 }; size_t packetsDiscarded{ 0 }; size_t packetsRepaired{ 0 }; size_t firCount{ 0 }; diff --git a/worker/include/RTC/Transport.hpp b/worker/include/RTC/Transport.hpp index d50dabb437..ad6772bd25 100644 --- a/worker/include/RTC/Transport.hpp +++ b/worker/include/RTC/Transport.hpp @@ -47,7 +47,7 @@ namespace RTC uint8_t absSendTime{ 0 }; // 0 means no abs-send-time id. uint8_t mid{ 0 }; // 0 means no MID id. uint8_t rid{ 0 }; // 0 means no RID id. - uint8_t videoOrientation{ 0 }; // 0 means no RID id. + uint8_t videoOrientation{ 0 }; // 0 means no video-orientation id. }; public: diff --git a/worker/src/RTC/PlainRtpTransport.cpp b/worker/src/RTC/PlainRtpTransport.cpp index fee6e408da..7dc9e00266 100644 --- a/worker/src/RTC/PlainRtpTransport.cpp +++ b/worker/src/RTC/PlainRtpTransport.cpp @@ -283,6 +283,11 @@ namespace RTC packet->AddExtensionMapping( RtpHeaderExtensionUri::Type::ABS_SEND_TIME, this->headerExtensionIds.absSendTime); } + if (this->headerExtensionIds.videoOrientation != 0u) + { + packet->AddExtensionMapping( + RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION, this->headerExtensionIds.videoOrientation); + } if (this->headerExtensionIds.mid != 0u) { packet->AddExtensionMapping(RtpHeaderExtensionUri::Type::MID, this->headerExtensionIds.mid); diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 6c9dc7e9b2..52c4031a80 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -382,6 +382,7 @@ namespace RTC uint8_t absSendTimeId{ 0 }; uint8_t midId{ 0 }; uint8_t ridId{ 0 }; + uint8_t videoOrientationId{ 0 }; for (auto& exten : this->rtpParameters.headerExtensions) { @@ -408,6 +409,17 @@ namespace RTC this->transportHeaderExtensionIds.absSendTime = exten.id; } + if ((videoOrientationId == 0u) && exten.type == RTC::RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION) + { + if (idMapping.find(exten.id) != idMapping.end()) + videoOrientationId = idMapping[exten.id]; + else + videoOrientationId = exten.id; + + this->headerExtensionIds.videoOrientation = absSendTimeId; + this->transportHeaderExtensionIds.videoOrientation = exten.id; + } + if ((midId == 0u) && exten.type == RTC::RtpHeaderExtensionUri::Type::MID) { if (idMapping.find(exten.id) != idMapping.end()) @@ -620,6 +632,12 @@ namespace RTC packet->AddExtensionMapping( RtpHeaderExtensionUri::Type::RTP_STREAM_ID, this->headerExtensionIds.rid); } + + if (this->headerExtensionIds.videoOrientation != 0u) + { + packet->AddExtensionMapping( + RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION, this->headerExtensionIds.videoOrientation); + } } void Producer::ActivateStream(RTC::RtpStreamRecv* rtpStream) diff --git a/worker/src/RTC/RtpStream.cpp b/worker/src/RTC/RtpStream.cpp index 74a904a01e..ece480a3bc 100644 --- a/worker/src/RTC/RtpStream.cpp +++ b/worker/src/RTC/RtpStream.cpp @@ -63,6 +63,7 @@ namespace RTC static const Json::StaticString JsonStringBitRate{ "bitrate" }; static const Json::StaticString JsonStringPacketsLost{ "packetsLost" }; static const Json::StaticString JsonStringFractionLost{ "fractionLost" }; + static const Json::StaticString JsonStringVideoOrientation{ "videoOrientation" }; static const Json::StaticString JsonStringPacketsDiscarded{ "packetsDiscarded" }; static const Json::StaticString JsonStringPacketsRepaired{ "packetsRepaired" }; static const Json::StaticString JsonStringFirCount{ "firCount" }; @@ -73,17 +74,18 @@ namespace RTC Json::Value json(Json::objectValue); uint64_t now = DepLibUV::GetTime(); - json[JsonStringId] = this->rtpStreamId; - json[JsonStringTimestamp] = Json::UInt64{ now }; - json[JsonStringSsrc] = Json::UInt{ this->params.ssrc }; - json[JsonStringMediaType] = RtpCodecMimeType::type2String[this->params.mimeType.type]; - json[JsonStringKind] = RtpCodecMimeType::type2String[this->params.mimeType.type]; - json[JsonStringMimeType] = this->params.mimeType.ToString(); - json[JsonStringPacketCount] = static_cast(this->transmissionCounter.GetPacketCount()); - json[JsonStringByteCount] = static_cast(this->transmissionCounter.GetBytes()); - json[JsonStringBitRate] = Json::UInt{ this->transmissionCounter.GetRate(now) }; + json[JsonStringId] = this->rtpStreamId; + json[JsonStringTimestamp] = Json::UInt64{ now }; + json[JsonStringSsrc] = Json::UInt{ this->params.ssrc }; + json[JsonStringMediaType] = RtpCodecMimeType::type2String[this->params.mimeType.type]; + json[JsonStringKind] = RtpCodecMimeType::type2String[this->params.mimeType.type]; + json[JsonStringMimeType] = this->params.mimeType.ToString(); + json[JsonStringPacketCount] = static_cast(this->transmissionCounter.GetPacketCount()); + json[JsonStringByteCount] = static_cast(this->transmissionCounter.GetBytes()); + json[JsonStringBitRate] = Json::UInt{ this->transmissionCounter.GetRate(now) }; json[JsonStringPacketsLost] = Json::UInt{ this->packetsLost }; json[JsonStringFractionLost] = Json::UInt{ this->fractionLost }; + json[JsonStringVideoOrientation] = Json::UInt{ this->videoOrientation }; json[JsonStringPacketsDiscarded] = static_cast(this->packetsDiscarded); json[JsonStringPacketsRepaired] = static_cast(this->packetsRepaired); json[JsonStringFirCount] = static_cast(this->firCount); @@ -112,6 +114,11 @@ namespace RTC this->maxPacketMs = DepLibUV::GetTime(); } + uint8_t videoOrientation; + if (packet->ReadVideoOrientation(&videoOrientation)) { + this->videoOrientation = videoOrientation; + } + // If not a valid packet ignore it. if (!UpdateSeq(packet)) { @@ -244,12 +251,12 @@ namespace RTC Json::Value json(Json::objectValue); - json[JsonStringSsrc] = Json::UInt{ this->ssrc }; - json[JsonStringPayloadType] = Json::UInt{ this->payloadType }; - json[JsonStringMimeType] = this->mimeType.ToString(); - json[JsonStringClockRate] = Json::UInt{ this->clockRate }; - json[JsonStringUseNack] = this->useNack; - json[JsonStringUsePli] = this->usePli; + json[JsonStringSsrc] = Json::UInt{ this->ssrc }; + json[JsonStringPayloadType] = Json::UInt{ this->payloadType }; + json[JsonStringMimeType] = this->mimeType.ToString(); + json[JsonStringClockRate] = Json::UInt{ this->clockRate }; + json[JsonStringUseNack] = this->useNack; + json[JsonStringUsePli] = this->usePli; return json; } diff --git a/worker/src/RTC/WebRtcTransport.cpp b/worker/src/RTC/WebRtcTransport.cpp index 2c21dc3109..0d7c909de3 100644 --- a/worker/src/RTC/WebRtcTransport.cpp +++ b/worker/src/RTC/WebRtcTransport.cpp @@ -861,6 +861,11 @@ namespace RTC packet->AddExtensionMapping( RtpHeaderExtensionUri::Type::ABS_SEND_TIME, this->headerExtensionIds.absSendTime); } + if (this->headerExtensionIds.videoOrientation != 0u) + { + packet->AddExtensionMapping( + RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION, this->headerExtensionIds.videoOrientation); + } if (this->headerExtensionIds.mid != 0u) { packet->AddExtensionMapping(RtpHeaderExtensionUri::Type::MID, this->headerExtensionIds.mid); From ce61812c8a967d07fd7b52681e7e06fc4baa39af Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Tue, 5 Mar 2019 18:22:37 -0600 Subject: [PATCH 23/82] orientation; progress (or not much of) on parsing rotation from rtp header --- package.json | 2 +- worker/include/RTC/RtpPacket.hpp | 65 ++++++++++++++++++++++++-------- worker/src/RTC/Producer.cpp | 6 ++- worker/src/RTC/RtpPacket.cpp | 2 +- worker/src/RTC/Transport.cpp | 3 ++ 5 files changed, 60 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index fd6c3dc98f..678585fe85 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv1", + "version": "2.6.8-lv1-orientation2", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 2f8ce7962a..80f96b3603 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -3,6 +3,7 @@ #include "common.hpp" #include "Utils.hpp" +#include "Logger.hpp" #include "RTC/Codecs/PayloadDescriptorHandler.hpp" #include "RTC/RtpDictionaries.hpp" #include @@ -277,18 +278,20 @@ namespace RTC { *len = 0; - if (this->extensionMap.find(uri) == this->extensionMap.end()) + if (this->extensionMap.find(uri) == this->extensionMap.end()) { return nullptr; + } uint8_t id = this->extensionMap.at(uri); - - if (HasOneByteExtensions()) + if (HasOneByteExtensions()) { - if (this->oneByteExtensions.find(id) == this->oneByteExtensions.end()) + if (this->oneByteExtensions.find(id) == this->oneByteExtensions.end()){ + MS_ERROR("READ VIDEOORIENTATION GET oneByteExtension FAIL[id:'%hhu']", id); return nullptr; + } *len = this->oneByteExtensions.at(id)->len + 1; - + MS_ERROR("READ VIDEOORIENTATION GET oneByteExtension SUCCESS[id:'%hhu']", id); return this->oneByteExtensions.at(id)->value; } else if (HasTwoBytesExtensions()) @@ -341,22 +344,54 @@ namespace RTC inline bool RtpPacket::ReadVideoOrientation(uint8_t* rotation) const { uint8_t extenLen; + uint8_t cvoByte; uint8_t* extenValue; extenValue = GetExtension(RTC::RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION, &extenLen); - - if (!extenValue || extenLen != 1) + MS_ERROR("READ VIDEOORIENTATION [extenValue:'%s']", extenValue); + MS_ERROR("READ VIDEOORIENTATION [extenLen:'%hhu']", extenLen); + if (!extenValue || extenLen != 1) { + MS_ERROR("READ VIDEOORIENTATION FALSE!!!!!!!!!!!!!!!!!!!!!!"); return false; + } /** - FIXME: may need to massage this to get the actual value - Rotation signalling for 2-bit granularity - 00 = 0 rotation - 01 = 90 CCW (aka: 270 CW) - 10 = 180 CCW (aka: 180 CW) - 11 = 270 CCW (aka: 90 CW) + Coordination of Video Orientation + + Bit# 7 6 5 4 3 2 1 0(LSB) + Definition 0 0 0 0 C F R1 R0 + + C = Camera + 0: Front-facing camera, facing the user. If camera direction is unknown, this is the default value used. + 1: Back-facing camera, facing away from the user. + + F = Flip + 0: No flip operation. If the sending client flips value is unknown, this is the default value used. + 1: Horizontal flip operation + + R1 R0 = Rotation + 0 0 = 0 rotation + 0 1 = 90 CCW (aka: 270 CW) + 1 0 = 180 CCW (aka: 180 CW) + 1 1 = 270 CCW (aka: 90 CW) **/ - *rotation = Utils::Byte::Get1Byte(extenValue, 0); - + MS_ERROR("READ VIDEOORIENTATION TRUE"); + cvoByte = Utils::Byte::Get1Byte(extenValue, 0); + int r0 = cvoByte & (1 << 0); + int r1 = cvoByte & (1 << 1); + MS_ERROR("READ VIDEOORIENTATION [byte:'%hhu']", cvoByte); + MS_ERROR("READ VIDEOORIENTATION [r0 bit:'%d']", r0); + MS_ERROR("READ VIDEOORIENTATION [f1 bit:'%d']", r1); + + if (r1 == 1 && r0 == 1) { + *rotation = (uint8_t)90; + } else if (r1 == 1 && r0 == 0) { + *rotation = (uint8_t)180; + } else if (r1 == 0 && r0 == 1) { + *rotation = (uint8_t)270; + } else { + *rotation = (uint8_t)0; + } + MS_ERROR("READ VIDEOORIENTATION [rotation:'%s']", rotation); return true; } diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 52c4031a80..3c6905bbf1 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -75,6 +75,7 @@ namespace RTC static const Json::StaticString JsonStringRtpStreamInfos{ "rtpStreamInfos" }; static const Json::StaticString JsonStringRtpStream{ "rtpStream" }; static const Json::StaticString JsonStringRid{ "rid" }; + static const Json::StaticString JsonStringVideoOrientation{ "videoOrientation" }; static const Json::StaticString JsonStringProfile{ "profile" }; static const Json::StaticString JsonStringNone{ "none" }; static const Json::StaticString JsonStringDefault{ "default" }; @@ -154,6 +155,9 @@ namespace RTC if (this->headerExtensionIds.rid != 0u) jsonHeaderExtensionIds[JsonStringRid] = this->headerExtensionIds.rid; + if (this->headerExtensionIds.videoOrientation != 0u) + jsonHeaderExtensionIds[JsonStringVideoOrientation] = this->headerExtensionIds.videoOrientation; + json[JsonStringHeaderExtensionIds] = jsonHeaderExtensionIds; json[JsonStringPaused] = this->paused; @@ -416,7 +420,7 @@ namespace RTC else videoOrientationId = exten.id; - this->headerExtensionIds.videoOrientation = absSendTimeId; + this->headerExtensionIds.videoOrientation = videoOrientationId; this->transportHeaderExtensionIds.videoOrientation = exten.id; } diff --git a/worker/src/RTC/RtpPacket.cpp b/worker/src/RTC/RtpPacket.cpp index 543c35c9b6..185bdf48d0 100644 --- a/worker/src/RTC/RtpPacket.cpp +++ b/worker/src/RTC/RtpPacket.cpp @@ -534,7 +534,7 @@ namespace RTC { uint8_t id = (*ptr & 0xF0) >> 4; size_t len = static_cast(*ptr & 0x0F) + 1; - + MS_ERROR("RtpPacket::ParseExtensions #########[id:'%hhu']", id); if (ptr + 1 + len > extensionEnd) { MS_WARN_TAG( diff --git a/worker/src/RTC/Transport.cpp b/worker/src/RTC/Transport.cpp index e2a9a40094..922d007b6c 100644 --- a/worker/src/RTC/Transport.cpp +++ b/worker/src/RTC/Transport.cpp @@ -167,6 +167,9 @@ namespace RTC if (producer->GetTransportHeaderExtensionIds().rid != 0u) this->headerExtensionIds.rid = producer->GetTransportHeaderExtensionIds().rid; + + if (producer->GetTransportHeaderExtensionIds().videoOrientation != 0u) + this->headerExtensionIds.videoOrientation = producer->GetTransportHeaderExtensionIds().videoOrientation; } void Transport::HandleConsumer(RTC::Consumer* consumer) From 3e9a815705f6e9318b761e7a1f80b5f05281e966 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Wed, 6 Mar 2019 12:47:45 -0600 Subject: [PATCH 24/82] orientationv2.6.8; add a bool to stats to indicate if at least one cvo header has been processed; for safety before starting up proxy --- worker/include/RTC/RtpPacket.hpp | 16 +++++----------- worker/include/RTC/RtpStream.hpp | 3 ++- worker/src/RTC/RtpPacket.cpp | 1 - worker/src/RTC/RtpStream.cpp | 13 ++++++++++--- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 80f96b3603..31e2ed4759 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -286,12 +286,10 @@ namespace RTC if (HasOneByteExtensions()) { if (this->oneByteExtensions.find(id) == this->oneByteExtensions.end()){ - MS_ERROR("READ VIDEOORIENTATION GET oneByteExtension FAIL[id:'%hhu']", id); return nullptr; } *len = this->oneByteExtensions.at(id)->len + 1; - MS_ERROR("READ VIDEOORIENTATION GET oneByteExtension SUCCESS[id:'%hhu']", id); return this->oneByteExtensions.at(id)->value; } else if (HasTwoBytesExtensions()) @@ -348,10 +346,7 @@ namespace RTC uint8_t* extenValue; extenValue = GetExtension(RTC::RtpHeaderExtensionUri::Type::VIDEO_ORIENTATION, &extenLen); - MS_ERROR("READ VIDEOORIENTATION [extenValue:'%s']", extenValue); - MS_ERROR("READ VIDEOORIENTATION [extenLen:'%hhu']", extenLen); if (!extenValue || extenLen != 1) { - MS_ERROR("READ VIDEOORIENTATION FALSE!!!!!!!!!!!!!!!!!!!!!!"); return false; } /** @@ -373,14 +368,11 @@ namespace RTC 0 1 = 90 CCW (aka: 270 CW) 1 0 = 180 CCW (aka: 180 CW) 1 1 = 270 CCW (aka: 90 CW) - **/ - MS_ERROR("READ VIDEOORIENTATION TRUE"); + **/ cvoByte = Utils::Byte::Get1Byte(extenValue, 0); int r0 = cvoByte & (1 << 0); int r1 = cvoByte & (1 << 1); - MS_ERROR("READ VIDEOORIENTATION [byte:'%hhu']", cvoByte); - MS_ERROR("READ VIDEOORIENTATION [r0 bit:'%d']", r0); - MS_ERROR("READ VIDEOORIENTATION [f1 bit:'%d']", r1); + if (r1 == 1 && r0 == 1) { *rotation = (uint8_t)90; @@ -391,7 +383,9 @@ namespace RTC } else { *rotation = (uint8_t)0; } - MS_ERROR("READ VIDEOORIENTATION [rotation:'%s']", rotation); + MS_ERROR("READ VIDEOORIENTATION [r0 bit:'%d']", r0); + MS_ERROR("READ VIDEOORIENTATION [f1 bit:'%d']", r1); + MS_ERROR("READ VIDEOORIENTATION [rotation:'%hhu']", *rotation); return true; } diff --git a/worker/include/RTC/RtpStream.hpp b/worker/include/RTC/RtpStream.hpp index dc3bbd3607..114a1ad561 100644 --- a/worker/include/RTC/RtpStream.hpp +++ b/worker/include/RTC/RtpStream.hpp @@ -62,13 +62,14 @@ namespace RTC // Stats. uint32_t packetsLost{ 0 }; uint8_t fractionLost{ 0 }; - uint8_t videoOrientation{ 0 }; size_t packetsDiscarded{ 0 }; size_t packetsRepaired{ 0 }; size_t firCount{ 0 }; size_t pliCount{ 0 }; size_t nackCount{ 0 }; size_t sliCount{ 0 }; + uint8_t videoOrientation{ 0 }; + bool cvoReceived{ false }; RtpDataCounter transmissionCounter; RtpDataCounter retransmissionCounter; diff --git a/worker/src/RTC/RtpPacket.cpp b/worker/src/RTC/RtpPacket.cpp index 185bdf48d0..d9ed587a52 100644 --- a/worker/src/RTC/RtpPacket.cpp +++ b/worker/src/RTC/RtpPacket.cpp @@ -534,7 +534,6 @@ namespace RTC { uint8_t id = (*ptr & 0xF0) >> 4; size_t len = static_cast(*ptr & 0x0F) + 1; - MS_ERROR("RtpPacket::ParseExtensions #########[id:'%hhu']", id); if (ptr + 1 + len > extensionEnd) { MS_WARN_TAG( diff --git a/worker/src/RTC/RtpStream.cpp b/worker/src/RTC/RtpStream.cpp index ece480a3bc..35181b8e86 100644 --- a/worker/src/RTC/RtpStream.cpp +++ b/worker/src/RTC/RtpStream.cpp @@ -64,6 +64,7 @@ namespace RTC static const Json::StaticString JsonStringPacketsLost{ "packetsLost" }; static const Json::StaticString JsonStringFractionLost{ "fractionLost" }; static const Json::StaticString JsonStringVideoOrientation{ "videoOrientation" }; + static const Json::StaticString JsonStringCvoReceived{ "cvoReceived" }; static const Json::StaticString JsonStringPacketsDiscarded{ "packetsDiscarded" }; static const Json::StaticString JsonStringPacketsRepaired{ "packetsRepaired" }; static const Json::StaticString JsonStringFirCount{ "firCount" }; @@ -86,6 +87,7 @@ namespace RTC json[JsonStringPacketsLost] = Json::UInt{ this->packetsLost }; json[JsonStringFractionLost] = Json::UInt{ this->fractionLost }; json[JsonStringVideoOrientation] = Json::UInt{ this->videoOrientation }; + json[JsonStringCvoReceived] = this->cvoReceived; json[JsonStringPacketsDiscarded] = static_cast(this->packetsDiscarded); json[JsonStringPacketsRepaired] = static_cast(this->packetsRepaired); json[JsonStringFirCount] = static_cast(this->firCount); @@ -96,6 +98,8 @@ namespace RTC return json; } + uint8_t vo; + bool voReceived; bool RtpStream::ReceivePacket(RTC::RtpPacket* packet) { MS_TRACE(); @@ -114,10 +118,13 @@ namespace RTC this->maxPacketMs = DepLibUV::GetTime(); } - uint8_t videoOrientation; - if (packet->ReadVideoOrientation(&videoOrientation)) { - this->videoOrientation = videoOrientation; + + + if (packet->ReadVideoOrientation(&vo)) { + voReceived = true; } + this->videoOrientation = vo; + this->cvoReceived = voReceived; // If not a valid packet ignore it. if (!UpdateSeq(packet)) From 8c03b2b103c39ae19e35d3a027b4204a7f64413c Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Wed, 6 Mar 2019 15:08:27 -0600 Subject: [PATCH 25/82] orientationv2.6.8; update ReadVideoOrientation func --- worker/include/RTC/RtpPacket.hpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 31e2ed4759..34b3629f38 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -351,7 +351,6 @@ namespace RTC } /** Coordination of Video Orientation - Bit# 7 6 5 4 3 2 1 0(LSB) Definition 0 0 0 0 C F R1 R0 @@ -370,22 +369,16 @@ namespace RTC 1 1 = 270 CCW (aka: 90 CW) **/ cvoByte = Utils::Byte::Get1Byte(extenValue, 0); - int r0 = cvoByte & (1 << 0); - int r1 = cvoByte & (1 << 1); - - - if (r1 == 1 && r0 == 1) { - *rotation = (uint8_t)90; - } else if (r1 == 1 && r0 == 0) { - *rotation = (uint8_t)180; - } else if (r1 == 0 && r0 == 1) { + int rValue = (cvoByte & 0x03); + if (rValue == 3) { *rotation = (uint8_t)270; + } else if (rValue == 2) { + *rotation = (uint8_t)180; + } else if (rValue == 1) { + *rotation = (uint8_t)90; } else { *rotation = (uint8_t)0; } - MS_ERROR("READ VIDEOORIENTATION [r0 bit:'%d']", r0); - MS_ERROR("READ VIDEOORIENTATION [f1 bit:'%d']", r1); - MS_ERROR("READ VIDEOORIENTATION [rotation:'%hhu']", *rotation); return true; } From 42cd3d8bd37d6f31f98c712fb4577360d5b7b429 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Wed, 6 Mar 2019 16:10:57 -0600 Subject: [PATCH 26/82] orientationv2.6.8; update ReadVideoOrientation to returnn clockwise values --- worker/include/RTC/RtpPacket.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 34b3629f38..ca7ce5e538 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -370,12 +370,13 @@ namespace RTC **/ cvoByte = Utils::Byte::Get1Byte(extenValue, 0); int rValue = (cvoByte & 0x03); + // NOTE: using the clockwise orientation values if (rValue == 3) { - *rotation = (uint8_t)270; + *rotation = (uint8_t)90; } else if (rValue == 2) { *rotation = (uint8_t)180; } else if (rValue == 1) { - *rotation = (uint8_t)90; + *rotation = (uint8_t)270; } else { *rotation = (uint8_t)0; } From 9e951cb2f563031fb3038f14ee94633d56911d22 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Thu, 7 Mar 2019 11:59:18 -0600 Subject: [PATCH 27/82] bump version in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 678585fe85..61466f8dd8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv1-orientation2", + "version": "2.6.8-lv1-orientation4", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From fb9fe5d9470059cf9d070e8cda3fc5152aa66441 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Thu, 7 Mar 2019 22:26:17 -0600 Subject: [PATCH 28/82] orientation; update readVideoOrientation to use uint16 and well as return CCW values --- package.json | 2 +- worker/include/RTC/RtpPacket.hpp | 23 ++++++++++++----------- worker/include/RTC/RtpStream.hpp | 2 +- worker/src/RTC/RtpStream.cpp | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 61466f8dd8..2695f19fa7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv1-orientation4", + "version": "2.6.8-lv1-orientation6", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index ca7ce5e538..552e927fa9 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -113,7 +113,7 @@ namespace RTC uint8_t* GetExtension(RTC::RtpHeaderExtensionUri::Type uri, uint8_t* len) const; bool ReadAudioLevel(uint8_t* volume, bool* voice) const; bool ReadAbsSendTime(uint32_t* time) const; - bool ReadVideoOrientation(uint8_t* data) const; + bool ReadVideoOrientation(uint16_t* data) const; bool ReadMid(const uint8_t** data, size_t* len) const; bool ReadRid(const uint8_t** data, size_t* len) const; uint8_t* GetPayload() const; @@ -339,7 +339,7 @@ namespace RTC return true; } - inline bool RtpPacket::ReadVideoOrientation(uint8_t* rotation) const + inline bool RtpPacket::ReadVideoOrientation(uint16_t* rotation) const { uint8_t extenLen; uint8_t cvoByte; @@ -370,16 +370,17 @@ namespace RTC **/ cvoByte = Utils::Byte::Get1Byte(extenValue, 0); int rValue = (cvoByte & 0x03); - // NOTE: using the clockwise orientation values - if (rValue == 3) { - *rotation = (uint8_t)90; - } else if (rValue == 2) { - *rotation = (uint8_t)180; - } else if (rValue == 1) { - *rotation = (uint8_t)270; - } else { - *rotation = (uint8_t)0; + switch (rValue) { + case 3: // NOTE: using counter clockwise values + *rotation = 270; + case 2: + *rotation = 180; + case 1: + *rotation = 90; + default: + *rotation = 0; } + return true; } diff --git a/worker/include/RTC/RtpStream.hpp b/worker/include/RTC/RtpStream.hpp index 114a1ad561..82d7ca58ae 100644 --- a/worker/include/RTC/RtpStream.hpp +++ b/worker/include/RTC/RtpStream.hpp @@ -68,7 +68,7 @@ namespace RTC size_t pliCount{ 0 }; size_t nackCount{ 0 }; size_t sliCount{ 0 }; - uint8_t videoOrientation{ 0 }; + uint16_t videoOrientation{ 0 }; bool cvoReceived{ false }; RtpDataCounter transmissionCounter; diff --git a/worker/src/RTC/RtpStream.cpp b/worker/src/RTC/RtpStream.cpp index 35181b8e86..3dec10c740 100644 --- a/worker/src/RTC/RtpStream.cpp +++ b/worker/src/RTC/RtpStream.cpp @@ -98,7 +98,7 @@ namespace RTC return json; } - uint8_t vo; + uint16_t vo; bool voReceived; bool RtpStream::ReceivePacket(RTC::RtpPacket* packet) { From 8c0878aae9a2e4aa2cf58c8504cfc5d02ca5f704 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Thu, 7 Mar 2019 23:16:54 -0600 Subject: [PATCH 29/82] orientationv2.6.8; add missing breaks in switch statement in ReadVideoOrientation func --- package.json | 2 +- worker/include/RTC/RtpPacket.hpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2695f19fa7..0d15a92394 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv1-orientation6", + "version": "2.6.8-lv1-orientation7", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 552e927fa9..690a0d8969 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -373,10 +373,13 @@ namespace RTC switch (rValue) { case 3: // NOTE: using counter clockwise values *rotation = 270; + break; case 2: *rotation = 180; + break; case 1: *rotation = 90; + break; default: *rotation = 0; } From 085851a9d9928cfe37a9c0d293714765d49c6e0d Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Fri, 8 Mar 2019 11:00:38 -0600 Subject: [PATCH 30/82] orientation; remove global var when setting orientation --- package.json | 2 +- worker/src/RTC/RtpStream.cpp | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 0d15a92394..8313410986 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv1-orientation7", + "version": "2.6.8-lv1-orientation8", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/RtpStream.cpp b/worker/src/RTC/RtpStream.cpp index 3dec10c740..21c873b695 100644 --- a/worker/src/RTC/RtpStream.cpp +++ b/worker/src/RTC/RtpStream.cpp @@ -98,8 +98,6 @@ namespace RTC return json; } - uint16_t vo; - bool voReceived; bool RtpStream::ReceivePacket(RTC::RtpPacket* packet) { MS_TRACE(); @@ -118,13 +116,9 @@ namespace RTC this->maxPacketMs = DepLibUV::GetTime(); } - - - if (packet->ReadVideoOrientation(&vo)) { - voReceived = true; + if (packet->ReadVideoOrientation(&this->videoOrientation)) { + this->cvoReceived = true; } - this->videoOrientation = vo; - this->cvoReceived = voReceived; // If not a valid packet ignore it. if (!UpdateSeq(packet)) From 3bc631bd2a3cf5af1e2ca5daad36911a8ef1d0b4 Mon Sep 17 00:00:00 2001 From: artushin Date: Mon, 11 Mar 2019 18:28:45 -0500 Subject: [PATCH 31/82] remove throw which is causing uncaught rejections --- lib/Peer.js | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Peer.js b/lib/Peer.js index b356b47bac..9b3cc3d3fd 100644 --- a/lib/Peer.js +++ b/lib/Peer.js @@ -790,7 +790,8 @@ class Peer extends EnhancedEventEmitter { logger.error('"router.createConsumer" request failed: %s', String(error)); - throw error; + // remove throw as it's causing uncaught promise rejections + // throw error; }); this.safeEmit('newconsumer', consumer); diff --git a/package.json b/package.json index fd6c3dc98f..f84795f24e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv1", + "version": "2.6.8-lv2", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From d2522e6c1814762b72805f87c9d8182a98d8e1a9 Mon Sep 17 00:00:00 2001 From: Jeremiah Seeley Date: Fri, 15 Mar 2019 16:02:37 -0500 Subject: [PATCH 32/82] orientationv2.6.8; remove logger include from RtpPacket.hpp --- worker/include/RTC/RtpPacket.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp index 690a0d8969..380b686845 100644 --- a/worker/include/RTC/RtpPacket.hpp +++ b/worker/include/RTC/RtpPacket.hpp @@ -3,7 +3,6 @@ #include "common.hpp" #include "Utils.hpp" -#include "Logger.hpp" #include "RTC/Codecs/PayloadDescriptorHandler.hpp" #include "RTC/RtpDictionaries.hpp" #include From 469a6c1413331d35edef39205b1b5d53adcb0910 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 28 Mar 2019 07:58:07 -0700 Subject: [PATCH 33/82] enable -gp compilation flag to run gprof --- worker/common.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/common.gypi b/worker/common.gypi index 15f55c3cc5..5e4be2d62d 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,12 +21,12 @@ { 'Release': { - 'cflags': [ '-g' ] + 'cflags': [ '-g', '-gp' ] }, 'Debug': { 'defines': [ 'DEBUG', 'MS_LOG_TRACE', 'MS_LOG_FILE_LINE' ], - 'cflags': [ '-g', '-O0', '-fwrapv', '-Wno-parentheses-equality' ], + 'cflags': [ '-g', '-O0', '-fwrapv', '-gp', '-Wno-parentheses-equality' ], 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' From 539c28dd28dd2a91f468afe5f04a6c6fcedc2864 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 28 Mar 2019 09:06:27 -0700 Subject: [PATCH 34/82] package version to 2.6.8-lv3-gprof --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6fb415487..6e3aa90fa1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3", + "version": "2.6.8-lv3-gprof", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 4e3e867e394f44631cbabe63aac98429ca9a94c3 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 28 Mar 2019 11:06:42 -0700 Subject: [PATCH 35/82] correct compiler option --- package.json | 2 +- worker/common.gypi | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6e3aa90fa1..c055d663d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof", + "version": "2.6.8-lv3-gprof2", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/common.gypi b/worker/common.gypi index 5e4be2d62d..617a5d9c9a 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,12 +21,12 @@ { 'Release': { - 'cflags': [ '-g', '-gp' ] + 'cflags': [ '-g', '-pg' ] }, 'Debug': { 'defines': [ 'DEBUG', 'MS_LOG_TRACE', 'MS_LOG_FILE_LINE' ], - 'cflags': [ '-g', '-O0', '-fwrapv', '-gp', '-Wno-parentheses-equality' ], + 'cflags': [ '-g', '-O0', '-fwrapv', '-pg', '-Wno-parentheses-equality' ], 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' @@ -42,7 +42,7 @@ 'OTHER_CFLAGS': [ '-fstrict-aliasing', - '-g' + '-pg' ], 'WARNING_CFLAGS': [ From aebc37981db5cfa1b937d694613fd09d02b12df6 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Sun, 31 Mar 2019 16:00:50 -0700 Subject: [PATCH 36/82] Replace std::_Exit() with exit() to run gprof --- worker/common.gypi | 1 + worker/src/main.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/worker/common.gypi b/worker/common.gypi index 617a5d9c9a..a0a428c722 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -42,6 +42,7 @@ 'OTHER_CFLAGS': [ '-fstrict-aliasing', + '-g', '-pg' ], 'WARNING_CFLAGS': diff --git a/worker/src/main.cpp b/worker/src/main.cpp index 970fd07843..7b9f34970f 100644 --- a/worker/src/main.cpp +++ b/worker/src/main.cpp @@ -174,7 +174,8 @@ void exitSuccess() // Wait a bit so peding messages to stdout/Channel arrive to the main process. usleep(100000); // And exit with success status. - std::_Exit(EXIT_SUCCESS); + //std::_Exit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } void exitWithError() @@ -182,5 +183,6 @@ void exitWithError() // Wait a bit so peding messages to stderr arrive to the main process. usleep(100000); // And exit with error status. - std::_Exit(EXIT_FAILURE); + //std::_Exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } From bf2f542a6198d40ae2f8039c8db66be668c03263 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Sun, 31 Mar 2019 16:05:45 -0700 Subject: [PATCH 37/82] version 2.6.8-lv3-gprof3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c055d663d8..9d8421dcf2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof2", + "version": "2.6.8-lv3-gprof3", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From f93b201c674ec8d0c42aab735f168702f758a650 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 1 Apr 2019 11:36:06 -0700 Subject: [PATCH 38/82] try compiling with -no-pie option to enable gprof --- package.json | 2 +- worker/common.gypi | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9d8421dcf2..1650df4320 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof3", + "version": "2.6.8-lv3-gprof4", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/common.gypi b/worker/common.gypi index a0a428c722..c326cd23f1 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,12 +21,12 @@ { 'Release': { - 'cflags': [ '-g', '-pg' ] + 'cflags': [ '-g', '-no-pie', '-pg' ] }, 'Debug': { 'defines': [ 'DEBUG', 'MS_LOG_TRACE', 'MS_LOG_FILE_LINE' ], - 'cflags': [ '-g', '-O0', '-fwrapv', '-pg', '-Wno-parentheses-equality' ], + 'cflags': [ '-g', '-O0', '-fwrapv', '-pg', '-no-pie', '-Wno-parentheses-equality' ], 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' @@ -42,6 +42,7 @@ 'OTHER_CFLAGS': [ '-fstrict-aliasing', + '-no-pie', '-g', '-pg' ], From a1ca74240a8fae446559b2db683a08e33f47798d Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 1 Apr 2019 14:06:17 -0700 Subject: [PATCH 39/82] tweaking compilation flags again --- package.json | 2 +- worker/common.gypi | 8 ++++---- worker/mediasoup-worker.gyp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 1650df4320..531b6f13d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof4", + "version": "2.6.8-lv3-gprof5", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/common.gypi b/worker/common.gypi index c326cd23f1..4ed1a1c7ea 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,12 +21,12 @@ { 'Release': { - 'cflags': [ '-g', '-no-pie', '-pg' ] + 'cflags': [ '-g', '-pg', '-O0' ] }, 'Debug': { 'defines': [ 'DEBUG', 'MS_LOG_TRACE', 'MS_LOG_FILE_LINE' ], - 'cflags': [ '-g', '-O0', '-fwrapv', '-pg', '-no-pie', '-Wno-parentheses-equality' ], + 'cflags': [ '-g', '-fwrapv', '-pg', '-Wno-parentheses-equality' ], 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' @@ -42,9 +42,9 @@ 'OTHER_CFLAGS': [ '-fstrict-aliasing', - '-no-pie', '-g', - '-pg' + '-pg', + '-O0' ], 'WARNING_CFLAGS': [ diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index 11915e4a4d..c1999b57c0 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -221,8 +221,8 @@ }], [ 'OS == "linux" and mediasoup_asan == "true"', { - 'cflags': [ '-fsanitize=address' ], - 'ldflags': [ '-fsanitize=address' ] + 'cflags': [ '-fsanitize=address', '-pg', '-O0' ], + 'ldflags': [ '-fsanitize=address', '-pg', 'O0' ] }], [ 'OS in "linux freebsd"', { @@ -334,7 +334,7 @@ 'conditions': [ [ 'OS == "linux"', { - 'cflags': [ '-g', '-O0', '-fsanitize=address,fuzzer' ], + 'cflags': [ '-g', '-O0', '-pg', '-fsanitize=address,fuzzer' ], 'ldflags': [ '-fsanitize=address,fuzzer' ] }] ] From 06d9f3b6a733455c582b049c96070e7beb3945c2 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 3 Apr 2019 09:42:42 -0700 Subject: [PATCH 40/82] another permutation of compiler and linker flags :) --- worker/mediasoup-worker.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index c1999b57c0..2f1197f716 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -213,6 +213,8 @@ }], [ 'OS == "linux"', { + 'cflags': [ '-pg', '-O0' ], + 'ldflags': [ '-static-libgcc', '-Wl','-Bstatic', '-lc', '-pg', 'O0' ] 'defines': [ '_POSIX_C_SOURCE=200112', From 7c1e2c8ab38733d55120a28706a49349d34059e4 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 3 Apr 2019 09:43:18 -0700 Subject: [PATCH 41/82] bump up version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 531b6f13d6..7c746e1182 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof5", + "version": "2.6.8-lv3-gprof6", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 251d657dd1c4098ffa7924795266409b105d4be1 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 3 Apr 2019 09:56:32 -0700 Subject: [PATCH 42/82] syntax --- worker/mediasoup-worker.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index 2f1197f716..1b596ef1a0 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -214,7 +214,7 @@ [ 'OS == "linux"', { 'cflags': [ '-pg', '-O0' ], - 'ldflags': [ '-static-libgcc', '-Wl','-Bstatic', '-lc', '-pg', 'O0' ] + 'ldflags': [ '-static-libgcc', '-Wl','-Bstatic', '-lc', '-pg', 'O0' ], 'defines': [ '_POSIX_C_SOURCE=200112', From ddeece3110bf82642b217adf141e5f1e72699434 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 3 Apr 2019 09:57:12 -0700 Subject: [PATCH 43/82] version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7c746e1182..e8b8f9e638 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof6", + "version": "2.6.8-lv3-gprof7", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From d7b632e1fd8fd905d1f72f276a40ad68b2ec78cb Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 3 Apr 2019 10:27:09 -0700 Subject: [PATCH 44/82] linker --- package.json | 2 +- worker/mediasoup-worker.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e8b8f9e638..558fb4c515 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof7", + "version": "2.6.8-lv3-gprof8", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index 1b596ef1a0..f248c7e887 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -214,7 +214,7 @@ [ 'OS == "linux"', { 'cflags': [ '-pg', '-O0' ], - 'ldflags': [ '-static-libgcc', '-Wl','-Bstatic', '-lc', '-pg', 'O0' ], + 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O0' ], 'defines': [ '_POSIX_C_SOURCE=200112', From 08c2ccf29aee572848121e813f39b4f14e3f2a8d Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 4 Apr 2019 09:09:09 -0700 Subject: [PATCH 45/82] gprof works now but I want to measure with O2 optimization level --- package.json | 2 +- worker/common.gypi | 4 ++-- worker/mediasoup-worker.gyp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 558fb4c515..330eddba25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof8", + "version": "2.6.8-lv3-gprof9", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/common.gypi b/worker/common.gypi index 4ed1a1c7ea..db641c5654 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,7 +21,7 @@ { 'Release': { - 'cflags': [ '-g', '-pg', '-O0' ] + 'cflags': [ '-g', '-pg', '-O2' ] }, 'Debug': { @@ -44,7 +44,7 @@ '-fstrict-aliasing', '-g', '-pg', - '-O0' + '-O2' ], 'WARNING_CFLAGS': [ diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index f248c7e887..5282d6fa35 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -213,8 +213,8 @@ }], [ 'OS == "linux"', { - 'cflags': [ '-pg', '-O0' ], - 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O0' ], + 'cflags': [ '-pg', '-O2' ], + 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O2' ], 'defines': [ '_POSIX_C_SOURCE=200112', @@ -223,8 +223,8 @@ }], [ 'OS == "linux" and mediasoup_asan == "true"', { - 'cflags': [ '-fsanitize=address', '-pg', '-O0' ], - 'ldflags': [ '-fsanitize=address', '-pg', 'O0' ] + 'cflags': [ '-fsanitize=address', '-pg', '-O2' ], + 'ldflags': [ '-fsanitize=address', '-pg', 'O2' ] }], [ 'OS in "linux freebsd"', { From e432de8b807e9d8b7a44e7b6eff289e8ea498719 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 5 Apr 2019 10:45:26 -0700 Subject: [PATCH 46/82] Try O3 optimization --- package.json | 2 +- worker/common.gypi | 2 +- worker/mediasoup-worker.gyp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 330eddba25..5779cfdc49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof9", + "version": "2.6.8-lv3-gprof10", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/common.gypi b/worker/common.gypi index db641c5654..1b83b25832 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,7 +21,7 @@ { 'Release': { - 'cflags': [ '-g', '-pg', '-O2' ] + 'cflags': [ '-g', '-pg', '-O3' ] }, 'Debug': { diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index 5282d6fa35..89a2ea3b31 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -213,8 +213,8 @@ }], [ 'OS == "linux"', { - 'cflags': [ '-pg', '-O2' ], - 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O2' ], + 'cflags': [ '-pg', '-O3' ], + 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O3' ], 'defines': [ '_POSIX_C_SOURCE=200112', @@ -223,8 +223,8 @@ }], [ 'OS == "linux" and mediasoup_asan == "true"', { - 'cflags': [ '-fsanitize=address', '-pg', '-O2' ], - 'ldflags': [ '-fsanitize=address', '-pg', 'O2' ] + 'cflags': [ '-fsanitize=address', '-pg', '-O3' ], + 'ldflags': [ '-fsanitize=address', '-pg', 'O3' ] }], [ 'OS in "linux freebsd"', { From b8c123bf4e35b6996982379a7fc599d09646b29b Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 5 Apr 2019 13:18:55 -0700 Subject: [PATCH 47/82] Try O3 and -fno-inline hoping to get more details gprof data --- package.json | 2 +- worker/common.gypi | 2 +- worker/mediasoup-worker.gyp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5779cfdc49..a21345aa05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof10", + "version": "2.6.8-lv3-gprof11", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/common.gypi b/worker/common.gypi index 1b83b25832..5b135b0afb 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,7 +21,7 @@ { 'Release': { - 'cflags': [ '-g', '-pg', '-O3' ] + 'cflags': [ '-g', '-pg', '-O3', '-fno-inline' ] }, 'Debug': { diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index 89a2ea3b31..bf59733cd7 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -213,8 +213,8 @@ }], [ 'OS == "linux"', { - 'cflags': [ '-pg', '-O3' ], - 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O3' ], + 'cflags': [ '-pg', '-O3', '-fno-inline' ], + 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O3', '-fno-inline' ], 'defines': [ '_POSIX_C_SOURCE=200112', @@ -223,8 +223,8 @@ }], [ 'OS == "linux" and mediasoup_asan == "true"', { - 'cflags': [ '-fsanitize=address', '-pg', '-O3' ], - 'ldflags': [ '-fsanitize=address', '-pg', 'O3' ] + 'cflags': [ '-fsanitize=address', '-pg', '-O3', '-fno-inline' ], + 'ldflags': [ '-fsanitize=address', '-pg', 'O3', '-fno-inline' ] }], [ 'OS in "linux freebsd"', { From 1ee8e1b3fb3d5bbf9cfb84f50edb44182f43a5c8 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 17 Apr 2019 16:02:59 -0700 Subject: [PATCH 48/82] Compilable but not tested yet: replace std::list with circular array in RtpStreamSend --- worker/include/RTC/RtpStreamSend.hpp | 28 ++++- worker/src/RTC/RtpStreamSend.cpp | 156 ++++++++++++++++++--------- 2 files changed, 135 insertions(+), 49 deletions(-) diff --git a/worker/include/RTC/RtpStreamSend.hpp b/worker/include/RTC/RtpStreamSend.hpp index e8e59fcb21..e318592e31 100644 --- a/worker/include/RTC/RtpStreamSend.hpp +++ b/worker/include/RTC/RtpStreamSend.hpp @@ -4,6 +4,8 @@ #include "RTC/RTCP/ReceiverReport.hpp" #include "RTC/RTCP/SenderReport.hpp" #include "RTC/RtpStream.hpp" +#include "RTC/SeqManager.hpp" +#include "Logger.hpp" #include #include @@ -25,6 +27,31 @@ namespace RTC RTC::RtpPacket* packet{ nullptr }; }; + private: + class Buffer + { + private: + std::vector vctr; // array can hold up to maxsize of BufferItems plus always has one empty slot for easier inserts + uint8_t start{ 0 }; // index where data begins + size_t cursize{ 0 }; // number of items currently in array. While inserting a new packet, we may see cursize == maxsize + 1 until trim_front() is called + size_t maxsize{ 0 }; //maximum number of items that can be stored in this Buffer + + public: + Buffer(size_t bufferSize) : vctr(bufferSize + 1), start(0), cursize(0), maxsize(bufferSize) {} + + inline bool empty() const { return vctr.empty() || cursize == 0; } + inline size_t datasize() const { return vctr.empty() ? 0 : cursize; } + inline void clear() { vctr.clear(); start = cursize = maxsize = 0; } + + RtpStreamSend::BufferItem& first(); + RtpStreamSend::BufferItem& last(); + bool push_back (const RtpStreamSend::BufferItem& val); + void trim_front(); + size_t ordered_insert_by_seq( const RtpStreamSend::BufferItem& val); // checks bufferItem.seq and inserts data into a buffer. returns index of just inserted item. + + RtpStreamSend::BufferItem& operator[] (size_t index); + }; + public: RtpStreamSend(RTC::RtpStream::Params& params, size_t bufferSize); ~RtpStreamSend() override; @@ -51,7 +78,6 @@ namespace RTC private: // Passed by argument. std::vector storage; - using Buffer = std::list; Buffer buffer; // Stats. float rtt{ 0 }; diff --git a/worker/src/RTC/RtpStreamSend.cpp b/worker/src/RTC/RtpStreamSend.cpp index 42462a9109..a17a23842c 100644 --- a/worker/src/RTC/RtpStreamSend.cpp +++ b/worker/src/RTC/RtpStreamSend.cpp @@ -15,10 +15,98 @@ namespace RTC static constexpr uint32_t MaxRetransmissionDelay{ 2000 }; static constexpr uint32_t DefaultRtt{ 100 }; + /* Buffer methods */ + RtpStreamSend::BufferItem& RtpStreamSend::Buffer::first() + { + MS_ASSERT(vctr.size() > 0, "Read first() from empty Buffer"); + return vctr[start]; + } + + RtpStreamSend::BufferItem& RtpStreamSend::Buffer::last() + { + MS_ASSERT(vctr.size() > 0, "Read last() from empty Buffer"); + return vctr[(start + cursize) % vctr.size()]; + } + + RtpStreamSend::BufferItem& RtpStreamSend::Buffer::operator[] (size_t index) + { + MS_ASSERT(index >= maxsize, "index out of vector maxsize capacity"); + auto idx = (start + index) % vctr.size(); + return vctr[idx]; + } + + bool RtpStreamSend::Buffer::push_back(const RtpStreamSend::BufferItem& val) + { + // can't insert, no room in array + if (cursize >= maxsize + 1) + return false; + + (*this)[cursize] = val; + cursize++; + + return true; + } + + // Delete the first item in array. + // This function is only used to remove the oldest packet in case buffer has exceeded max capacity, but we don't check for that condition here, it's not important + void RtpStreamSend::Buffer::trim_front() + { + if (empty()) + return; + + (*this)[start].packet = nullptr; + start = (start + 1) % vctr.size(); + cursize--; + } + + // checks bufferItem.seq and inserts data into a buffer. returns false if buffer went 1 item above maxcapacity and needs to be trimmed back. asserts if buffer is already above maxcapacity (should not happen) + size_t RtpStreamSend::Buffer::ordered_insert_by_seq( const RtpStreamSend::BufferItem& val ) + { + MS_ASSERT(cursize <= maxsize, "Buffer exceeded max capacity, must trim it prior to inserting new items"); + + // This var will point to a location of just inserted buffer item + auto idx = cursize - 1; + auto packetSeq = val.seq; + + // First, insert new packet in buffer array unless already stored. + // Later we will check if buffer array went beyond max capacity and in that case remove the oldest packet + for (; idx >=0; idx--) + { + auto currentSeq = (*this)[idx].seq; + + // Packet is already stored. TODO: need to return smth special insted of idx value to tell the caller there is no need to copy packet data into storage + if (packetSeq == currentSeq) { + // rollback: shift all items moved in anticipation of insertion op back to the left + // j points to the location of a "hole" slot + for (auto j = idx + 1; j < cursize; j++ ) { + (*this)[j] = (*this)[j + 1]; + (*this)[j + 1].packet = nullptr; // now "hole" has moved one step to the right + } + return idx; + } + + if (SeqManager::IsSeqHigherThan(packetSeq, currentSeq)) + { + // insert here. + (*this)[idx] = val; + + break; + } + + // Now move current buffer item into an empty slot on the right. + // Then either we insert a new packet to the left of it, or iterate further + (*this)[idx + 1] = (*this)[idx]; + (*this)[idx].packet = nullptr; + } + + return idx; + } + + /* Instance methods. */ RtpStreamSend::RtpStreamSend(RTC::RtpStream::Params& params, size_t bufferSize) - : RtpStream::RtpStream(params), storage(bufferSize) + : RtpStream::RtpStream(params), storage(bufferSize), buffer(bufferSize) { MS_TRACE(); } @@ -124,10 +212,8 @@ namespace RTC // Number of requested packets cannot be greater than the container size - 1. MS_ASSERT(container.size() - 1 >= MaxRequestedPackets, "RtpPacket container is too small"); - auto bufferIt = this->buffer.begin(); - auto bufferItReverse = this->buffer.rbegin(); - uint16_t bufferFirstSeq = (*bufferIt).seq; - uint16_t bufferLastSeq = (*bufferItReverse).seq; + uint16_t bufferFirstSeq = this->buffer.first().seq; + uint16_t bufferLastSeq = this->buffer.last().seq; // Requested packet range not found. if ( @@ -165,14 +251,15 @@ namespace RTC if (requested) { - for (; bufferIt != this->buffer.end(); ++bufferIt) + size_t idx = 0; + for (; idx < this->buffer.datasize(); idx++) { - auto currentSeq = (*bufferIt).seq; + auto currentSeq = this->buffer[idx].seq; // Found. if (currentSeq == seq) { - auto currentPacket = (*bufferIt).packet; + auto currentPacket = this->buffer[idx].packet; // Calculate how the elapsed time between the max timestampt seen and // the requested packet's timestampt (in ms). uint32_t diffTs = this->maxPacketTs - currentPacket->GetTimestamp(); @@ -200,7 +287,7 @@ namespace RTC } // Don't resent the packet if it was resent in the last RTT ms. - auto resentAtTime = (*bufferIt).resentAtTime; + auto resentAtTime = this->buffer[idx].resentAtTime; if ((resentAtTime != 0u) && now - resentAtTime <= static_cast(rtt)) { @@ -218,7 +305,7 @@ namespace RTC container[containerIdx++] = currentPacket; // Save when this packet was resent. - (*bufferIt).resentAtTime = now; + this->buffer[idx].resentAtTime = now; sent = true; if (isFirstPacket) @@ -298,9 +385,9 @@ namespace RTC MS_TRACE(); // Delete cloned packets. - for (auto& bufferItem : this->buffer) + for (size_t idx = 0; idx < this->buffer.datasize(); idx++) { - delete bufferItem.packet; + delete this->buffer[idx].packet; } // Clear list. @@ -341,57 +428,30 @@ namespace RTC } // Otherwise, do the stuff. + size_t newIdx = this->buffer.ordered_insert_by_seq(bufferItem); - Buffer::iterator newBufferIt; uint8_t* store{ nullptr }; - - // Iterate the buffer in reverse order and find the proper place to store the - // packet. - auto bufferItReverse = this->buffer.rbegin(); - for (; bufferItReverse != this->buffer.rend(); ++bufferItReverse) + if (this->buffer.datasize() <= this->storage.size()) { - auto currentSeq = (*bufferItReverse).seq; - - if (SeqManager::IsSeqHigherThan(packetSeq, currentSeq)) - { - // Get a forward iterator pointing to the same element. - auto it = bufferItReverse.base(); - - newBufferIt = this->buffer.insert(it, bufferItem); - - break; - } - - // Packet is already stored. - if (packetSeq == currentSeq) - return; - } - - // The packet was older than anything in the buffer, store it at the beginning. - if (bufferItReverse == this->buffer.rend()) - newBufferIt = this->buffer.insert(this->buffer.begin(), bufferItem); - - // If the buffer is not full use the next free storage item. - if (this->buffer.size() - 1 < this->storage.size()) - { - store = this->storage[this->buffer.size() - 1].store; + store = this->storage[this->buffer.datasize() - 1].store; } - // Otherwise remove the first packet of the buffer and replace its storage area. else { - auto& firstBufferItem = *(this->buffer.begin()); - auto firstPacket = firstBufferItem.packet; + // Otherwise remove the first packet of the buffer and replace its storage area. + MS_ASSERT(this->buffer.datasize() - 1 == this->storage.size(), "When buffer beyond max capacity storage should be exactly at full capacity"); + auto firstPacket = this->buffer.first().packet; // Store points to the store used by the first packet. store = const_cast(firstPacket->GetData()); // Free the first packet. delete firstPacket; + // Remove the first element in the list. - this->buffer.pop_front(); + this->buffer.trim_front(); } // Update the new buffer item so it points to the cloned packed. - (*newBufferIt).packet = packet->Clone(store); + this->buffer[newIdx].packet = packet->Clone(store); } void RtpStreamSend::SetRtx(uint8_t payloadType, uint32_t ssrc) From 9d83a2dec3b35361dcb4d27e3a5e8d87a35eeada Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 18 Apr 2019 16:30:06 -0700 Subject: [PATCH 49/82] Tested on my local dev machine --- worker/include/RTC/RtpStreamSend.hpp | 23 +++++----- worker/src/RTC/RtpPacket.cpp | 2 +- worker/src/RTC/RtpStreamSend.cpp | 63 ++++++++++++++++------------ 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/worker/include/RTC/RtpStreamSend.hpp b/worker/include/RTC/RtpStreamSend.hpp index e318592e31..fea8f51cfd 100644 --- a/worker/include/RTC/RtpStreamSend.hpp +++ b/worker/include/RTC/RtpStreamSend.hpp @@ -4,8 +4,6 @@ #include "RTC/RTCP/ReceiverReport.hpp" #include "RTC/RTCP/SenderReport.hpp" #include "RTC/RtpStream.hpp" -#include "RTC/SeqManager.hpp" -#include "Logger.hpp" #include #include @@ -31,25 +29,24 @@ namespace RTC class Buffer { private: - std::vector vctr; // array can hold up to maxsize of BufferItems plus always has one empty slot for easier inserts - uint8_t start{ 0 }; // index where data begins - size_t cursize{ 0 }; // number of items currently in array. While inserting a new packet, we may see cursize == maxsize + 1 until trim_front() is called - size_t maxsize{ 0 }; //maximum number of items that can be stored in this Buffer + std::vector vctr; // array that can hold up to maxsize of BufferItems plus 1 empty slot reserved for easier inserts + uint8_t start{ 0 }; // index in vctr where data begins + size_t cursize{ 0 }; // number of items currently stored in array. While inserting a new packet, we may see cursize == maxsize + 1 until trim_front() is called + size_t maxsize{ 0 }; //maximum number of items that can be stored in this Buffer instance public: Buffer(size_t bufferSize) : vctr(bufferSize + 1), start(0), cursize(0), maxsize(bufferSize) {} - inline bool empty() const { return vctr.empty() || cursize == 0; } inline size_t datasize() const { return vctr.empty() ? 0 : cursize; } - inline void clear() { vctr.clear(); start = cursize = maxsize = 0; } - RtpStreamSend::BufferItem& first(); - RtpStreamSend::BufferItem& last(); + const RtpStreamSend::BufferItem& first() const; + const RtpStreamSend::BufferItem& last() const; + RtpStreamSend::BufferItem& operator[] (size_t index); + bool push_back (const RtpStreamSend::BufferItem& val); void trim_front(); - size_t ordered_insert_by_seq( const RtpStreamSend::BufferItem& val); // checks bufferItem.seq and inserts data into a buffer. returns index of just inserted item. - - RtpStreamSend::BufferItem& operator[] (size_t index); + RtpStreamSend::BufferItem* ordered_insert_by_seq( const RtpStreamSend::BufferItem& val); + inline void clear() { vctr.clear(); start = cursize = maxsize = 0; } }; public: diff --git a/worker/src/RTC/RtpPacket.cpp b/worker/src/RTC/RtpPacket.cpp index d9ed587a52..61f12c180e 100644 --- a/worker/src/RTC/RtpPacket.cpp +++ b/worker/src/RTC/RtpPacket.cpp @@ -379,7 +379,7 @@ namespace RTC // Parse RFC 5285 extension header. packet->ParseExtensions(); - // Clone the extension map. + // Clone the extension map. TODO: this takes 3.5% CPU on MacOS, check gprof data and maybe optimize too? packet->extensionMap = this->extensionMap; return packet; diff --git a/worker/src/RTC/RtpStreamSend.cpp b/worker/src/RTC/RtpStreamSend.cpp index a17a23842c..a0c5b5f8dc 100644 --- a/worker/src/RTC/RtpStreamSend.cpp +++ b/worker/src/RTC/RtpStreamSend.cpp @@ -15,40 +15,47 @@ namespace RTC static constexpr uint32_t MaxRetransmissionDelay{ 2000 }; static constexpr uint32_t DefaultRtt{ 100 }; - /* Buffer methods */ - RtpStreamSend::BufferItem& RtpStreamSend::Buffer::first() + /* RtpStreamSend::Buffer methods */ + + // Access the first item in array + const RtpStreamSend::BufferItem& RtpStreamSend::Buffer::first() const { - MS_ASSERT(vctr.size() > 0, "Read first() from empty Buffer"); + MS_ASSERT(vctr.size() > 0 && maxsize > 0 && cursize > 0, "Read first() from empty Buffer"); return vctr[start]; } - RtpStreamSend::BufferItem& RtpStreamSend::Buffer::last() + // Access the last item in array + const RtpStreamSend::BufferItem& RtpStreamSend::Buffer::last() const { - MS_ASSERT(vctr.size() > 0, "Read last() from empty Buffer"); + MS_ASSERT(vctr.size() > 0 && maxsize > 0 && cursize > 0, "Read last() from empty Buffer"); return vctr[(start + cursize) % vctr.size()]; } + // Access an item in vctr[] by index relative to start. RtpStreamSend::BufferItem& RtpStreamSend::Buffer::operator[] (size_t index) { - MS_ASSERT(index >= maxsize, "index out of vector maxsize capacity"); - auto idx = (start + index) % vctr.size(); + MS_ASSERT(index <= maxsize, "index out of vector maxsize capacity"); + + auto idx = vctr.empty() ? start + index : (start + index) % vctr.size(); + MS_ASSERT(idx >= 0 && idx < vctr.size(), "idx out of boundaries of vctr"); return vctr[idx]; } + // Add new item at the end, if there is room bool RtpStreamSend::Buffer::push_back(const RtpStreamSend::BufferItem& val) { // can't insert, no room in array if (cursize >= maxsize + 1) return false; - - (*this)[cursize] = val; + + auto idx = vctr.empty() ? start : (start + cursize) % vctr.size(); + vctr[idx] = val; cursize++; return true; } - // Delete the first item in array. - // This function is only used to remove the oldest packet in case buffer has exceeded max capacity, but we don't check for that condition here, it's not important + // Remove the first item from array void RtpStreamSend::Buffer::trim_front() { if (empty()) @@ -59,14 +66,16 @@ namespace RTC cursize--; } - // checks bufferItem.seq and inserts data into a buffer. returns false if buffer went 1 item above maxcapacity and needs to be trimmed back. asserts if buffer is already above maxcapacity (should not happen) - size_t RtpStreamSend::Buffer::ordered_insert_by_seq( const RtpStreamSend::BufferItem& val ) + // Inserts data into a buffer in position determined by BufferItem::seq value. + // Returns a pointer to newly added item, or nullptr if packet was already stored + RtpStreamSend::BufferItem* RtpStreamSend::Buffer::ordered_insert_by_seq(const RtpStreamSend::BufferItem& val) { MS_ASSERT(cursize <= maxsize, "Buffer exceeded max capacity, must trim it prior to inserting new items"); // This var will point to a location of just inserted buffer item auto idx = cursize - 1; auto packetSeq = val.seq; + RtpStreamSend::BufferItem* retItem = { nullptr }; // First, insert new packet in buffer array unless already stored. // Later we will check if buffer array went beyond max capacity and in that case remove the oldest packet @@ -74,22 +83,20 @@ namespace RTC { auto currentSeq = (*this)[idx].seq; - // Packet is already stored. TODO: need to return smth special insted of idx value to tell the caller there is no need to copy packet data into storage - if (packetSeq == currentSeq) { - // rollback: shift all items moved in anticipation of insertion op back to the left - // j points to the location of a "hole" slot - for (auto j = idx + 1; j < cursize; j++ ) { + // Packet is already stored, nothing to do but shift back all items which we moved to the right, back to the left + if (packetSeq == currentSeq) { + for (auto j = idx + 1; j < cursize; j++ ) { // j indicates the location of a "hole" slot, we want to move the "hole" to the very right position (*this)[j] = (*this)[j + 1]; - (*this)[j + 1].packet = nullptr; // now "hole" has moved one step to the right + (*this)[j + 1].packet = nullptr; } - return idx; + break; } if (SeqManager::IsSeqHigherThan(packetSeq, currentSeq)) { // insert here. (*this)[idx] = val; - + retItem = &((*this)[idx]); break; } @@ -99,7 +106,7 @@ namespace RTC (*this)[idx].packet = nullptr; } - return idx; + return retItem; } @@ -420,15 +427,19 @@ namespace RTC if (this->buffer.empty()) { auto store = this->storage[0].store; - bufferItem.packet = packet->Clone(store); this->buffer.push_back(bufferItem); - return; } // Otherwise, do the stuff. - size_t newIdx = this->buffer.ordered_insert_by_seq(bufferItem); + RtpStreamSend::BufferItem* newItem = this->buffer.ordered_insert_by_seq(bufferItem); + + // Packet already stored, nothing to do + if (newItem == nullptr) + { + return; + } uint8_t* store{ nullptr }; if (this->buffer.datasize() <= this->storage.size()) @@ -451,7 +462,7 @@ namespace RTC } // Update the new buffer item so it points to the cloned packed. - this->buffer[newIdx].packet = packet->Clone(store); + newItem->packet = packet->Clone(store); } void RtpStreamSend::SetRtx(uint8_t payloadType, uint32_t ssrc) From 16341770f4195c1fc5f30f0bc9320e8ddbafa7ee Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 18 Apr 2019 16:57:21 -0700 Subject: [PATCH 50/82] package version bump 2.6.8-lv3-gprof12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a21345aa05..237fb49d1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof11", + "version": "2.6.8-lv3-gprof12", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From bdeda9dd8ad9d7c27757de81d760848a2be62d13 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 19 Apr 2019 09:09:55 -0700 Subject: [PATCH 51/82] small bugfix and version bump for ms worker --- package.json | 2 +- worker/src/RTC/RtpStreamSend.cpp | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 237fb49d1f..1f64eb230f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof12", + "version": "2.6.8-lv3-gprof13", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/RtpStreamSend.cpp b/worker/src/RTC/RtpStreamSend.cpp index a0c5b5f8dc..8d84099e64 100644 --- a/worker/src/RTC/RtpStreamSend.cpp +++ b/worker/src/RTC/RtpStreamSend.cpp @@ -66,26 +66,28 @@ namespace RTC cursize--; } - // Inserts data into a buffer in position determined by BufferItem::seq value. - // Returns a pointer to newly added item, or nullptr if packet was already stored + // Inserts data into a buffer so newer packets with higher BufferItem::seq placed are at the end + // Returns a pointer to newly added item, or nullptr if packet with the same seq was already stored RtpStreamSend::BufferItem* RtpStreamSend::Buffer::ordered_insert_by_seq(const RtpStreamSend::BufferItem& val) { MS_ASSERT(cursize <= maxsize, "Buffer exceeded max capacity, must trim it prior to inserting new items"); + MS_ASSERT(cursize > 0, "ordered_insert_by_seq should only be called when there is at least one item in array"); - // This var will point to a location of just inserted buffer item - auto idx = cursize - 1; + // idx is a position of the "hole" between array elements. + // Inserted packets will be put in there + size_t idx = cursize; auto packetSeq = val.seq; RtpStreamSend::BufferItem* retItem = { nullptr }; // First, insert new packet in buffer array unless already stored. // Later we will check if buffer array went beyond max capacity and in that case remove the oldest packet - for (; idx >=0; idx--) + for (; idx > 0; idx--) { - auto currentSeq = (*this)[idx].seq; + auto currentSeq = (*this)[idx-1].seq; - // Packet is already stored, nothing to do but shift back all items which we moved to the right, back to the left + // Packet is already stored, nothing to do but shift all items back to the left if (packetSeq == currentSeq) { - for (auto j = idx + 1; j < cursize; j++ ) { // j indicates the location of a "hole" slot, we want to move the "hole" to the very right position + for (auto j = idx; j < cursize; j++ ) { // j indicates the location of a "hole" slot, we want to move the "hole" to the very right position (*this)[j] = (*this)[j + 1]; (*this)[j + 1].packet = nullptr; } @@ -100,10 +102,10 @@ namespace RTC break; } - // Now move current buffer item into an empty slot on the right. - // Then either we insert a new packet to the left of it, or iterate further - (*this)[idx + 1] = (*this)[idx]; - (*this)[idx].packet = nullptr; + // Shift current buffer item into an empty slot on the right, so the "hole" moves to the left + // Then either we insert a new packet in place of "hole" on the next iteration, or will iterate further + (*this)[idx] = (*this)[idx - 1]; + (*this)[idx - 1].packet = nullptr; } return retItem; From de6c3df5f006738365b3575176521958f21191af Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 22 Apr 2019 13:30:03 -0700 Subject: [PATCH 52/82] Disable grpof instrumentation; minor cleanup --- package.json | 2 +- worker/common.gypi | 8 +++----- worker/mediasoup-worker.gyp | 10 +++++----- worker/src/RTC/RtpPacket.cpp | 2 +- worker/src/RTC/RtpStreamSend.cpp | 1 - worker/src/main.cpp | 6 ++---- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 1f64eb230f..b6964911d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof13", + "version": "2.6.8-lv3-gprof14", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/common.gypi b/worker/common.gypi index 5b135b0afb..90fe74927b 100644 --- a/worker/common.gypi +++ b/worker/common.gypi @@ -21,12 +21,12 @@ { 'Release': { - 'cflags': [ '-g', '-pg', '-O3', '-fno-inline' ] + 'cflags': [ '-g', '-O3' ] }, 'Debug': { 'defines': [ 'DEBUG', 'MS_LOG_TRACE', 'MS_LOG_FILE_LINE' ], - 'cflags': [ '-g', '-fwrapv', '-pg', '-Wno-parentheses-equality' ], + 'cflags': [ '-g', '-O0', '-fwrapv', '-Wno-parentheses-equality' ], 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' @@ -42,9 +42,7 @@ 'OTHER_CFLAGS': [ '-fstrict-aliasing', - '-g', - '-pg', - '-O2' + '-g' ], 'WARNING_CFLAGS': [ diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index bf59733cd7..cde7f5b412 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -213,8 +213,8 @@ }], [ 'OS == "linux"', { - 'cflags': [ '-pg', '-O3', '-fno-inline' ], - 'ldflags': [ '-static-libgcc', '-Bstatic', '-lc', '-pg', '-O3', '-fno-inline' ], + 'cflags': [ '-O3' ], + 'ldflags': [ '-O3' ], 'defines': [ '_POSIX_C_SOURCE=200112', @@ -223,8 +223,8 @@ }], [ 'OS == "linux" and mediasoup_asan == "true"', { - 'cflags': [ '-fsanitize=address', '-pg', '-O3', '-fno-inline' ], - 'ldflags': [ '-fsanitize=address', '-pg', 'O3', '-fno-inline' ] + 'cflags': [ '-fsanitize=address', '-O3' ], + 'ldflags': [ '-fsanitize=address', 'O3' ] }], [ 'OS in "linux freebsd"', { @@ -336,7 +336,7 @@ 'conditions': [ [ 'OS == "linux"', { - 'cflags': [ '-g', '-O0', '-pg', '-fsanitize=address,fuzzer' ], + 'cflags': [ '-g', '-O0', '-fsanitize=address,fuzzer' ], 'ldflags': [ '-fsanitize=address,fuzzer' ] }] ] diff --git a/worker/src/RTC/RtpPacket.cpp b/worker/src/RTC/RtpPacket.cpp index 61f12c180e..d9ed587a52 100644 --- a/worker/src/RTC/RtpPacket.cpp +++ b/worker/src/RTC/RtpPacket.cpp @@ -379,7 +379,7 @@ namespace RTC // Parse RFC 5285 extension header. packet->ParseExtensions(); - // Clone the extension map. TODO: this takes 3.5% CPU on MacOS, check gprof data and maybe optimize too? + // Clone the extension map. packet->extensionMap = this->extensionMap; return packet; diff --git a/worker/src/RTC/RtpStreamSend.cpp b/worker/src/RTC/RtpStreamSend.cpp index 8d84099e64..557013f292 100644 --- a/worker/src/RTC/RtpStreamSend.cpp +++ b/worker/src/RTC/RtpStreamSend.cpp @@ -37,7 +37,6 @@ namespace RTC MS_ASSERT(index <= maxsize, "index out of vector maxsize capacity"); auto idx = vctr.empty() ? start + index : (start + index) % vctr.size(); - MS_ASSERT(idx >= 0 && idx < vctr.size(), "idx out of boundaries of vctr"); return vctr[idx]; } diff --git a/worker/src/main.cpp b/worker/src/main.cpp index 7b9f34970f..970fd07843 100644 --- a/worker/src/main.cpp +++ b/worker/src/main.cpp @@ -174,8 +174,7 @@ void exitSuccess() // Wait a bit so peding messages to stdout/Channel arrive to the main process. usleep(100000); // And exit with success status. - //std::_Exit(EXIT_SUCCESS); - exit(EXIT_SUCCESS); + std::_Exit(EXIT_SUCCESS); } void exitWithError() @@ -183,6 +182,5 @@ void exitWithError() // Wait a bit so peding messages to stderr arrive to the main process. usleep(100000); // And exit with error status. - //std::_Exit(EXIT_FAILURE); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } From d8ae3eac2a264bd047d4dbd9bc3d04172f810d9e Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Tue, 23 Apr 2019 11:37:58 -0700 Subject: [PATCH 53/82] version bump 2.6.8-lv4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6964911d5..1c3d0f1183 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv3-gprof14", + "version": "2.6.8-lv4", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 214739abb192fa7779732c9f0ed3b7b4c26c5235 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 24 Apr 2019 19:39:36 -0700 Subject: [PATCH 54/82] possible memory leak fix --- package.json | 2 +- worker/include/RTC/RtpStreamSend.hpp | 2 +- worker/mediasoup-worker.gyp | 2 +- worker/src/RTC/RtpStreamSend.cpp | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1c3d0f1183..328c458898 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv4", + "version": "2.6.8-lv5", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/RtpStreamSend.hpp b/worker/include/RTC/RtpStreamSend.hpp index fea8f51cfd..e28f051efc 100644 --- a/worker/include/RTC/RtpStreamSend.hpp +++ b/worker/include/RTC/RtpStreamSend.hpp @@ -46,7 +46,7 @@ namespace RTC bool push_back (const RtpStreamSend::BufferItem& val); void trim_front(); RtpStreamSend::BufferItem* ordered_insert_by_seq( const RtpStreamSend::BufferItem& val); - inline void clear() { vctr.clear(); start = cursize = maxsize = 0; } + inline void clear() { vctr.clear(); start = cursize = 0; } }; public: diff --git a/worker/mediasoup-worker.gyp b/worker/mediasoup-worker.gyp index cde7f5b412..86e5edfe3c 100644 --- a/worker/mediasoup-worker.gyp +++ b/worker/mediasoup-worker.gyp @@ -224,7 +224,7 @@ [ 'OS == "linux" and mediasoup_asan == "true"', { 'cflags': [ '-fsanitize=address', '-O3' ], - 'ldflags': [ '-fsanitize=address', 'O3' ] + 'ldflags': [ '-fsanitize=address', '-O3' ] }], [ 'OS in "linux freebsd"', { diff --git a/worker/src/RTC/RtpStreamSend.cpp b/worker/src/RTC/RtpStreamSend.cpp index 557013f292..6e8d27692a 100644 --- a/worker/src/RTC/RtpStreamSend.cpp +++ b/worker/src/RTC/RtpStreamSend.cpp @@ -398,8 +398,11 @@ namespace RTC delete this->buffer[idx].packet; } - // Clear list. + // Clear buffer list. this->buffer.clear(); + + //Clear storage list. + this->storage.clear(); } inline void RtpStreamSend::StorePacket(RTC::RtpPacket* packet) From 54d43cf52d4b33de15211078063f6646b3387d44 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 6 May 2019 13:20:54 -0700 Subject: [PATCH 55/82] Port design change in RtpStreamSend from MS v.3 --- package.json | 2 +- worker/include/RTC/RtpStreamSend.hpp | 51 ++-- worker/src/RTC/Consumer.cpp | 6 +- worker/src/RTC/RtpStreamSend.cpp | 404 ++++++++++++--------------- 4 files changed, 191 insertions(+), 272 deletions(-) diff --git a/package.json b/package.json index 328c458898..986f0ee118 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv5", + "version": "2.6.8-lv6-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/RtpStreamSend.hpp b/worker/include/RTC/RtpStreamSend.hpp index e28f051efc..ce3599c477 100644 --- a/worker/include/RTC/RtpStreamSend.hpp +++ b/worker/include/RTC/RtpStreamSend.hpp @@ -11,42 +11,17 @@ namespace RTC { class RtpStreamSend : public RtpStream { - private: + public: struct StorageItem { - uint8_t store[RTC::MtuSize]; - }; - - private: - struct BufferItem - { - uint16_t seq{ 0 }; // RTP seq. - uint64_t resentAtTime{ 0 }; + // Cloned packet. RTC::RtpPacket* packet{ nullptr }; - }; - - private: - class Buffer - { - private: - std::vector vctr; // array that can hold up to maxsize of BufferItems plus 1 empty slot reserved for easier inserts - uint8_t start{ 0 }; // index in vctr where data begins - size_t cursize{ 0 }; // number of items currently stored in array. While inserting a new packet, we may see cursize == maxsize + 1 until trim_front() is called - size_t maxsize{ 0 }; //maximum number of items that can be stored in this Buffer instance - - public: - Buffer(size_t bufferSize) : vctr(bufferSize + 1), start(0), cursize(0), maxsize(bufferSize) {} - inline bool empty() const { return vctr.empty() || cursize == 0; } - inline size_t datasize() const { return vctr.empty() ? 0 : cursize; } - - const RtpStreamSend::BufferItem& first() const; - const RtpStreamSend::BufferItem& last() const; - RtpStreamSend::BufferItem& operator[] (size_t index); - - bool push_back (const RtpStreamSend::BufferItem& val); - void trim_front(); - RtpStreamSend::BufferItem* ordered_insert_by_seq( const RtpStreamSend::BufferItem& val); - inline void clear() { vctr.clear(); start = cursize = 0; } + // Memory to hold the cloned packet (with extra space for RTX encoding). + uint8_t store[RTC::MtuSize + 100]; + // Last time this packet was resent. + uint64_t resentAtTime{ 0 }; + // Number of times this packet was resent. + uint8_t sentTimes{ 0 }; }; public: @@ -67,15 +42,21 @@ namespace RTC private: void StorePacket(RTC::RtpPacket* packet); + void ResetStorageItem(StorageItem* storageItem); + void UpdateBufferStartIdx(); /* Pure virtual methods inherited from RtpStream. */ protected: void CheckStatus() override; private: - // Passed by argument. + std::vector buffer; + uint16_t bufferStartIdx{ 0 }; + size_t bufferSize{ 0 }; std::vector storage; - Buffer buffer; + + RTC::RtpDataCounter transmissionCounter; + // Stats. float rtt{ 0 }; diff --git a/worker/src/RTC/Consumer.cpp b/worker/src/RTC/Consumer.cpp index 5a1a66f62c..b4a93f3e98 100644 --- a/worker/src/RTC/Consumer.cpp +++ b/worker/src/RTC/Consumer.cpp @@ -796,10 +796,8 @@ namespace RTC params.usePli = usePli; // Create a RtpStreamSend for sending a single media stream. - if (useNack) - this->rtpStream = new RTC::RtpStreamSend(params, 1500); - else - this->rtpStream = new RTC::RtpStreamSend(params, 0); + size_t bufferSize = params.useNack ? 600 : 0; + this->rtpStream = new RTC::RtpStreamSend(params, bufferSize); if (encoding.hasRtx && encoding.rtx.ssrc != 0u) { diff --git a/worker/src/RTC/RtpStreamSend.cpp b/worker/src/RTC/RtpStreamSend.cpp index 6e8d27692a..baf77f1840 100644 --- a/worker/src/RTC/RtpStreamSend.cpp +++ b/worker/src/RTC/RtpStreamSend.cpp @@ -10,111 +10,18 @@ namespace RTC { /* Static. */ - + // 17: 16 bit mask + the initial sequence number. + static constexpr size_t MaxRequestedPackets{ 17 }; + static std::vector RetransmissionContainer(MaxRequestedPackets + 1); // Don't retransmit packets older than this (ms). static constexpr uint32_t MaxRetransmissionDelay{ 2000 }; static constexpr uint32_t DefaultRtt{ 100 }; - /* RtpStreamSend::Buffer methods */ - - // Access the first item in array - const RtpStreamSend::BufferItem& RtpStreamSend::Buffer::first() const - { - MS_ASSERT(vctr.size() > 0 && maxsize > 0 && cursize > 0, "Read first() from empty Buffer"); - return vctr[start]; - } - - // Access the last item in array - const RtpStreamSend::BufferItem& RtpStreamSend::Buffer::last() const - { - MS_ASSERT(vctr.size() > 0 && maxsize > 0 && cursize > 0, "Read last() from empty Buffer"); - return vctr[(start + cursize) % vctr.size()]; - } - - // Access an item in vctr[] by index relative to start. - RtpStreamSend::BufferItem& RtpStreamSend::Buffer::operator[] (size_t index) - { - MS_ASSERT(index <= maxsize, "index out of vector maxsize capacity"); - - auto idx = vctr.empty() ? start + index : (start + index) % vctr.size(); - return vctr[idx]; - } - - // Add new item at the end, if there is room - bool RtpStreamSend::Buffer::push_back(const RtpStreamSend::BufferItem& val) - { - // can't insert, no room in array - if (cursize >= maxsize + 1) - return false; - - auto idx = vctr.empty() ? start : (start + cursize) % vctr.size(); - vctr[idx] = val; - cursize++; - - return true; - } - - // Remove the first item from array - void RtpStreamSend::Buffer::trim_front() - { - if (empty()) - return; - - (*this)[start].packet = nullptr; - start = (start + 1) % vctr.size(); - cursize--; - } - - // Inserts data into a buffer so newer packets with higher BufferItem::seq placed are at the end - // Returns a pointer to newly added item, or nullptr if packet with the same seq was already stored - RtpStreamSend::BufferItem* RtpStreamSend::Buffer::ordered_insert_by_seq(const RtpStreamSend::BufferItem& val) - { - MS_ASSERT(cursize <= maxsize, "Buffer exceeded max capacity, must trim it prior to inserting new items"); - MS_ASSERT(cursize > 0, "ordered_insert_by_seq should only be called when there is at least one item in array"); - - // idx is a position of the "hole" between array elements. - // Inserted packets will be put in there - size_t idx = cursize; - auto packetSeq = val.seq; - RtpStreamSend::BufferItem* retItem = { nullptr }; - - // First, insert new packet in buffer array unless already stored. - // Later we will check if buffer array went beyond max capacity and in that case remove the oldest packet - for (; idx > 0; idx--) - { - auto currentSeq = (*this)[idx-1].seq; - - // Packet is already stored, nothing to do but shift all items back to the left - if (packetSeq == currentSeq) { - for (auto j = idx; j < cursize; j++ ) { // j indicates the location of a "hole" slot, we want to move the "hole" to the very right position - (*this)[j] = (*this)[j + 1]; - (*this)[j + 1].packet = nullptr; - } - break; - } - - if (SeqManager::IsSeqHigherThan(packetSeq, currentSeq)) - { - // insert here. - (*this)[idx] = val; - retItem = &((*this)[idx]); - break; - } - - // Shift current buffer item into an empty slot on the right, so the "hole" moves to the left - // Then either we insert a new packet in place of "hole" on the next iteration, or will iterate further - (*this)[idx] = (*this)[idx - 1]; - (*this)[idx - 1].packet = nullptr; - } - - return retItem; - } - - /* Instance methods. */ RtpStreamSend::RtpStreamSend(RTC::RtpStream::Params& params, size_t bufferSize) - : RtpStream::RtpStream(params), storage(bufferSize), buffer(bufferSize) + : RtpStream::RtpStream(params), buffer(bufferSize > 0 ? 65536 : 0, nullptr), + storage(bufferSize) { MS_TRACE(); } @@ -153,6 +60,9 @@ namespace RTC if (!this->storage.empty()) StorePacket(packet); + // Increase transmission counter. + this->transmissionCounter.Update(packet); + return true; } @@ -196,45 +106,13 @@ namespace RTC { MS_TRACE(); - // 17: 16 bit mask + the initial sequence number. - static constexpr size_t MaxRequestedPackets{ 17 }; - // Ensure the container's first element is 0. container[0] = nullptr; // If NACK is not supported, exit. if (!this->params.useNack) { - MS_WARN_TAG(rtx, "NACK not negotiated"); - - return; - } - - // If the buffer is empty just return. - if (this->buffer.empty()) - return; - - uint16_t firstSeq = seq; - uint16_t lastSeq = firstSeq + MaxRequestedPackets - 1; - - // Number of requested packets cannot be greater than the container size - 1. - MS_ASSERT(container.size() - 1 >= MaxRequestedPackets, "RtpPacket container is too small"); - - uint16_t bufferFirstSeq = this->buffer.first().seq; - uint16_t bufferLastSeq = this->buffer.last().seq; - - // Requested packet range not found. - if ( - SeqManager::IsSeqHigherThan(firstSeq, bufferLastSeq) || - SeqManager::IsSeqLowerThan(lastSeq, bufferFirstSeq)) - { - MS_WARN_TAG( - rtx, - "requested packet range not in the buffer [seq:%" PRIu16 ", bufferFirstseq:%" PRIu16 - ", bufferLastseq:%" PRIu16 "]", - seq, - bufferFirstSeq, - bufferLastSeq); + MS_WARN_TAG(rtx, "NACK not supported"); return; } @@ -259,74 +137,72 @@ namespace RTC if (requested) { - size_t idx = 0; - for (; idx < this->buffer.datasize(); idx++) + auto* storageItem = this->buffer[seq]; + RTC::RtpPacket* packet{ nullptr }; + uint32_t diffMs; + + // Calculate how the elapsed time between the max timestampt seen and + // the requested packet's timestampt (in ms). + if (storageItem) { - auto currentSeq = this->buffer[idx].seq; + packet = storageItem->packet; + + uint32_t diffTs = this->maxPacketTs - packet->GetTimestamp(); + diffMs = diffTs * 1000 / this->params.clockRate; + } - // Found. - if (currentSeq == seq) + if (!storageItem) + { + // Do nothing. + } + // Don't resend the packet if older than MaxRetransmissionDelay ms. + else if (diffMs > MaxRetransmissionDelay) + { + if (!tooOldPacketFound) { - auto currentPacket = this->buffer[idx].packet; - // Calculate how the elapsed time between the max timestampt seen and - // the requested packet's timestampt (in ms). - uint32_t diffTs = this->maxPacketTs - currentPacket->GetTimestamp(); - uint32_t diffMs = diffTs * 1000 / this->params.clockRate; - - // Just provide the packet if no older than MaxRetransmissionDelay ms. - if (diffMs > MaxRetransmissionDelay) - { - if (!tooOldPacketFound) - { - // TODO: May we ask for a key frame in this case? - - MS_WARN_TAG( - rtx, - "ignoring retransmission for too old packet " - "[seq:%" PRIu16 ", max age:%" PRIu32 "ms, packet age:%" PRIu32 "ms]", - currentPacket->GetSequenceNumber(), - MaxRetransmissionDelay, - diffMs); - - tooOldPacketFound = true; - } - - break; - } - - // Don't resent the packet if it was resent in the last RTT ms. - auto resentAtTime = this->buffer[idx].resentAtTime; - - if ((resentAtTime != 0u) && now - resentAtTime <= static_cast(rtt)) - { - MS_DEBUG_TAG( - rtx, - "ignoring retransmission for a packet already resent in the last RTT ms " - "[seq:%" PRIu16 ", rtt:%" PRIu32 "]", - currentPacket->GetSequenceNumber(), - rtt); - - break; - } - - // Store the packet in the container and then increment its index. - container[containerIdx++] = currentPacket; - - // Save when this packet was resent. - this->buffer[idx].resentAtTime = now; - - sent = true; - if (isFirstPacket) - firstPacketSent = true; - - break; + MS_WARN_TAG( + rtx, + "ignoring retransmission for too old packet " + "[seq:%" PRIu16 ", max age:%" PRIu32 "ms, packet age:%" PRIu32 "ms]", + packet->GetSequenceNumber(), + MaxRetransmissionDelay, + diffMs); + + tooOldPacketFound = true; } + } + // Don't resent the packet if it was resent in the last RTT ms. + // clang-format off + else if ( + storageItem->resentAtTime != 0u && + now - storageItem->resentAtTime <= static_cast(rtt) + ) + // clang-format on + { + MS_DEBUG_TAG( + rtx, + "ignoring retransmission for a packet already resent in the last RTT ms " + "[seq:%" PRIu16 ", rtt:%" PRIu32 "]", + packet->GetSequenceNumber(), + rtt); + } + // Store the packet in the container and then increment its index. + else { + container[containerIdx++] = packet; + + // Save when this packet was resent. + storageItem->resentAtTime = now; - // It can not be after this packet. - if (SeqManager::IsSeqHigherThan(currentSeq, seq)) - break; + // Increase the number of times this packet was sent. + storageItem->sentTimes++; + + sent = true; + + if (isFirstPacket) + firstPacketSent = true; } } + requested = (bitmask & 1) != 0; bitmask >>= 1; @@ -392,17 +268,65 @@ namespace RTC { MS_TRACE(); - // Delete cloned packets. - for (size_t idx = 0; idx < this->buffer.datasize(); idx++) + if (this->storage.empty()) + return; + + for (uint32_t idx{ 0 }; idx < this->buffer.size(); ++idx) { - delete this->buffer[idx].packet; + auto* storageItem = this->buffer[idx]; + + if (!storageItem) + { + // TODO + MS_ASSERT(this->buffer[idx] == nullptr, "key should be NULL"); + + continue; + } + + // Reset (free RTP packet) the storage item. + ResetStorageItem(storageItem); + + // Unfill the buffer item. + this->buffer[idx] = nullptr; } - // Clear buffer list. - this->buffer.clear(); - - //Clear storage list. - this->storage.clear(); + // Reset buffer. + this->bufferStartIdx = 0; + this->bufferSize = 0; + } + + inline void RtpStreamSend::ResetStorageItem(StorageItem* storageItem) + { + MS_TRACE(); + + MS_ASSERT(storageItem, "storageItem cannot be nullptr"); + + delete storageItem->packet; + + storageItem->packet = nullptr; + storageItem->resentAtTime = 0; + storageItem->sentTimes = 0; + } + + /** + * Iterates the buffer starting from the current start idx + 1 until next + * used one. It takes into account that the buffer is circular. + */ + inline void RtpStreamSend::UpdateBufferStartIdx() + { + uint16_t seq = this->bufferStartIdx + 1; + + for (uint32_t idx{ 0 }; idx < this->buffer.size(); ++idx, ++seq) + { + auto* storageItem = this->buffer[seq]; + + if (storageItem) + { + this->bufferStartIdx = seq; + + break; + } + } } inline void RtpStreamSend::StorePacket(RTC::RtpPacket* packet) @@ -421,52 +345,68 @@ namespace RTC return; } - // Sum the packet seq number and the number of 16 bits cycles. - auto packetSeq = packet->GetSequenceNumber(); - BufferItem bufferItem; - - bufferItem.seq = packetSeq; + auto seq = packet->GetSequenceNumber(); + auto* storageItem = this->buffer[seq]; - // If empty do it easy. - if (this->buffer.empty()) + // Buffer is empty. + if (this->bufferSize == 0) { - auto store = this->storage[0].store; - bufferItem.packet = packet->Clone(store); - this->buffer.push_back(bufferItem); - return; + // Take the first storage position. + storageItem = std::addressof(this->storage[0]); + this->buffer[seq] = storageItem; + + // Increase buffer size and set start index. + this->bufferSize++; + this->bufferStartIdx = seq; } + // The buffer item is already used. Check whether we should replace its + // storage with the new packet or just ignore it (if duplicated packet). + else if (storageItem) + { + auto* storedPacket = storageItem->packet; - // Otherwise, do the stuff. - RtpStreamSend::BufferItem* newItem = this->buffer.ordered_insert_by_seq(bufferItem); + if (packet->GetTimestamp() == storedPacket->GetTimestamp()) + return; - // Packet already stored, nothing to do - if (newItem == nullptr) - { - return; - } + // Reset the storage item. + ResetStorageItem(storageItem); - uint8_t* store{ nullptr }; - if (this->buffer.datasize() <= this->storage.size()) + // If this was the item referenced by the buffer start index, move it to + // the next one. + if (this->bufferStartIdx == seq) + UpdateBufferStartIdx(); + } + // Buffer not yet full, add an entry. + else if (this->bufferSize < this->storage.size()) { - store = this->storage[this->buffer.datasize() - 1].store; + // Take the next storage position. + storageItem = std::addressof(this->storage[this->bufferSize]); + this->buffer[seq] = storageItem; + + // Increase buffer size. + this->bufferSize++; } + // Buffer full, remove oldest entry and add new one. else { - // Otherwise remove the first packet of the buffer and replace its storage area. - MS_ASSERT(this->buffer.datasize() - 1 == this->storage.size(), "When buffer beyond max capacity storage should be exactly at full capacity"); - auto firstPacket = this->buffer.first().packet; + auto* firstStorageItem = this->buffer[this->bufferStartIdx]; + + // Reset the first storage item. + ResetStorageItem(firstStorageItem); + + // Unfill the buffer start item. + this->buffer[this->bufferStartIdx] = nullptr; - // Store points to the store used by the first packet. - store = const_cast(firstPacket->GetData()); - // Free the first packet. - delete firstPacket; + // Move the buffer start index. + UpdateBufferStartIdx(); - // Remove the first element in the list. - this->buffer.trim_front(); + // Take the freed storage item. + storageItem = firstStorageItem; + this->buffer[seq] = storageItem; } - // Update the new buffer item so it points to the cloned packed. - newItem->packet = packet->Clone(store); + // Clone the packet into the retrieved storage item. + storageItem->packet = packet->Clone(storageItem->store); } void RtpStreamSend::SetRtx(uint8_t payloadType, uint32_t ssrc) From 1c1c10ad7de7d15218904c4ab9a4654696a63ba0 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 13 May 2019 10:52:52 -0700 Subject: [PATCH 56/82] port unit tests for NACK retransmission from v3 --- worker/test/src/RTC/TestRtpStreamSend.cpp | 31 ++++++++++------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/worker/test/src/RTC/TestRtpStreamSend.cpp b/worker/test/src/RTC/TestRtpStreamSend.cpp index 580e97c075..66b906622c 100644 --- a/worker/test/src/RTC/TestRtpStreamSend.cpp +++ b/worker/test/src/RTC/TestRtpStreamSend.cpp @@ -79,13 +79,16 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp]") params.useNack = true; // Create a RtpStreamSend. - RtpStreamSend* stream = new RtpStreamSend(params, 200); + RtpStreamSend* stream = new RtpStreamSend(params, 4); - // Receive all the packets in order into the stream. + // Receive all the packets (some of them not in order and/or duplicated). stream->ReceivePacket(packet1); + stream->ReceivePacket(packet3); stream->ReceivePacket(packet2); stream->ReceivePacket(packet3); stream->ReceivePacket(packet4); + stream->ReceivePacket(packet4); + stream->ReceivePacket(packet5); stream->ReceivePacket(packet5); // Create a NACK item that request for all the packets. @@ -101,30 +104,22 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp]") auto rtxPacket2 = rtpRetransmissionContainer[1]; auto rtxPacket3 = rtpRetransmissionContainer[2]; auto rtxPacket4 = rtpRetransmissionContainer[3]; - auto rtxPacket5 = rtpRetransmissionContainer[4]; - auto rtxPacket6 = rtpRetransmissionContainer[5]; REQUIRE(rtxPacket1); - REQUIRE(rtxPacket1->GetSequenceNumber() == packet1->GetSequenceNumber()); - REQUIRE(rtxPacket1->GetTimestamp() == packet1->GetTimestamp()); + REQUIRE(rtxPacket1->GetSequenceNumber() == packet2->GetSequenceNumber()); + REQUIRE(rtxPacket1->GetTimestamp() == packet2->GetTimestamp()); REQUIRE(rtxPacket2); - REQUIRE(rtxPacket2->GetSequenceNumber() == packet2->GetSequenceNumber()); - REQUIRE(rtxPacket2->GetTimestamp() == packet2->GetTimestamp()); + REQUIRE(rtxPacket2->GetSequenceNumber() == packet3->GetSequenceNumber()); + REQUIRE(rtxPacket2->GetTimestamp() == packet3->GetTimestamp()); REQUIRE(rtxPacket3); - REQUIRE(rtxPacket3->GetSequenceNumber() == packet3->GetSequenceNumber()); - REQUIRE(rtxPacket3->GetTimestamp() == packet3->GetTimestamp()); + REQUIRE(rtxPacket3->GetSequenceNumber() == packet4->GetSequenceNumber()); + REQUIRE(rtxPacket3->GetTimestamp() == packet4->GetTimestamp()); REQUIRE(rtxPacket4); - REQUIRE(rtxPacket4->GetSequenceNumber() == packet4->GetSequenceNumber()); - REQUIRE(rtxPacket4->GetTimestamp() == packet4->GetTimestamp()); - - REQUIRE(rtxPacket5); - REQUIRE(rtxPacket5->GetSequenceNumber() == packet5->GetSequenceNumber()); - REQUIRE(rtxPacket5->GetTimestamp() == packet5->GetTimestamp()); - - REQUIRE(rtxPacket6 == nullptr); + REQUIRE(rtxPacket4->GetSequenceNumber() == packet5->GetSequenceNumber()); + REQUIRE(rtxPacket4->GetTimestamp() == packet5->GetTimestamp()); // Clean stuff. delete packet1; From 54f347456caf863831ce8e3f5269dac72a22ea5b Mon Sep 17 00:00:00 2001 From: artushin Date: Fri, 24 May 2019 14:52:14 -0500 Subject: [PATCH 57/82] rtx all --- package.json | 2 +- worker/src/RTC/NackGenerator.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 986f0ee118..52b9601872 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv6-v3port", + "version": "2.6.8-lv6-v3port-debug5", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/NackGenerator.cpp b/worker/src/RTC/NackGenerator.cpp index f9a19cc052..2c65982f19 100644 --- a/worker/src/RTC/NackGenerator.cpp +++ b/worker/src/RTC/NackGenerator.cpp @@ -84,7 +84,8 @@ namespace RTC packet->GetSsrc(), packet->GetSequenceNumber()); - return false; + // MS has this as false, but this makes nice with the ffmpeg proxy + return true; } // If we are here it means that we may have lost some packets so seq From 06ba72844945f862b5a4063e1e0ecc77fd9bb33d Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 30 May 2019 10:12:38 -0700 Subject: [PATCH 58/82] optionally allow sending old or out of order nacks to ffmpeg --- package.json | 2 +- worker/include/RTC/NackGenerator.hpp | 3 ++- worker/include/RTC/PlainRtpTransport.hpp | 3 +++ worker/include/RTC/RtpStream.hpp | 1 + worker/src/RTC/NackGenerator.cpp | 4 ++-- worker/src/RTC/PlainRtpTransport.cpp | 5 +++++ worker/src/RTC/Producer.cpp | 6 ++++++ worker/src/RTC/Router.cpp | 4 ++++ worker/src/RTC/RtpStream.cpp | 2 ++ worker/src/RTC/RtpStreamRecv.cpp | 2 +- 10 files changed, 27 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 986f0ee118..3ac5517c31 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv6-v3port", + "version": "2.6.8-lv7", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/NackGenerator.hpp b/worker/include/RTC/NackGenerator.hpp index 37bbbc28cf..04a69edc79 100644 --- a/worker/include/RTC/NackGenerator.hpp +++ b/worker/include/RTC/NackGenerator.hpp @@ -40,7 +40,7 @@ namespace RTC }; public: - explicit NackGenerator(Listener* listener); + explicit NackGenerator(Listener* listener, bool oldNack=false); ~NackGenerator() override; bool ReceivePacket(RTC::RtpPacket* packet); @@ -70,6 +70,7 @@ namespace RTC bool started{ false }; uint16_t lastSeq{ 0 }; // Seq number of last valid packet. uint32_t rtt{ 0 }; // Round trip time (ms). + bool sendOldNack{ false }; // whether to resend on old or out of sequence rtx packets }; // Inline instance methods. diff --git a/worker/include/RTC/PlainRtpTransport.hpp b/worker/include/RTC/PlainRtpTransport.hpp index 29ad477c93..03c51281c0 100644 --- a/worker/include/RTC/PlainRtpTransport.hpp +++ b/worker/include/RTC/PlainRtpTransport.hpp @@ -19,6 +19,7 @@ namespace RTC std::string localIP; bool preferIPv4; bool preferIPv6; + bool sendOldNack; }; public: @@ -34,6 +35,7 @@ namespace RTC public: Json::Value ToJson() const override; Json::Value GetStats() const override; + bool SendOldNack() const { return sendOldNack; } void SetRemoteParameters(const std::string& ip, uint16_t port); void SendRtpPacket(RTC::RtpPacket* packet) override; void SendRtcpPacket(RTC::RTCP::Packet* packet) override; @@ -60,6 +62,7 @@ namespace RTC RTC::TransportTuple* tuple{ nullptr }; // Others. struct sockaddr_storage remoteAddrStorage; + bool sendOldNack{ false }; }; } // namespace RTC diff --git a/worker/include/RTC/RtpStream.hpp b/worker/include/RTC/RtpStream.hpp index 82d7ca58ae..80f401bc01 100644 --- a/worker/include/RTC/RtpStream.hpp +++ b/worker/include/RTC/RtpStream.hpp @@ -23,6 +23,7 @@ namespace RTC uint32_t clockRate{ 0 }; bool useNack{ false }; bool usePli{ false }; + bool sendOldNack{ false }; }; public: diff --git a/worker/src/RTC/NackGenerator.cpp b/worker/src/RTC/NackGenerator.cpp index f9a19cc052..1774629e34 100644 --- a/worker/src/RTC/NackGenerator.cpp +++ b/worker/src/RTC/NackGenerator.cpp @@ -18,7 +18,7 @@ namespace RTC /* Instance methods. */ - NackGenerator::NackGenerator(Listener* listener) : listener(listener), rtt(DefaultRtt) + NackGenerator::NackGenerator(Listener* listener, bool oldNack) : listener(listener), rtt(DefaultRtt), sendOldNack(oldNack) { MS_TRACE(); @@ -84,7 +84,7 @@ namespace RTC packet->GetSsrc(), packet->GetSequenceNumber()); - return false; + return this->sendOldNack; // MS has this as false, but this makes nice with the ffmpeg proxy } // If we are here it means that we may have lost some packets so seq diff --git a/worker/src/RTC/PlainRtpTransport.cpp b/worker/src/RTC/PlainRtpTransport.cpp index 7dc9e00266..e5a6399f76 100644 --- a/worker/src/RTC/PlainRtpTransport.cpp +++ b/worker/src/RTC/PlainRtpTransport.cpp @@ -77,6 +77,8 @@ namespace RTC CreateSocket(AF_INET6, options.localIP); } } + + sendOldNack = options.sendOldNack; } PlainRtpTransport::~PlainRtpTransport() @@ -96,6 +98,7 @@ namespace RTC static const Json::StaticString JsonStringRtpListener{ "rtpListener" }; static const Json::StaticString JsonStringLocalIP{ "localIP" }; static const Json::StaticString JsonStringLocalPort{ "localPort" }; + static const Json::StaticString JsonStringSendOldNack{ "sendOldNack" }; Json::Value json(Json::objectValue); @@ -113,6 +116,8 @@ namespace RTC // Add rtpListener. json[JsonStringRtpListener] = this->rtpListener.ToJson(); + json[JsonStringSendOldNack] = this->sendOldNack; + return json; } diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 3c6905bbf1..aaea0e0793 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -2,6 +2,7 @@ // #define MS_LOG_DEV #include "RTC/Producer.hpp" +#include "RTC/PlainRtpTransport.hpp" #include "Logger.hpp" #include "MediaSoupError.hpp" #include "RTC/RTCP/FeedbackPsPli.hpp" @@ -563,6 +564,11 @@ namespace RTC params.clockRate = codec.clockRate; params.useNack = useNack; params.usePli = usePli; + params.sendOldNack = false; + RTC::PlainRtpTransport *plainTransport = dynamic_cast (transport); + if (plainTransport) { + params.sendOldNack = plainTransport->SendOldNack(); + } // Create a RtpStreamRecv for receiving a media stream. auto* rtpStream = new RTC::RtpStreamRecv(this, params); diff --git a/worker/src/RTC/Router.cpp b/worker/src/RTC/Router.cpp index 13649e2532..9e1818c3cd 100644 --- a/worker/src/RTC/Router.cpp +++ b/worker/src/RTC/Router.cpp @@ -236,6 +236,7 @@ namespace RTC static const Json::StaticString JsonStringLocalIP{ "localIP" }; static const Json::StaticString JsonStringPreferIPv4{ "preferIPv4" }; static const Json::StaticString JsonStringPreferIPv6{ "preferIPv6" }; + static const Json::StaticString JsonStringSendOldNacks{ "sendOldNacks" }; uint32_t transportId; @@ -267,6 +268,9 @@ namespace RTC if (request->data[JsonStringPreferIPv6].isBool()) options.preferIPv6 = request->data[JsonStringPreferIPv6].asBool(); + if (request->data[JsonStringSendOldNacks].isBool()) + options.sendOldNack = request->data[JsonStringSendOldNacks].asBool(); + RTC::PlainRtpTransport* plainRtpTransport; try diff --git a/worker/src/RTC/RtpStream.cpp b/worker/src/RTC/RtpStream.cpp index 21c873b695..9704f26733 100644 --- a/worker/src/RTC/RtpStream.cpp +++ b/worker/src/RTC/RtpStream.cpp @@ -249,6 +249,7 @@ namespace RTC static const Json::StaticString JsonStringClockRate{ "clockRate" }; static const Json::StaticString JsonStringUseNack{ "useNack" }; static const Json::StaticString JsonStringUsePli{ "usePli" }; + static const Json::StaticString JsonStringSendOldNack{ "sendOldNack" }; Json::Value json(Json::objectValue); @@ -258,6 +259,7 @@ namespace RTC json[JsonStringClockRate] = Json::UInt{ this->clockRate }; json[JsonStringUseNack] = this->useNack; json[JsonStringUsePli] = this->usePli; + json[JsonStringSendOldNack] = this->sendOldNack; return json; } diff --git a/worker/src/RTC/RtpStreamRecv.cpp b/worker/src/RTC/RtpStreamRecv.cpp index 0e4c71f722..d2dc20d910 100644 --- a/worker/src/RTC/RtpStreamRecv.cpp +++ b/worker/src/RTC/RtpStreamRecv.cpp @@ -20,7 +20,7 @@ namespace RTC MS_TRACE(); if (this->params.useNack) - this->nackGenerator.reset(new RTC::NackGenerator(this)); + this->nackGenerator.reset(new RTC::NackGenerator(this, this->params.sendOldNack)); // Run the timer. this->statusCheckTimer->Start(StatusCheckPeriod, StatusCheckPeriod); From bdf1c3c78cf161f19ad5420a8defa631d111cba3 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 30 May 2019 11:09:48 -0700 Subject: [PATCH 59/82] minor fix --- worker/src/RTC/Router.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worker/src/RTC/Router.cpp b/worker/src/RTC/Router.cpp index 9e1818c3cd..a2fc1d9ef0 100644 --- a/worker/src/RTC/Router.cpp +++ b/worker/src/RTC/Router.cpp @@ -236,7 +236,7 @@ namespace RTC static const Json::StaticString JsonStringLocalIP{ "localIP" }; static const Json::StaticString JsonStringPreferIPv4{ "preferIPv4" }; static const Json::StaticString JsonStringPreferIPv6{ "preferIPv6" }; - static const Json::StaticString JsonStringSendOldNacks{ "sendOldNacks" }; + static const Json::StaticString JsonStringSendOldNack{ "sendOldNack" }; uint32_t transportId; @@ -268,8 +268,8 @@ namespace RTC if (request->data[JsonStringPreferIPv6].isBool()) options.preferIPv6 = request->data[JsonStringPreferIPv6].asBool(); - if (request->data[JsonStringSendOldNacks].isBool()) - options.sendOldNack = request->data[JsonStringSendOldNacks].asBool(); + if (request->data[JsonStringSendOldNack].isBool()) + options.sendOldNack = request->data[JsonStringSendOldNack].asBool(); RTC::PlainRtpTransport* plainRtpTransport; From 917dcbdde71ca1bcb27b323ec7dcf3c4925fe263 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 31 May 2019 09:11:17 -0700 Subject: [PATCH 60/82] small logging change --- package.json | 2 +- worker/src/RTC/NackGenerator.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 3ac5517c31..bd0abe9dbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv7", + "version": "2.6.8-lv8", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/NackGenerator.cpp b/worker/src/RTC/NackGenerator.cpp index 1774629e34..4c5dd597b7 100644 --- a/worker/src/RTC/NackGenerator.cpp +++ b/worker/src/RTC/NackGenerator.cpp @@ -80,9 +80,10 @@ namespace RTC // Out of order packet or already handled NACKed packet. MS_DEBUG_TAG( rtx, - "ignoring old packet not present in the NACK list [ssrc:%" PRIu32 ", seq:%" PRIu16 "]", + "ignoring old packet not present in the NACK list [ssrc:%" PRIu32 ", seq:%" PRIu16 "], respond with %s", packet->GetSsrc(), - packet->GetSequenceNumber()); + packet->GetSequenceNumber(), + this->sendOldNack ? "true" : "false"); return this->sendOldNack; // MS has this as false, but this makes nice with the ffmpeg proxy } From 339ca87c731c49df782ca4a495df5e6192557610 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 31 May 2019 10:45:52 -0700 Subject: [PATCH 61/82] debug logging for nack option --- lib/Room.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Room.js b/lib/Room.js index 254ea0ae92..86f25079b8 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -240,7 +240,7 @@ class Room extends EnhancedEventEmitter createRtpStreamer(producer, options) { - logger.debug('createRtpStreamer()'); + logger.debug('createRtpStreamer() sendOldNack: %s', options.sendOldNack ? 'true' : 'false'); if (!this._producers.has(producer.id)) return Promise.reject(new Error('Producer not found')); From 96ad172dd4f7e1e7cacfe77c51702e6d01b136c6 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 31 May 2019 10:46:53 -0700 Subject: [PATCH 62/82] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd0abe9dbe..e765b02551 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv8", + "version": "2.6.8-lv9", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 4199374dea12765eb6586b19b756c572949d2963 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 31 May 2019 14:20:27 -0700 Subject: [PATCH 63/82] logging in producer --- package.json | 2 +- worker/src/RTC/Producer.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e765b02551..4390095796 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv9", + "version": "2.6.8-lv10", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index aaea0e0793..b10f03564d 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -570,6 +570,9 @@ namespace RTC params.sendOldNack = plainTransport->SendOldNack(); } + MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream transport is PlainRtpTransport=%s sendOldNack is %s", + plainTransport ? "true" : "false", params.sendOldNack ? "true" : "false"); + // Create a RtpStreamRecv for receiving a media stream. auto* rtpStream = new RTC::RtpStreamRecv(this, params); From 0b87c79556b0ecf1f80e6a1fd3a9affeb39d6956 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Fri, 31 May 2019 18:09:39 -0700 Subject: [PATCH 64/82] try Transport::SendOldNack() as pure virtual --- package.json | 2 +- worker/include/RTC/PlainRtpTransport.hpp | 2 +- worker/include/RTC/Transport.hpp | 1 + worker/include/RTC/WebRtcTransport.hpp | 1 + worker/src/RTC/Producer.cpp | 11 ++++------- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 4390095796..27d0b98ba3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv10", + "version": "2.6.8-lv11", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/PlainRtpTransport.hpp b/worker/include/RTC/PlainRtpTransport.hpp index 03c51281c0..ca1d46cd5f 100644 --- a/worker/include/RTC/PlainRtpTransport.hpp +++ b/worker/include/RTC/PlainRtpTransport.hpp @@ -35,7 +35,7 @@ namespace RTC public: Json::Value ToJson() const override; Json::Value GetStats() const override; - bool SendOldNack() const { return sendOldNack; } + bool SendOldNack() const override { return sendOldNack; } void SetRemoteParameters(const std::string& ip, uint16_t port); void SendRtpPacket(RTC::RtpPacket* packet) override; void SendRtcpPacket(RTC::RTCP::Packet* packet) override; diff --git a/worker/include/RTC/Transport.hpp b/worker/include/RTC/Transport.hpp index ad6772bd25..9c4b0d7f1f 100644 --- a/worker/include/RTC/Transport.hpp +++ b/worker/include/RTC/Transport.hpp @@ -71,6 +71,7 @@ namespace RTC public: virtual Json::Value ToJson() const = 0; virtual Json::Value GetStats() const = 0; + virtual bool SendOldNack() const = 0; void HandleProducer(RTC::Producer* producer); void HandleConsumer(RTC::Consumer* consumer); virtual void SendRtpPacket(RTC::RtpPacket* packet) = 0; diff --git a/worker/include/RTC/WebRtcTransport.hpp b/worker/include/RTC/WebRtcTransport.hpp index ca9994c0d7..989870e438 100644 --- a/worker/include/RTC/WebRtcTransport.hpp +++ b/worker/include/RTC/WebRtcTransport.hpp @@ -47,6 +47,7 @@ namespace RTC public: Json::Value ToJson() const override; Json::Value GetStats() const override; + bool SendOldNack() const override { return false; } // hacky RTC::DtlsTransport::Role SetRemoteDtlsParameters( RTC::DtlsTransport::Fingerprint& fingerprint, RTC::DtlsTransport::Role role); void SetMaxBitrate(uint32_t bitrate); diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index b10f03564d..885f52f640 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -564,14 +564,11 @@ namespace RTC params.clockRate = codec.clockRate; params.useNack = useNack; params.usePli = usePli; - params.sendOldNack = false; - RTC::PlainRtpTransport *plainTransport = dynamic_cast (transport); - if (plainTransport) { - params.sendOldNack = plainTransport->SendOldNack(); - } - MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream transport is PlainRtpTransport=%s sendOldNack is %s", - plainTransport ? "true" : "false", params.sendOldNack ? "true" : "false"); + params.sendOldNack = transport->SendOldNack(); + + MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream sendOldNack is %s", + params.sendOldNack ? "true" : "false"); // Create a RtpStreamRecv for receiving a media stream. auto* rtpStream = new RTC::RtpStreamRecv(this, params); From 3ce205842fc3f8cf74f3408995f2aa5574c61288 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 20 Jun 2019 08:38:33 -0700 Subject: [PATCH 65/82] version bump --- package.json | 2 +- worker/src/RTC/Router.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 27d0b98ba3..ebf9628a78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv11", + "version": "2.6.8-lv12", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/Router.cpp b/worker/src/RTC/Router.cpp index a2fc1d9ef0..52dfc6dd55 100644 --- a/worker/src/RTC/Router.cpp +++ b/worker/src/RTC/Router.cpp @@ -288,7 +288,7 @@ namespace RTC // Insert into the map. this->transports[transportId] = plainRtpTransport; - MS_DEBUG_DEV("PlainRtpTransport created [transportId:%" PRIu32 "]", transportId); + MS_DEBUG_DEV("PlainRtpTransport created [transportId:%" PRIu32 "] sendOldNack %d", transportId, plainRtpTransport->SendOldNack()); auto data = plainRtpTransport->ToJson(); From ccffa62b75f655e3246df145919300c7449e6c45 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 20 Jun 2019 09:29:58 -0700 Subject: [PATCH 66/82] only a bit more logging --- package.json | 2 +- worker/src/RTC/NackGenerator.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ebf9628a78..4d5d38df9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv12", + "version": "2.6.8-lv13", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/NackGenerator.cpp b/worker/src/RTC/NackGenerator.cpp index 4c5dd597b7..2021b555c4 100644 --- a/worker/src/RTC/NackGenerator.cpp +++ b/worker/src/RTC/NackGenerator.cpp @@ -24,6 +24,11 @@ namespace RTC // Set the timer. this->timer = new Timer(this); + + MS_DEBUG_TAG( + rtx, + "NackGenerator ctor - sendOldNack=%s", + this->sendOldNack ? "true" : "false"); } NackGenerator::~NackGenerator() From aa1d63eed69195cd279acf823aa6737339e71b7f Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 20 Jun 2019 13:35:39 -0700 Subject: [PATCH 67/82] logging and versioning --- package.json | 2 +- worker/src/RTC/PlainRtpTransport.cpp | 5 +++++ worker/src/RTC/Producer.cpp | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4d5d38df9b..2fb899759f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv13", + "version": "2.6.8-lv14", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/PlainRtpTransport.cpp b/worker/src/RTC/PlainRtpTransport.cpp index e5a6399f76..e31034a81d 100644 --- a/worker/src/RTC/PlainRtpTransport.cpp +++ b/worker/src/RTC/PlainRtpTransport.cpp @@ -79,6 +79,11 @@ namespace RTC } sendOldNack = options.sendOldNack; + + MS_DEBUG_TAG( + rtp, + "PlainRtpTransport ctor - sendOldNack=%s", + this->sendOldNack ? "true" : "false"); } PlainRtpTransport::~PlainRtpTransport() diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 885f52f640..c8b910e4db 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -537,10 +537,13 @@ namespace RTC { if (!useNack && fb.type == "nack") { - MS_DEBUG_2TAGS(rtcp, rtx, "NACK supported"); + MS_DEBUG_2TAGS(rtcp, rtx, "NACK supported kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); useNack = true; } + else { + MS_DEBUG_2TAGS(rtcp, rtx, "NACK not supported kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); + } if (!usePli && fb.type == "nack" && fb.parameter == "pli") { MS_DEBUG_TAG(rtcp, "PLI supported"); From 57dbb6d73959b3ac465dde8b7ae3ea1419a0f46b Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 20 Jun 2019 14:24:14 -0700 Subject: [PATCH 68/82] loging --- package.json | 2 +- worker/src/RTC/Producer.cpp | 15 +++++++++++---- worker/src/RTC/RtpStreamRecv.cpp | 3 +++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2fb899759f..52bfbc63f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv14", + "version": "2.6.8-lv15", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index c8b910e4db..85923759e5 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -42,6 +42,12 @@ namespace RTC // Set the RTP key frame request block timer. this->keyFrameRequestBlockTimer = new Timer(this); + + if (this->transport != nullptr) + MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport->sendOldNack is %s", + this->transport->SendOldNack() ? "true" : "false"); + else + MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport is nullptr, sendOldNack is undefined"); } Producer::~Producer() @@ -567,11 +573,12 @@ namespace RTC params.clockRate = codec.clockRate; params.useNack = useNack; params.usePli = usePli; + params.sendOldNack = false; + if (this->transport != nullptr) + params.sendOldNack = transport->SendOldNack(); - params.sendOldNack = transport->SendOldNack(); - - MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream sendOldNack is %s", - params.sendOldNack ? "true" : "false"); + MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream sendOldNack=%s kind=%s", + params.sendOldNack ? "true" : "false", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio"); // Create a RtpStreamRecv for receiving a media stream. auto* rtpStream = new RTC::RtpStreamRecv(this, params); diff --git a/worker/src/RTC/RtpStreamRecv.cpp b/worker/src/RTC/RtpStreamRecv.cpp index d2dc20d910..a8b8c06383 100644 --- a/worker/src/RTC/RtpStreamRecv.cpp +++ b/worker/src/RTC/RtpStreamRecv.cpp @@ -19,6 +19,9 @@ namespace RTC { MS_TRACE(); + MS_DEBUG_TAG( + rtx, + "RtpStreamRecv ctor useNack=%s sendOldNack=%s", (this->params.useNack ? "true" : "false"), (this->params.sendOldNack ? "true" : "false")); if (this->params.useNack) this->nackGenerator.reset(new RTC::NackGenerator(this, this->params.sendOldNack)); From 9960f8cb07ceff4daefaae93729852a64bb08acb Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 20 Jun 2019 17:08:26 -0700 Subject: [PATCH 69/82] version --- package.json | 2 +- worker/src/RTC/Producer.cpp | 8 ++++---- worker/src/RTC/RtpStreamRecv.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 52bfbc63f0..e7caba98ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv15", + "version": "2.6.8-lv16", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 85923759e5..93b83e8887 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -44,10 +44,10 @@ namespace RTC this->keyFrameRequestBlockTimer = new Timer(this); if (this->transport != nullptr) - MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport->sendOldNack is %s", - this->transport->SendOldNack() ? "true" : "false"); + MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport->sendOldNack=%s kind=%s", + this->transport->SendOldNack() ? "true" : "false", ((this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio")); else - MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport is nullptr, sendOldNack is undefined"); + MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport is nullptr, sendOldNack=undefined kind=%s", ((this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio")); } Producer::~Producer() @@ -577,7 +577,7 @@ namespace RTC if (this->transport != nullptr) params.sendOldNack = transport->SendOldNack(); - MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream sendOldNack=%s kind=%s", + MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream of RtpStreamRecv sendOldNack=%s kind=%s", params.sendOldNack ? "true" : "false", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio"); // Create a RtpStreamRecv for receiving a media stream. diff --git a/worker/src/RTC/RtpStreamRecv.cpp b/worker/src/RTC/RtpStreamRecv.cpp index a8b8c06383..5c6e0d5969 100644 --- a/worker/src/RTC/RtpStreamRecv.cpp +++ b/worker/src/RTC/RtpStreamRecv.cpp @@ -21,9 +21,9 @@ namespace RTC MS_DEBUG_TAG( rtx, - "RtpStreamRecv ctor useNack=%s sendOldNack=%s", (this->params.useNack ? "true" : "false"), (this->params.sendOldNack ? "true" : "false")); + "RtpStreamRecv ctor useNack=%s params.sendOldNack=%s this->params.sendOldNack=%s", (this->params.useNack ? "true" : "false"), (params.sendOldNack ? "true" : "false"), (this->params.sendOldNack ? "true" : "false")); if (this->params.useNack) - this->nackGenerator.reset(new RTC::NackGenerator(this, this->params.sendOldNack)); + this->nackGenerator.reset(new RTC::NackGenerator(this, params.sendOldNack)); // Run the timer. this->statusCheckTimer->Start(StatusCheckPeriod, StatusCheckPeriod); From de4cf302bffb27c1fafddcc3d5b00c562c0ba825 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 24 Jun 2019 13:35:39 -0700 Subject: [PATCH 70/82] try using rtcp-fb SDP --- lib/Room.js | 2 +- lib/supportedRtpCapabilities.js | 17 ++++++++++------ package.json | 2 +- worker/include/RTC/NackGenerator.hpp | 13 +++++++++--- worker/include/RTC/RtpStreamRecv.hpp | 2 ++ worker/src/RTC/Consumer.cpp | 8 ++++++++ worker/src/RTC/NackGenerator.cpp | 30 +++++++++++----------------- worker/src/RTC/Producer.cpp | 27 +++++++++++-------------- worker/src/RTC/RtpStreamRecv.cpp | 18 ++++++++++++++--- 9 files changed, 72 insertions(+), 47 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index 86f25079b8..3d74b7f621 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -240,7 +240,7 @@ class Room extends EnhancedEventEmitter createRtpStreamer(producer, options) { - logger.debug('createRtpStreamer() sendOldNack: %s', options.sendOldNack ? 'true' : 'false'); + logger.debug('createRtpStreamer() sendOldNack: %s', options.sendOldNack ? 'true' : 'false'); // TODO: if SDP rtcp-fb... option works this will no longer be needed if (!this._producers.has(producer.id)) return Promise.reject(new Error('Producer not found')); diff --git a/lib/supportedRtpCapabilities.js b/lib/supportedRtpCapabilities.js index f8844013f6..b2b1600f8b 100644 --- a/lib/supportedRtpCapabilities.js +++ b/lib/supportedRtpCapabilities.js @@ -154,7 +154,8 @@ const supportedRtpCapabilities = { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, - { type: 'goog-remb' } + { type: 'goog-remb' }, + { type: 'ffmpeg-proxy' } ] }, { @@ -167,8 +168,9 @@ const supportedRtpCapabilities = { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, - { type: 'goog-remb' } - ] + { type: 'goog-remb' }, + { type: 'ffmpeg-proxy' } + ] }, { kind : 'video', @@ -184,7 +186,8 @@ const supportedRtpCapabilities = { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, - { type: 'goog-remb' } + { type: 'goog-remb' }, + { type: 'ffmpeg-proxy' } ] }, { @@ -201,7 +204,8 @@ const supportedRtpCapabilities = { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, - { type: 'goog-remb' } + { type: 'goog-remb' }, + { type: 'ffmpeg-proxy' } ] }, { @@ -214,7 +218,8 @@ const supportedRtpCapabilities = { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, - { type: 'goog-remb' } + { type: 'goog-remb' }, + { type: 'ffmpeg-proxy' } ] } ], diff --git a/package.json b/package.json index e7caba98ad..034c084970 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv16", + "version": "2.6.8-lv17", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/NackGenerator.hpp b/worker/include/RTC/NackGenerator.hpp index 04a69edc79..31f70ee15c 100644 --- a/worker/include/RTC/NackGenerator.hpp +++ b/worker/include/RTC/NackGenerator.hpp @@ -13,6 +13,14 @@ namespace RTC { class NackGenerator : public Timer::Listener { + public: + enum class NACKedPacket + { + NOT_FOUND = 0, + FOUND = 1, + TOO_OLD = 2 + }; + public: class Listener { @@ -40,10 +48,10 @@ namespace RTC }; public: - explicit NackGenerator(Listener* listener, bool oldNack=false); + explicit NackGenerator(Listener* listener); ~NackGenerator() override; - bool ReceivePacket(RTC::RtpPacket* packet); + NACKedPacket ReceivePacket(RTC::RtpPacket* packet); size_t GetNackListLength() const; void Reset(); @@ -70,7 +78,6 @@ namespace RTC bool started{ false }; uint16_t lastSeq{ 0 }; // Seq number of last valid packet. uint32_t rtt{ 0 }; // Round trip time (ms). - bool sendOldNack{ false }; // whether to resend on old or out of sequence rtx packets }; // Inline instance methods. diff --git a/worker/include/RTC/RtpStreamRecv.hpp b/worker/include/RTC/RtpStreamRecv.hpp index b8edebeb61..8731853c4e 100644 --- a/worker/include/RTC/RtpStreamRecv.hpp +++ b/worker/include/RTC/RtpStreamRecv.hpp @@ -34,6 +34,8 @@ namespace RTC void RequestKeyFrame(); bool IsActive() const; + //bool SendOldNack() const { return this->params.sendOldNack; } // try to use this when producer processes rtx packet, ffmpeg consumer wants a different behavior + private: void CalculateJitter(uint32_t rtpTimestamp); diff --git a/worker/src/RTC/Consumer.cpp b/worker/src/RTC/Consumer.cpp index b4a93f3e98..4ffac969c7 100644 --- a/worker/src/RTC/Consumer.cpp +++ b/worker/src/RTC/Consumer.cpp @@ -768,6 +768,7 @@ namespace RTC auto& codec = this->rtpParameters.GetCodecForEncoding(encoding); bool useNack{ false }; bool usePli{ false }; + bool sendOldNack{ false }; for (auto& fb : codec.rtcpFeedback) { @@ -783,6 +784,12 @@ namespace RTC usePli = true; } + if (!sendOldNack && fb.type == "ffmpeg-proxy") + { + MS_DEBUG_TAG(rtcp, "Ffmpeg proxy uses sendOldNack"); + + sendOldNack = true; + } } // Create stream params. @@ -794,6 +801,7 @@ namespace RTC params.clockRate = codec.clockRate; params.useNack = useNack; params.usePli = usePli; + params.sendOldNack = sendOldNack; // TODO: don't care for RtpStreamSend // Create a RtpStreamSend for sending a single media stream. size_t bufferSize = params.useNack ? 600 : 0; diff --git a/worker/src/RTC/NackGenerator.cpp b/worker/src/RTC/NackGenerator.cpp index 2021b555c4..1e2683c93a 100644 --- a/worker/src/RTC/NackGenerator.cpp +++ b/worker/src/RTC/NackGenerator.cpp @@ -18,17 +18,12 @@ namespace RTC /* Instance methods. */ - NackGenerator::NackGenerator(Listener* listener, bool oldNack) : listener(listener), rtt(DefaultRtt), sendOldNack(oldNack) + NackGenerator::NackGenerator(Listener* listener) : listener(listener), rtt(DefaultRtt) { MS_TRACE(); // Set the timer. this->timer = new Timer(this); - - MS_DEBUG_TAG( - rtx, - "NackGenerator ctor - sendOldNack=%s", - this->sendOldNack ? "true" : "false"); } NackGenerator::~NackGenerator() @@ -39,8 +34,8 @@ namespace RTC delete this->timer; } - // Returns true if this is a found nacked packet. False otherwise. - bool NackGenerator::ReceivePacket(RTC::RtpPacket* packet) + // Returns 0 if this is a found nacked packet. 1 if not found, 2 if pkt is already NACK'ed or out of order. + NackGenerator::NACKedPacket NackGenerator::ReceivePacket(RTC::RtpPacket* packet) { MS_TRACE(); @@ -55,12 +50,12 @@ namespace RTC if (isKeyFrame) this->keyFrameList.insert(seq); - return false; + return NackGenerator::NACKedPacket::NOT_FOUND; } // Obviously never nacked, so ignore. if (seq == this->lastSeq) - return false; + return NackGenerator::NACKedPacket::NOT_FOUND; // May be an out of order packet, or already handled retransmitted packet, // or a retransmitted packet. @@ -79,18 +74,17 @@ namespace RTC this->nackList.erase(it); - return true; + return NackGenerator::NACKedPacket::FOUND; } // Out of order packet or already handled NACKed packet. MS_DEBUG_TAG( rtx, - "ignoring old packet not present in the NACK list [ssrc:%" PRIu32 ", seq:%" PRIu16 "], respond with %s", + "ignoring old packet not present in the NACK list [ssrc:%" PRIu32 ", seq:%" PRIu16 "]", packet->GetSsrc(), - packet->GetSequenceNumber(), - this->sendOldNack ? "true" : "false"); + packet->GetSequenceNumber()); - return this->sendOldNack; // MS has this as false, but this makes nice with the ffmpeg proxy + return NackGenerator::NACKedPacket::TOO_OLD; // MS has this as false, but this makes nice with the ffmpeg proxy } // If we are here it means that we may have lost some packets so seq @@ -112,14 +106,14 @@ namespace RTC { this->lastSeq++; - return false; + return NackGenerator::NACKedPacket::NOT_FOUND; } AddPacketsToNackList(this->lastSeq + 1, seq); // NackGenerator instance may have been reseted. if (!this->started) - return false; + return NackGenerator::NACKedPacket::NOT_FOUND; this->lastSeq = seq; @@ -131,7 +125,7 @@ namespace RTC MayRunTimer(); - return false; + return NackGenerator::NACKedPacket::NOT_FOUND; } void NackGenerator::CleanOldNackItems(uint16_t seq) diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 93b83e8887..915aa5a3b0 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -42,12 +42,6 @@ namespace RTC // Set the RTP key frame request block timer. this->keyFrameRequestBlockTimer = new Timer(this); - - if (this->transport != nullptr) - MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport->sendOldNack=%s kind=%s", - this->transport->SendOldNack() ? "true" : "false", ((this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio")); - else - MS_DEBUG_2TAGS(rtcp, rtx, "Producer ctor transport is nullptr, sendOldNack=undefined kind=%s", ((this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio")); } Producer::~Producer() @@ -276,6 +270,8 @@ namespace RTC if (info.rtxSsrc != 0u && info.rtxSsrc == ssrc) { + // H@@CK: TODO: rtpStream is now smart enough to make sense out of NackGenerator return value depending on whether its sendOldNack value set or not. + // Now I need to find out how to set up a consumer correctly so that it can set up its rtpStream's parameters right rtpStream = info.rtpStream; profile = info.profile; @@ -538,6 +534,7 @@ namespace RTC bool useNack{ false }; bool usePli{ false }; bool useRemb{ false }; + bool sendOldNack{ false }; for (auto& fb : codec.rtcpFeedback) { @@ -547,9 +544,7 @@ namespace RTC useNack = true; } - else { - MS_DEBUG_2TAGS(rtcp, rtx, "NACK not supported kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); - } + if (!usePli && fb.type == "nack" && fb.parameter == "pli") { MS_DEBUG_TAG(rtcp, "PLI supported"); @@ -562,6 +557,13 @@ namespace RTC useRemb = true; } + + if (!sendOldNack && fb.type == "ffmpeg-proxy") + { + MS_DEBUG_2TAGS(rtcp, rtx, "Ffmpeg proxy uses sendOldNack"); + + sendOldNack = true; + } } // Create stream params. @@ -573,12 +575,7 @@ namespace RTC params.clockRate = codec.clockRate; params.useNack = useNack; params.usePli = usePli; - params.sendOldNack = false; - if (this->transport != nullptr) - params.sendOldNack = transport->SendOldNack(); - - MS_DEBUG_2TAGS(rtcp, rtx, "Producer::CreateRtpStream of RtpStreamRecv sendOldNack=%s kind=%s", - params.sendOldNack ? "true" : "false", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio"); + params.sendOldNack = sendOldNack; // Create a RtpStreamRecv for receiving a media stream. auto* rtpStream = new RTC::RtpStreamRecv(this, params); diff --git a/worker/src/RTC/RtpStreamRecv.cpp b/worker/src/RTC/RtpStreamRecv.cpp index 5c6e0d5969..517d42abd3 100644 --- a/worker/src/RTC/RtpStreamRecv.cpp +++ b/worker/src/RTC/RtpStreamRecv.cpp @@ -23,7 +23,7 @@ namespace RTC rtx, "RtpStreamRecv ctor useNack=%s params.sendOldNack=%s this->params.sendOldNack=%s", (this->params.useNack ? "true" : "false"), (params.sendOldNack ? "true" : "false"), (this->params.sendOldNack ? "true" : "false")); if (this->params.useNack) - this->nackGenerator.reset(new RTC::NackGenerator(this, params.sendOldNack)); + this->nackGenerator.reset(new RTC::NackGenerator(this)); // Run the timer. this->statusCheckTimer->Start(StatusCheckPeriod, StatusCheckPeriod); @@ -137,8 +137,20 @@ namespace RTC // Pass the packet to the NackGenerator and return true just if this was a // NACKed packet. - if (this->params.useNack) - return this->nackGenerator->ReceivePacket(packet); + if (this->params.useNack) { + RTC::NackGenerator::NACKedPacket ret = this->nackGenerator->ReceivePacket(packet); + switch(ret) { + case RTC::NackGenerator::NACKedPacket::NOT_FOUND: + return false; + case RTC::NackGenerator::NACKedPacket::FOUND: + return true; + case RTC::NackGenerator::NACKedPacket::TOO_OLD: + MS_DEBUG_TAG( + rtx, + "RtpStreamRecv::ReceiveRtxPacket this->params.sendOldNack=%s", (this->params.useNack ? "true" : "false")); + return this->params.sendOldNack; + } + } return false; } From 5a45b1d73479b249bb9e086b07e7165f441798fb Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 24 Jun 2019 14:39:59 -0700 Subject: [PATCH 71/82] keepdebugging --- lib/Room.js | 2 +- package.json | 2 +- worker/include/RTC/PlainRtpTransport.hpp | 3 --- worker/include/RTC/RtpStreamRecv.hpp | 2 -- worker/include/RTC/Transport.hpp | 1 - worker/include/RTC/WebRtcTransport.hpp | 1 - worker/src/RTC/Consumer.cpp | 2 +- worker/src/RTC/PlainRtpTransport.cpp | 10 ---------- worker/src/RTC/Producer.cpp | 3 +++ worker/src/RTC/Router.cpp | 6 +----- worker/src/RTC/RtpStream.cpp | 2 -- 11 files changed, 7 insertions(+), 27 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index 3d74b7f621..86f25079b8 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -240,7 +240,7 @@ class Room extends EnhancedEventEmitter createRtpStreamer(producer, options) { - logger.debug('createRtpStreamer() sendOldNack: %s', options.sendOldNack ? 'true' : 'false'); // TODO: if SDP rtcp-fb... option works this will no longer be needed + logger.debug('createRtpStreamer() sendOldNack: %s', options.sendOldNack ? 'true' : 'false'); if (!this._producers.has(producer.id)) return Promise.reject(new Error('Producer not found')); diff --git a/package.json b/package.json index 034c084970..a1891630fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv17", + "version": "2.6.8-lv18", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/PlainRtpTransport.hpp b/worker/include/RTC/PlainRtpTransport.hpp index ca1d46cd5f..29ad477c93 100644 --- a/worker/include/RTC/PlainRtpTransport.hpp +++ b/worker/include/RTC/PlainRtpTransport.hpp @@ -19,7 +19,6 @@ namespace RTC std::string localIP; bool preferIPv4; bool preferIPv6; - bool sendOldNack; }; public: @@ -35,7 +34,6 @@ namespace RTC public: Json::Value ToJson() const override; Json::Value GetStats() const override; - bool SendOldNack() const override { return sendOldNack; } void SetRemoteParameters(const std::string& ip, uint16_t port); void SendRtpPacket(RTC::RtpPacket* packet) override; void SendRtcpPacket(RTC::RTCP::Packet* packet) override; @@ -62,7 +60,6 @@ namespace RTC RTC::TransportTuple* tuple{ nullptr }; // Others. struct sockaddr_storage remoteAddrStorage; - bool sendOldNack{ false }; }; } // namespace RTC diff --git a/worker/include/RTC/RtpStreamRecv.hpp b/worker/include/RTC/RtpStreamRecv.hpp index 8731853c4e..b8edebeb61 100644 --- a/worker/include/RTC/RtpStreamRecv.hpp +++ b/worker/include/RTC/RtpStreamRecv.hpp @@ -34,8 +34,6 @@ namespace RTC void RequestKeyFrame(); bool IsActive() const; - //bool SendOldNack() const { return this->params.sendOldNack; } // try to use this when producer processes rtx packet, ffmpeg consumer wants a different behavior - private: void CalculateJitter(uint32_t rtpTimestamp); diff --git a/worker/include/RTC/Transport.hpp b/worker/include/RTC/Transport.hpp index 9c4b0d7f1f..ad6772bd25 100644 --- a/worker/include/RTC/Transport.hpp +++ b/worker/include/RTC/Transport.hpp @@ -71,7 +71,6 @@ namespace RTC public: virtual Json::Value ToJson() const = 0; virtual Json::Value GetStats() const = 0; - virtual bool SendOldNack() const = 0; void HandleProducer(RTC::Producer* producer); void HandleConsumer(RTC::Consumer* consumer); virtual void SendRtpPacket(RTC::RtpPacket* packet) = 0; diff --git a/worker/include/RTC/WebRtcTransport.hpp b/worker/include/RTC/WebRtcTransport.hpp index 989870e438..ca9994c0d7 100644 --- a/worker/include/RTC/WebRtcTransport.hpp +++ b/worker/include/RTC/WebRtcTransport.hpp @@ -47,7 +47,6 @@ namespace RTC public: Json::Value ToJson() const override; Json::Value GetStats() const override; - bool SendOldNack() const override { return false; } // hacky RTC::DtlsTransport::Role SetRemoteDtlsParameters( RTC::DtlsTransport::Fingerprint& fingerprint, RTC::DtlsTransport::Role role); void SetMaxBitrate(uint32_t bitrate); diff --git a/worker/src/RTC/Consumer.cpp b/worker/src/RTC/Consumer.cpp index 4ffac969c7..b2daa7901b 100644 --- a/worker/src/RTC/Consumer.cpp +++ b/worker/src/RTC/Consumer.cpp @@ -786,7 +786,7 @@ namespace RTC } if (!sendOldNack && fb.type == "ffmpeg-proxy") { - MS_DEBUG_TAG(rtcp, "Ffmpeg proxy uses sendOldNack"); + MS_DEBUG_TAG(rtcp, "Ffmpeg proxy - sendOldNack"); sendOldNack = true; } diff --git a/worker/src/RTC/PlainRtpTransport.cpp b/worker/src/RTC/PlainRtpTransport.cpp index e31034a81d..7dc9e00266 100644 --- a/worker/src/RTC/PlainRtpTransport.cpp +++ b/worker/src/RTC/PlainRtpTransport.cpp @@ -77,13 +77,6 @@ namespace RTC CreateSocket(AF_INET6, options.localIP); } } - - sendOldNack = options.sendOldNack; - - MS_DEBUG_TAG( - rtp, - "PlainRtpTransport ctor - sendOldNack=%s", - this->sendOldNack ? "true" : "false"); } PlainRtpTransport::~PlainRtpTransport() @@ -103,7 +96,6 @@ namespace RTC static const Json::StaticString JsonStringRtpListener{ "rtpListener" }; static const Json::StaticString JsonStringLocalIP{ "localIP" }; static const Json::StaticString JsonStringLocalPort{ "localPort" }; - static const Json::StaticString JsonStringSendOldNack{ "sendOldNack" }; Json::Value json(Json::objectValue); @@ -121,8 +113,6 @@ namespace RTC // Add rtpListener. json[JsonStringRtpListener] = this->rtpListener.ToJson(); - json[JsonStringSendOldNack] = this->sendOldNack; - return json; } diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 915aa5a3b0..b65e4f8e15 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -466,6 +466,7 @@ namespace RTC { if (encoding.ssrc == ssrc) { + MS_DEBUG_2TAGS(rtcp, rtx, "MayNeedNewStream() will call CreateRtpStream() for found ssrc, kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); CreateRtpStream(encoding, ssrc); return; @@ -515,6 +516,8 @@ namespace RTC } } + MS_DEBUG_2TAGS(rtcp, rtx, "MayNeedNewStream() will call CreateRtpStream() for matching encodingId, kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); + CreateRtpStream(encoding, ssrc); return; diff --git a/worker/src/RTC/Router.cpp b/worker/src/RTC/Router.cpp index 52dfc6dd55..13649e2532 100644 --- a/worker/src/RTC/Router.cpp +++ b/worker/src/RTC/Router.cpp @@ -236,7 +236,6 @@ namespace RTC static const Json::StaticString JsonStringLocalIP{ "localIP" }; static const Json::StaticString JsonStringPreferIPv4{ "preferIPv4" }; static const Json::StaticString JsonStringPreferIPv6{ "preferIPv6" }; - static const Json::StaticString JsonStringSendOldNack{ "sendOldNack" }; uint32_t transportId; @@ -268,9 +267,6 @@ namespace RTC if (request->data[JsonStringPreferIPv6].isBool()) options.preferIPv6 = request->data[JsonStringPreferIPv6].asBool(); - if (request->data[JsonStringSendOldNack].isBool()) - options.sendOldNack = request->data[JsonStringSendOldNack].asBool(); - RTC::PlainRtpTransport* plainRtpTransport; try @@ -288,7 +284,7 @@ namespace RTC // Insert into the map. this->transports[transportId] = plainRtpTransport; - MS_DEBUG_DEV("PlainRtpTransport created [transportId:%" PRIu32 "] sendOldNack %d", transportId, plainRtpTransport->SendOldNack()); + MS_DEBUG_DEV("PlainRtpTransport created [transportId:%" PRIu32 "]", transportId); auto data = plainRtpTransport->ToJson(); diff --git a/worker/src/RTC/RtpStream.cpp b/worker/src/RTC/RtpStream.cpp index 9704f26733..21c873b695 100644 --- a/worker/src/RTC/RtpStream.cpp +++ b/worker/src/RTC/RtpStream.cpp @@ -249,7 +249,6 @@ namespace RTC static const Json::StaticString JsonStringClockRate{ "clockRate" }; static const Json::StaticString JsonStringUseNack{ "useNack" }; static const Json::StaticString JsonStringUsePli{ "usePli" }; - static const Json::StaticString JsonStringSendOldNack{ "sendOldNack" }; Json::Value json(Json::objectValue); @@ -259,7 +258,6 @@ namespace RTC json[JsonStringClockRate] = Json::UInt{ this->clockRate }; json[JsonStringUseNack] = this->useNack; json[JsonStringUsePli] = this->usePli; - json[JsonStringSendOldNack] = this->sendOldNack; return json; } From 6dc0cac40d190d01e4a9d4491ea3cb4649e1039c Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 24 Jun 2019 15:14:33 -0700 Subject: [PATCH 72/82] check streams --- package.json | 2 +- worker/include/RTC/RtpStream.hpp | 1 + worker/src/RTC/Producer.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a1891630fd..1bccc92bd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv18", + "version": "2.6.8-lv19", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/include/RTC/RtpStream.hpp b/worker/include/RTC/RtpStream.hpp index 80f401bc01..b8f873c783 100644 --- a/worker/include/RTC/RtpStream.hpp +++ b/worker/include/RTC/RtpStream.hpp @@ -44,6 +44,7 @@ namespace RTC const std::string& GetId() const; void RestartStatusCheckTimer(); void StopStatusCheckTimer(); + bool SendOldNack() const {return params.sendOldNack;} protected: bool UpdateSeq(RTC::RtpPacket* packet); diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index b65e4f8e15..df1ca7bea1 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -270,8 +270,6 @@ namespace RTC if (info.rtxSsrc != 0u && info.rtxSsrc == ssrc) { - // H@@CK: TODO: rtpStream is now smart enough to make sense out of NackGenerator return value depending on whether its sendOldNack value set or not. - // Now I need to find out how to set up a consumer correctly so that it can set up its rtpStream's parameters right rtpStream = info.rtpStream; profile = info.profile; @@ -281,6 +279,8 @@ namespace RTC packet = clonedPacket.get(); // Process the packet. + MS_DEBUG_2TAGS(rtcp, rtx, "calling ReceiveRtxPacket() for rtpStream.params.sendOldNack=%s, Producer kind=%s", rtpStream->SendOldNack() ? "true" : "false", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); + if (!rtpStream->ReceiveRtxPacket(packet)) return; From 420ac18999979225ec11f4e32e2e320fa6620c2d Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Mon, 24 Jun 2019 17:00:47 -0700 Subject: [PATCH 73/82] almost done --- lib/Room.js | 2 +- package.json | 2 +- worker/src/RTC/Consumer.cpp | 4 ++-- worker/src/RTC/Producer.cpp | 15 ++++++++------- worker/src/RTC/RtpStreamRecv.cpp | 3 --- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index 86f25079b8..2aa57e3299 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -240,7 +240,7 @@ class Room extends EnhancedEventEmitter createRtpStreamer(producer, options) { - logger.debug('createRtpStreamer() sendOldNack: %s', options.sendOldNack ? 'true' : 'false'); + logger.debug('"createRtpStreamer()" sendOldNack is %s producer.kind is %s', options.sendOldNack, producer.kind); if (!this._producers.has(producer.id)) return Promise.reject(new Error('Producer not found')); diff --git a/package.json b/package.json index 1bccc92bd9..a6f0fbb860 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv19", + "version": "2.6.8-lv7-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/Consumer.cpp b/worker/src/RTC/Consumer.cpp index b2daa7901b..906a036f21 100644 --- a/worker/src/RTC/Consumer.cpp +++ b/worker/src/RTC/Consumer.cpp @@ -786,7 +786,7 @@ namespace RTC } if (!sendOldNack && fb.type == "ffmpeg-proxy") { - MS_DEBUG_TAG(rtcp, "Ffmpeg proxy - sendOldNack"); + MS_DEBUG_TAG(rtcp, "Ffmpeg proxy uses sendOldNack"); sendOldNack = true; } @@ -801,7 +801,7 @@ namespace RTC params.clockRate = codec.clockRate; params.useNack = useNack; params.usePli = usePli; - params.sendOldNack = sendOldNack; // TODO: don't care for RtpStreamSend + params.sendOldNack = sendOldNack; // Create a RtpStreamSend for sending a single media stream. size_t bufferSize = params.useNack ? 600 : 0; diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index df1ca7bea1..397f2f5fbd 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -2,7 +2,6 @@ // #define MS_LOG_DEV #include "RTC/Producer.hpp" -#include "RTC/PlainRtpTransport.hpp" #include "Logger.hpp" #include "MediaSoupError.hpp" #include "RTC/RTCP/FeedbackPsPli.hpp" @@ -279,8 +278,6 @@ namespace RTC packet = clonedPacket.get(); // Process the packet. - MS_DEBUG_2TAGS(rtcp, rtx, "calling ReceiveRtxPacket() for rtpStream.params.sendOldNack=%s, Producer kind=%s", rtpStream->SendOldNack() ? "true" : "false", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); - if (!rtpStream->ReceiveRtxPacket(packet)) return; @@ -466,7 +463,6 @@ namespace RTC { if (encoding.ssrc == ssrc) { - MS_DEBUG_2TAGS(rtcp, rtx, "MayNeedNewStream() will call CreateRtpStream() for found ssrc, kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); CreateRtpStream(encoding, ssrc); return; @@ -516,8 +512,6 @@ namespace RTC } } - MS_DEBUG_2TAGS(rtcp, rtx, "MayNeedNewStream() will call CreateRtpStream() for matching encodingId, kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); - CreateRtpStream(encoding, ssrc); return; @@ -543,7 +537,7 @@ namespace RTC { if (!useNack && fb.type == "nack") { - MS_DEBUG_2TAGS(rtcp, rtx, "NACK supported kind=%s", (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio" ); + MS_DEBUG_2TAGS(rtcp, rtx, "NACK supported"); useNack = true; } @@ -580,6 +574,13 @@ namespace RTC params.usePli = usePli; params.sendOldNack = sendOldNack; + if (params.sendOldNack) { + MS_DEBUG_2TAGS(rtcp, rtx, "Producer of %s creating new RtpStreamRecv: useNack=%s, sendOldNack=%s", + (this->kind == RTC::Media::Kind::VIDEO)? "video" : "audio", + params.useNack ? "true" : "false", + params.sendOldNack ? "true" : "false" ); + } + // Create a RtpStreamRecv for receiving a media stream. auto* rtpStream = new RTC::RtpStreamRecv(this, params); diff --git a/worker/src/RTC/RtpStreamRecv.cpp b/worker/src/RTC/RtpStreamRecv.cpp index 517d42abd3..c90233077d 100644 --- a/worker/src/RTC/RtpStreamRecv.cpp +++ b/worker/src/RTC/RtpStreamRecv.cpp @@ -19,9 +19,6 @@ namespace RTC { MS_TRACE(); - MS_DEBUG_TAG( - rtx, - "RtpStreamRecv ctor useNack=%s params.sendOldNack=%s this->params.sendOldNack=%s", (this->params.useNack ? "true" : "false"), (params.sendOldNack ? "true" : "false"), (this->params.sendOldNack ? "true" : "false")); if (this->params.useNack) this->nackGenerator.reset(new RTC::NackGenerator(this)); From ba91415690ec4bff2d4f58f839540b4c040dd995 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Tue, 25 Jun 2019 08:00:27 -0700 Subject: [PATCH 74/82] make ffmpeg-proxy capability an option --- lib/supportedRtpCapabilities.js | 15 ++++++++++----- package.json | 2 +- worker/src/RTC/Consumer.cpp | 2 +- worker/src/RTC/Producer.cpp | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/supportedRtpCapabilities.js b/lib/supportedRtpCapabilities.js index b2b1600f8b..e58dbd3107 100644 --- a/lib/supportedRtpCapabilities.js +++ b/lib/supportedRtpCapabilities.js @@ -155,7 +155,8 @@ const supportedRtpCapabilities = { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' }, - { type: 'ffmpeg-proxy' } + { type: 'ffmpeg-proxy' }, + { type: 'ffmpeg-proxy', parameter: 'yes' } ] }, { @@ -169,7 +170,8 @@ const supportedRtpCapabilities = { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' }, - { type: 'ffmpeg-proxy' } + { type: 'ffmpeg-proxy' }, + { type: 'ffmpeg-proxy', parameter: 'yes' } ] }, { @@ -187,7 +189,8 @@ const supportedRtpCapabilities = { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' }, - { type: 'ffmpeg-proxy' } + { type: 'ffmpeg-proxy' }, + { type: 'ffmpeg-proxy', parameter: 'yes' } ] }, { @@ -205,7 +208,8 @@ const supportedRtpCapabilities = { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' }, - { type: 'ffmpeg-proxy' } + { type: 'ffmpeg-proxy' }, + { type: 'ffmpeg-proxy', parameter: 'yes' } ] }, { @@ -219,7 +223,8 @@ const supportedRtpCapabilities = { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' }, - { type: 'ffmpeg-proxy' } + { type: 'ffmpeg-proxy' }, + { type: 'ffmpeg-proxy', parameter: 'yes' } ] } ], diff --git a/package.json b/package.json index a6f0fbb860..7e2022257f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv7-v3port", + "version": "2.6.8-lv8-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/Consumer.cpp b/worker/src/RTC/Consumer.cpp index 906a036f21..e2021555a3 100644 --- a/worker/src/RTC/Consumer.cpp +++ b/worker/src/RTC/Consumer.cpp @@ -784,7 +784,7 @@ namespace RTC usePli = true; } - if (!sendOldNack && fb.type == "ffmpeg-proxy") + if (!sendOldNack && fb.type == "ffmpeg-proxy" && fb.parameter == "yes") { MS_DEBUG_TAG(rtcp, "Ffmpeg proxy uses sendOldNack"); diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 397f2f5fbd..45b0f8e79c 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -555,7 +555,7 @@ namespace RTC useRemb = true; } - if (!sendOldNack && fb.type == "ffmpeg-proxy") + if (!sendOldNack && fb.type == "ffmpeg-proxy" && fb.parameter == "yes") { MS_DEBUG_2TAGS(rtcp, rtx, "Ffmpeg proxy uses sendOldNack"); From 715ce0b33b731c79dba7b6b07e55a53492418d51 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 26 Jun 2019 16:23:10 -0700 Subject: [PATCH 75/82] optionally remove ffmpeg-proxy from consumer rtp capabilities --- lib/Consumer.js | 2 +- lib/Room.js | 13 ++++++++++++- package.json | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index c4b6796183..575e8616c8 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -13,7 +13,7 @@ class Consumer extends EnhancedEventEmitter { super(logger); - logger.debug('constructor()'); + logger.debug('constructor() data=%s', JSON.stringify(data)); // Closed flag. this._closed = false; diff --git a/lib/Room.js b/lib/Room.js index 2aa57e3299..b845d399cb 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -270,10 +270,21 @@ class Room extends EnhancedEventEmitter }; // TODO: The app should provide his own RTP capabilities. - const consumerRtpParameters = + let consumerRtpParameters = ortc.getConsumerRtpParameters( producer.consumableRtpParameters, this.rtpCapabilities); + // Remove ffmpeg-proxy from capabilities unless sendOldNack is set + // remove from each rtpParameters.codecs ffmpeg-proxy mentioning - unless sendOldNack is true + if (!options.sendOldNack) + { + consumerRtpParameters.forEach((codec) => { + codec.rtcpFeedback = codec.rtcpFeedback.filter(function(value, index, arr) { + return value.type !== 'ffmpeg-proxy'; + }); + }); + } + const data = { kind : producer.kind, diff --git a/package.json b/package.json index 7e2022257f..ad2970f716 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv8-v3port", + "version": "2.6.8-lv9-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 8f14a5e20a940f8c48d5e046ed4e345f4fedb019 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 26 Jun 2019 17:05:39 -0700 Subject: [PATCH 76/82] same --- lib/Room.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Room.js b/lib/Room.js index b845d399cb..13c639996c 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -278,7 +278,7 @@ class Room extends EnhancedEventEmitter // remove from each rtpParameters.codecs ffmpeg-proxy mentioning - unless sendOldNack is true if (!options.sendOldNack) { - consumerRtpParameters.forEach((codec) => { + consumerRtpParameters.codecs.forEach((codec) => { codec.rtcpFeedback = codec.rtcpFeedback.filter(function(value, index, arr) { return value.type !== 'ffmpeg-proxy'; }); From c45a2566878c63ce18ffaa8a9dadf960c1f6645a Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 27 Jun 2019 08:13:10 -0700 Subject: [PATCH 77/82] version --- lib/Consumer.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Consumer.js b/lib/Consumer.js index 575e8616c8..c4b6796183 100644 --- a/lib/Consumer.js +++ b/lib/Consumer.js @@ -13,7 +13,7 @@ class Consumer extends EnhancedEventEmitter { super(logger); - logger.debug('constructor() data=%s', JSON.stringify(data)); + logger.debug('constructor()'); // Closed flag. this._closed = false; diff --git a/package.json b/package.json index ad2970f716..59346347fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv9-v3port", + "version": "2.6.8-lv11-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 1bc4f1f0ea5401cd3f250663396330e75a0850fc Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 27 Jun 2019 13:41:26 -0700 Subject: [PATCH 78/82] bugs --- lib/Room.js | 15 ++++++++++----- package.json | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index 13c639996c..7dd61cd583 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -275,15 +275,20 @@ class Room extends EnhancedEventEmitter producer.consumableRtpParameters, this.rtpCapabilities); // Remove ffmpeg-proxy from capabilities unless sendOldNack is set - // remove from each rtpParameters.codecs ffmpeg-proxy mentioning - unless sendOldNack is true - if (!options.sendOldNack) + if (options.sendOldNack !== true) { consumerRtpParameters.codecs.forEach((codec) => { - codec.rtcpFeedback = codec.rtcpFeedback.filter(function(value, index, arr) { - return value.type !== 'ffmpeg-proxy'; - }); + let dbgfeed = codec.rtcpFeedback.filter((val) => val.type === 'ffmpeg-proxy'); // TODO: remove before checkin + logger.debug('"createRtpStreamer()" has ffmpeg-proxy rtcp-fb: %s', dbgfeed); + + let rtcpFeedback = codec.rtcpFeedback.filter((val) => val.type !== 'ffmpeg-proxy'); + codec.rtcpFeedback = rtcpFeedback; }); } + else + { + logger.debug('"createRtpStreamer()" no changes in ffmpeg-proxy rtcp-fb '); // TODO: remove before checkin + } const data = { diff --git a/package.json b/package.json index 59346347fd..16a6f120a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv11-v3port", + "version": "2.6.8-lv12-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 0171a22c013166b434e1043c0fe801cfe21392a1 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 27 Jun 2019 15:00:54 -0700 Subject: [PATCH 79/82] fix --- lib/Room.js | 12 ++++++++---- package.json | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index 7dd61cd583..e96f8b28da 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -278,11 +278,15 @@ class Room extends EnhancedEventEmitter if (options.sendOldNack !== true) { consumerRtpParameters.codecs.forEach((codec) => { - let dbgfeed = codec.rtcpFeedback.filter((val) => val.type === 'ffmpeg-proxy'); // TODO: remove before checkin - logger.debug('"createRtpStreamer()" has ffmpeg-proxy rtcp-fb: %s', dbgfeed); + if (codec.rtcpFeedback !== undefined && Array.isArray(codec.rtcpFeedback)) + { + let dbgfeed = codec.rtcpFeedback.filter((val) => val.type === 'ffmpeg-proxy'); // TODO: remove before checkin + if (dbgfeed.length > 0) + logger.debug('"createRtpStreamer()" has ffmpeg-proxy rtcp-fb: %s', dbgfeed); - let rtcpFeedback = codec.rtcpFeedback.filter((val) => val.type !== 'ffmpeg-proxy'); - codec.rtcpFeedback = rtcpFeedback; + let rtcpFeedback = codec.rtcpFeedback.filter((val) => val.type !== 'ffmpeg-proxy'); + codec.rtcpFeedback = rtcpFeedback; + } }); } else diff --git a/package.json b/package.json index 16a6f120a0..d3e41ec76c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv12-v3port", + "version": "2.6.8-lv13-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ From 5bc1fdff56d4e12ebe1090e497dbc7dd419c2938 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 27 Jun 2019 15:51:38 -0700 Subject: [PATCH 80/82] debug stuff, remove soon --- lib/Room.js | 2 ++ package.json | 2 +- worker/src/RTC/RtpStreamRecv.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index e96f8b28da..ab1ee003cb 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -285,6 +285,8 @@ class Room extends EnhancedEventEmitter logger.debug('"createRtpStreamer()" has ffmpeg-proxy rtcp-fb: %s', dbgfeed); let rtcpFeedback = codec.rtcpFeedback.filter((val) => val.type !== 'ffmpeg-proxy'); + if (rtcpFeedback.length > 0) + logger.debug('"createRtpStreamer()" with removed ffmpeg-proxy rtcp-fb: %s', rtcpFeedback); codec.rtcpFeedback = rtcpFeedback; } }); diff --git a/package.json b/package.json index d3e41ec76c..3648077c76 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv13-v3port", + "version": "2.6.8-lv14-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/RtpStreamRecv.cpp b/worker/src/RTC/RtpStreamRecv.cpp index c90233077d..be822ddc4a 100644 --- a/worker/src/RTC/RtpStreamRecv.cpp +++ b/worker/src/RTC/RtpStreamRecv.cpp @@ -144,7 +144,7 @@ namespace RTC case RTC::NackGenerator::NACKedPacket::TOO_OLD: MS_DEBUG_TAG( rtx, - "RtpStreamRecv::ReceiveRtxPacket this->params.sendOldNack=%s", (this->params.useNack ? "true" : "false")); + "RtpStreamRecv::ReceiveRtxPacket this->params.sendOldNack=%s", (this->params.sendOldNack ? "true" : "false")); return this->params.sendOldNack; } } From eb3541b058818f22770cdbf685a6b8003ecdbd11 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Thu, 27 Jun 2019 16:45:55 -0700 Subject: [PATCH 81/82] final --- lib/Room.js | 12 +----------- package.json | 2 +- worker/src/RTC/Producer.cpp | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/Room.js b/lib/Room.js index ab1ee003cb..18b8429fc3 100644 --- a/lib/Room.js +++ b/lib/Room.js @@ -274,27 +274,17 @@ class Room extends EnhancedEventEmitter ortc.getConsumerRtpParameters( producer.consumableRtpParameters, this.rtpCapabilities); - // Remove ffmpeg-proxy from capabilities unless sendOldNack is set + // Remove ffmpeg-proxy from capabilities if sendOldNack is not present if (options.sendOldNack !== true) { consumerRtpParameters.codecs.forEach((codec) => { if (codec.rtcpFeedback !== undefined && Array.isArray(codec.rtcpFeedback)) { - let dbgfeed = codec.rtcpFeedback.filter((val) => val.type === 'ffmpeg-proxy'); // TODO: remove before checkin - if (dbgfeed.length > 0) - logger.debug('"createRtpStreamer()" has ffmpeg-proxy rtcp-fb: %s', dbgfeed); - let rtcpFeedback = codec.rtcpFeedback.filter((val) => val.type !== 'ffmpeg-proxy'); - if (rtcpFeedback.length > 0) - logger.debug('"createRtpStreamer()" with removed ffmpeg-proxy rtcp-fb: %s', rtcpFeedback); codec.rtcpFeedback = rtcpFeedback; } }); } - else - { - logger.debug('"createRtpStreamer()" no changes in ffmpeg-proxy rtcp-fb '); // TODO: remove before checkin - } const data = { diff --git a/package.json b/package.json index 3648077c76..2c907c3dcf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv14-v3port", + "version": "2.6.8-lv15-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [ diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp index 45b0f8e79c..e1c0e72de5 100644 --- a/worker/src/RTC/Producer.cpp +++ b/worker/src/RTC/Producer.cpp @@ -541,7 +541,6 @@ namespace RTC useNack = true; } - if (!usePli && fb.type == "nack" && fb.parameter == "pli") { MS_DEBUG_TAG(rtcp, "PLI supported"); @@ -554,7 +553,6 @@ namespace RTC useRemb = true; } - if (!sendOldNack && fb.type == "ffmpeg-proxy" && fb.parameter == "yes") { MS_DEBUG_2TAGS(rtcp, rtx, "Ffmpeg proxy uses sendOldNack"); From 3b6f174a1b084ad531a5cd97cbe5bc1b928ceaf6 Mon Sep 17 00:00:00 2001 From: Maria Tverdostup Date: Wed, 10 Jul 2019 14:47:29 -0700 Subject: [PATCH 82/82] cleanup ffmpeg property for other consumers --- lib/Peer.js | 10 +++++++++- package.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/Peer.js b/lib/Peer.js index 9b3cc3d3fd..5b9d14a0dc 100644 --- a/lib/Peer.js +++ b/lib/Peer.js @@ -753,10 +753,18 @@ class Peer extends EnhancedEventEmitter transportId : undefined }; - const consumerRtpParameters = + let consumerRtpParameters = ortc.getConsumerRtpParameters( producer.consumableRtpParameters, this.rtpCapabilities); + consumerRtpParameters.codecs.forEach((codec) => { + if (codec.rtcpFeedback !== undefined && Array.isArray(codec.rtcpFeedback)) + { + let rtcpFeedback = codec.rtcpFeedback.filter((val) => val.type !== 'ffmpeg-proxy'); + codec.rtcpFeedback = rtcpFeedback; + } + }); + const data = { kind : producer.kind, diff --git a/package.json b/package.json index 2c907c3dcf..f366f47989 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@livelyvideo/mediasoup", - "version": "2.6.8-lv15-v3port", + "version": "2.6.8-lv16-v3port", "description": "Cutting Edge WebRTC Video Conferencing", "author": "Iñaki Baz Castillo (https://inakibaz.me)", "contributors": [