Merge branch 'maint'

Two fixes for gcc-12 warnings, and another fix for a benign but
embarrassing braino in gcrypt.c.

* maint:
  gcrypt: Fix return value of apc_get_pubkey().
  error.h: Be more careful with error code masking.
  mp3_afh: Drop unused fields from struct mp3header.

diff --combined crypt.h
index 5ca6a54112b60f6d61b16485248fb28ff708df6b,cee108f2da62179526c6353002d4e8cbdff794cb..5578cd563fae4dc24d673e653dcf21329eba90bc
--- 1/crypt.h
--- 2/crypt.h
+++ b/crypt.h
@@@ -48,7 -48,7 +48,7 @@@ int apc_priv_decrypt(const char *key_fi
   * \param key_file The file containing the key.
   * \param result The key structure is returned here.
   *
-  * \return The size of the key on success, negative on errors.
+  * \return The size of the key in bytes on success, negative on errors.
   */
  int apc_get_pubkey(const char *key_file, struct asymmetric_key **result);
  
@@@ -200,42 -200,3 +200,42 @@@ void hash_to_asc(const unsigned char *h
   * less than or equal to h2, respectively.
   */
  int hash_compare(const unsigned char *h1, const unsigned char *h2);
 +
 +/** Size of the hash value in bytes. */
 +#define HASH2_SIZE 32
 +
 +/**
 + * Compute the hash2 of the given input data.
 + *
 + * \param data Pointer to the data to compute the hash value from.
 + * \param len The length of \a data in bytes.
 + * \param hash Result pointer.
 + *
 + * \a hash must point to an area at least \p HASH2_SIZE bytes large.
 + *
 + * \sa sha(3), openssl(1).
 + * */
 +void hash2_function(const char *data, unsigned long len, unsigned char *hash);
 +
 +/**
 + * Convert a hash2 value to ascii format.
 + *
 + * \param hash the hash value.
 + * \param asc Result pointer.
 + *
 + * \a asc must point to an area of at least 2 * \p HASH2_SIZE + 1 bytes which
 + * will be filled by the function with the ascii representation of the hash
 + * value given by \a hash, and a terminating \p NULL byte.
 + */
 +void hash2_to_asc(const unsigned char *hash, char *asc);
 +
 +/**
 + * Compare two version 2 hashes.
 + *
 + * \param h1 Pointer to the first hash value.
 + * \param h2 Pointer to the second hash value.
 + *
 + * \return 1, -1, or zero, depending on whether \a h1 is greater than,
 + * less than or equal to h2, respectively.
 + */
 +int hash2_compare(const unsigned char *h1, const unsigned char *h2);

diff --combined error.h
index 94f315ce9948c2a042c3014c5b5c334af1129da8,f2c6e15e41e7a77fd5b30312e5ae7118d0f2f0b6..8805c9c7a4c0de6fe958e1523df883ad47effaad
--- 1/error.h
--- 2/error.h
+++ b/error.h
@@@ -2,7 -2,6 +2,7 @@@
  
  /** \file error.h List of error codes and messages. */
  
 +/** \cond para_error */
  /** Codes and messages. */
  #define PARA_ERRORS \
        PARA_ERROR(SUCCESS, "success"), \
@@@ -14,26 -13,31 +14,26 @@@
        PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
        PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
        PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \
 -      PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \
        PARA_ERROR(ALSA, "alsa error"), \
        PARA_ERROR(ALSA_MIX_GET_VAL, "could not read control element state"), \
        PARA_ERROR(ALSA_MIX_OPEN, "could not open mixer"), \
        PARA_ERROR(ALSA_MIX_RANGE, "value control element out of range"), \
        PARA_ERROR(ALSA_MIX_SET_VAL, "could not set control element state"), \
 -      PARA_ERROR(AMP_EOF, "amp: end of file"), \
        PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \
        PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
        PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \
        PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \
        PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \
 -      PARA_ERROR(AO_EOF, "ao: end of file"), \
        PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \
        PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \
        PARA_ERROR(AO_PLAY, "ao_play() failed"), \
        PARA_ERROR(AO_PTHREAD, "pthread error"), \
 -      PARA_ERROR(ARG_NOT_FOUND, "argument not found in arg vector"), \
        PARA_ERROR(ASN1_PARSE, "could not parse ASN.1 key"), \
        PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \
        PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \
        PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
        PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \
        PARA_ERROR(ATT_TABLE_FULL, "no more space left in attribute table"), \
 -      PARA_ERROR(AUDIOC_EOF, "audioc: end of file"), \
        PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
        PARA_ERROR(AUDIOD_SIGNAL, "caught deadly signal"), \
        PARA_ERROR(AUDIOD_TERM, "terminating on user request"), \
@@@ -48,7 -52,7 +48,7 @@@
        PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration"), \
        PARA_ERROR(BAD_FEATURE, "invalid feature request"), \
        PARA_ERROR(BAD_FEC_HEADER, "invalid fec header"), \
 -      PARA_ERROR(BAD_LL, "invalid loglevel"), \
 +      PARA_ERROR(BAD_MOP, "invalid mood or playlist"), \
        PARA_ERROR(BAD_PATH, "invalid path"), \
        PARA_ERROR(BAD_PRIVATE_KEY, "invalid private key"), \
        PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
@@@ -62,6 -66,7 +62,6 @@@
        PARA_ERROR(BIGNUM, "bignum error"), \
        PARA_ERROR(BLINDING, "failed to activate key blinding"), \
        PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
 -      PARA_ERROR(BTR_EOF, "buffer tree: end of file"), \
        PARA_ERROR(BTR_NAVAIL, "btr node: value currently unavailable"), \
        PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \
        PARA_ERROR(CHILD_CONTEXT, "now running in child context"), \
@@@ -69,6 -74,7 +69,6 @@@
        PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
        PARA_ERROR(CLIENT_WRITE, "client write error"), \
        PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
 -      PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \
        PARA_ERROR(CREATE_OPUS_DECODER, "could not create opus decoder"), \
        PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \
        PARA_ERROR(DECRYPT, "decrypt error"), \
@@@ -79,6 -85,7 +79,6 @@@
        PARA_ERROR(EOF, "end of file"), \
        PARA_ERROR(EOP, "end of playlist"), \
        PARA_ERROR(FEC_BAD_IDX, "invalid index vector"), \
 -      PARA_ERROR(FECDEC_EOF, "received eof packet"), \
        PARA_ERROR(FECDEC_OVERRUN, "fecdec output buffer overrun"), \
        PARA_ERROR(FEC_PARMS, "invalid fec parameters"), \
        PARA_ERROR(FEC_PIVOT, "pivot column not found"), \
@@@ -91,6 -98,7 +91,6 @@@
        PARA_ERROR(FLAC_CHAIN_READ, "could not read meta chain"), \
        PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \
        PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \
 -      PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \
        PARA_ERROR(FLAC_DECODE_POS, "could not get decode position"), \
        PARA_ERROR(FLAC_ITER_ALLOC, "could not allocate meta iterator"), \
        PARA_ERROR(FLAC_REPLACE_COMMENT, "could not replace vorbis comment"), \
@@@ -108,6 -116,7 +108,6 @@@
        PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
        PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \
        PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \
 -      PARA_ERROR(I9E_EOF, "end of input"), \
        PARA_ERROR(I9E_SETUPTERM, "failed to set up terminal"), \
        PARA_ERROR(I9E_TERM_RQ, "received termination request"), \
        PARA_ERROR(ID3_ATTACH, "could not attach id3 frame"), \
@@@ -124,16 -133,19 +124,16 @@@
        PARA_ERROR(MAKESOCK, "makesock error"), \
        PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
        PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
 -      PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
        PARA_ERROR(MOOD_PARSE, "mood parse error"), \
        PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \
 -      PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
        PARA_ERROR(MP3_INFO, "could not read mp3 info"), \
 -      PARA_ERROR(MP4FF_BAD_CHANNEL_COUNT, "mp4ff: invalid number of channels"), \
 -      PARA_ERROR(MP4FF_BAD_SAMPLE, "mp4ff: invalid sample number"), \
 -      PARA_ERROR(MP4FF_BAD_SAMPLERATE, "mp4ff: invalid sample rate"), \
 -      PARA_ERROR(MP4FF_BAD_SAMPLE_COUNT, "mp4ff: invalid number of samples"), \
 -      PARA_ERROR(MP4FF_META_READ, "mp4ff: could not read mp4 metadata"), \
 -      PARA_ERROR(MP4FF_META_WRITE, "mp4ff: could not update mp4 metadata"), \
 -      PARA_ERROR(MP4FF_OPEN, "mp4ff: open failed"), \
 -      PARA_ERROR(MP4FF_TRACK, "mp4ff: no audio track"), \
 +      PARA_ERROR(MP4_READ, "mp4: read error or unexpected end of file"), \
 +      PARA_ERROR(MP4_CORRUPT, "invalid/corrupt mp4 file"), \
 +      PARA_ERROR(MP4_BAD_SAMPLE, "mp4: invalid sample number"), \
 +      PARA_ERROR(MP4_BAD_SAMPLERATE, "mp4: invalid sample rate"), \
 +      PARA_ERROR(MP4_BAD_SAMPLE_COUNT, "mp4: invalid number of samples"), \
 +      PARA_ERROR(MP4_TRACK, "mp4: no audio track"), \
 +      PARA_ERROR(MP4_MISSING_ATOM, "mp4: essential atom not found"), \
        PARA_ERROR(MPI_SCAN, "could not scan multi-precision integer"), \
        PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
        PARA_ERROR(NO_AFHI, "audio format handler info required"), \
@@@ -141,6 -153,7 +141,6 @@@
        PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
        PARA_ERROR(NOFD, "did not receive open fd from afs"), \
        PARA_ERROR(NO_MATCH, "no matches"), \
 -      PARA_ERROR(NO_MOOD, "no mood available"), \
        PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \
        PARA_ERROR(NOT_PLAYING, "not playing"), \
        PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \
@@@ -153,6 -166,7 +153,6 @@@
        PARA_ERROR(OGGDEC_VERSION, "vorbis version mismatch"), \
        PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \
        PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \
 -      PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \
        PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
        PARA_ERROR(OPENSSH_PARSE, "could not parse openssh private key"), \
        PARA_ERROR(OPUS_COMMENT, "invalid or corrupted opus comment"), \
@@@ -160,13 -174,17 +160,13 @@@
        PARA_ERROR(OPUS_HEADER, "invalid opus header"), \
        PARA_ERROR(OPUS_SET_GAIN, "opus: could not set gain"), \
        PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \
 -      PARA_ERROR(PERM, "permission denied"), \
        PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \
 -      PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \
        PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
        PARA_ERROR(PRIVATE_KEY, "can not read private key"), \
        PARA_ERROR(QUEUE, "packet queue overrun"), \
        PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \
 -      PARA_ERROR(RECV_EOF, "end of file"), \
        PARA_ERROR(RECVMSG, "recvmsg() failed"), \
        PARA_ERROR(REGEX, "regular expression error"), \
 -      PARA_ERROR(RESAMPLE_EOF, "resample filter: end of file"), \
        PARA_ERROR(RSA, "RSA error"), \
        PARA_ERROR(RSA_DECODE, "RSA decoding error"), \
        PARA_ERROR(SB_PACKET_SIZE, "invalid sideband packet size or protocol error"), \
@@@ -176,6 -194,7 +176,6 @@@
        PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
        PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
        PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
 -      PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
        PARA_ERROR(SEXP_BUILD, "could not build S-expression"), \
        PARA_ERROR(SEXP_DECRYPT, "could not decrypt S-expression"), \
        PARA_ERROR(SEXP_ENCRYPT, "could not encrypt S-expression"), \
@@@ -219,26 -238,21 +219,26 @@@
        PARA_ERROR(VORBIS_COMMENTHEADER, "could not create vorbis comment header"), \
        PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \
        PARA_ERROR(WAV_BAD_FC, "invalid filter configuration"), \
 -      PARA_ERROR(WAV_EOF, "wav filter: end of file"), \
        PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \
        PARA_ERROR(WMA_BAD_PARAMS, "invalid WMA parameters"), \
        PARA_ERROR(WMA_BAD_SUPERFRAME, "invalid superframe"), \
        PARA_ERROR(WMA_BLOCK_SIZE, "invalid block size"), \
 -      PARA_ERROR(WMADEC_EOF, "wmadec: end of file"), \
        PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \
        PARA_ERROR(WMA_OUTPUT_SPACE, "insufficient output space"), \
 -      PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \
  
  /**
   * This is temporarily defined to expand to its first argument (prefixed by
   * 'E_') and gets later redefined to expand to the error text only
   */
  #define PARA_ERROR(err, msg) E_ ## err
 +/**
 + * Numeric error codes.
 + *
 + * Public functions which can fail return the negated value of one of the
 + * constants defined here to indicate the cause of the error.
 + *
 + * \sa \ref para_strerror().
 + */
  enum para_error_codes {PARA_ERRORS};
  #undef PARA_ERROR
  #define PARA_ERROR(err, msg) msg
@@@ -246,7 -260,6 +246,7 @@@
  extern const char * const para_errlist[];
  /** Exactly one .c file per executable must define the array. */
  #define DEFINE_PARA_ERRLIST const char * const para_errlist[] = {PARA_ERRORS}
 +/** \endcond para_error */
  
  /**
   * This bit indicates whether a number is considered a system error number
@@@ -290,18 -303,20 +290,20 @@@ static const char *weak_lls_strerror(in
   */
  _static_inline_ const char *para_strerror(int num)
  {
+       unsigned idx = num & ~((1U << OSL_ERROR_BIT) | (1U << LLS_ERROR_BIT)
+               | (1U << SYSTEM_ERROR_BIT));
        assert(num > 0);
        if (IS_OSL_ERROR(num)) {
                assert(weak_osl_strerror);
-               return weak_osl_strerror(num & ~(1U << OSL_ERROR_BIT));
+               return weak_osl_strerror(idx);
        }
        if (IS_LLS_ERROR(num)) {
                assert(weak_lls_strerror);
-               return weak_lls_strerror(num & ~(1U << LLS_ERROR_BIT));
+               return weak_lls_strerror(idx);
        }
        if (IS_SYSTEM_ERROR(num))
-               return strerror(num & ~(1U << SYSTEM_ERROR_BIT));
-       return para_errlist[num];
+               return strerror(idx);
+       return para_errlist[idx];
  }
  
  /**

diff --combined gcrypt.c
index 763fa6de3252d2f5f188fc3f447f2029d0f5775a,c6024d285c15315b25c8fd3ce26966093caa1fe9..f9a849067f3ef1084b36e36ccef72cf1826a12a9
--- 1/gcrypt.c
--- 2/gcrypt.c
+++ b/gcrypt.c
@@@ -46,22 -46,6 +46,22 @@@ void hash_function(const char *data, un
        gcry_md_close(handle);
  }
  
 +void hash2_function(const char *data, unsigned long len, unsigned char *hash)
 +{
 +      gcry_error_t gret;
 +      gcry_md_hd_t handle;
 +      unsigned char *md;
 +
 +      gret = gcry_md_open(&handle, GCRY_MD_SHA256, 0);
 +      assert(gret == 0);
 +      gcry_md_write(handle, data, (size_t)len);
 +      gcry_md_final(handle);
 +      md = gcry_md_read(handle, GCRY_MD_SHA256);
 +      assert(md);
 +      memcpy(hash, md, HASH2_SIZE);
 +      gcry_md_close(handle);
 +}
 +
  void get_random_bytes_or_die(unsigned char *buf, int num)
  {
        gcry_randomize(buf, (size_t)num, GCRY_STRONG_RANDOM);
@@@ -406,7 -390,7 +406,7 @@@ static int get_private_key(const char *
                ret = -E_SEXP_BUILD;
                goto free_params;
        }
 -      key = para_malloc(sizeof(*key));
 +      key = alloc(sizeof(*key));
        key->sexp = sexp;
        *result = key;
        ret = bits;
@@@ -456,11 -440,11 +456,11 @@@ int apc_get_pubkey(const char *key_file
                goto release_n;
        }
        PARA_INFO_LOG("successfully read %u bit ssh public key\n", bits);
 -      key = para_malloc(sizeof(*key));
 +      key = alloc(sizeof(*key));
        key->num_bytes = ret;
        key->sexp = sexp;
        *result = key;
-       ret = bits;
+       ret = bits / 8;
  release_n:
        gcry_mpi_release(n);
  release_e:
@@@ -624,7 -608,7 +624,7 @@@ struct stream_cipher 
  struct stream_cipher *sc_new(const unsigned char *data, int len)
  {
        gcry_error_t gret;
 -      struct stream_cipher *sc = para_malloc(sizeof(*sc));
 +      struct stream_cipher *sc = alloc(sizeof(*sc));
  
        assert(len >= 2 * AES_CRT128_BLOCK_SIZE);
        gret = gcry_cipher_open(&sc->handle, GCRY_CIPHER_AES128,

diff --combined mp3_afh.c
index d7493ac01e28bba581b7112a41a37e84426be11a,652aa70cda050ae3c58202e856921a02ac7c06cd..56f28a09d8eb9fd18a9ba2262f14a58c6cec7997
--- 1/mp3_afh.c
--- 2/mp3_afh.c
+++ b/mp3_afh.c
@@@ -37,9 -37,6 +37,6 @@@ struct mp3header 
        unsigned int freq;
        unsigned int padding;
        unsigned int mode;
-       unsigned int copyright;
-       unsigned int original;
-       unsigned int emphasis;
  };
  
  static const int frequencies[3][4] = {
@@@ -348,7 -345,7 +345,7 @@@ static int mp3_rewrite_tags(const char 
        if (ret < 0)
                goto out;
        new_v2size = id3_tag_render(v2_tag, NULL);
 -      v2_buffer = para_malloc(new_v2size);
 +      v2_buffer = alloc(new_v2size);
        id3_tag_render(v2_tag, v2_buffer);
        PARA_INFO_LOG("writing v2 tag (%lu bytes)\n", new_v2size);
        ret = write_all(fd, (char *)v2_buffer, new_v2size);
@@@ -473,7 -470,7 +470,7 @@@ static int frame_length(struct mp3heade
                + header->padding;
  }
  
- static int compare_headers(struct mp3header *h1,struct mp3header *h2)
+ static int compare_headers(struct mp3header *h1, struct mp3header *h2)
  {
        if ((*(unsigned int*)h1) == (*(unsigned int*)h2))
                return 1;
@@@ -481,10 -478,7 +478,7 @@@
                        (h1->layer == h2->layer) &&
                        (h1->crc == h2->crc) &&
                        (h1->freq == h2->freq) &&
-                       (h1->mode == h2->mode) &&
-                       (h1->copyright == h2->copyright) &&
-                       (h1->original == h2->original) &&
-                       (h1->emphasis == h2->emphasis))
+                       (h1->mode == h2->mode))
                return 1;
        return 0;
  }
@@@ -598,7 -592,7 +592,7 @@@ static int mp3_read_info(unsigned char 
        const char *tag_versions[] = {"no", "id3v1", "id3v2", "id3v1+id3v2"};
  
        afhi->chunks_total = 0;
 -      afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
 +      afhi->chunk_table = arr_alloc(chunk_table_size, sizeof(uint32_t));
        while (1) {
                int freq, br;
                struct timeval tmp, cct; /* current chunk time */
@@@ -633,8 -627,8 +627,8 @@@
                total_time = tmp;
                if (afhi->chunks_total >= chunk_table_size) {
                        chunk_table_size *= 2;
 -                      afhi->chunk_table = para_realloc(afhi->chunk_table,
 -                              chunk_table_size * sizeof(uint32_t));
 +                      afhi->chunk_table = arr_realloc(afhi->chunk_table,
 +                              chunk_table_size, sizeof(uint32_t));
                }
                afhi->chunk_table[afhi->chunks_total] = fpos;
                afhi->chunks_total++;