Merge branch '1.0' into 2.0

* 1.0:
This commit is contained in:
Andreas Fischer 2015-11-10 10:05:06 +01:00
commit 466ad666b8

View File

@ -188,7 +188,7 @@ class RSA
/** /**
* PKCS#8 formatted private key * PKCS#8 formatted private key
*/ */
const PRIVATE_FORMAT_PKCS8 = 8; const PRIVATE_FORMAT_PKCS8 = 3;
/**#@-*/ /**#@-*/
/**#@+ /**#@+