diff options
| author | kamil <kamil@pkgsrc.org> | 2016-10-30 01:10:10 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2016-10-30 01:10:10 +0000 |
| commit | e9d75b109534904ef1c3256b8aef4cb48fc1ee44 (patch) | |
| tree | 0d46563c27232c9a1bf3d902b5c10858f8ef7f23 /www/firefox | |
| parent | a89981e3ecca16b66f120aca1ea0495512213fe4 (diff) | |
| download | pkgsrc-e9d75b109534904ef1c3256b8aef4cb48fc1ee44.tar.gz | |
Sync new hmac name as ffhmac
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/distinfo | 4 | ||||
| -rw-r--r-- | www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 98a3689fc15..5e4c1fa2f15 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.256 2016/10/30 01:06:26 kamil Exp $ +$NetBSD: distinfo,v 1.257 2016/10/30 01:10:10 kamil Exp $ SHA1 (firefox-49.0.2.source.tar.xz) = 52d527f06c522c95e2fcf4008dce1a9913379aaf RMD160 (firefox-49.0.2.source.tar.xz) = b0c7bda2f551ea025bb75b0f9a58722f7322ea2d @@ -80,7 +80,7 @@ SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 133b1658839d9b0f932a601670862c1f4 SHA1 (patch-modules_libpref_init_all.js) = 3bc5962fdabb5aecb72ffc7e73bb56392d1ea717 SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249 SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc -SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = 7f097a1096c91d66fe365c0875e1bb726379d886 +SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = 852abd95ca0a553bbe1b65da2fa4006fd205d588 SHA1 (patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = a589bff3b76e79b54f5e617020b137ff3d7f816b SHA1 (patch-python_mozbuild_mozbuild_configure_options.py) = f862ee425ae016df6fe12b55050a8dc075ecce89 SHA1 (patch-rc) = 9628b038f036f3fc0e37bdf84fa0abf99dbc8d2a diff --git a/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c b/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c index 14b38dcdba5..cb8e375a6cb 100644 --- a/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c +++ b/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c @@ -1,4 +1,4 @@ -$NetBSD: patch-netwerk_srtp_src_crypto_hash_hmac.c,v 1.1 2016/10/30 01:06:26 kamil Exp $ +$NetBSD: patch-netwerk_srtp_src_crypto_hash_hmac.c,v 1.2 2016/10/30 01:10:10 kamil Exp $ Fix conflicting hmac symbol name with <stdlib.h> on NetBSD. @@ -9,7 +9,7 @@ Fix conflicting hmac symbol name with <stdlib.h> on NetBSD. err_status_t hmac_alloc(auth_t **a, int key_len, int out_len) { - extern auth_type_t hmac; -+ extern auth_type_t my_hmac; ++ extern auth_type_t ffhmac; uint8_t *pointer; debug_print(mod_hmac, "allocating auth func with key length %d", key_len); @@ -18,7 +18,7 @@ Fix conflicting hmac symbol name with <stdlib.h> on NetBSD. /* set pointers */ *a = (auth_t *)pointer; - (*a)->type = &hmac; -+ (*a)->type = &my_hmac; ++ (*a)->type = &ffhmac; (*a)->state = pointer + sizeof(auth_t); (*a)->out_len = out_len; (*a)->key_len = key_len; @@ -26,7 +26,7 @@ Fix conflicting hmac symbol name with <stdlib.h> on NetBSD. /* increment global count of all hmac uses */ - hmac.ref_count++; -+ my_hmac.ref_count++; ++ ffhmac.ref_count++; return err_status_ok; } @@ -34,7 +34,7 @@ Fix conflicting hmac symbol name with <stdlib.h> on NetBSD. err_status_t hmac_dealloc(auth_t *a) { - extern auth_type_t hmac; -+ extern auth_type_t my_hmac; ++ extern auth_type_t ffhmac; /* zeroize entire state*/ octet_string_set_to_zero((uint8_t *)a, @@ -43,7 +43,7 @@ Fix conflicting hmac symbol name with <stdlib.h> on NetBSD. /* decrement global count of all hmac uses */ - hmac.ref_count--; -+ my_hmac.ref_count--; ++ ffhmac.ref_count--; return err_status_ok; } |