Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

a new PR for HLS AES Encrypt feature #1109

Merged
merged 8 commits into from
Aug 25, 2018
Merged

a new PR for HLS AES Encrypt feature #1109

merged 8 commits into from
Aug 25, 2018

Conversation

harlanc
Copy link
Contributor

@harlanc harlanc commented Apr 6, 2018

fix the CI test issue

@harlanc harlanc mentioned this pull request Apr 6, 2018
Closed
@harlanc harlanc changed the title a new PR for AES Encrypt feature a new PR for HLS AES Encrypt feature Apr 7, 2018
@jhaoheng
Copy link

jhaoheng commented May 15, 2018 •
edited
Loading

@harlanc
Does srs:v2 will support this feature?

@harlanc
Copy link
Contributor Author

harlanc commented May 16, 2018

@jhaoheng yes , it will support this feature.

@winlinvip
Copy link
Member

👍 It seems great

@harlanc
Copy link
Contributor Author

harlanc commented May 23, 2018

@winlinvip thanks

@winlinvip
Copy link
Member

Please resolve the conflict in trunk/src/kernel/srs_kernel_utility.hpp. You can pull then merge 3.0release to your branch.

@winlinvip winlinvip mentioned this pull request Aug 14, 2018
Closed
@winlinvip
Copy link
Member

@T-bagwell Please review code whether exists any license problem.

@winlinvip winlinvip added the Feature It's a new feature. label Aug 14, 2018
@winlinvip winlinvip added this to the srs 3.0 release milestone Aug 14, 2018
@harlanc
Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0rel…
22c5af6 
…ease

# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
@harlanc
Copy link
Contributor Author

harlanc commented Aug 18, 2018

@winlinvip done

@winlinvip
Copy link
Member

👍 I will take some time to update wiki and docs. Really good job, buddy!

@winlinvip
Copy link
Member

winlinvip commented Aug 25, 2018 •
edited
Loading

Need to support cases that do not rely on SSL.

TRANS_BY_GPT3

@winlinvip winlinvip merged commit 22c5af6 into ossrs:3.0release Aug 25, 2018
winlinvip added a commit that referenced this pull request Aug 25, 2018
@winlinvip
For #1109, Support without ssl for HLS key.
ee068cf
@winlinvip
Copy link
Member

Refine code: 1e2cca4

@harlanc
Copy link
Contributor Author

harlanc commented Oct 17, 2018 •
edited by winlinvip
Loading

Is it because the licenses of openSSL and SRS are different?

TRANS_BY_GPT3

@winlinvip
Copy link
Member

winlinvip commented Oct 28, 2018 •
edited
Loading

Is it because the licenses of openSSL and SRS are different?

No, it's because during compilation, it allows not to depend on SSL. However, SRS3 may have to depend on SSL.

TRANS_BY_GPT3

@harlanc
Copy link
Contributor Author

harlanc commented Oct 28, 2018 •
edited by winlinvip
Loading

Oh. But it seems like the code of OpenSSL can be directly used, just need to keep the copyright statement.

TRANS_BY_GPT3

@winlinvip winlinvip added the TransByAI Translated by AI/GPT. label Jul 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Feature It's a new feature. TransByAI Translated by AI/GPT.
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@harlanc @jhaoheng @winlinvip