diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2022-04-05 11:39:09 +0300 |
|---|---|---|
| committer | Michal Domonkos <mdomonko@redhat.com> | 2022-07-01 10:52:14 +0200 |
| commit | 6745f12859368541e521ebeaf91544b34d0bf3a6 (patch) | |
| tree | 5c5d4789181d0e862a62a1b45446774e0ff5de49 | |
| parent | 81c17fa4699f7fe6b480c4b5d71f784a50c8565b (diff) | |
| download | rpm-6745f12859368541e521ebeaf91544b34d0bf3a6.tar.gz | |
Mark deprecated PGP/keyring APIs as such
Add RPM_GNUC_DEPRECATED markers where we can, unfortunately these APIs
are used to implement each others so adding more would cause unwanted
warnings to build of rpm itself.
(cherry picked from commit 4af06be2a496939f293bfdae6b0ca558ac6d1a33)
| -rw-r--r-- | rpmio/rpmkeyring.h | 6 | ||||
| -rw-r--r-- | rpmio/rpmpgp.h | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/rpmio/rpmkeyring.h b/rpmio/rpmkeyring.h index 8aeed8c6c..6019ef66f 100644 --- a/rpmio/rpmkeyring.h +++ b/rpmio/rpmkeyring.h @@ -36,10 +36,13 @@ int rpmKeyringAddKey(rpmKeyring keyring, rpmPubkey key); /** \ingroup rpmkeyring * Perform keyring lookup for a key matching a signature + * @deprecated Obsolete, do not use. + * * @param keyring keyring handle * @param sig OpenPGP packet container of signature * @return RPMRC_OK if found, RPMRC_NOKEY otherwise */ +RPM_GNUC_DEPRECATED rpmRC rpmKeyringLookup(rpmKeyring keyring, pgpDig sig); /** \ingroup rpmkeyring @@ -97,9 +100,12 @@ rpmPubkey rpmPubkeyLink(rpmPubkey key); /** \ingroup rpmkeyring * Parse OpenPGP pubkey parameters. + * @deprecated Obsolete, do not use. + * * @param key Pubkey * @return parsed output of pubkey packet parameters */ +RPM_GNUC_DEPRECATED pgpDig rpmPubkeyDig(rpmPubkey key); /** \ingroup rpmkeyring diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h index c53e29b01..93f2c811e 100644 --- a/rpmio/rpmpgp.h +++ b/rpmio/rpmpgp.h @@ -1042,6 +1042,8 @@ int pgpPrtParamsSubkeys(const uint8_t *pkts, size_t pktlen, int *subkeysCount); /** \ingroup rpmpgp * Print/parse a OpenPGP packet(s). + * @deprecated Obsolete, do not use. + * * @param pkts OpenPGP packet(s) * @param pktlen OpenPGP packet(s) length (no. of bytes) * @param[out] dig parsed output of signature/pubkey packet parameters @@ -1093,18 +1095,24 @@ char * pgpArmorWrap(int atype, const unsigned char * s, size_t ns); /** \ingroup rpmpgp * Create a container for parsed OpenPGP packet(s). + * @deprecated Obsolete, do not use. + * * @return container */ pgpDig pgpNewDig(void); /** \ingroup rpmpgp * Release (malloc'd) data from container. + * @deprecated Obsolete, do not use. + * * @param dig container */ void pgpCleanDig(pgpDig dig); /** \ingroup rpmpgp * Destroy a container for parsed OpenPGP packet(s). + * @deprecated Obsolete, do not use. + * * @param dig container * @return NULL always */ |