[Swan-commit] Changes to ref refs/heads/master

[Andrew Cagney]

New commits:
commit 63f6e72770e4bad2ae07ac79b1b71d1206140352
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Jun 19 11:28:00 2018 -0400

    cavp: dump remaining compatibility with strongswan's equivalent
    
    Since fixing derivedKeyingMaterialLength broke compatibilty and
    CAVP both directly accepts ACVP key/value pairs and emit json.
    
    For instance:
    
    $ cavp -json -v2 \
         \
         -hashAlg SHA-1 \
         -derivedKeyingMaterialLength 1056 \
         \
         -tcId 100 \
         -gir 4b2c1f971981a8ad8d0abeafabf38cf75fc8349c148142465ed9c8b516b8be52 \
         -girNew 863f3c9d06efd39d2b907b97f8699e5dd5251ef64a2a176f36ee40c87d4f9330 \
         -nInit 32b50d5f4a3763f3 \
         -nResp 9206a04b26564cb1 \
         -spiInit 34c9e7c188868785 \
         -spiResp 3ff77d760d2b2199
    
    outputs:
    
    {
      "tcId": 100,
      "sKeySeed": "a9a7b222b59f8f48645f28a1db5b5f5d7479cba7",
      "derivedKeyingMaterial": "a14293677cc80ff8f9cc0eee30d895da9d8f405666e30ef0dfcb63c634a46002a2a63080e514a062768b76606f9fa5e992204fc5a670bde3f10d6b027113936a5c55b648a194ae587b0088d52204b702c979fa280870d2ed41efa9c549fd11198af1670b143d384bd275c5f594cf266b05ebadca855e4249520a441a81157435a7a56cc4",
      "derivedKeyingMaterialChild": "8059e3ee8810e6c3a91bc8bcd2a7a41151b8d0e6ae239c7b38093ad85ef4c5811a8e7b5d1cdabd9560b2d5e092d1f24e2d4b85eccdf0ad0dc9abd94b51ee71814ca6dbc8bb51b6309f5b9545c7eb35cf5580b1e521a8fe20754a2d883ba0c2cf285f524aea6545b33106bc03e614296d319d41d4b50b3f510b1c0a22f3e664994d234cb4",
      "derivedKeyingMaterialDh": "bb43244c1860ad65ee1e211ffe8bb3661750c8f89cb9f547df7f4fa61d37301628190e38c66232eab4b3ab14c400a5197dd3730ed4820a8a10394d51e1c0400052f63ebd36b0e7ef53aaed31eba4a5080d7d4b5666023a8bbb5ffb7857240f9a05884d1b7d2f933708450b7b3288f1fc863ab49fa901227cffc06e27899c7054d56fd74c",
      "sKeySeedReKey": "63e81194946ebd05df7df5ebf5d8750056bf1f1d"
    }