Merge pull request #1055 from agl/9518-agl-rsakeyloading

Author: agl Reviewer: glyph, alex Fixes: ticket:9518 Don't corrupt RSA private keys during loading.
twisted · Sep 3, 2018 · 2a18aba · 2a18aba
2 parents 1928146 + 8e6d503
commit 2a18aba
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 47 deletions.
diff --git a/src/twisted/conch/newsfragments/9518.bugfix b/src/twisted/conch/newsfragments/9518.bugfix
@@ -0,0 +1 @@
+RSA private keys are no longer corrupted during loading, allowing OpenSSL's fast-path to operate for RSA signing.
diff --git a/src/twisted/conch/ssh/keys.py b/src/twisted/conch/ssh/keys.py
@@ -416,8 +416,6 @@ def _fromString_PRIVATE_OPENSSH(cls, data, passphrase):
             n, e, d, p, q, dmp1, dmq1, iqmp = [
                 long(value) for value in decodedKey[1:9]
                 ]
-            if p > q:  # Make p smaller than q
-                p, q = q, p
             return cls(
                 rsa.RSAPrivateNumbers(
                     p=p,
@@ -1110,8 +1108,8 @@ def _toString_OPENSSH(self, extra):
                                b' PRIVATE KEY-----'))]
             if self.type() == 'RSA':
                 p, q = data['p'], data['q']
