Implementing multipart/msigned

Author: c-geek

index.js

@@ -26,8 +26,7 @@ module.exports = function sign(signFunction) {
       , end = res.end
       , stream
       , method
-      , doSign = req.headers['accept'] == 'multipart/signed'
-      , boundary = 'foo';
+      , doSign = req.headers['accept'] == 'multipart/msigned';
 
     // see compress.js #724
     req.on('close', function(){
@@ -71,10 +70,8 @@ module.exports = function sign(signFunction) {
       stream = new SigningStream(signFunction, boundary);
 
       // header fields
-      var contentType = 'multipart/signed;';
+      var contentType = 'multipart/msigned;';
       contentType += ' boundary='+boundary+';';
-      //contentType += ' micalg=pgp-sha1;';
-      contentType += ' protocol="application/pgp-signature"';
       res.setHeader('Content-Type', contentType);
       res.removeHeader('Content-Length');
 

signingstream.js

@@ -23,20 +23,17 @@ SigningStream.prototype.end = function(data) {
 SigningStream.prototype.sign = function(callback) {
   var that = this;
   process.nextTick(function () {
-    var body = that.buffer.replace(/\r\n/g, '\n').replace(/\n/g, '\r\n');
-    var text = body;
-    // var start = Date.now();
-    that.doSign(body, function (err, ciphertext) {
-      // var end = Date.now();
-      // console.log("Duration: %sms", (end-start));
+    var text = that.buffer.replace(/\r\n/g, '\n').replace(/\n/g, '\r\n');
+    that.doSign(text, function (err, signature) {
       var body = '';
       body += '--' + that.boundary + '\n';
-      body += text + '\n\n';
+      body += 'Content-Type: octet-stream\r\n\r\n';
+      body += text + '\r\n';
       if(!err){
-        ciphertext = ciphertext.substring(ciphertext.lastIndexOf('-----BEGIN PGP SIGNATURE-----'));
+        signature = signature.substring(signature.lastIndexOf('-----BEGIN PGP SIGNATURE-----'));
         body += '--' + that.boundary + '\n';
         body += 'Content-Type: application/pgp-signature\n\n';
-        body += ciphertext + '\n';
+        body += signature + '\n';
       }
       body += '--' + that.boundary + '--\n';
       callback(body);