0.6.2 release

[onak.git] / openpgp.h

diff --git a/openpgp.h b/openpgp.h
index 1d40533cc350cb6f53e6cb504f446002728701e5..768a6f251171fdd172dc35924f38cbd5df8d9ad9 100644 (file)
--- a/openpgp.h
+++ b/openpgp.h
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef __OPENPGP_H__
@@ -25,21 +24,34 @@
 #define OPENPGP_PKALGO_RSA_SIGN                3
 #define OPENPGP_PKALGO_ELGAMAL_ENC     16
 #define OPENPGP_PKALGO_DSA             17
+#define OPENPGP_PKALGO_EC              18
+#define OPENPGP_PKALGO_ECDSA           19
 #define OPENPGP_PKALGO_ELGAMAL_SIGN    20
+#define OPENPGP_PKALGO_DH              21
+#define OPENPGP_PKALGO_EDDSA           22
 
 #define OPENPGP_SYMALGO_PLAIN          0
 #define OPENPGP_SYMALGO_IDEA           1
 #define OPENPGP_SYMALGO_3DES           2
 #define OPENPGP_SYMALGO_CAST5          3
 #define OPENPGP_SYMALGO_BLOWFISH       4
+#define OPENPGP_SYMALGO_SAFER_SK128    5       /* In RFC2440, not in RFC4880 */
+#define OPENPGP_SYMALGO_DES_SK         6       /* In RFC2440, not in RFC4880 */
 #define OPENPGP_SYMALGO_AES128         7
 #define OPENPGP_SYMALGO_AES192         8
 #define OPENPGP_SYMALGO_AES256         9
 #define OPENPGP_SYMALGO_TWOFISH                10
+#define OPENPGP_SYMALGO_CAMELLIA128    11      /* From GnuPG */
+#define OPENPGP_SYMALGO_CAMELLIA192    12      /* From GnuPG */
+#define OPENPGP_SYMALGO_CAMELLIA256    13      /* From GnuPG */
 
 #define OPENPGP_HASH_MD5               1
 #define OPENPGP_HASH_SHA1              2
 #define OPENPGP_HASH_RIPEMD160         3
+#define OPENPGP_HASH_SHA1X             4       /* In RFC2440, not in RFC4880 */
+#define OPENPGP_HASH_MD2               5       /* In RFC2440, not in RFC4880 */
+#define OPENPGP_HASH_TIGER192          6       /* In RFC2440, not in RFC4880 */
+#define OPENPGP_HASH_HAVAL_5_160       7       /* In RFC2440, not in RFC4880 */
 #define OPENPGP_HASH_SHA256            8
 #define OPENPGP_HASH_SHA384            9
 #define OPENPGP_HASH_SHA512            10
@@ -80,15 +92,29 @@
 #define OPENPGP_SIGSUB_EXPORTABLE      4
 #define OPENPGP_SIGSUB_TRUSTSIG                5
 #define OPENPGP_SIGSUB_REGEX           6
+#define OPENPGP_SIGSUB_REVOCABLE       7
+#define OPENPGP_SIGSUB_CAPABILITIES    8       /* Legacy */
 #define OPENPGP_SIGSUB_KEYEXPIRY       9
+#define OPENPGP_SIGSUB_ARR             10      /* Placeholder in RFC */
 #define OPENPGP_SIGSUB_PREFSYM         11
+#define OPENPGP_SIGSUB_REVOCATION_KEY  12
 #define OPENPGP_SIGSUB_ISSUER          16
+#define OPENPGP_SIGSUB_ISSUER_UID      17      /* Legacy */
+#define OPENPGP_SIGSUB_URL             18      /* Legacy */
+#define OPENPGP_SIGSUB_X_ISSUER_FINGER 19      /* Legacy */
 #define OPENPGP_SIGSUB_NOTATION                20
 #define OPENPGP_SIGSUB_PREFHASH                21
 #define OPENPGP_SIGSUB_PREFCOMPRESS    22
 #define OPENPGP_SIGSUB_KEYSERVER       23
+#define OPENPGP_SIGSUB_PREFKEYSERVER   24
 #define OPENPGP_SIGSUB_PRIMARYUID      25
 #define OPENPGP_SIGSUB_POLICYURI       26
 #define OPENPGP_SIGSUB_KEYFLAGS                27
+#define OPENPGP_SIGSUB_SIGNER_UID      28
+#define OPENPGP_SIGSUB_REVOKE_REASON   29
+#define OPENPGP_SIGSUB_FEATURES                30
+#define OPENPGP_SIGSUB_SIGNATURE_TARGET        31
+#define OPENPGP_SIGSUB_EMBEDDED_SIG    32
+#define OPENPGP_SIGSUB_ISSUER_FINGER   33
 
 #endif /* __OPENPGP_H__ */