-                objData = (0, data['n'], data['e'], data['d'], q, p,
-                           data['d'] % (q - 1), data['d'] % (p - 1),
+                objData = (0, data['n'], data['e'], data['d'], p, q,
+                           data['d'] % (p - 1), data['d'] % (q - 1),
                            data['u'])
             else:
                 objData = (0, data['p'], data['q'], data['g'], data['y'],

diff --git a/src/twisted/conch/test/keydata.py b/src/twisted/conch/test/keydata.py
@@ -34,16 +34,16 @@
               '477930426013703886193016416453215950072147440344656137718959053'
               '897268663969428680144841987624962928576808352739627262941675617'
               '7724661940425316604626522633351193810751757014073'),
-    'q': long('176444974592327996338888725079951900172097062203378367409936859'
-              '072670162290963119826394224277287608693818012745872307600855894'
-              '647300295516866118620024751601329775653542084052616260193174546'
-              '400544176890518564317596334518015173606460860373958663673307503'
-              '231977779632583864454001476729233959405710696795574874403'),
     'p': long('152689878451107675391723141129365667732639179427453246378763774'
               '448531436802867910180261906924087589684175595016060014593521649'
               '964959248408388984465569934780790357826811592229318702991401054'
               '226302790395714901636384511513449977061729214247279176398290513'
               '085108930550446985490864812445551198848562639933888780317'),
+    'q': long('176444974592327996338888725079951900172097062203378367409936859'
+              '072670162290963119826394224277287608693818012745872307600855894'
+              '647300295516866118620024751601329775653542084052616260193174546'
+              '400544176890518564317596334518015173606460860373958663673307503'
+              '231977779632583864454001476729233959405710696795574874403'),
     'u': long('936018002388095842969518498561007090965136403384715613439364803'
               '229386793506402222847415019772053080458257034241832795210460612'
               '924445085372678524176842007912276654532773301546269997020970818'
@@ -160,23 +160,26 @@
 u2geG+bdu3NjuWfmsid/z88wm8KY/dkYNi82LvE9gXqf4QMtR9s0UWI53U/prKiL
 2dbzhMQXuXGdBghCeE27xSr0w1jNVSvtvjNfBOp75gQkY/It1z0bbNWcY0MvkoiN
 Pm7aGDfYDyVniR25RjReyc7Ei+2SWjMHD9+GCPmS6dvrOAg2yc3NCgFIWzk+esrG
-gKnc1DkCgYEA+0QXi6Q2vh43Haf2YWwExKrdeD4HjB4zAq4DFIeDeuWefQhnqPKq
-vxJwz3Kpp8cLHYjVIP2cY8pHMFVOi8TP9H8WpJISdKEJwsRunIwz76Xl9+ArrU9c
-EaoahDdb/Xrqw818sMjkH1Rjtcev3/QJp/zHJfxc6ZHXksWYHlbTsSMCgYEA2XAG
-2OK81HiRUJTUwRuJOGxGZFpRoJoHPUiPA1HMaxKOfRqxZedxdTngMgV1jRhMr5Ox
-SbFmX3hietEMyuZNQ7Oc9Gt95gyY3M8hYo7VLhLeBK7XJG6DMaIVokQ9IqliJiK5
-su1UCp0Ig6cHDf8ZGI7Yqx3aSJwxaBGhZm3j2B0CgYBpZjfGQN0hxQTzsLg+R5R8
-dvwt6z85PJXDQwFRxEKX8+gWpMbu7NRJEFA4BO47zdfQzMwyaZAHoBtan/4xzR46
-fnEeGZQaTk8M319S1dEXbuzXnLZVnduOIV+8JIi2/K+r8O+kLLDcn4awAxK4i+Ld
-D8DuIz1KUP4vuClGWL+2JwKBgFGv6ZKflAtKhGU+lLM7khC1dLiMye/JDgEy+i9o
-EqEDJq7PUWgUTCabKKQCMwhf4adwmAE0eV5SjsTPNrwfS1Ws68FThMfhYahK1KL/
-QA2AHxKpUMAqGHWUDAabFlCoS+xBzXvv90vJdQJoxJi4hogYWkPnAjOXImSTgwxF
-KnztAoGBAIVLG3qbEhA3nh+tXtr+xpb+3zVruTTiFpeSJgm9vXAgA6c1vS0boNIH
+gKnc1DkCgYEA2XAG2OK81HiRUJTUwRuJOGxGZFpRoJoHPUiPA1HMaxKOfRqxZedx
+dTngMgV1jRhMr5OxSbFmX3hietEMyuZNQ7Oc9Gt95gyY3M8hYo7VLhLeBK7XJG6D
+MaIVokQ9IqliJiK5su1UCp0Ig6cHDf8ZGI7Yqx3aSJwxaBGhZm3j2B0CgYEA+0QX
+i6Q2vh43Haf2YWwExKrdeD4HjB4zAq4DFIeDeuWefQhnqPKqvxJwz3Kpp8cLHYjV
+IP2cY8pHMFVOi8TP9H8WpJISdKEJwsRunIwz76Xl9+ArrU9cEaoahDdb/Xrqw818
+sMjkH1Rjtcev3/QJp/zHJfxc6ZHXksWYHlbTsSMCgYBRr+mSn5QLSoRlPpSzO5IQ
+tXS4jMnvyQ4BMvovaBKhAyauz1FoFEwmmyikAjMIX+GncJgBNHleUo7Ezza8H0tV
+rOvBU4TH4WGoStSi/0ANgB8SqVDAKhh1lAwGmxZQqEvsQc177/dLyXUCaMSYuIaI
+GFpD5wIzlyJkk4MMRSp87QKBgGlmN8ZA3SHFBPOwuD5HlHx2/C3rPzk8lcNDAVHE
+Qpfz6Bakxu7s1EkQUDgE7jvN19DMzDJpkAegG1qf/jHNHjp+cR4ZlBpOTwzfX1LV
+0Rdu7NectlWd244hX7wkiLb8r6vw76QssNyfhrADEriL4t0PwO4jPUpQ/i+4KUZY
+v7YnAoGBAIVLG3qbEhA3nh+tXtr+xpb+3zVruTTiFpeSJgm9vXAgA6c1vS0boNIH
 RyvU3qioBwcbuAQgpydBPGw5OelBzucXHdFMXLw90iYm/mrW/Uhyrkb6e8PTGWBE
 HaUTp4D1YynUel0GBxZd9os9y2Q64oRaTYwGLS2dHOuDTHg9eVTO
 -----END RSA PRIVATE KEY-----'''
 
-# Some versions of OpenSSH generate these (slightly different keys)
+# Some versions of OpenSSH generate these (slightly different keys): the PKCS#1
+# structure is wrapped in an extra ASN.1 SEQUENCE and there's an empty SEQUENCE
+# following it. It is not any standard key format and was probably a bug in
+# OpenSSH at some point.
 privateRSA_openssh_alternate = b"""-----BEGIN RSA PRIVATE KEY-----
 MIIEqTCCBKMCAQACggEBANVqrHgj1tYb7CWhUMR3Y1CERQFVQhQqKuDQYO7U6aOtSvo5Bl6EVXVf
 ADa/b6oqP4MmN8FpLlv98PPSfdaYzTpAeNXKqBjAEZMkCQyBTI/3nO0TFmqkBOlJd8PkVWSzeWie
@@ -187,19 +190,19 @@
 +LMkYIS5zmmVmvni/B9RTScV2ysnre+0aay+fRDrhkdwc7QAh5UVOzf55xTngLtoHhvm3btzY7ln
 5rInf8/PMJvCmP3ZGDYvNi7xPYF6n+EDLUfbNFFiOd1P6ayoi9nW84TEF7lxnQYIQnhNu8Uq9MNY
 zVUr7b4zXwTqe+YEJGPyLdc9G2zVnGNDL5KIjT5u2hg32A8lZ4kduUY0XsnOxIvtklozBw/fhgj5
-kunb6zgINsnNzQoBSFs5PnrKxoCp3NQ5AoGBAPtEF4ukNr4eNx2n9mFsBMSq3Xg+B4weMwKuAxSH
-g3rlnn0IZ6jyqr8ScM9yqafHCx2I1SD9nGPKRzBVTovEz/R/FqSSEnShCcLEbpyMM++l5ffgK61P
-XBGqGoQ3W/166sPNfLDI5B9UY7XHr9/0Caf8xyX8XOmR15LFmB5W07EjAoGBANlwBtjivNR4kVCU
-1MEbiThsRmRaUaCaBz1IjwNRzGsSjn0asWXncXU54DIFdY0YTK+TsUmxZl94YnrRDMrmTUOznPRr
-feYMmNzPIWKO1S4S3gSu1yRugzGiFaJEPSKpYiYiubLtVAqdCIOnBw3/GRiO2Ksd2kicMWgRoWZt
-49gdAoGAaWY3xkDdIcUE87C4PkeUfHb8Les/OTyVw0MBUcRCl/PoFqTG7uzUSRBQOATuO83X0MzM
-MmmQB6AbWp/+Mc0eOn5xHhmUGk5PDN9fUtXRF27s15y2VZ3bjiFfvCSItvyvq/DvpCyw3J+GsAMS
-uIvi3Q/A7iM9SlD+L7gpRli/ticCgYBRr+mSn5QLSoRlPpSzO5IQtXS4jMnvyQ4BMvovaBKhAyau
-z1FoFEwmmyikAjMIX+GncJgBNHleUo7Ezza8H0tVrOvBU4TH4WGoStSi/0ANgB8SqVDAKhh1lAwG
-mxZQqEvsQc177/dLyXUCaMSYuIaIGFpD5wIzlyJkk4MMRSp87QKBgQCFSxt6mxIQN54frV7a/saW
+kunb6zgINsnNzQoBSFs5PnrKxoCp3NQ5AoGBANlwBtjivNR4kVCU1MEbiThsRmRaUaCaBz1IjwNR
+zGsSjn0asWXncXU54DIFdY0YTK+TsUmxZl94YnrRDMrmTUOznPRrfeYMmNzPIWKO1S4S3gSu1yRu
+gzGiFaJEPSKpYiYiubLtVAqdCIOnBw3/GRiO2Ksd2kicMWgRoWZt49gdAoGBAPtEF4ukNr4eNx2n
+9mFsBMSq3Xg+B4weMwKuAxSHg3rlnn0IZ6jyqr8ScM9yqafHCx2I1SD9nGPKRzBVTovEz/R/FqSS
+EnShCcLEbpyMM++l5ffgK61PXBGqGoQ3W/166sPNfLDI5B9UY7XHr9/0Caf8xyX8XOmR15LFmB5W
+07EjAoGAUa/pkp+UC0qEZT6UszuSELV0uIzJ78kOATL6L2gSoQMmrs9RaBRMJpsopAIzCF/hp3CY
+ATR5XlKOxM82vB9LVazrwVOEx+FhqErUov9ADYAfEqlQwCoYdZQMBpsWUKhL7EHNe+/3S8l1AmjE
+mLiGiBhaQ+cCM5ciZJODDEUqfO0CgYBpZjfGQN0hxQTzsLg+R5R8dvwt6z85PJXDQwFRxEKX8+gW
+pMbu7NRJEFA4BO47zdfQzMwyaZAHoBtan/4xzR46fnEeGZQaTk8M319S1dEXbuzXnLZVnduOIV+8
+JIi2/K+r8O+kLLDcn4awAxK4i+LdD8DuIz1KUP4vuClGWL+2JwKBgQCFSxt6mxIQN54frV7a/saW
 /t81a7k04haXkiYJvb1wIAOnNb0tG6DSB0cr1N6oqAcHG7gEIKcnQTxsOTnpQc7nFx3RTFy8PdIm
 Jv5q1v1Icq5G+nvD0xlgRB2lE6eA9WMp1HpdBgcWXfaLPctkOuKEWk2MBi0tnRzrg0x4PXlUzjAA
-------END RSA PRIVATE KEY------"""
+-----END RSA PRIVATE KEY-----"""
 
 # Encrypted with the passphrase 'encrypted'
 privateRSA_openssh_encrypted = b"""-----BEGIN RSA PRIVATE KEY-----
@@ -217,20 +220,20 @@
 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
-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
+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
 -----END RSA PRIVATE KEY-----"""
 
 # Encrypted with the passphrase 'testxp'. NB: this key was generated by
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		RSA private keys are no longer corrupted during loading, allowing OpenSSL's fast-path to operate for RSA signing.